ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.113 by root, Mon Jan 1 15:32:40 2007 UTC vs.
Revision 1.167 by root, Sat Jan 13 23:32:43 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
37our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
38 43
39our @EVENT; 44our @EVENT;
40our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
41 46
42our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
47our %CFG; 52our %CFG;
48 53
49our $UPTIME; $UPTIME ||= time; 54our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 55our $RUNTIME;
51 56
57our %PLAYER; # all users
52our %MAP; # all maps 58our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 59our $LINK_MAP; # the special {link} map, which is always available
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 60our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 61
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64
65# used to convert map paths into valid unix filenames by replacing / by ∕
66our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
57 67
58binmode STDOUT; 68binmode STDOUT;
59binmode STDERR; 69binmode STDERR;
60 70
61# read virtual server time, if available 71# read virtual server time, if available
69mkdir cf::localdir . "/" . cf::playerdir; 79mkdir cf::localdir . "/" . cf::playerdir;
70mkdir cf::localdir . "/" . cf::tmpdir; 80mkdir cf::localdir . "/" . cf::tmpdir;
71mkdir cf::localdir . "/" . cf::uniquedir; 81mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 82mkdir $RANDOM_MAPS;
73 83
74# a special map that is always available 84our $EMERGENCY_POSITION;
75our $LINK_MAP;
76
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 85
79############################################################################# 86#############################################################################
80 87
81=head2 GLOBAL VARIABLES 88=head2 GLOBAL VARIABLES
82 89
106 113
107=item %cf::CFG 114=item %cf::CFG
108 115
109Configuration for the server, loaded from C</etc/crossfire/config>, or 116Configuration for the server, loaded from C</etc/crossfire/config>, or
110from wherever your confdir points to. 117from wherever your confdir points to.
118
119=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
120
121These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
122or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
123processing has been done. Call C<< ->wait >> on them to maximise the
124window of cpu time available, or simply to synchronise to the server tick.
111 125
112=back 126=back
113 127
114=cut 128=cut
115 129
119 utf8::encode $msg; 133 utf8::encode $msg;
120 134
121 $msg .= "\n" 135 $msg .= "\n"
122 unless $msg =~ /\n$/; 136 unless $msg =~ /\n$/;
123 137
124 LOG llevError, "cfperl: $msg"; 138 LOG llevError, $msg;
125 }; 139 };
126} 140}
127 141
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 142@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 143@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
147 161
148$Event::DIED = sub { 162$Event::DIED = sub {
149 warn "error in event callback: @_"; 163 warn "error in event callback: @_";
150}; 164};
151 165
152my %ext_pkg;
153my @exts;
154my @hook;
155
156=head2 UTILITY FUNCTIONS 166=head2 UTILITY FUNCTIONS
157 167
158=over 4 168=over 4
159 169
170=item dumpval $ref
171
160=cut 172=cut
173
174sub dumpval {
175 eval {
176 local $SIG{__DIE__};
177 my $d;
178 if (1) {
179 $d = new Data::Dumper([$_[0]], ["*var"]);
180 $d->Terse(1);
181 $d->Indent(2);
182 $d->Quotekeys(0);
183 $d->Useqq(1);
184 #$d->Bless(...);
185 $d->Seen($_[1]) if @_ > 1;
186 $d = $d->Dump();
187 }
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d
190 } || "[unable to dump $_[0]: '$@']";
191}
161 192
162use JSON::Syck (); # TODO# replace by JSON::PC once working 193use JSON::Syck (); # TODO# replace by JSON::PC once working
163 194
164=item $ref = cf::from_json $json 195=item $ref = cf::from_json $json
165 196
180 211
181sub to_json($) { 212sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 214 JSON::Syck::Dump $_[0]
184} 215}
216
217=item cf::lock_wait $string
218
219Wait until the given lock is available. See cf::lock_acquire.
220
221=item my $lock = cf::lock_acquire $string
222
223Wait until the given lock is available and then acquires it and returns
224a Coro::guard object. If the guard object gets destroyed (goes out of scope,
225for example when the coroutine gets canceled), the lock is automatically
226returned.
227
228Lock names should begin with a unique identifier (for example, cf::map::find
229uses map_find and cf::map::load uses map_load).
230
231=cut
232
233our %LOCK;
234
235sub lock_wait($) {
236 my ($key) = @_;
237
238 # wait for lock, if any
239 while ($LOCK{$key}) {
240 push @{ $LOCK{$key} }, $Coro::current;
241 Coro::schedule;
242 }
243}
244
245sub lock_acquire($) {
246 my ($key) = @_;
247
248 # wait, to be sure we are not locked
249 lock_wait $key;
250
251 $LOCK{$key} = [];
252
253 Coro::guard {
254 # wake up all waiters, to be on the safe side
255 $_->ready for @{ delete $LOCK{$key} };
256 }
257}
258
259sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active;
261
262 my $guard = Coro::guard { $TICK_WATCHER->start };
263 $TICK_WATCHER->stop;
264 $guard
265}
266
267=item cf::async { BLOCK }
268
269Currently the same as Coro::async_pool, meaning you cannot use
270C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
271thing you are allowed to do is call C<prio> on it.
272
273=cut
274
275BEGIN { *async = \&Coro::async_pool }
185 276
186=item cf::sync_job { BLOCK } 277=item cf::sync_job { BLOCK }
187 278
188The design of crossfire+ requires that the main coro ($Coro::main) is 279The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 280always able to handle events or runnable, as crossfire+ is only partly
203 # this is the main coro, too bad, we have to block 294 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 295 # till the operation succeeds, freezing the server :/
205 296
206 # TODO: use suspend/resume instead 297 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 298 # (but this is cancel-safe)
208 local $FREEZE = 1; 299 my $freeze_guard = freeze_mainloop;
209 300
210 my $busy = 1; 301 my $busy = 1;
211 my @res; 302 my @res;
212 303
213 (Coro::async { 304 (async {
214 @res = eval { $job->() }; 305 @res = eval { $job->() };
215 warn $@ if $@; 306 warn $@ if $@;
216 undef $busy; 307 undef $busy;
217 })->prio (Coro::PRIO_MAX); 308 })->prio (Coro::PRIO_MAX);
218 309
219 while ($busy) { 310 while ($busy) {
220 Coro::cede_notself; 311 Coro::cede or Event::one_event;
221 Event::one_event unless Coro::nready;
222 } 312 }
223 313
224 wantarray ? @res : $res[0] 314 wantarray ? @res : $res[0]
225 } else { 315 } else {
226 # we are in another coroutine, how wonderful, everything just works 316 # we are in another coroutine, how wonderful, everything just works
227 317
228 $job->() 318 $job->()
229 } 319 }
230} 320}
231 321
232=item $coro = cf::coro { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
233 323
234Creates and returns a new coro. This coro is automcatially being canceled 324Like async, but this coro is automatically being canceled when the
235when the extension calling this is being unloaded. 325extension calling this is being unloaded.
236 326
237=cut 327=cut
238 328
239sub coro(&) { 329sub async_ext(&) {
240 my $cb = shift; 330 my $cb = shift;
241 331
242 my $coro; $coro = async { 332 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 333
249 $coro->on_destroy (sub { 334 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 335 delete $EXT_CORO{$coro+0};
251 }); 336 });
252 $EXT_CORO{$coro+0} = $coro; 337 $EXT_CORO{$coro+0} = $coro;
253 338
254 $coro 339 $coro
255} 340}
256 341
257sub write_runtime { 342sub write_runtime {
343 return unless $TICK_WATCHER->is_active;
344
258 my $runtime = cf::localdir . "/runtime"; 345 my $runtime = cf::localdir . "/runtime";
259 346
260 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
261 or return; 348 or return;
262 349
277} 364}
278 365
279=back 366=back
280 367
281=cut 368=cut
282
283#############################################################################
284
285package cf::path;
286
287sub new {
288 my ($class, $path, $base) = @_;
289
290 $path = $path->as_string if ref $path;
291
292 my $self = bless { }, $class;
293
294 if ($path =~ s{^\?random/}{}) {
295 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
296 $self->{random} = cf::from_json $data;
297 } else {
298 if ($path =~ s{^~([^/]+)?}{}) {
299 $self->{user_rel} = 1;
300
301 if (defined $1) {
302 $self->{user} = $1;
303 } elsif ($base =~ m{^~([^/]+)/}) {
304 $self->{user} = $1;
305 } else {
306 warn "cannot resolve user-relative path without user <$path,$base>\n";
307 }
308 } elsif ($path =~ /^\//) {
309 # already absolute
310 } else {
311 $base =~ s{[^/]+/?$}{};
312 return $class->new ("$base/$path");
313 }
314
315 for ($path) {
316 redo if s{/\.?/}{/};
317 redo if s{/[^/]+/\.\./}{/};
318 }
319 }
320
321 $self->{path} = $path;
322
323 $self
324}
325
326# the name / primary key / in-game path
327sub as_string {
328 my ($self) = @_;
329
330 $self->{user_rel} ? "~$self->{user}$self->{path}"
331 : $self->{random} ? "?random/$self->{path}"
332 : $self->{path}
333}
334
335# the displayed name, this is a one way mapping
336sub visible_name {
337 my ($self) = @_;
338
339# if (my $rmp = $self->{random}) {
340# # todo: be more intelligent about this
341# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
342# } else {
343 $self->as_string
344# }
345}
346
347# escape the /'s in the path
348sub _escaped_path {
349 # ∕ is U+2215
350 (my $path = $_[0]{path}) =~ s/\//∕/g;
351 $path
352}
353
354# the original (read-only) location
355sub load_path {
356 my ($self) = @_;
357
358 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
359}
360
361# the temporary/swap location
362sub save_path {
363 my ($self) = @_;
364
365 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
366 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
367 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
368}
369
370# the unique path, might be eq to save_path
371sub uniq_path {
372 my ($self) = @_;
373
374 $self->{user_rel} || $self->{random}
375 ? undef
376 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
377}
378
379# return random map parameters, or undef
380sub random_map_params {
381 my ($self) = @_;
382
383 $self->{random}
384}
385
386# this is somewhat ugly, but style maps do need special treatment
387sub is_style_map {
388 $_[0]{path} =~ m{^/styles/}
389}
390
391package cf;
392 369
393############################################################################# 370#############################################################################
394 371
395=head2 ATTACHABLE OBJECTS 372=head2 ATTACHABLE OBJECTS
396 373
807 (aio_load "$filename.pst", $av) >= 0 784 (aio_load "$filename.pst", $av) >= 0
808 or return; 785 or return;
809 $av = eval { (Storable::thaw $av)->{objs} }; 786 $av = eval { (Storable::thaw $av)->{objs} };
810 } 787 }
811 788
789 warn sprintf "loading %s (%d)\n",
790 $filename, length $data, scalar @{$av || []};#d#
812 return ($data, $av); 791 return ($data, $av);
813} 792}
814 793
815############################################################################# 794#############################################################################
816# command handling &c 795# command handling &c
841=cut 820=cut
842 821
843sub register_extcmd { 822sub register_extcmd {
844 my ($name, $cb) = @_; 823 my ($name, $cb) = @_;
845 824
846 my $caller = caller;
847 #warn "registering extcmd '$name' to '$caller'";
848
849 $EXTCMD{$name} = [$cb, $caller]; 825 $EXTCMD{$name} = $cb;
850} 826}
851 827
852cf::player->attach ( 828cf::player->attach (
853 on_command => sub { 829 on_command => sub {
854 my ($pl, $name, $params) = @_; 830 my ($pl, $name, $params) = @_;
867 843
868 my $msg = eval { from_json $buf }; 844 my $msg = eval { from_json $buf };
869 845
870 if (ref $msg) { 846 if (ref $msg) {
871 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 847 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
872 if (my %reply = $cb->[0]->($pl, $msg)) { 848 if (my %reply = $cb->($pl, $msg)) {
873 $pl->ext_reply ($msg->{msgid}, %reply); 849 $pl->ext_reply ($msg->{msgid}, %reply);
874 } 850 }
875 } 851 }
876 } else { 852 } else {
877 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 853 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
879 855
880 cf::override; 856 cf::override;
881 }, 857 },
882); 858);
883 859
884sub register {
885 my ($base, $pkg) = @_;
886
887 #TODO
888}
889
890sub load_extension { 860sub load_extension {
891 my ($path) = @_; 861 my ($path) = @_;
892 862
893 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 863 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
894 my $base = $1; 864 my $base = $1;
895 my $pkg = $1; 865 my $pkg = $1;
896 $pkg =~ s/[^[:word:]]/_/g; 866 $pkg =~ s/[^[:word:]]/_/g;
897 $pkg = "ext::$pkg"; 867 $pkg = "ext::$pkg";
898 868
899 warn "loading '$path' into '$pkg'\n"; 869 warn "... loading '$path' into '$pkg'\n";
900 870
901 open my $fh, "<:utf8", $path 871 open my $fh, "<:utf8", $path
902 or die "$path: $!"; 872 or die "$path: $!";
903 873
904 my $source = 874 my $source =
905 "package $pkg; use strict; use utf8;\n" 875 "package $pkg; use strict; use utf8;\n"
906 . "#line 1 \"$path\"\n{\n" 876 . "#line 1 \"$path\"\n{\n"
907 . (do { local $/; <$fh> }) 877 . (do { local $/; <$fh> })
908 . "\n};\n1"; 878 . "\n};\n1";
909 879
910 eval $source 880 unless (eval $source) {
911 or die $@ ? "$path: $@\n" 881 my $msg = $@ ? "$path: $@\n"
912 : "extension disabled.\n"; 882 : "extension disabled.\n";
913 883 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
914 push @exts, $pkg; 884 warn $@;
915 $ext_pkg{$base} = $pkg; 885 warn "mandatory extension failed to load, exiting.\n";
916 886 exit 1;
917# no strict 'refs'; 887 }
918# @{"$pkg\::ISA"} = ext::; 888 die $@;
919
920 register $base, $pkg;
921}
922
923sub unload_extension {
924 my ($pkg) = @_;
925
926 warn "removing extension $pkg\n";
927
928 # remove hooks
929 #TODO
930# for my $idx (0 .. $#PLUGIN_EVENT) {
931# delete $hook[$idx]{$pkg};
932# } 889 }
933 890
934 # remove commands 891 push @EXTS, $pkg;
935 for my $name (keys %COMMAND) {
936 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
937
938 if (@cb) {
939 $COMMAND{$name} = \@cb;
940 } else {
941 delete $COMMAND{$name};
942 }
943 }
944
945 # remove extcmds
946 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
947 delete $EXTCMD{$name};
948 }
949
950 if (my $cb = $pkg->can ("unload")) {
951 eval {
952 $cb->($pkg);
953 1
954 } or warn "$pkg unloaded, but with errors: $@";
955 }
956
957 Symbol::delete_package $pkg;
958} 892}
959 893
960sub load_extensions { 894sub load_extensions {
961 for my $ext (<$LIBDIR/*.ext>) { 895 for my $ext (<$LIBDIR/*.ext>) {
962 next unless -r $ext; 896 next unless -r $ext;
966 } or warn "$ext not loaded: $@"; 900 } or warn "$ext not loaded: $@";
967 } 901 }
968} 902}
969 903
970############################################################################# 904#############################################################################
971# load/save/clean perl data associated with a map
972
973*cf::mapsupport::on_clean = sub {
974 my ($map) = @_;
975
976 my $path = $map->tmpname;
977 defined $path or return;
978
979 unlink "$path.pst";
980};
981
982cf::map->attach (prio => -10000, package => cf::mapsupport::);
983
984#############################################################################
985# load/save perl data associated with player->ob objects
986
987sub all_objects(@) {
988 @_, map all_objects ($_->inv), @_
989}
990
991# TODO: compatibility cruft, remove when no longer needed
992cf::player->attach (
993 on_load => sub {
994 my ($pl, $path) = @_;
995
996 for my $o (all_objects $pl->ob) {
997 if (my $value = $o->get_ob_key_value ("_perl_data")) {
998 $o->set_ob_key_value ("_perl_data");
999
1000 %$o = %{ Storable::thaw pack "H*", $value };
1001 }
1002 }
1003 },
1004);
1005
1006#############################################################################
1007 905
1008=head2 CORE EXTENSIONS 906=head2 CORE EXTENSIONS
1009 907
1010Functions and methods that extend core crossfire objects. 908Functions and methods that extend core crossfire objects.
1011 909
910=cut
911
912package cf::player;
913
914use Coro::AIO;
915
1012=head3 cf::player 916=head3 cf::player
1013 917
1014=over 4 918=over 4
1015 919
1016=item cf::player::exists $login 920=item cf::player::find $login
1017 921
1018Returns true when the given account exists. 922Returns the given player object, loading it if necessary (might block).
1019 923
1020=cut 924=cut
1021 925
1022sub cf::player::exists($) { 926sub playerdir($) {
1023 cf::player::find $_[0] 927 cf::localdir
1024 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 928 . "/"
929 . cf::playerdir
930 . "/"
931 . (ref $_[0] ? $_[0]->ob->name : $_[0])
932}
933
934sub path($) {
935 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
936
937 (playerdir $login) . "/$login.pl"
938}
939
940sub find_active($) {
941 $cf::PLAYER{$_[0]}
942 and $cf::PLAYER{$_[0]}->active
943 and $cf::PLAYER{$_[0]}
944}
945
946sub exists($) {
947 my ($login) = @_;
948
949 $cf::PLAYER{$login}
950 or cf::sync_job { !aio_stat $login }
951}
952
953sub find($) {
954 return $cf::PLAYER{$_[0]} || do {
955 my $login = $_[0];
956
957 my $guard = cf::lock_acquire "user_find:$login";
958
959 $cf::PLAYER{$_[0]} || do {
960 my $pl = load_pl path $login
961 or return;
962 $cf::PLAYER{$login} = $pl
963 }
964 }
965}
966
967sub save($) {
968 my ($pl) = @_;
969
970 return if $pl->{deny_save};
971
972 my $path = path $pl;
973 my $guard = cf::lock_acquire "user_save:$path";
974
975 return if $pl->{deny_save};
976
977 aio_mkdir playerdir $pl, 0770;
978 $pl->{last_save} = $cf::RUNTIME;
979
980 $pl->save_pl ($path);
981 Coro::cede;
982}
983
984sub new($) {
985 my ($login) = @_;
986
987 my $self = create;
988
989 $self->ob->name ($login);
990 $self->{deny_save} = 1;
991
992 $cf::PLAYER{$login} = $self;
993
994 $self
995}
996
997=item $pl->quit_character
998
999Nukes the player without looking back. If logged in, the connection will
1000be destroyed. May block for a long time.
1001
1002=cut
1003
1004sub quit_character {
1005 my ($pl) = @_;
1006
1007 $pl->{deny_save} = 1;
1008 $pl->password ("*"); # this should lock out the player until we nuked the dir
1009
1010 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1011 $pl->deactivate;
1012 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1013 $pl->ns->destroy if $pl->ns;
1014
1015 my $path = playerdir $pl;
1016 my $temp = "$path~$cf::RUNTIME~deleting~";
1017 aio_rename $path, $temp;
1018 delete $cf::PLAYER{$pl->ob->name};
1019 $pl->destroy;
1020 IO::AIO::aio_rmtree $temp;
1021}
1022
1023=item cf::player::list_logins
1024
1025Returns am arrayref of all valid playernames in the system, can take a
1026while and may block, so not sync_job-capable, ever.
1027
1028=cut
1029
1030sub list_logins {
1031 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1032 or return [];
1033
1034 my @logins;
1035
1036 for my $login (@$dirs) {
1037 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1038 aio_read $fh, 0, 512, my $buf, 0 or next;
1039 $buf !~ /^password -------------$/m or next; # official not-valid tag
1040
1041 utf8::decode $login;
1042 push @logins, $login;
1043 }
1044
1045 \@logins
1046}
1047
1048=item $player->maps
1049
1050Returns an arrayref of map paths that are private for this
1051player. May block.
1052
1053=cut
1054
1055sub maps($) {
1056 my ($pl) = @_;
1057
1058 my $files = aio_readdir playerdir $pl
1059 or return;
1060
1061 my @paths;
1062
1063 for (@$files) {
1064 utf8::decode $_;
1065 next if /\.(?:pl|pst)$/;
1066 next unless /^$PATH_SEP/o;
1067
1068 s/\.map$//;
1069 push @paths, "~" . $pl->ob->name . "/" . $_;
1070 }
1071
1072 \@paths
1025} 1073}
1026 1074
1027=item $player->ext_reply ($msgid, $msgtype, %msg) 1075=item $player->ext_reply ($msgid, $msgtype, %msg)
1028 1076
1029Sends an ext reply to the player. 1077Sends an ext reply to the player.
1030 1078
1031=cut 1079=cut
1032 1080
1033sub cf::player::ext_reply($$$%) { 1081sub ext_reply($$$%) {
1034 my ($self, $id, %msg) = @_; 1082 my ($self, $id, %msg) = @_;
1035 1083
1036 $msg{msgid} = $id; 1084 $msg{msgid} = $id;
1037 1085
1038 $self->send ("ext " . to_json \%msg); 1086 $self->send ("ext " . cf::to_json \%msg);
1039} 1087}
1088
1089package cf;
1040 1090
1041=back 1091=back
1042 1092
1043 1093
1044=head3 cf::map 1094=head3 cf::map
1050package cf::map; 1100package cf::map;
1051 1101
1052use Fcntl; 1102use Fcntl;
1053use Coro::AIO; 1103use Coro::AIO;
1054 1104
1105use overload
1106 '""' => \&as_string;
1107
1055our $MAX_RESET = 7200; 1108our $MAX_RESET = 3600;
1056our $DEFAULT_RESET = 3600; 1109our $DEFAULT_RESET = 3000;
1057 1110
1058sub generate_random_map { 1111sub generate_random_map {
1059 my ($path, $rmp) = @_; 1112 my ($self, $rmp) = @_;
1060 1113
1061 # mit "rum" bekleckern, nicht 1114 # mit "rum" bekleckern, nicht
1062 cf::map::_create_random_map 1115 $self->_create_random_map (
1063 $path,
1064 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1065 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1066 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1067 $rmp->{exit_on_final_map}, 1119 $rmp->{exit_on_final_map},
1068 $rmp->{xsize}, $rmp->{ysize}, 1120 $rmp->{xsize}, $rmp->{ysize},
1069 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1121 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1070 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1122 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1071 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1123 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1072 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1124 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1073 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1074 (cf::region::find $rmp->{region}) 1126 (cf::region::find $rmp->{region}), $rmp->{custom}
1127 )
1128}
1129
1130sub register {
1131 my (undef, $regex) = @_;
1132 my $pkg = caller;
1133
1134 no strict;
1135 push @{"$pkg\::ISA"}, __PACKAGE__;
1136
1137 $EXT_MAP{$pkg} = qr<$regex>;
1138}
1139
1140# also paths starting with '/'
1141$EXT_MAP{"cf::map"} = qr{^(?=/)};
1142
1143sub normalise {
1144 my ($path, $base) = @_;
1145
1146 # map plan:
1147 #
1148 # /! non-realised random map exit (special hack!)
1149 # {... are special paths that are not being touched
1150 # ?xxx/... are special absolute paths
1151 # ?random/... random maps
1152 # /... normal maps
1153 # ~user/... per-player map of a specific user
1154
1155 $path =~ s/$PATH_SEP/\//go;
1156
1157 # treat it as relative path if it starts with
1158 # something that looks reasonable
1159 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1160 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1161
1162 $base =~ s{[^/]+/?$}{};
1163 $path = "$base/$path";
1164 }
1165
1166 for ($path) {
1167 redo if s{//}{/};
1168 redo if s{/\.?/}{/};
1169 redo if s{/[^/]+/\.\./}{/};
1170 }
1171
1172 $path
1173}
1174
1175sub new_from_path {
1176 my (undef, $path, $base) = @_;
1177
1178 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1179
1180 $path = normalise $path, $base;
1181
1182 for my $pkg (keys %EXT_MAP) {
1183 if ($path =~ $EXT_MAP{$pkg}) {
1184 my $self = bless cf::map::new, $pkg;
1185 $self->{path} = $path; $self->path ($path);
1186 $self->init; # pass $1 etc.
1187 return $self;
1188 }
1189 }
1190
1191 Carp::carp "unable to resolve path '$path'.";
1192 ()
1193}
1194
1195sub init {
1196 my ($self) = @_;
1197
1198 $self
1199}
1200
1201sub as_string {
1202 my ($self) = @_;
1203
1204 "$self->{path}"
1205}
1206
1207# the displayed name, this is a one way mapping
1208sub visible_name {
1209 &as_string
1210}
1211
1212# the original (read-only) location
1213sub load_path {
1214 my ($self) = @_;
1215
1216 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1217}
1218
1219# the temporary/swap location
1220sub save_path {
1221 my ($self) = @_;
1222
1223 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1224 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1225}
1226
1227# the unique path, undef == no special unique path
1228sub uniq_path {
1229 my ($self) = @_;
1230
1231 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1232 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1075} 1233}
1076 1234
1077# and all this just because we cannot iterate over 1235# and all this just because we cannot iterate over
1078# all maps in C++... 1236# all maps in C++...
1079sub change_all_map_light { 1237sub change_all_map_light {
1080 my ($change) = @_; 1238 my ($change) = @_;
1081 1239
1082 $_->change_map_light ($change) for values %cf::MAP; 1240 $_->change_map_light ($change)
1241 for grep $_->outdoor, values %cf::MAP;
1083} 1242}
1084 1243
1244sub unlink_save {
1245 my ($self) = @_;
1246
1247 utf8::encode (my $save = $self->save_path);
1248 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1249 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1250}
1251
1085sub try_load_header($) { 1252sub load_header_from($) {
1086 my ($path) = @_; 1253 my ($self, $path) = @_;
1087 1254
1088 utf8::encode $path; 1255 utf8::encode $path;
1089 aio_open $path, O_RDONLY, 0 1256 aio_open $path, O_RDONLY, 0
1090 or return; 1257 or return;
1091 1258
1092 my $map = cf::map::new 1259 $self->_load_header ($path)
1093 or return; 1260 or return;
1094 1261
1095 $map->load_header ($path) 1262 $self->{load_path} = $path;
1263
1264 1
1265}
1266
1267sub load_orig {
1268 my ($self) = @_;
1269
1270 $self->load_header_from ($self->load_path)
1271}
1272
1273sub load_temp {
1274 my ($self) = @_;
1275
1276 $self->load_header_from ($self->save_path)
1277}
1278
1279sub load_header {
1280 my ($self) = @_;
1281
1282 if ($self->load_temp) {
1283 $self->last_access ((delete $self->{last_access})
1284 || $cf::RUNTIME); #d#
1285 # safety
1286 $self->{instantiate_time} = $cf::RUNTIME
1287 if $self->{instantiate_time} > $cf::RUNTIME;
1288 } else {
1289 $self->load_orig
1096 or return; 1290 or return;
1097 1291
1098 $map->{load_path} = $path; 1292 $self->{load_original} = 1;
1293 $self->{instantiate_time} = $cf::RUNTIME;
1294 $self->last_access ($cf::RUNTIME);
1295 $self->instantiate;
1296 }
1099 1297
1100 $map 1298 1
1101} 1299}
1102 1300
1301sub find;
1103sub find_map { 1302sub find {
1104 my ($path, $origin) = @_; 1303 my ($path, $origin) = @_;
1105 1304
1106 #warn "find_map<$path,$origin>\n";#d#
1107
1108 $path = new cf::path $path, $origin && $origin->path; 1305 $path = normalise $path, $origin && $origin->path;
1109 my $key = $path->as_string;
1110 1306
1307 cf::lock_wait "map_find:$path";
1308
1111 $cf::MAP{$key} || do { 1309 $cf::MAP{$path} || do {
1112 # do it the slow way 1310 my $guard = cf::lock_acquire "map_find:$path";
1113 my $map = try_load_header $path->save_path; 1311 my $map = new_from_path cf::map $path
1114
1115 if ($map) {
1116 # safety
1117 $map->{instantiate_time} = $cf::RUNTIME
1118 if $map->{instantiate_time} > $cf::RUNTIME;
1119 } else {
1120 if (my $rmp = $path->random_map_params) {
1121 $map = generate_random_map $key, $rmp;
1122 } else {
1123 $map = try_load_header $path->load_path;
1124 }
1125
1126 $map or return; 1312 or return;
1127 1313
1128 $map->{load_original} = 1;
1129 $map->{instantiate_time} = $cf::RUNTIME;
1130 $map->instantiate;
1131
1132 # per-player maps become, after loading, normal maps
1133 $map->per_player (0) if $path->{user_rel};
1134 }
1135
1136 $map->path ($key);
1137 $map->{path} = $path;
1138 $map->last_access ($cf::RUNTIME); 1314 $map->{last_save} = $cf::RUNTIME;
1315
1316 $map->load_header
1317 or return;
1139 1318
1140 if ($map->should_reset) { 1319 if ($map->should_reset) {
1141 $map->reset; 1320 $map->reset;
1321 undef $guard;
1142 $map = find_map $path; 1322 $map = find $path
1323 or return;
1143 } 1324 }
1144 1325
1145 $cf::MAP{$key} = $map 1326 $cf::MAP{$path} = $map
1146 } 1327 }
1147} 1328}
1148 1329
1149sub load { 1330sub load {
1150 my ($self) = @_; 1331 my ($self) = @_;
1151 1332
1333 my $path = $self->{path};
1334 my $guard = cf::lock_acquire "map_load:$path";
1335
1152 return if $self->in_memory != cf::MAP_SWAPPED; 1336 return if $self->in_memory != cf::MAP_SWAPPED;
1153 1337
1154 $self->in_memory (cf::MAP_LOADING); 1338 $self->in_memory (cf::MAP_LOADING);
1155 1339
1156 my $path = $self->{path};
1157
1158 $self->alloc; 1340 $self->alloc;
1159 $self->load_objects ($self->{load_path}, 1) 1341 $self->_load_objects ($self->{load_path}, 1)
1160 or return; 1342 or return;
1161 1343
1162 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1344 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1163 if delete $self->{load_original}; 1345 if delete $self->{load_original};
1164 1346
1165 if (my $uniq = $path->uniq_path) { 1347 if (my $uniq = $self->uniq_path) {
1166 utf8::encode $uniq; 1348 utf8::encode $uniq;
1167 if (aio_open $uniq, O_RDONLY, 0) { 1349 if (aio_open $uniq, O_RDONLY, 0) {
1168 $self->clear_unique_items; 1350 $self->clear_unique_items;
1169 $self->load_objects ($uniq, 0); 1351 $self->_load_objects ($uniq, 0);
1170 } 1352 }
1171 } 1353 }
1354
1355 Coro::cede;
1172 1356
1173 # now do the right thing for maps 1357 # now do the right thing for maps
1174 $self->link_multipart_objects; 1358 $self->link_multipart_objects;
1175 1359
1176 if ($self->{path}->is_style_map) { 1360 unless ($self->{deny_activate}) {
1177 $self->{deny_save} = 1; 1361 $self->decay_objects;
1178 $self->{deny_reset} = 1;
1179 } else {
1180 $self->fix_auto_apply; 1362 $self->fix_auto_apply;
1181 $self->decay_objects;
1182 $self->update_buttons; 1363 $self->update_buttons;
1364 Coro::cede;
1183 $self->set_darkness_map; 1365 $self->set_darkness_map;
1184 $self->difficulty ($self->estimate_difficulty) 1366 $self->difficulty ($self->estimate_difficulty)
1185 unless $self->difficulty; 1367 unless $self->difficulty;
1368 Coro::cede;
1186 $self->activate; 1369 $self->activate;
1187 } 1370 }
1188 1371
1189 $self->in_memory (cf::MAP_IN_MEMORY); 1372 $self->in_memory (cf::MAP_IN_MEMORY);
1190} 1373}
1191 1374
1192sub load_map_sync { 1375sub customise_for {
1376 my ($self, $ob) = @_;
1377
1378 return find "~" . $ob->name . "/" . $self->{path}
1379 if $self->per_player;
1380
1381 $self
1382}
1383
1384# find and load all maps in the 3x3 area around a map
1385sub load_diag {
1386 my ($map) = @_;
1387
1388 my @diag; # diagonal neighbours
1389
1390 for (0 .. 3) {
1391 my $neigh = $map->tile_path ($_)
1392 or next;
1393 $neigh = find $neigh, $map
1394 or next;
1395 $neigh->load;
1396
1397 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1398 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1399 }
1400
1401 for (@diag) {
1402 my $neigh = find @$_
1403 or next;
1404 $neigh->load;
1405 }
1406}
1407
1408sub find_sync {
1193 my ($path, $origin) = @_; 1409 my ($path, $origin) = @_;
1194 1410
1195 #warn "load_map_sync<$path, $origin>\n";#d# 1411 cf::sync_job { find $path, $origin }
1412}
1196 1413
1197 cf::sync_job { 1414sub do_load_sync {
1198 my $map = cf::map::find_map $path, $origin 1415 my ($map) = @_;
1416
1417 cf::sync_job { $map->load };
1418}
1419
1420our %MAP_PREFETCH;
1421our $MAP_PREFETCHER = Coro::async {
1422 while () {
1423 for my $path (keys %MAP_PREFETCH) {
1424 my $map = find $path
1199 or return; 1425 or next;
1200 $map->load; 1426 $map->load;
1201 $map 1427
1428 delete $MAP_PREFETCH{$path};
1429 }
1430 Coro::schedule;
1202 } 1431 }
1432};
1433
1434sub find_async {
1435 my ($path, $origin) = @_;
1436
1437 $path = normalise $path, $origin && $origin->{path};
1438
1439 if (my $map = $cf::MAP{$path}) {
1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1441 }
1442
1443 $MAP_PREFETCH{$path} = 0;
1444 $MAP_PREFETCHER->ready;
1445
1446 ()
1203} 1447}
1204 1448
1205sub save { 1449sub save {
1206 my ($self) = @_; 1450 my ($self) = @_;
1207 1451
1208 my $save = $self->{path}->save_path; utf8::encode $save; 1452 my $lock = cf::lock_acquire "map_data:" . $self->path;
1209 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1210 1453
1211 $self->{last_save} = $cf::RUNTIME; 1454 $self->{last_save} = $cf::RUNTIME;
1212 1455
1213 return unless $self->dirty; 1456 return unless $self->dirty;
1214 1457
1458 my $save = $self->save_path; utf8::encode $save;
1459 my $uniq = $self->uniq_path; utf8::encode $uniq;
1460
1215 $self->{load_path} = $save; 1461 $self->{load_path} = $save;
1216 1462
1217 return if $self->{deny_save}; 1463 return if $self->{deny_save};
1218 1464
1465 local $self->{last_access} = $self->last_access;#d#
1466
1467 cf::async {
1468 $_->contr->save for $self->players;
1469 };
1470
1219 if ($uniq) { 1471 if ($uniq) {
1220 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1472 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1221 $self->save_objects ($uniq, cf::IO_UNIQUES); 1473 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1222 } else { 1474 } else {
1223 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1475 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1224 } 1476 }
1225} 1477}
1226 1478
1227sub swap_out { 1479sub swap_out {
1228 my ($self) = @_; 1480 my ($self) = @_;
1481
1482 # save first because save cedes
1483 $self->save;
1484
1485 my $lock = cf::lock_acquire "map_data:" . $self->path;
1229 1486
1230 return if $self->players; 1487 return if $self->players;
1231 return if $self->in_memory != cf::MAP_IN_MEMORY; 1488 return if $self->in_memory != cf::MAP_IN_MEMORY;
1232 return if $self->{deny_save}; 1489 return if $self->{deny_save};
1233 1490
1234 $self->save;
1235 $self->clear; 1491 $self->clear;
1236 $self->in_memory (cf::MAP_SWAPPED); 1492 $self->in_memory (cf::MAP_SWAPPED);
1237} 1493}
1238 1494
1239sub reset_at { 1495sub reset_at {
1240 my ($self) = @_; 1496 my ($self) = @_;
1241 1497
1242 # TODO: safety, remove and allow resettable per-player maps 1498 # TODO: safety, remove and allow resettable per-player maps
1243 return 1e100 if $self->{path}{user_rel}; 1499 return 1e99 if $self->isa ("ext::map_per_player");
1244 return 1e100 if $self->{deny_reset}; 1500 return 1e99 if $self->{deny_reset};
1245 1501
1246 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1247 my $to = $self->reset_timeout || $DEFAULT_RESET; 1503 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1248 $to = $MAX_RESET if $to > $MAX_RESET;
1249 1504
1250 $time + $to 1505 $time + $to
1251} 1506}
1252 1507
1253sub should_reset { 1508sub should_reset {
1254 my ($self) = @_; 1509 my ($self) = @_;
1255 1510
1256 $self->reset_at <= $cf::RUNTIME 1511 $self->reset_at <= $cf::RUNTIME
1257} 1512}
1258 1513
1259sub unlink_save {
1260 my ($self) = @_;
1261
1262 utf8::encode (my $save = $self->{path}->save_path);
1263 aioreq_pri 3; IO::AIO::aio_unlink $save;
1264 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1265}
1266
1267sub rename { 1514sub rename {
1268 my ($self, $new_path) = @_; 1515 my ($self, $new_path) = @_;
1269 1516
1517 normalise $new_path;
1518
1270 $self->unlink_save; 1519 $self->unlink_save;
1271 1520
1272 delete $cf::MAP{$self->path}; 1521 delete $cf::MAP{$self->path};
1273 $self->{path} = new cf::path $new_path; 1522 $self->{path} = $new_path; $self->path ($self->{path});
1274 $self->path ($self->{path}->path);
1275 $cf::MAP{$self->path} = $self; 1523 $cf::MAP{$self->path} = $self;
1276 1524
1277 $self->save; 1525 $self->save;
1278} 1526}
1279 1527
1280sub reset { 1528sub reset {
1281 my ($self) = @_; 1529 my ($self) = @_;
1282 1530
1531 my $lock = cf::lock_acquire "map_data:$self->{path}";
1532
1283 return if $self->players; 1533 return if $self->players;
1284 return if $self->{path}{user_rel};#d# 1534 return if $self->isa ("ext::map_per_player");#d#
1285 1535
1286 warn "resetting map ", $self->path;#d# 1536 warn "resetting map ", $self->path;#d#
1287 1537
1288 delete $cf::MAP{$self->path}; 1538 delete $cf::MAP{$self->path};
1539
1540 $self->in_memory (cf::MAP_SWAPPED);
1541 $self->clear;
1289 1542
1290 $_->clear_links_to ($self) for values %cf::MAP; 1543 $_->clear_links_to ($self) for values %cf::MAP;
1291 1544
1292 $self->unlink_save; 1545 $self->unlink_save;
1293 $self->destroy; 1546 $self->destroy;
1294} 1547}
1295 1548
1296sub customise_for { 1549my $nuke_counter = "aaaa";
1297 my ($map, $ob) = @_;
1298 1550
1299 if ($map->per_player) { 1551sub nuke {
1300 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1552 my ($self) = @_;
1301 }
1302 1553
1303 $map 1554 $self->{deny_save} = 1;
1555 $self->reset_timeout (1);
1556 $self->rename ("{nuke}/" . ($nuke_counter++));
1557 $self->reset; # polite request, might not happen
1304} 1558}
1305 1559
1306sub emergency_save { 1560=item cf::map::unique_maps
1307 local $cf::FREEZE = 1;
1308 1561
1309 warn "enter emergency map save\n"; 1562Returns an arrayref of paths of all shared maps that have
1563instantiated unique items. May block.
1310 1564
1311 cf::sync_job { 1565=cut
1312 warn "begin emergency map save\n"; 1566
1313 $_->save for values %cf::MAP; 1567sub unique_maps() {
1568 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1569 or return;
1570
1571 my @paths;
1572
1573 for (@$files) {
1574 utf8::decode $_;
1575 next if /\.pst$/;
1576 next unless /^$PATH_SEP/o;
1577
1578 s/\.map$//;
1579 push @paths, $_;
1314 }; 1580 }
1315 1581
1316 warn "end emergency map save\n"; 1582 \@paths
1317} 1583}
1318 1584
1319package cf; 1585package cf;
1320 1586
1321=back 1587=back
1322 1588
1589=head3 cf::object
1590
1591=cut
1592
1593package cf::object;
1594
1595=over 4
1596
1597=item $ob->inv_recursive
1598
1599Returns the inventory of the object _and_ their inventories, recursively.
1600
1601=cut
1602
1603sub inv_recursive_;
1604sub inv_recursive_ {
1605 map { $_, inv_recursive_ $_->inv } @_
1606}
1607
1608sub inv_recursive {
1609 inv_recursive_ inv $_[0]
1610}
1611
1612package cf;
1613
1614=back
1323 1615
1324=head3 cf::object::player 1616=head3 cf::object::player
1325 1617
1326=over 4 1618=over 4
1327 1619
1363 (ref $cf::CFG{"may_$access"} 1655 (ref $cf::CFG{"may_$access"}
1364 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1656 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1365 : $cf::CFG{"may_$access"}) 1657 : $cf::CFG{"may_$access"})
1366} 1658}
1367 1659
1660=item $player_object->enter_link
1661
1662Freezes the player and moves him/her to a special map (C<{link}>).
1663
1664The player should be reasonably safe there for short amounts of time. You
1665I<MUST> call C<leave_link> as soon as possible, though.
1666
1667Will never block.
1668
1669=item $player_object->leave_link ($map, $x, $y)
1670
1671Moves the player out of the special C<{link}> map onto the specified
1672map. If the map is not valid (or omitted), the player will be moved back
1673to the location he/she was before the call to C<enter_link>, or, if that
1674fails, to the emergency map position.
1675
1676Might block.
1677
1678=cut
1679
1680sub link_map {
1681 unless ($LINK_MAP) {
1682 $LINK_MAP = cf::map::find "{link}"
1683 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1684 $LINK_MAP->load;
1685 }
1686
1687 $LINK_MAP
1688}
1689
1368sub cf::object::player::enter_link { 1690sub cf::object::player::enter_link {
1369 my ($self) = @_; 1691 my ($self) = @_;
1370 1692
1371 return if $self->map == $LINK_MAP; 1693 $self->deactivate_recursive;
1372 1694
1695 return if UNIVERSAL::isa $self->map, "ext::map_link";
1696
1373 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1697 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1374 if $self->map; 1698 if $self->map;
1375 1699
1376 $self->enter_map ($LINK_MAP, 20, 20); 1700 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1377 $self->deactivate_recursive;
1378} 1701}
1379 1702
1380sub cf::object::player::leave_link { 1703sub cf::object::player::leave_link {
1381 my ($self, $map, $x, $y) = @_; 1704 my ($self, $map, $x, $y) = @_;
1382 1705
1383 my $link_pos = delete $self->{_link_pos}; 1706 my $link_pos = delete $self->{_link_pos};
1384 1707
1385 unless ($map) { 1708 unless ($map) {
1386 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1387
1388 # restore original map position 1709 # restore original map position
1389 ($map, $x, $y) = @{ $link_pos || [] }; 1710 ($map, $x, $y) = @{ $link_pos || [] };
1390 $map = cf::map::find_map $map; 1711 $map = cf::map::find $map;
1391 1712
1392 unless ($map) { 1713 unless ($map) {
1393 ($map, $x, $y) = @$EMERGENCY_POSITION; 1714 ($map, $x, $y) = @$EMERGENCY_POSITION;
1394 $map = cf::map::find_map $map 1715 $map = cf::map::find $map
1395 or die "FATAL: cannot load emergency map\n"; 1716 or die "FATAL: cannot load emergency map\n";
1396 } 1717 }
1397 } 1718 }
1398 1719
1399 ($x, $y) = (-1, -1) 1720 ($x, $y) = (-1, -1)
1402 # use -1 or undef as default coordinates, not 0, 0 1723 # use -1 or undef as default coordinates, not 0, 0
1403 ($x, $y) = ($map->enter_x, $map->enter_y) 1724 ($x, $y) = ($map->enter_x, $map->enter_y)
1404 if $x <=0 && $y <= 0; 1725 if $x <=0 && $y <= 0;
1405 1726
1406 $map->load; 1727 $map->load;
1728 $map->load_diag;
1407 1729
1730 return unless $self->contr->active;
1408 $self->activate_recursive; 1731 $self->activate_recursive;
1409 $self->enter_map ($map, $x, $y); 1732 $self->enter_map ($map, $x, $y);
1410} 1733}
1411 1734
1735cf::player->attach (
1736 on_logout => sub {
1737 my ($pl) = @_;
1738
1739 # abort map switching before logout
1740 if ($pl->ob->{_link_pos}) {
1741 cf::sync_job {
1742 $pl->ob->leave_link
1743 };
1744 }
1745 },
1746 on_login => sub {
1747 my ($pl) = @_;
1748
1749 # try to abort aborted map switching on player login :)
1750 # should happen only on crashes
1751 if ($pl->ob->{_link_pos}) {
1752 $pl->ob->enter_link;
1753 (async {
1754 # we need this sleep as the login has a concurrent enter_exit running
1755 # and this sleep increases chances of the player not ending up in scorn
1756 $pl->ob->reply (undef,
1757 "There was an internal problem at your last logout, "
1758 . "the server will try to bring you to your intended destination in a second.",
1759 cf::NDI_RED);
1760 Coro::Timer::sleep 1;
1761 $pl->ob->leave_link;
1762 })->prio (2);
1763 }
1764 },
1765);
1766
1412=item $player_object->goto_map ($map, $x, $y) 1767=item $player_object->goto ($path, $x, $y)
1413 1768
1414=cut 1769=cut
1415 1770
1416sub cf::object::player::goto_map { 1771sub cf::object::player::goto {
1417 my ($self, $path, $x, $y) = @_; 1772 my ($self, $path, $x, $y) = @_;
1418 1773
1419 $self->enter_link; 1774 $self->enter_link;
1420 1775
1421 (Coro::async { 1776 (async {
1422 $path = new cf::path $path;
1423
1424 my $map = cf::map::find_map $path->as_string; 1777 my $map = cf::map::find $path;
1425 $map = $map->customise_for ($self) if $map; 1778 $map = $map->customise_for ($self) if $map;
1426 1779
1427 warn "entering ", $map->path, " at ($x, $y)\n" 1780# warn "entering ", $map->path, " at ($x, $y)\n"
1428 if $map; 1781# if $map;
1782
1783 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1429 1784
1430 $self->leave_link ($map, $x, $y); 1785 $self->leave_link ($map, $x, $y);
1431 })->prio (1); 1786 })->prio (1);
1432} 1787}
1433 1788
1486 1841
1487 return unless $self->type == cf::PLAYER; 1842 return unless $self->type == cf::PLAYER;
1488 1843
1489 $self->enter_link; 1844 $self->enter_link;
1490 1845
1491 (Coro::async { 1846 (async {
1847 $self->deactivate_recursive; # just to be sure
1492 unless (eval { 1848 unless (eval {
1493
1494 prepare_random_map $exit 1849 prepare_random_map $exit
1495 if $exit->slaying eq "/!"; 1850 if $exit->slaying eq "/!";
1496 1851
1497 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1852 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1498 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1853 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1499 1854
1500 1; 1855 1;
1501 }) { 1856 }) {
1502 $self->message ("Something went wrong deep within the crossfire server. " 1857 $self->message ("Something went wrong deep within the crossfire server. "
1503 . "I'll try to bring you back to the map you were before. " 1858 . "I'll try to bring you back to the map you were before. "
1504 . "Please report this to the dungeon master", 1859 . "Please report this to the dungeon master!",
1505 cf::NDI_UNIQUE | cf::NDI_RED); 1860 cf::NDI_UNIQUE | cf::NDI_RED);
1506 1861
1507 warn "ERROR in enter_exit: $@"; 1862 warn "ERROR in enter_exit: $@";
1508 $self->leave_link; 1863 $self->leave_link;
1509 } 1864 }
1560 on_reply => sub { 1915 on_reply => sub {
1561 my ($ns, $msg) = @_; 1916 my ($ns, $msg) = @_;
1562 1917
1563 # this weird shuffling is so that direct followup queries 1918 # this weird shuffling is so that direct followup queries
1564 # get handled first 1919 # get handled first
1565 my $queue = delete $ns->{query_queue}; 1920 my $queue = delete $ns->{query_queue}
1921 or return; # be conservative, not sure how that can happen, but we saw a crash here
1566 1922
1567 (shift @$queue)->[1]->($msg); 1923 (shift @$queue)->[1]->($msg);
1568 1924
1569 push @{ $ns->{query_queue} }, @$queue; 1925 push @{ $ns->{query_queue} }, @$queue;
1570 1926
1576 } 1932 }
1577 } 1933 }
1578 }, 1934 },
1579); 1935);
1580 1936
1581=item $client->coro (\&cb) 1937=item $client->async (\&cb)
1582 1938
1583Create a new coroutine, running the specified callback. The coroutine will 1939Create a new coroutine, running the specified callback. The coroutine will
1584be automatically cancelled when the client gets destroyed (e.g. on logout, 1940be automatically cancelled when the client gets destroyed (e.g. on logout,
1585or loss of connection). 1941or loss of connection).
1586 1942
1587=cut 1943=cut
1588 1944
1589sub cf::client::coro { 1945sub cf::client::async {
1590 my ($self, $cb) = @_; 1946 my ($self, $cb) = @_;
1591 1947
1592 my $coro; $coro = async { 1948 my $coro = &Coro::async ($cb);
1593 eval {
1594 $cb->();
1595 };
1596 warn $@ if $@;
1597 };
1598 1949
1599 $coro->on_destroy (sub { 1950 $coro->on_destroy (sub {
1600 delete $self->{_coro}{$coro+0}; 1951 delete $self->{_coro}{$coro+0};
1601 }); 1952 });
1602 1953
1774 2125
1775{ 2126{
1776 my $path = cf::localdir . "/database.pst"; 2127 my $path = cf::localdir . "/database.pst";
1777 2128
1778 sub db_load() { 2129 sub db_load() {
1779 warn "loading database $path\n";#d# remove later
1780 $DB = stat $path ? Storable::retrieve $path : { }; 2130 $DB = stat $path ? Storable::retrieve $path : { };
1781 } 2131 }
1782 2132
1783 my $pid; 2133 my $pid;
1784 2134
1785 sub db_save() { 2135 sub db_save() {
1786 warn "saving database $path\n";#d# remove later
1787 waitpid $pid, 0 if $pid; 2136 waitpid $pid, 0 if $pid;
1788 if (0 == ($pid = fork)) { 2137 if (0 == ($pid = fork)) {
1789 $DB->{_meta}{version} = 1; 2138 $DB->{_meta}{version} = 1;
1790 Storable::nstore $DB, "$path~"; 2139 Storable::nstore $DB, "$path~";
1791 rename "$path~", $path; 2140 rename "$path~", $path;
1839 open my $fh, "<:utf8", cf::confdir . "/config" 2188 open my $fh, "<:utf8", cf::confdir . "/config"
1840 or return; 2189 or return;
1841 2190
1842 local $/; 2191 local $/;
1843 *CFG = YAML::Syck::Load <$fh>; 2192 *CFG = YAML::Syck::Load <$fh>;
2193
2194 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2195
2196 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2197 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2198
2199 if (exists $CFG{mlockall}) {
2200 eval {
2201 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2202 and die "WARNING: m(un)lockall failed: $!\n";
2203 };
2204 warn $@ if $@;
2205 }
1844} 2206}
1845 2207
1846sub main { 2208sub main {
1847 # we must not ever block the main coroutine 2209 # we must not ever block the main coroutine
1848 local $Coro::idle = sub { 2210 local $Coro::idle = sub {
1849 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2211 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1850 (Coro::unblock_sub {
1851 Event::one_event; 2212 async { Event::one_event };
1852 })->();
1853 }; 2213 };
1854 2214
1855 cfg_load; 2215 cfg_load;
1856 db_load; 2216 db_load;
1857 load_extensions; 2217 load_extensions;
1858 Event::loop; 2218 Event::loop;
1859} 2219}
1860 2220
1861############################################################################# 2221#############################################################################
1862# initialisation 2222# initialisation and cleanup
2223
2224# install some emergency cleanup handlers
2225BEGIN {
2226 for my $signal (qw(INT HUP TERM)) {
2227 Event->signal (
2228 data => WF_AUTOCANCEL,
2229 signal => $signal,
2230 cb => sub {
2231 cf::cleanup "SIG$signal";
2232 },
2233 );
2234 }
2235}
2236
2237sub emergency_save() {
2238 my $freeze_guard = cf::freeze_mainloop;
2239
2240 warn "enter emergency perl save\n";
2241
2242 cf::sync_job {
2243 # use a peculiar iteration method to avoid tripping on perl
2244 # refcount bugs in for. also avoids problems with players
2245 # and maps saved/destroyed asynchronously.
2246 warn "begin emergency player save\n";
2247 for my $login (keys %cf::PLAYER) {
2248 my $pl = $cf::PLAYER{$login} or next;
2249 $pl->valid or next;
2250 $pl->save;
2251 }
2252 warn "end emergency player save\n";
2253
2254 warn "begin emergency map save\n";
2255 for my $path (keys %cf::MAP) {
2256 my $map = $cf::MAP{$path} or next;
2257 $map->valid or next;
2258 $map->save;
2259 }
2260 warn "end emergency map save\n";
2261 };
2262
2263 warn "leave emergency perl save\n";
2264}
1863 2265
1864sub reload() { 2266sub reload() {
1865 # can/must only be called in main 2267 # can/must only be called in main
1866 if ($Coro::current != $Coro::main) { 2268 if ($Coro::current != $Coro::main) {
1867 warn "can only reload from main coroutine\n"; 2269 warn "can only reload from main coroutine\n";
1868 return; 2270 return;
1869 } 2271 }
1870 2272
1871 warn "reloading..."; 2273 warn "reloading...";
1872 2274
1873 local $FREEZE = 1; 2275 warn "freezing server";
2276 my $guard = freeze_mainloop;
1874 cf::emergency_save; 2277 cf::emergency_save;
2278
2279 warn "sync database to disk";
2280 cf::db_sync;
2281 IO::AIO::flush;
1875 2282
1876 eval { 2283 eval {
1877 # if anything goes wrong in here, we should simply crash as we already saved 2284 # if anything goes wrong in here, we should simply crash as we already saved
1878 2285
1879 # cancel all watchers 2286 warn "cancel all watchers";
1880 for (Event::all_watchers) { 2287 for (Event::all_watchers) {
1881 $_->cancel if $_->data & WF_AUTOCANCEL; 2288 $_->cancel if $_->data & WF_AUTOCANCEL;
1882 } 2289 }
1883 2290
1884 # cancel all extension coros 2291 warn "cancel all extension coros";
1885 $_->cancel for values %EXT_CORO; 2292 $_->cancel for values %EXT_CORO;
1886 %EXT_CORO = (); 2293 %EXT_CORO = ();
1887 2294
2295 warn "remove commands";
2296 %COMMAND = ();
2297
2298 warn "remove ext commands";
2299 %EXTCMD = ();
2300
1888 # unload all extensions 2301 warn "unload/nuke all extensions";
1889 for (@exts) { 2302 for my $pkg (@EXTS) {
1890 warn "unloading <$_>"; 2303 warn "... unloading $pkg";
1891 unload_extension $_; 2304
2305 if (my $cb = $pkg->can ("unload")) {
2306 eval {
2307 $cb->($pkg);
2308 1
2309 } or warn "$pkg unloaded, but with errors: $@";
1892 } 2310 }
1893 2311
2312 warn "... nuking $pkg";
2313 Symbol::delete_package $pkg;
2314 }
2315
1894 # unload all modules loaded from $LIBDIR 2316 warn "unload all perl modules loaded from $LIBDIR";
1895 while (my ($k, $v) = each %INC) { 2317 while (my ($k, $v) = each %INC) {
1896 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2318 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
1897 2319
1898 warn "removing <$k>"; 2320 warn "removing <$k>";
1899 delete $INC{$k}; 2321 delete $INC{$k};
1906 } 2328 }
1907 2329
1908 Symbol::delete_package $k; 2330 Symbol::delete_package $k;
1909 } 2331 }
1910 2332
1911 # sync database to disk
1912 cf::db_sync;
1913 IO::AIO::flush;
1914
1915 # get rid of safe::, as good as possible 2333 warn "get rid of safe::, as good as possible";
1916 Symbol::delete_package "safe::$_" 2334 Symbol::delete_package "safe::$_"
1917 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2335 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
1918 2336
1919 # remove register_script_function callbacks
1920 # TODO
1921
1922 # unload cf.pm "a bit" 2337 warn "unload cf.pm \"a bit\"";
1923 delete $INC{"cf.pm"}; 2338 delete $INC{"cf.pm"};
1924 2339
1925 # don't, removes xs symbols, too, 2340 # don't, removes xs symbols, too,
1926 # and global variables created in xs 2341 # and global variables created in xs
1927 #Symbol::delete_package __PACKAGE__; 2342 #Symbol::delete_package __PACKAGE__;
1928 2343
1929 # reload cf.pm
1930 warn "reloading cf.pm"; 2344 warn "reloading cf.pm";
1931 require cf; 2345 require cf;
1932 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2346 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
1933 2347
1934 # load config and database again 2348 warn "load config and database again";
1935 cf::cfg_load; 2349 cf::cfg_load;
1936 cf::db_load; 2350 cf::db_load;
1937 2351
1938 # load extensions
1939 warn "load extensions"; 2352 warn "load extensions";
1940 cf::load_extensions; 2353 cf::load_extensions;
1941 2354
1942 # reattach attachments to objects 2355 warn "reattach attachments to objects/players";
1943 warn "reattach";
1944 _global_reattach; 2356 _global_reattach;
2357 warn "reattach attachments to maps";
2358 reattach $_ for values %MAP;
1945 }; 2359 };
1946 2360
1947 if ($@) { 2361 if ($@) {
1948 warn $@; 2362 warn $@;
1949 warn "error while reloading, exiting."; 2363 warn "error while reloading, exiting.";
1950 exit 1; 2364 exit 1;
1951 } 2365 }
1952 2366
1953 warn "reloaded successfully"; 2367 warn "reloaded";
1954}; 2368};
1955
1956#############################################################################
1957
1958unless ($LINK_MAP) {
1959 $LINK_MAP = cf::map::new;
1960
1961 $LINK_MAP->width (41);
1962 $LINK_MAP->height (41);
1963 $LINK_MAP->alloc;
1964 $LINK_MAP->path ("{link}");
1965 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
1966 $LINK_MAP->in_memory (MAP_IN_MEMORY);
1967
1968 # dirty hack because... archetypes are not yet loaded
1969 Event->timer (
1970 after => 2,
1971 cb => sub {
1972 $_[0]->w->cancel;
1973
1974 # provide some exits "home"
1975 my $exit = cf::object::new "exit";
1976
1977 $exit->slaying ($EMERGENCY_POSITION->[0]);
1978 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
1979 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
1980
1981 $LINK_MAP->insert ($exit->clone, 19, 19);
1982 $LINK_MAP->insert ($exit->clone, 19, 20);
1983 $LINK_MAP->insert ($exit->clone, 19, 21);
1984 $LINK_MAP->insert ($exit->clone, 20, 19);
1985 $LINK_MAP->insert ($exit->clone, 20, 21);
1986 $LINK_MAP->insert ($exit->clone, 21, 19);
1987 $LINK_MAP->insert ($exit->clone, 21, 20);
1988 $LINK_MAP->insert ($exit->clone, 21, 21);
1989
1990 $exit->destroy;
1991 });
1992
1993 $LINK_MAP->{deny_save} = 1;
1994 $LINK_MAP->{deny_reset} = 1;
1995
1996 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
1997}
1998
1999register "<global>", __PACKAGE__;
2000 2369
2001register_command "reload" => sub { 2370register_command "reload" => sub {
2002 my ($who, $arg) = @_; 2371 my ($who, $arg) = @_;
2003 2372
2004 if ($who->flag (FLAG_WIZ)) { 2373 if ($who->flag (FLAG_WIZ)) {
2014 reentrant => 0, 2383 reentrant => 0,
2015 prio => 0, 2384 prio => 0,
2016 at => $NEXT_TICK || $TICK, 2385 at => $NEXT_TICK || $TICK,
2017 data => WF_AUTOCANCEL, 2386 data => WF_AUTOCANCEL,
2018 cb => sub { 2387 cb => sub {
2019 unless ($FREEZE) { 2388 $NOW = Event::time;
2389
2020 cf::server_tick; # one server iteration 2390 cf::server_tick; # one server iteration
2021 $RUNTIME += $TICK; 2391 $RUNTIME += $TICK;
2022 }
2023
2024 $NEXT_TICK += $TICK; 2392 $NEXT_TICK += $TICK;
2393
2394 $WAIT_FOR_TICK->broadcast;
2395 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2025 2396
2026 # if we are delayed by four ticks or more, skip them all 2397 # if we are delayed by four ticks or more, skip them all
2027 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2398 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2028 2399
2029 $TICK_WATCHER->at ($NEXT_TICK); 2400 $TICK_WATCHER->at ($NEXT_TICK);
2051 or warn "ERROR: unable to write runtime file: $!"; 2422 or warn "ERROR: unable to write runtime file: $!";
2052 })->(); 2423 })->();
2053 }, 2424 },
2054); 2425);
2055 2426
2427END { cf::emergency_save }
2428
20561 24291
2057 2430

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines