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.124 by root, Tue Jan 2 22:55:05 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
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}
185 216
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string 217=item cf::lock_wait $string
209 218
210Wait until the given lock is available. See cf::lock_acquire. 219Wait until the given lock is available. See cf::lock_acquire.
211 220
212=item my $lock = cf::lock_acquire $string 221=item my $lock = cf::lock_acquire $string
213 222
214Wait until the given lock is available and then acquires it and returns 223Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope, 224a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 225for example when the coroutine gets canceled), the lock is automatically
217returned. 226returned.
218 227
219Lock names should begin with a unique identifier (for example, find_map 228Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 229uses map_find and cf::map::load uses map_load).
221 230
222=cut 231=cut
223 232
224our %LOCK; 233our %LOCK;
225 234
239 # wait, to be sure we are not locked 248 # wait, to be sure we are not locked
240 lock_wait $key; 249 lock_wait $key;
241 250
242 $LOCK{$key} = []; 251 $LOCK{$key} = [];
243 252
244 cf::guard { 253 Coro::guard {
245 # wake up all waiters, to be on the safe side 254 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 255 $_->ready for @{ delete $LOCK{$key} };
247 } 256 }
248} 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 }
249 276
250=item cf::sync_job { BLOCK } 277=item cf::sync_job { BLOCK }
251 278
252The design of crossfire+ requires that the main coro ($Coro::main) is 279The design of crossfire+ requires that the main coro ($Coro::main) is
253always able to handle events or runnable, as crossfire+ is only partly 280always able to handle events or runnable, as crossfire+ is only partly
267 # this is the main coro, too bad, we have to block 294 # this is the main coro, too bad, we have to block
268 # till the operation succeeds, freezing the server :/ 295 # till the operation succeeds, freezing the server :/
269 296
270 # TODO: use suspend/resume instead 297 # TODO: use suspend/resume instead
271 # (but this is cancel-safe) 298 # (but this is cancel-safe)
272 local $FREEZE = 1; 299 my $freeze_guard = freeze_mainloop;
273 300
274 my $busy = 1; 301 my $busy = 1;
275 my @res; 302 my @res;
276 303
277 (Coro::async { 304 (async {
278 @res = eval { $job->() }; 305 @res = eval { $job->() };
279 warn $@ if $@; 306 warn $@ if $@;
280 undef $busy; 307 undef $busy;
281 })->prio (Coro::PRIO_MAX); 308 })->prio (Coro::PRIO_MAX);
282 309
283 while ($busy) { 310 while ($busy) {
284 Coro::cede_notself; 311 Coro::cede or Event::one_event;
285 Event::one_event unless Coro::nready;
286 } 312 }
287 313
288 wantarray ? @res : $res[0] 314 wantarray ? @res : $res[0]
289 } else { 315 } else {
290 # we are in another coroutine, how wonderful, everything just works 316 # we are in another coroutine, how wonderful, everything just works
291 317
292 $job->() 318 $job->()
293 } 319 }
294} 320}
295 321
296=item $coro = cf::coro { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
297 323
298Creates and returns a new coro. This coro is automcatially being canceled 324Like async, but this coro is automatically being canceled when the
299when the extension calling this is being unloaded. 325extension calling this is being unloaded.
300 326
301=cut 327=cut
302 328
303sub coro(&) { 329sub async_ext(&) {
304 my $cb = shift; 330 my $cb = shift;
305 331
306 my $coro; $coro = async { 332 my $coro = &Coro::async ($cb);
307 eval {
308 $cb->();
309 };
310 warn $@ if $@;
311 };
312 333
313 $coro->on_destroy (sub { 334 $coro->on_destroy (sub {
314 delete $EXT_CORO{$coro+0}; 335 delete $EXT_CORO{$coro+0};
315 }); 336 });
316 $EXT_CORO{$coro+0} = $coro; 337 $EXT_CORO{$coro+0} = $coro;
317 338
318 $coro 339 $coro
319} 340}
320 341
321sub write_runtime { 342sub write_runtime {
343 return unless $TICK_WATCHER->is_active;
344
322 my $runtime = cf::localdir . "/runtime"; 345 my $runtime = cf::localdir . "/runtime";
323 346
324 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
325 or return; 348 or return;
326 349
341} 364}
342 365
343=back 366=back
344 367
345=cut 368=cut
346
347#############################################################################
348
349package cf::path;
350
351sub new {
352 my ($class, $path, $base) = @_;
353
354 $path = $path->as_string if ref $path;
355
356 my $self = bless { }, $class;
357
358 # {... are special paths that are not touched
359 # ?xxx/... are special absolute paths
360 # ?random/... random maps
361 # /! non-realised random map exit
362 # /... normal maps
363 # ~/... per-player maps without a specific player (DO NOT USE)
364 # ~user/... per-player map of a specific user
365
366 if ($path =~ /^{/) {
367 # fine as it is
368 } elsif ($path =~ s{^\?random/}{}) {
369 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
370 $self->{random} = cf::from_json $data;
371 } else {
372 if ($path =~ s{^~([^/]+)?}{}) {
373 $self->{user_rel} = 1;
374
375 if (defined $1) {
376 $self->{user} = $1;
377 } elsif ($base =~ m{^~([^/]+)/}) {
378 $self->{user} = $1;
379 } else {
380 warn "cannot resolve user-relative path without user <$path,$base>\n";
381 }
382 } elsif ($path =~ /^\//) {
383 # already absolute
384 } else {
385 $base =~ s{[^/]+/?$}{};
386 return $class->new ("$base/$path");
387 }
388
389 for ($path) {
390 redo if s{/\.?/}{/};
391 redo if s{/[^/]+/\.\./}{/};
392 }
393 }
394
395 $self->{path} = $path;
396
397 $self
398}
399
400# the name / primary key / in-game path
401sub as_string {
402 my ($self) = @_;
403
404 $self->{user_rel} ? "~$self->{user}$self->{path}"
405 : $self->{random} ? "?random/$self->{path}"
406 : $self->{path}
407}
408
409# the displayed name, this is a one way mapping
410sub visible_name {
411 my ($self) = @_;
412
413# if (my $rmp = $self->{random}) {
414# # todo: be more intelligent about this
415# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
416# } else {
417 $self->as_string
418# }
419}
420
421# escape the /'s in the path
422sub _escaped_path {
423 # ∕ is U+2215
424 (my $path = $_[0]{path}) =~ s/\//∕/g;
425 $path
426}
427
428# the original (read-only) location
429sub load_path {
430 my ($self) = @_;
431
432 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
433}
434
435# the temporary/swap location
436sub save_path {
437 my ($self) = @_;
438
439 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
440 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
441 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
442}
443
444# the unique path, might be eq to save_path
445sub uniq_path {
446 my ($self) = @_;
447
448 $self->{user_rel} || $self->{random}
449 ? undef
450 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
451}
452
453# return random map parameters, or undef
454sub random_map_params {
455 my ($self) = @_;
456
457 $self->{random}
458}
459
460# this is somewhat ugly, but style maps do need special treatment
461sub is_style_map {
462 $_[0]{path} =~ m{^/styles/}
463}
464
465package cf;
466 369
467############################################################################# 370#############################################################################
468 371
469=head2 ATTACHABLE OBJECTS 372=head2 ATTACHABLE OBJECTS
470 373
917=cut 820=cut
918 821
919sub register_extcmd { 822sub register_extcmd {
920 my ($name, $cb) = @_; 823 my ($name, $cb) = @_;
921 824
922 my $caller = caller;
923 #warn "registering extcmd '$name' to '$caller'";
924
925 $EXTCMD{$name} = [$cb, $caller]; 825 $EXTCMD{$name} = $cb;
926} 826}
927 827
928cf::player->attach ( 828cf::player->attach (
929 on_command => sub { 829 on_command => sub {
930 my ($pl, $name, $params) = @_; 830 my ($pl, $name, $params) = @_;
943 843
944 my $msg = eval { from_json $buf }; 844 my $msg = eval { from_json $buf };
945 845
946 if (ref $msg) { 846 if (ref $msg) {
947 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 847 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
948 if (my %reply = $cb->[0]->($pl, $msg)) { 848 if (my %reply = $cb->($pl, $msg)) {
949 $pl->ext_reply ($msg->{msgid}, %reply); 849 $pl->ext_reply ($msg->{msgid}, %reply);
950 } 850 }
951 } 851 }
952 } else { 852 } else {
953 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 853 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
955 855
956 cf::override; 856 cf::override;
957 }, 857 },
958); 858);
959 859
960sub register {
961 my ($base, $pkg) = @_;
962
963 #TODO
964}
965
966sub load_extension { 860sub load_extension {
967 my ($path) = @_; 861 my ($path) = @_;
968 862
969 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 863 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
970 my $base = $1; 864 my $base = $1;
971 my $pkg = $1; 865 my $pkg = $1;
972 $pkg =~ s/[^[:word:]]/_/g; 866 $pkg =~ s/[^[:word:]]/_/g;
973 $pkg = "ext::$pkg"; 867 $pkg = "ext::$pkg";
974 868
975 warn "loading '$path' into '$pkg'\n"; 869 warn "... loading '$path' into '$pkg'\n";
976 870
977 open my $fh, "<:utf8", $path 871 open my $fh, "<:utf8", $path
978 or die "$path: $!"; 872 or die "$path: $!";
979 873
980 my $source = 874 my $source =
981 "package $pkg; use strict; use utf8;\n" 875 "package $pkg; use strict; use utf8;\n"
982 . "#line 1 \"$path\"\n{\n" 876 . "#line 1 \"$path\"\n{\n"
983 . (do { local $/; <$fh> }) 877 . (do { local $/; <$fh> })
984 . "\n};\n1"; 878 . "\n};\n1";
985 879
986 eval $source 880 unless (eval $source) {
987 or die $@ ? "$path: $@\n" 881 my $msg = $@ ? "$path: $@\n"
988 : "extension disabled.\n"; 882 : "extension disabled.\n";
989 883 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
990 push @exts, $pkg; 884 warn $@;
991 $ext_pkg{$base} = $pkg; 885 warn "mandatory extension failed to load, exiting.\n";
992 886 exit 1;
993# no strict 'refs'; 887 }
994# @{"$pkg\::ISA"} = ext::; 888 die $@;
995
996 register $base, $pkg;
997}
998
999sub unload_extension {
1000 my ($pkg) = @_;
1001
1002 warn "removing extension $pkg\n";
1003
1004 # remove hooks
1005 #TODO
1006# for my $idx (0 .. $#PLUGIN_EVENT) {
1007# delete $hook[$idx]{$pkg};
1008# } 889 }
1009 890
1010 # remove commands 891 push @EXTS, $pkg;
1011 for my $name (keys %COMMAND) {
1012 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1013
1014 if (@cb) {
1015 $COMMAND{$name} = \@cb;
1016 } else {
1017 delete $COMMAND{$name};
1018 }
1019 }
1020
1021 # remove extcmds
1022 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1023 delete $EXTCMD{$name};
1024 }
1025
1026 if (my $cb = $pkg->can ("unload")) {
1027 eval {
1028 $cb->($pkg);
1029 1
1030 } or warn "$pkg unloaded, but with errors: $@";
1031 }
1032
1033 Symbol::delete_package $pkg;
1034} 892}
1035 893
1036sub load_extensions { 894sub load_extensions {
1037 for my $ext (<$LIBDIR/*.ext>) { 895 for my $ext (<$LIBDIR/*.ext>) {
1038 next unless -r $ext; 896 next unless -r $ext;
1042 } or warn "$ext not loaded: $@"; 900 } or warn "$ext not loaded: $@";
1043 } 901 }
1044} 902}
1045 903
1046############################################################################# 904#############################################################################
1047# load/save/clean perl data associated with a map
1048
1049*cf::mapsupport::on_clean = sub {
1050 my ($map) = @_;
1051
1052 my $path = $map->tmpname;
1053 defined $path or return;
1054
1055 unlink "$path.pst";
1056};
1057
1058cf::map->attach (prio => -10000, package => cf::mapsupport::);
1059
1060#############################################################################
1061# load/save perl data associated with player->ob objects
1062
1063sub all_objects(@) {
1064 @_, map all_objects ($_->inv), @_
1065}
1066
1067# TODO: compatibility cruft, remove when no longer needed
1068cf::player->attach (
1069 on_load => sub {
1070 my ($pl, $path) = @_;
1071
1072 for my $o (all_objects $pl->ob) {
1073 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1074 $o->set_ob_key_value ("_perl_data");
1075
1076 %$o = %{ Storable::thaw pack "H*", $value };
1077 }
1078 }
1079 },
1080);
1081
1082#############################################################################
1083 905
1084=head2 CORE EXTENSIONS 906=head2 CORE EXTENSIONS
1085 907
1086Functions and methods that extend core crossfire objects. 908Functions and methods that extend core crossfire objects.
1087 909
910=cut
911
912package cf::player;
913
914use Coro::AIO;
915
1088=head3 cf::player 916=head3 cf::player
1089 917
1090=over 4 918=over 4
1091 919
1092=item cf::player::exists $login 920=item cf::player::find $login
1093 921
1094Returns true when the given account exists. 922Returns the given player object, loading it if necessary (might block).
1095 923
1096=cut 924=cut
1097 925
1098sub cf::player::exists($) { 926sub playerdir($) {
1099 cf::player::find $_[0] 927 cf::localdir
1100 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
1101} 1073}
1102 1074
1103=item $player->ext_reply ($msgid, $msgtype, %msg) 1075=item $player->ext_reply ($msgid, $msgtype, %msg)
1104 1076
1105Sends an ext reply to the player. 1077Sends an ext reply to the player.
1106 1078
1107=cut 1079=cut
1108 1080
1109sub cf::player::ext_reply($$$%) { 1081sub ext_reply($$$%) {
1110 my ($self, $id, %msg) = @_; 1082 my ($self, $id, %msg) = @_;
1111 1083
1112 $msg{msgid} = $id; 1084 $msg{msgid} = $id;
1113 1085
1114 $self->send ("ext " . to_json \%msg); 1086 $self->send ("ext " . cf::to_json \%msg);
1115} 1087}
1088
1089package cf;
1116 1090
1117=back 1091=back
1118 1092
1119 1093
1120=head3 cf::map 1094=head3 cf::map
1126package cf::map; 1100package cf::map;
1127 1101
1128use Fcntl; 1102use Fcntl;
1129use Coro::AIO; 1103use Coro::AIO;
1130 1104
1105use overload
1106 '""' => \&as_string;
1107
1131our $MAX_RESET = 7200; 1108our $MAX_RESET = 3600;
1132our $DEFAULT_RESET = 3600; 1109our $DEFAULT_RESET = 3000;
1133 1110
1134sub generate_random_map { 1111sub generate_random_map {
1135 my ($path, $rmp) = @_; 1112 my ($self, $rmp) = @_;
1136 1113
1137 # mit "rum" bekleckern, nicht 1114 # mit "rum" bekleckern, nicht
1138 cf::map::_create_random_map 1115 $self->_create_random_map (
1139 $path,
1140 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1141 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1142 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1143 $rmp->{exit_on_final_map}, 1119 $rmp->{exit_on_final_map},
1144 $rmp->{xsize}, $rmp->{ysize}, 1120 $rmp->{xsize}, $rmp->{ysize},
1145 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1121 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1146 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1122 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1147 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1123 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1148 $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},
1149 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1150 (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
1151} 1233}
1152 1234
1153# and all this just because we cannot iterate over 1235# and all this just because we cannot iterate over
1154# all maps in C++... 1236# all maps in C++...
1155sub change_all_map_light { 1237sub change_all_map_light {
1157 1239
1158 $_->change_map_light ($change) 1240 $_->change_map_light ($change)
1159 for grep $_->outdoor, values %cf::MAP; 1241 for grep $_->outdoor, values %cf::MAP;
1160} 1242}
1161 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
1162sub try_load_header($) { 1252sub load_header_from($) {
1163 my ($path) = @_; 1253 my ($self, $path) = @_;
1164 1254
1165 utf8::encode $path; 1255 utf8::encode $path;
1166 aio_open $path, O_RDONLY, 0 1256 aio_open $path, O_RDONLY, 0
1167 or return; 1257 or return;
1168 1258
1169 my $map = cf::map::new 1259 $self->_load_header ($path)
1170 or return; 1260 or return;
1171 1261
1172 $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
1173 or return; 1290 or return;
1174 1291
1175 $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 }
1176 1297
1177 $map 1298 1
1178} 1299}
1179 1300
1301sub find;
1180sub find_map { 1302sub find {
1181 my ($path, $origin) = @_; 1303 my ($path, $origin) = @_;
1182 1304
1183 #warn "find_map<$path,$origin>\n";#d#
1184
1185 $path = new cf::path $path, $origin && $origin->path; 1305 $path = normalise $path, $origin && $origin->path;
1186 my $key = $path->as_string;
1187 1306
1188 cf::lock_wait "map_find:$key"; 1307 cf::lock_wait "map_find:$path";
1189 1308
1190 $cf::MAP{$key} || do { 1309 $cf::MAP{$path} || do {
1191 my $guard = cf::lock_acquire "map_find:$key"; 1310 my $guard = cf::lock_acquire "map_find:$path";
1192 1311 my $map = new_from_path cf::map $path
1193 # do it the slow way
1194 my $map = try_load_header $path->save_path;
1195
1196 if ($map) {
1197 # safety
1198 $map->{instantiate_time} = $cf::RUNTIME
1199 if $map->{instantiate_time} > $cf::RUNTIME;
1200 } else {
1201 if (my $rmp = $path->random_map_params) {
1202 $map = generate_random_map $key, $rmp;
1203 } else {
1204 $map = try_load_header $path->load_path;
1205 }
1206
1207 $map or return; 1312 or return;
1208 1313
1209 $map->{load_original} = 1;
1210 $map->{instantiate_time} = $cf::RUNTIME;
1211 $map->instantiate;
1212
1213 # per-player maps become, after loading, normal maps
1214 $map->per_player (0) if $path->{user_rel};
1215 }
1216
1217 $map->path ($key);
1218 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME; 1314 $map->{last_save} = $cf::RUNTIME;
1220 $map->last_access ($cf::RUNTIME); 1315
1316 $map->load_header
1317 or return;
1221 1318
1222 if ($map->should_reset) { 1319 if ($map->should_reset) {
1223 $map->reset; 1320 $map->reset;
1224 undef $guard; 1321 undef $guard;
1225 $map = cf::map::find_map ($path) 1322 $map = find $path
1226 or return; 1323 or return;
1227 } 1324 }
1228 1325
1229 $cf::MAP{$key} = $map 1326 $cf::MAP{$path} = $map
1230 } 1327 }
1231} 1328}
1232 1329
1233sub load { 1330sub load {
1234 my ($self) = @_; 1331 my ($self) = @_;
1235 1332
1236 my $path = $self->{path}; 1333 my $path = $self->{path};
1237 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1334 my $guard = cf::lock_acquire "map_load:$path";
1238 1335
1239 return if $self->in_memory != cf::MAP_SWAPPED; 1336 return if $self->in_memory != cf::MAP_SWAPPED;
1240 1337
1241 $self->in_memory (cf::MAP_LOADING); 1338 $self->in_memory (cf::MAP_LOADING);
1242 1339
1243 $self->alloc; 1340 $self->alloc;
1244 $self->load_objects ($self->{load_path}, 1) 1341 $self->_load_objects ($self->{load_path}, 1)
1245 or return; 1342 or return;
1246 1343
1247 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1344 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1248 if delete $self->{load_original}; 1345 if delete $self->{load_original};
1249 1346
1250 if (my $uniq = $path->uniq_path) { 1347 if (my $uniq = $self->uniq_path) {
1251 utf8::encode $uniq; 1348 utf8::encode $uniq;
1252 if (aio_open $uniq, O_RDONLY, 0) { 1349 if (aio_open $uniq, O_RDONLY, 0) {
1253 $self->clear_unique_items; 1350 $self->clear_unique_items;
1254 $self->load_objects ($uniq, 0); 1351 $self->_load_objects ($uniq, 0);
1255 } 1352 }
1256 } 1353 }
1354
1355 Coro::cede;
1257 1356
1258 # now do the right thing for maps 1357 # now do the right thing for maps
1259 $self->link_multipart_objects; 1358 $self->link_multipart_objects;
1260 1359
1261 if ($self->{path}->is_style_map) { 1360 unless ($self->{deny_activate}) {
1262 $self->{deny_save} = 1; 1361 $self->decay_objects;
1263 $self->{deny_reset} = 1;
1264 } else {
1265 $self->fix_auto_apply; 1362 $self->fix_auto_apply;
1266 $self->decay_objects;
1267 $self->update_buttons; 1363 $self->update_buttons;
1364 Coro::cede;
1268 $self->set_darkness_map; 1365 $self->set_darkness_map;
1269 $self->difficulty ($self->estimate_difficulty) 1366 $self->difficulty ($self->estimate_difficulty)
1270 unless $self->difficulty; 1367 unless $self->difficulty;
1368 Coro::cede;
1271 $self->activate; 1369 $self->activate;
1272 } 1370 }
1273 1371
1274 $self->in_memory (cf::MAP_IN_MEMORY); 1372 $self->in_memory (cf::MAP_IN_MEMORY);
1275} 1373}
1276 1374
1277sub 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 {
1278 my ($path, $origin) = @_; 1409 my ($path, $origin) = @_;
1279 1410
1280 #warn "load_map_sync<$path, $origin>\n";#d# 1411 cf::sync_job { find $path, $origin }
1412}
1281 1413
1282 cf::sync_job { 1414sub do_load_sync {
1283 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
1284 or return; 1425 or next;
1285 $map->load; 1426 $map->load;
1286 $map 1427
1428 delete $MAP_PREFETCH{$path};
1429 }
1430 Coro::schedule;
1287 } 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 ()
1288} 1447}
1289 1448
1290sub save { 1449sub save {
1291 my ($self) = @_; 1450 my ($self) = @_;
1292 1451
1452 my $lock = cf::lock_acquire "map_data:" . $self->path;
1453
1293 $self->{last_save} = $cf::RUNTIME; 1454 $self->{last_save} = $cf::RUNTIME;
1294 1455
1295 return unless $self->dirty; 1456 return unless $self->dirty;
1296 1457
1297 my $save = $self->{path}->save_path; utf8::encode $save; 1458 my $save = $self->save_path; utf8::encode $save;
1298 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1459 my $uniq = $self->uniq_path; utf8::encode $uniq;
1299 1460
1300 $self->{load_path} = $save; 1461 $self->{load_path} = $save;
1301 1462
1302 return if $self->{deny_save}; 1463 return if $self->{deny_save};
1303 1464
1465 local $self->{last_access} = $self->last_access;#d#
1466
1467 cf::async {
1468 $_->contr->save for $self->players;
1469 };
1470
1304 if ($uniq) { 1471 if ($uniq) {
1305 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1472 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1306 $self->save_objects ($uniq, cf::IO_UNIQUES); 1473 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1307 } else { 1474 } else {
1308 $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);
1309 } 1476 }
1310} 1477}
1311 1478
1312sub swap_out { 1479sub swap_out {
1313 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;
1314 1486
1315 return if $self->players; 1487 return if $self->players;
1316 return if $self->in_memory != cf::MAP_IN_MEMORY; 1488 return if $self->in_memory != cf::MAP_IN_MEMORY;
1317 return if $self->{deny_save}; 1489 return if $self->{deny_save};
1318 1490
1319 $self->save;
1320 $self->clear; 1491 $self->clear;
1321 $self->in_memory (cf::MAP_SWAPPED); 1492 $self->in_memory (cf::MAP_SWAPPED);
1322} 1493}
1323 1494
1324sub reset_at { 1495sub reset_at {
1325 my ($self) = @_; 1496 my ($self) = @_;
1326 1497
1327 # TODO: safety, remove and allow resettable per-player maps 1498 # TODO: safety, remove and allow resettable per-player maps
1328 return 1e99 if $self->{path}{user_rel}; 1499 return 1e99 if $self->isa ("ext::map_per_player");
1329 return 1e99 if $self->{deny_reset}; 1500 return 1e99 if $self->{deny_reset};
1330 1501
1331 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1332 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1503 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1333 1504
1338 my ($self) = @_; 1509 my ($self) = @_;
1339 1510
1340 $self->reset_at <= $cf::RUNTIME 1511 $self->reset_at <= $cf::RUNTIME
1341} 1512}
1342 1513
1343sub unlink_save {
1344 my ($self) = @_;
1345
1346 utf8::encode (my $save = $self->{path}->save_path);
1347 aioreq_pri 3; IO::AIO::aio_unlink $save;
1348 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1349}
1350
1351sub rename { 1514sub rename {
1352 my ($self, $new_path) = @_; 1515 my ($self, $new_path) = @_;
1353 1516
1517 normalise $new_path;
1518
1354 $self->unlink_save; 1519 $self->unlink_save;
1355 1520
1356 delete $cf::MAP{$self->path}; 1521 delete $cf::MAP{$self->path};
1357 $self->{path} = new cf::path $new_path; 1522 $self->{path} = $new_path; $self->path ($self->{path});
1358 $self->path ($self->{path}->as_string);
1359 $cf::MAP{$self->path} = $self; 1523 $cf::MAP{$self->path} = $self;
1360 1524
1361 $self->save; 1525 $self->save;
1362} 1526}
1363 1527
1364sub reset { 1528sub reset {
1365 my ($self) = @_; 1529 my ($self) = @_;
1366 1530
1531 my $lock = cf::lock_acquire "map_data:$self->{path}";
1532
1367 return if $self->players; 1533 return if $self->players;
1368 return if $self->{path}{user_rel};#d# 1534 return if $self->isa ("ext::map_per_player");#d#
1369 1535
1370 warn "resetting map ", $self->path;#d# 1536 warn "resetting map ", $self->path;#d#
1371 1537
1372 delete $cf::MAP{$self->path}; 1538 delete $cf::MAP{$self->path};
1539
1540 $self->in_memory (cf::MAP_SWAPPED);
1541 $self->clear;
1373 1542
1374 $_->clear_links_to ($self) for values %cf::MAP; 1543 $_->clear_links_to ($self) for values %cf::MAP;
1375 1544
1376 $self->unlink_save; 1545 $self->unlink_save;
1377 $self->destroy; 1546 $self->destroy;
1386 $self->reset_timeout (1); 1555 $self->reset_timeout (1);
1387 $self->rename ("{nuke}/" . ($nuke_counter++)); 1556 $self->rename ("{nuke}/" . ($nuke_counter++));
1388 $self->reset; # polite request, might not happen 1557 $self->reset; # polite request, might not happen
1389} 1558}
1390 1559
1391sub customise_for { 1560=item cf::map::unique_maps
1392 my ($map, $ob) = @_;
1393 1561
1394 if ($map->per_player) { 1562Returns an arrayref of paths of all shared maps that have
1395 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1563instantiated unique items. May block.
1396 }
1397 1564
1398 $map 1565=cut
1399}
1400 1566
1401sub emergency_save { 1567sub unique_maps() {
1402 local $cf::FREEZE = 1; 1568 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1569 or return;
1403 1570
1404 warn "enter emergency map save\n"; 1571 my @paths;
1405 1572
1406 cf::sync_job { 1573 for (@$files) {
1407 warn "begin emergency map save\n"; 1574 utf8::decode $_;
1408 $_->save for values %cf::MAP; 1575 next if /\.pst$/;
1576 next unless /^$PATH_SEP/o;
1577
1578 s/\.map$//;
1579 push @paths, $_;
1409 }; 1580 }
1410 1581
1411 warn "end emergency map save\n"; 1582 \@paths
1412} 1583}
1413 1584
1414package cf; 1585package cf;
1415 1586
1416=back 1587=back
1417 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
1418 1615
1419=head3 cf::object::player 1616=head3 cf::object::player
1420 1617
1421=over 4 1618=over 4
1422 1619
1462 1659
1463=item $player_object->enter_link 1660=item $player_object->enter_link
1464 1661
1465Freezes the player and moves him/her to a special map (C<{link}>). 1662Freezes the player and moves him/her to a special map (C<{link}>).
1466 1663
1467The player should be reaosnably safe there for short amounts of time. You 1664The player should be reasonably safe there for short amounts of time. You
1468I<MUST> call C<leave_link> as soon as possible, though. 1665I<MUST> call C<leave_link> as soon as possible, though.
1469 1666
1667Will never block.
1668
1470=item $player_object->leave_link ($map, $x, $y) 1669=item $player_object->leave_link ($map, $x, $y)
1471 1670
1472Moves the player out of the specila link map onto the given map. If the 1671Moves the player out of the special C<{link}> map onto the specified
1473map is not valid (or omitted), the player will be moved back to the 1672map. If the map is not valid (or omitted), the player will be moved back
1474location he/she was before the call to C<enter_link>, or, if that fails, 1673to the location he/she was before the call to C<enter_link>, or, if that
1475to the emergency map position. 1674fails, to the emergency map position.
1476 1675
1477Might block. 1676Might block.
1478 1677
1479=cut 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}
1480 1689
1481sub cf::object::player::enter_link { 1690sub cf::object::player::enter_link {
1482 my ($self) = @_; 1691 my ($self) = @_;
1483 1692
1484 $self->deactivate_recursive; 1693 $self->deactivate_recursive;
1485 1694
1486 return if $self->map == $LINK_MAP; 1695 return if UNIVERSAL::isa $self->map, "ext::map_link";
1487 1696
1488 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1697 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1489 if $self->map; 1698 if $self->map;
1490 1699
1491 $self->enter_map ($LINK_MAP, 20, 20); 1700 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1492} 1701}
1493 1702
1494sub cf::object::player::leave_link { 1703sub cf::object::player::leave_link {
1495 my ($self, $map, $x, $y) = @_; 1704 my ($self, $map, $x, $y) = @_;
1496 1705
1497 my $link_pos = delete $self->{_link_pos}; 1706 my $link_pos = delete $self->{_link_pos};
1498 1707
1499 unless ($map) { 1708 unless ($map) {
1500 # restore original map position 1709 # restore original map position
1501 ($map, $x, $y) = @{ $link_pos || [] }; 1710 ($map, $x, $y) = @{ $link_pos || [] };
1502 $map = cf::map::find_map $map; 1711 $map = cf::map::find $map;
1503 1712
1504 unless ($map) { 1713 unless ($map) {
1505 ($map, $x, $y) = @$EMERGENCY_POSITION; 1714 ($map, $x, $y) = @$EMERGENCY_POSITION;
1506 $map = cf::map::find_map $map 1715 $map = cf::map::find $map
1507 or die "FATAL: cannot load emergency map\n"; 1716 or die "FATAL: cannot load emergency map\n";
1508 } 1717 }
1509 } 1718 }
1510 1719
1511 ($x, $y) = (-1, -1) 1720 ($x, $y) = (-1, -1)
1514 # use -1 or undef as default coordinates, not 0, 0 1723 # use -1 or undef as default coordinates, not 0, 0
1515 ($x, $y) = ($map->enter_x, $map->enter_y) 1724 ($x, $y) = ($map->enter_x, $map->enter_y)
1516 if $x <=0 && $y <= 0; 1725 if $x <=0 && $y <= 0;
1517 1726
1518 $map->load; 1727 $map->load;
1728 $map->load_diag;
1519 1729
1730 return unless $self->contr->active;
1520 $self->activate_recursive; 1731 $self->activate_recursive;
1521 $self->enter_map ($map, $x, $y); 1732 $self->enter_map ($map, $x, $y);
1522} 1733}
1523 1734
1524cf::player->attach ( 1735cf::player->attach (
1537 1748
1538 # try to abort aborted map switching on player login :) 1749 # try to abort aborted map switching on player login :)
1539 # should happen only on crashes 1750 # should happen only on crashes
1540 if ($pl->ob->{_link_pos}) { 1751 if ($pl->ob->{_link_pos}) {
1541 $pl->ob->enter_link; 1752 $pl->ob->enter_link;
1542 Coro::async { 1753 (async {
1543 # we need this sleep as the login has a concurrent enter_exit running 1754 # we need this sleep as the login has a concurrent enter_exit running
1544 # and this sleep increases chances of the player not ending up in scorn 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);
1545 Coro::Timer::sleep 1; 1760 Coro::Timer::sleep 1;
1546 $pl->ob->leave_link; 1761 $pl->ob->leave_link;
1547 }; 1762 })->prio (2);
1548 } 1763 }
1549 }, 1764 },
1550); 1765);
1551 1766
1552=item $player_object->goto_map ($path, $x, $y) 1767=item $player_object->goto ($path, $x, $y)
1553 1768
1554=cut 1769=cut
1555 1770
1556sub cf::object::player::goto_map { 1771sub cf::object::player::goto {
1557 my ($self, $path, $x, $y) = @_; 1772 my ($self, $path, $x, $y) = @_;
1558 1773
1559 $self->enter_link; 1774 $self->enter_link;
1560 1775
1561 (Coro::async { 1776 (async {
1562 $path = new cf::path $path;
1563
1564 my $map = cf::map::find_map $path->as_string; 1777 my $map = cf::map::find $path;
1565 $map = $map->customise_for ($self) if $map; 1778 $map = $map->customise_for ($self) if $map;
1566 1779
1567# warn "entering ", $map->path, " at ($x, $y)\n" 1780# warn "entering ", $map->path, " at ($x, $y)\n"
1568# if $map; 1781# if $map;
1569 1782
1570 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1783 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1571 1784
1572 $self->leave_link ($map, $x, $y); 1785 $self->leave_link ($map, $x, $y);
1573 })->prio (1); 1786 })->prio (1);
1574} 1787}
1575 1788
1628 1841
1629 return unless $self->type == cf::PLAYER; 1842 return unless $self->type == cf::PLAYER;
1630 1843
1631 $self->enter_link; 1844 $self->enter_link;
1632 1845
1633 (Coro::async { 1846 (async {
1847 $self->deactivate_recursive; # just to be sure
1634 unless (eval { 1848 unless (eval {
1635
1636 prepare_random_map $exit 1849 prepare_random_map $exit
1637 if $exit->slaying eq "/!"; 1850 if $exit->slaying eq "/!";
1638 1851
1639 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;
1640 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1853 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1641 1854
1642 1; 1855 1;
1643 }) { 1856 }) {
1644 $self->message ("Something went wrong deep within the crossfire server. " 1857 $self->message ("Something went wrong deep within the crossfire server. "
1645 . "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. "
1646 . "Please report this to the dungeon master", 1859 . "Please report this to the dungeon master!",
1647 cf::NDI_UNIQUE | cf::NDI_RED); 1860 cf::NDI_UNIQUE | cf::NDI_RED);
1648 1861
1649 warn "ERROR in enter_exit: $@"; 1862 warn "ERROR in enter_exit: $@";
1650 $self->leave_link; 1863 $self->leave_link;
1651 } 1864 }
1702 on_reply => sub { 1915 on_reply => sub {
1703 my ($ns, $msg) = @_; 1916 my ($ns, $msg) = @_;
1704 1917
1705 # this weird shuffling is so that direct followup queries 1918 # this weird shuffling is so that direct followup queries
1706 # get handled first 1919 # get handled first
1707 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
1708 1922
1709 (shift @$queue)->[1]->($msg); 1923 (shift @$queue)->[1]->($msg);
1710 1924
1711 push @{ $ns->{query_queue} }, @$queue; 1925 push @{ $ns->{query_queue} }, @$queue;
1712 1926
1718 } 1932 }
1719 } 1933 }
1720 }, 1934 },
1721); 1935);
1722 1936
1723=item $client->coro (\&cb) 1937=item $client->async (\&cb)
1724 1938
1725Create a new coroutine, running the specified callback. The coroutine will 1939Create a new coroutine, running the specified callback. The coroutine will
1726be automatically cancelled when the client gets destroyed (e.g. on logout, 1940be automatically cancelled when the client gets destroyed (e.g. on logout,
1727or loss of connection). 1941or loss of connection).
1728 1942
1729=cut 1943=cut
1730 1944
1731sub cf::client::coro { 1945sub cf::client::async {
1732 my ($self, $cb) = @_; 1946 my ($self, $cb) = @_;
1733 1947
1734 my $coro; $coro = async { 1948 my $coro = &Coro::async ($cb);
1735 eval {
1736 $cb->();
1737 };
1738 warn $@ if $@;
1739 };
1740 1949
1741 $coro->on_destroy (sub { 1950 $coro->on_destroy (sub {
1742 delete $self->{_coro}{$coro+0}; 1951 delete $self->{_coro}{$coro+0};
1743 }); 1952 });
1744 1953
1979 open my $fh, "<:utf8", cf::confdir . "/config" 2188 open my $fh, "<:utf8", cf::confdir . "/config"
1980 or return; 2189 or return;
1981 2190
1982 local $/; 2191 local $/;
1983 *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 }
1984} 2206}
1985 2207
1986sub main { 2208sub main {
1987 # we must not ever block the main coroutine 2209 # we must not ever block the main coroutine
1988 local $Coro::idle = sub { 2210 local $Coro::idle = sub {
1989 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2211 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1990 (Coro::unblock_sub {
1991 Event::one_event; 2212 async { Event::one_event };
1992 })->();
1993 }; 2213 };
1994 2214
1995 cfg_load; 2215 cfg_load;
1996 db_load; 2216 db_load;
1997 load_extensions; 2217 load_extensions;
1998 Event::loop; 2218 Event::loop;
1999} 2219}
2000 2220
2001############################################################################# 2221#############################################################################
2002# 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}
2003 2265
2004sub reload() { 2266sub reload() {
2005 # can/must only be called in main 2267 # can/must only be called in main
2006 if ($Coro::current != $Coro::main) { 2268 if ($Coro::current != $Coro::main) {
2007 warn "can only reload from main coroutine\n"; 2269 warn "can only reload from main coroutine\n";
2008 return; 2270 return;
2009 } 2271 }
2010 2272
2011 warn "reloading..."; 2273 warn "reloading...";
2012 2274
2013 local $FREEZE = 1; 2275 warn "freezing server";
2276 my $guard = freeze_mainloop;
2014 cf::emergency_save; 2277 cf::emergency_save;
2278
2279 warn "sync database to disk";
2280 cf::db_sync;
2281 IO::AIO::flush;
2015 2282
2016 eval { 2283 eval {
2017 # 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
2018 2285
2019 # cancel all watchers 2286 warn "cancel all watchers";
2020 for (Event::all_watchers) { 2287 for (Event::all_watchers) {
2021 $_->cancel if $_->data & WF_AUTOCANCEL; 2288 $_->cancel if $_->data & WF_AUTOCANCEL;
2022 } 2289 }
2023 2290
2024 # cancel all extension coros 2291 warn "cancel all extension coros";
2025 $_->cancel for values %EXT_CORO; 2292 $_->cancel for values %EXT_CORO;
2026 %EXT_CORO = (); 2293 %EXT_CORO = ();
2027 2294
2295 warn "remove commands";
2296 %COMMAND = ();
2297
2298 warn "remove ext commands";
2299 %EXTCMD = ();
2300
2028 # unload all extensions 2301 warn "unload/nuke all extensions";
2029 for (@exts) { 2302 for my $pkg (@EXTS) {
2030 warn "unloading <$_>"; 2303 warn "... unloading $pkg";
2031 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: $@";
2032 } 2310 }
2033 2311
2312 warn "... nuking $pkg";
2313 Symbol::delete_package $pkg;
2314 }
2315
2034 # unload all modules loaded from $LIBDIR 2316 warn "unload all perl modules loaded from $LIBDIR";
2035 while (my ($k, $v) = each %INC) { 2317 while (my ($k, $v) = each %INC) {
2036 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2318 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2037 2319
2038 warn "removing <$k>"; 2320 warn "removing <$k>";
2039 delete $INC{$k}; 2321 delete $INC{$k};
2046 } 2328 }
2047 2329
2048 Symbol::delete_package $k; 2330 Symbol::delete_package $k;
2049 } 2331 }
2050 2332
2051 # sync database to disk
2052 cf::db_sync;
2053 IO::AIO::flush;
2054
2055 # get rid of safe::, as good as possible 2333 warn "get rid of safe::, as good as possible";
2056 Symbol::delete_package "safe::$_" 2334 Symbol::delete_package "safe::$_"
2057 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);
2058 2336
2059 # remove register_script_function callbacks
2060 # TODO
2061
2062 # unload cf.pm "a bit" 2337 warn "unload cf.pm \"a bit\"";
2063 delete $INC{"cf.pm"}; 2338 delete $INC{"cf.pm"};
2064 2339
2065 # don't, removes xs symbols, too, 2340 # don't, removes xs symbols, too,
2066 # and global variables created in xs 2341 # and global variables created in xs
2067 #Symbol::delete_package __PACKAGE__; 2342 #Symbol::delete_package __PACKAGE__;
2068 2343
2069 # reload cf.pm
2070 warn "reloading cf.pm"; 2344 warn "reloading cf.pm";
2071 require cf; 2345 require cf;
2072 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2346 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2073 2347
2074 # load config and database again 2348 warn "load config and database again";
2075 cf::cfg_load; 2349 cf::cfg_load;
2076 cf::db_load; 2350 cf::db_load;
2077 2351
2078 # load extensions
2079 warn "load extensions"; 2352 warn "load extensions";
2080 cf::load_extensions; 2353 cf::load_extensions;
2081 2354
2082 # reattach attachments to objects 2355 warn "reattach attachments to objects/players";
2083 warn "reattach";
2084 _global_reattach; 2356 _global_reattach;
2357 warn "reattach attachments to maps";
2358 reattach $_ for values %MAP;
2085 }; 2359 };
2086 2360
2087 if ($@) { 2361 if ($@) {
2088 warn $@; 2362 warn $@;
2089 warn "error while reloading, exiting."; 2363 warn "error while reloading, exiting.";
2090 exit 1; 2364 exit 1;
2091 } 2365 }
2092 2366
2093 warn "reloaded successfully"; 2367 warn "reloaded";
2094}; 2368};
2095
2096#############################################################################
2097
2098unless ($LINK_MAP) {
2099 $LINK_MAP = cf::map::new;
2100
2101 $LINK_MAP->width (41);
2102 $LINK_MAP->height (41);
2103 $LINK_MAP->alloc;
2104 $LINK_MAP->path ("{link}");
2105 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2106 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2107
2108 # dirty hack because... archetypes are not yet loaded
2109 Event->timer (
2110 after => 2,
2111 cb => sub {
2112 $_[0]->w->cancel;
2113
2114 # provide some exits "home"
2115 my $exit = cf::object::new "exit";
2116
2117 $exit->slaying ($EMERGENCY_POSITION->[0]);
2118 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2119 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2120
2121 $LINK_MAP->insert ($exit->clone, 19, 19);
2122 $LINK_MAP->insert ($exit->clone, 19, 20);
2123 $LINK_MAP->insert ($exit->clone, 19, 21);
2124 $LINK_MAP->insert ($exit->clone, 20, 19);
2125 $LINK_MAP->insert ($exit->clone, 20, 21);
2126 $LINK_MAP->insert ($exit->clone, 21, 19);
2127 $LINK_MAP->insert ($exit->clone, 21, 20);
2128 $LINK_MAP->insert ($exit->clone, 21, 21);
2129
2130 $exit->destroy;
2131 });
2132
2133 $LINK_MAP->{deny_save} = 1;
2134 $LINK_MAP->{deny_reset} = 1;
2135
2136 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2137}
2138
2139register "<global>", __PACKAGE__;
2140 2369
2141register_command "reload" => sub { 2370register_command "reload" => sub {
2142 my ($who, $arg) = @_; 2371 my ($who, $arg) = @_;
2143 2372
2144 if ($who->flag (FLAG_WIZ)) { 2373 if ($who->flag (FLAG_WIZ)) {
2154 reentrant => 0, 2383 reentrant => 0,
2155 prio => 0, 2384 prio => 0,
2156 at => $NEXT_TICK || $TICK, 2385 at => $NEXT_TICK || $TICK,
2157 data => WF_AUTOCANCEL, 2386 data => WF_AUTOCANCEL,
2158 cb => sub { 2387 cb => sub {
2159 unless ($FREEZE) { 2388 $NOW = Event::time;
2389
2160 cf::server_tick; # one server iteration 2390 cf::server_tick; # one server iteration
2161 $RUNTIME += $TICK; 2391 $RUNTIME += $TICK;
2162 }
2163
2164 $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;
2165 2396
2166 # 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
2167 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2398 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2168 2399
2169 $TICK_WATCHER->at ($NEXT_TICK); 2400 $TICK_WATCHER->at ($NEXT_TICK);
2191 or warn "ERROR: unable to write runtime file: $!"; 2422 or warn "ERROR: unable to write runtime file: $!";
2192 })->(); 2423 })->();
2193 }, 2424 },
2194); 2425);
2195 2426
2427END { cf::emergency_save }
2428
21961 24291
2197 2430

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines