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.127 by root, Wed Jan 3 00:05:26 2007 UTC vs.
Revision 1.167 by root, Sat Jan 13 23:32:43 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines