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.134 by root, Thu Jan 4 17:28:49 2007 UTC vs.
Revision 1.171 by root, Sun Jan 14 12:24:48 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;
43our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
44our $NEXT_TICK; 51our $NEXT_TICK;
45our $NOW; 52our $NOW;
46 53
47our %CFG; 54our %CFG;
48 55
49our $UPTIME; $UPTIME ||= time; 56our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 57our $RUNTIME;
51 58
59our %PLAYER; # all users
52our %MAP; # all maps 60our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 61our $LINK_MAP; # the special {link} map, which is always available
54our $RANDOM_MAPS = cf::localdir . "/random"; 62our $RANDOM_MAPS = cf::localdir . "/random";
55our %EXT_CORO; 63
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66
67# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
56 69
57binmode STDOUT; 70binmode STDOUT;
58binmode STDERR; 71binmode STDERR;
59 72
60# read virtual server time, if available 73# read virtual server time, if available
68mkdir cf::localdir . "/" . cf::playerdir; 81mkdir cf::localdir . "/" . cf::playerdir;
69mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
70mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
71mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
72 85
73# a special map that is always available
74our $LINK_MAP;
75our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
76 87
77############################################################################# 88#############################################################################
78 89
79=head2 GLOBAL VARIABLES 90=head2 GLOBAL VARIABLES
104 115
105=item %cf::CFG 116=item %cf::CFG
106 117
107Configuration for the server, loaded from C</etc/crossfire/config>, or 118Configuration for the server, loaded from C</etc/crossfire/config>, or
108from wherever your confdir points to. 119from wherever your confdir points to.
120
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
122
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
125processing has been done. Call C<< ->wait >> on them to maximise the
126window of cpu time available, or simply to synchronise to the server tick.
109 127
110=back 128=back
111 129
112=cut 130=cut
113 131
117 utf8::encode $msg; 135 utf8::encode $msg;
118 136
119 $msg .= "\n" 137 $msg .= "\n"
120 unless $msg =~ /\n$/; 138 unless $msg =~ /\n$/;
121 139
122 LOG llevError, "cfperl: $msg"; 140 LOG llevError, $msg;
123 }; 141 };
124} 142}
125 143
126@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 144@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 145@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
145 163
146$Event::DIED = sub { 164$Event::DIED = sub {
147 warn "error in event callback: @_"; 165 warn "error in event callback: @_";
148}; 166};
149 167
150my %ext_pkg;
151my @exts;
152my @hook;
153
154=head2 UTILITY FUNCTIONS 168=head2 UTILITY FUNCTIONS
155 169
156=over 4 170=over 4
157 171
172=item dumpval $ref
173
158=cut 174=cut
175
176sub dumpval {
177 eval {
178 local $SIG{__DIE__};
179 my $d;
180 if (1) {
181 $d = new Data::Dumper([$_[0]], ["*var"]);
182 $d->Terse(1);
183 $d->Indent(2);
184 $d->Quotekeys(0);
185 $d->Useqq(1);
186 #$d->Bless(...);
187 $d->Seen($_[1]) if @_ > 1;
188 $d = $d->Dump();
189 }
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d
192 } || "[unable to dump $_[0]: '$@']";
193}
159 194
160use JSON::Syck (); # TODO# replace by JSON::PC once working 195use JSON::Syck (); # TODO# replace by JSON::PC once working
161 196
162=item $ref = cf::from_json $json 197=item $ref = cf::from_json $json
163 198
179sub to_json($) { 214sub to_json($) {
180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
181 JSON::Syck::Dump $_[0] 216 JSON::Syck::Dump $_[0]
182} 217}
183 218
184=item my $guard = cf::guard { BLOCK }
185
186Run the given callback when the guard object gets destroyed (useful for
187coroutine cancellations).
188
189You can call C<< ->cancel >> on the guard object to stop the block from
190being executed.
191
192=cut
193
194sub guard(&) {
195 bless \(my $cb = $_[0]), cf::guard::;
196}
197
198sub cf::guard::cancel {
199 ${$_[0]} = sub { };
200}
201
202sub cf::guard::DESTROY {
203 ${$_[0]}->();
204}
205
206=item cf::lock_wait $string 219=item cf::lock_wait $string
207 220
208Wait until the given lock is available. See cf::lock_acquire. 221Wait until the given lock is available. See cf::lock_acquire.
209 222
210=item my $lock = cf::lock_acquire $string 223=item my $lock = cf::lock_acquire $string
211 224
212Wait until the given lock is available and then acquires it and returns 225Wait until the given lock is available and then acquires it and returns
213a guard object. If the guard object gets destroyed (goes out of scope, 226a Coro::guard object. If the guard object gets destroyed (goes out of scope,
214for example when the coroutine gets canceled), the lock is automatically 227for example when the coroutine gets canceled), the lock is automatically
215returned. 228returned.
216 229
217Lock names should begin with a unique identifier (for example, cf::map::find 230Lock names should begin with a unique identifier (for example, cf::map::find
218uses map_find and cf::map::load uses map_load). 231uses map_find and cf::map::load uses map_load).
237 # wait, to be sure we are not locked 250 # wait, to be sure we are not locked
238 lock_wait $key; 251 lock_wait $key;
239 252
240 $LOCK{$key} = []; 253 $LOCK{$key} = [];
241 254
242 cf::guard { 255 Coro::guard {
243 # wake up all waiters, to be on the safe side 256 # wake up all waiters, to be on the safe side
244 $_->ready for @{ delete $LOCK{$key} }; 257 $_->ready for @{ delete $LOCK{$key} };
245 } 258 }
246} 259}
247 260
248=item cf::async { BLOCK }
249
250Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
251error instead of exiting the server in case of a problem.
252
253=cut
254
255sub async(&) {
256 my ($cb) = @_;
257
258 Coro::async {
259 eval { $cb->() };
260 warn $@ if $@;
261 }
262}
263
264sub freeze_mainloop { 261sub freeze_mainloop {
265 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
266 263
267 my $guard = guard { $TICK_WATCHER->start }; 264 my $guard = Coro::guard {
265 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 };
268 $WRITE_RUNTIME_WATCHER->stop;
268 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
269 $guard 270 $guard
270} 271}
272
273=item cf::async { BLOCK }
274
275Currently the same as Coro::async_pool, meaning you cannot use
276C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
277thing you are allowed to do is call C<prio> on it.
278
279=cut
280
281BEGIN { *async = \&Coro::async_pool }
271 282
272=item cf::sync_job { BLOCK } 283=item cf::sync_job { BLOCK }
273 284
274The design of crossfire+ requires that the main coro ($Coro::main) is 285The design of crossfire+ requires that the main coro ($Coro::main) is
275always able to handle events or runnable, as crossfire+ is only partly 286always able to handle events or runnable, as crossfire+ is only partly
294 my $freeze_guard = freeze_mainloop; 305 my $freeze_guard = freeze_mainloop;
295 306
296 my $busy = 1; 307 my $busy = 1;
297 my @res; 308 my @res;
298 309
299 (Coro::async { 310 (async {
300 @res = eval { $job->() }; 311 @res = eval { $job->() };
301 warn $@ if $@; 312 warn $@ if $@;
302 undef $busy; 313 undef $busy;
303 })->prio (Coro::PRIO_MAX); 314 })->prio (Coro::PRIO_MAX);
304 315
305 while ($busy) { 316 while ($busy) {
306 Coro::cede_notself; 317 Coro::cede or Event::one_event;
307 Event::one_event unless Coro::nready;
308 } 318 }
309 319
310 wantarray ? @res : $res[0] 320 wantarray ? @res : $res[0]
311 } else { 321 } else {
312 # we are in another coroutine, how wonderful, everything just works 322 # we are in another coroutine, how wonderful, everything just works
313 323
314 $job->() 324 $job->()
315 } 325 }
316} 326}
317 327
318=item $coro = cf::coro { BLOCK } 328=item $coro = cf::async_ext { BLOCK }
319 329
320Creates and returns a new coro. This coro is automcatially being canceled 330Like async, but this coro is automatically being canceled when the
321when the extension calling this is being unloaded. 331extension calling this is being unloaded.
322 332
323=cut 333=cut
324 334
325sub coro(&) { 335sub async_ext(&) {
326 my $cb = shift; 336 my $cb = shift;
327 337
328 my $coro = &cf::async ($cb); 338 my $coro = &Coro::async ($cb);
329 339
330 $coro->on_destroy (sub { 340 $coro->on_destroy (sub {
331 delete $EXT_CORO{$coro+0}; 341 delete $EXT_CORO{$coro+0};
332 }); 342 });
333 $EXT_CORO{$coro+0} = $coro; 343 $EXT_CORO{$coro+0} = $coro;
358} 368}
359 369
360=back 370=back
361 371
362=cut 372=cut
363
364#############################################################################
365
366package cf::path;
367
368sub new {
369 my ($class, $path, $base) = @_;
370
371 $path = $path->as_string if ref $path;
372
373 my $self = bless { }, $class;
374
375 # {... are special paths that are not touched
376 # ?xxx/... are special absolute paths
377 # ?random/... random maps
378 # /! non-realised random map exit
379 # /... normal maps
380 # ~/... per-player maps without a specific player (DO NOT USE)
381 # ~user/... per-player map of a specific user
382
383 if ($path =~ /^{/) {
384 # fine as it is
385 } elsif ($path =~ s{^\?random/}{}) {
386 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
387 $self->{random} = cf::from_json $data;
388 } else {
389 if ($path =~ s{^~([^/]+)?}{}) {
390 $self->{user_rel} = 1;
391
392 if (defined $1) {
393 $self->{user} = $1;
394 } elsif ($base =~ m{^~([^/]+)/}) {
395 $self->{user} = $1;
396 } else {
397 warn "cannot resolve user-relative path without user <$path,$base>\n";
398 }
399 } elsif ($path =~ /^\//) {
400 # already absolute
401 } else {
402 $base =~ s{[^/]+/?$}{};
403 return $class->new ("$base/$path");
404 }
405
406 for ($path) {
407 redo if s{/\.?/}{/};
408 redo if s{/[^/]+/\.\./}{/};
409 }
410 }
411
412 $self->{path} = $path;
413
414 $self
415}
416
417# the name / primary key / in-game path
418sub as_string {
419 my ($self) = @_;
420
421 $self->{user_rel} ? "~$self->{user}$self->{path}"
422 : $self->{random} ? "?random/$self->{path}"
423 : $self->{path}
424}
425
426# the displayed name, this is a one way mapping
427sub visible_name {
428 my ($self) = @_;
429
430# if (my $rmp = $self->{random}) {
431# # todo: be more intelligent about this
432# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
433# } else {
434 $self->as_string
435# }
436}
437
438# escape the /'s in the path
439sub _escaped_path {
440 # ∕ is U+2215
441 (my $path = $_[0]{path}) =~ s/\//∕/g;
442 $path
443}
444
445# the original (read-only) location
446sub load_path {
447 my ($self) = @_;
448
449 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
450}
451
452# the temporary/swap location
453sub save_path {
454 my ($self) = @_;
455
456 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
457 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
458 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
459}
460
461# the unique path, might be eq to save_path
462sub uniq_path {
463 my ($self) = @_;
464
465 $self->{user_rel} || $self->{random}
466 ? undef
467 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
468}
469
470# return random map parameters, or undef
471sub random_map_params {
472 my ($self) = @_;
473
474 $self->{random}
475}
476
477# this is somewhat ugly, but style maps do need special treatment
478sub is_style_map {
479 $_[0]{path} =~ m{^/styles/}
480}
481
482package cf;
483 373
484############################################################################# 374#############################################################################
485 375
486=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
487 377
613our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
614our @CB_MAP = (); 504our @CB_MAP = ();
615 505
616my %attachment; 506my %attachment;
617 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
618sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
619 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
620 516
621 use sort 'stable'; 517 use sort 'stable';
622 518
793# object support 689# object support
794 690
795sub reattach { 691sub reattach {
796 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
797 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
798 696
799 my $registry = $obj->registry; 697 my $registry = $obj->registry;
800 698
801 @$registry = (); 699 @$registry = ();
802 700
934=cut 832=cut
935 833
936sub register_extcmd { 834sub register_extcmd {
937 my ($name, $cb) = @_; 835 my ($name, $cb) = @_;
938 836
939 my $caller = caller;
940 #warn "registering extcmd '$name' to '$caller'";
941
942 $EXTCMD{$name} = [$cb, $caller]; 837 $EXTCMD{$name} = $cb;
943} 838}
944 839
945cf::player->attach ( 840cf::player->attach (
946 on_command => sub { 841 on_command => sub {
947 my ($pl, $name, $params) = @_; 842 my ($pl, $name, $params) = @_;
960 855
961 my $msg = eval { from_json $buf }; 856 my $msg = eval { from_json $buf };
962 857
963 if (ref $msg) { 858 if (ref $msg) {
964 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 859 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
965 if (my %reply = $cb->[0]->($pl, $msg)) { 860 if (my %reply = $cb->($pl, $msg)) {
966 $pl->ext_reply ($msg->{msgid}, %reply); 861 $pl->ext_reply ($msg->{msgid}, %reply);
967 } 862 }
968 } 863 }
969 } else { 864 } else {
970 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 865 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
972 867
973 cf::override; 868 cf::override;
974 }, 869 },
975); 870);
976 871
977sub register {
978 my ($base, $pkg) = @_;
979
980 #TODO
981}
982
983sub load_extension { 872sub load_extension {
984 my ($path) = @_; 873 my ($path) = @_;
985 874
986 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 875 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
987 my $base = $1; 876 my $base = $1;
988 my $pkg = $1; 877 my $pkg = $1;
989 $pkg =~ s/[^[:word:]]/_/g; 878 $pkg =~ s/[^[:word:]]/_/g;
990 $pkg = "ext::$pkg"; 879 $pkg = "ext::$pkg";
991 880
992 warn "loading '$path' into '$pkg'\n"; 881 warn "... loading '$path' into '$pkg'\n";
993 882
994 open my $fh, "<:utf8", $path 883 open my $fh, "<:utf8", $path
995 or die "$path: $!"; 884 or die "$path: $!";
996 885
997 my $source = 886 my $source =
998 "package $pkg; use strict; use utf8;\n" 887 "package $pkg; use strict; use utf8;\n"
999 . "#line 1 \"$path\"\n{\n" 888 . "#line 1 \"$path\"\n{\n"
1000 . (do { local $/; <$fh> }) 889 . (do { local $/; <$fh> })
1001 . "\n};\n1"; 890 . "\n};\n1";
1002 891
1003 eval $source 892 unless (eval $source) {
1004 or die $@ ? "$path: $@\n" 893 my $msg = $@ ? "$path: $@\n"
1005 : "extension disabled.\n"; 894 : "extension disabled.\n";
1006 895 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1007 push @exts, $pkg; 896 warn $@;
1008 $ext_pkg{$base} = $pkg; 897 warn "mandatory extension failed to load, exiting.\n";
1009 898 exit 1;
1010# no strict 'refs'; 899 }
1011# @{"$pkg\::ISA"} = ext::; 900 die $@;
1012
1013 register $base, $pkg;
1014}
1015
1016sub unload_extension {
1017 my ($pkg) = @_;
1018
1019 warn "removing extension $pkg\n";
1020
1021 # remove hooks
1022 #TODO
1023# for my $idx (0 .. $#PLUGIN_EVENT) {
1024# delete $hook[$idx]{$pkg};
1025# } 901 }
1026 902
1027 # remove commands 903 push @EXTS, $pkg;
1028 for my $name (keys %COMMAND) {
1029 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1030
1031 if (@cb) {
1032 $COMMAND{$name} = \@cb;
1033 } else {
1034 delete $COMMAND{$name};
1035 }
1036 }
1037
1038 # remove extcmds
1039 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1040 delete $EXTCMD{$name};
1041 }
1042
1043 if (my $cb = $pkg->can ("unload")) {
1044 eval {
1045 $cb->($pkg);
1046 1
1047 } or warn "$pkg unloaded, but with errors: $@";
1048 }
1049
1050 Symbol::delete_package $pkg;
1051} 904}
1052 905
1053sub load_extensions { 906sub load_extensions {
1054 for my $ext (<$LIBDIR/*.ext>) { 907 for my $ext (<$LIBDIR/*.ext>) {
1055 next unless -r $ext; 908 next unless -r $ext;
1059 } or warn "$ext not loaded: $@"; 912 } or warn "$ext not loaded: $@";
1060 } 913 }
1061} 914}
1062 915
1063############################################################################# 916#############################################################################
1064# load/save/clean perl data associated with a map
1065
1066*cf::mapsupport::on_clean = sub {
1067 my ($map) = @_;
1068
1069 my $path = $map->tmpname;
1070 defined $path or return;
1071
1072 unlink "$path.pst";
1073};
1074
1075cf::map->attach (prio => -10000, package => cf::mapsupport::);
1076
1077#############################################################################
1078# load/save perl data associated with player->ob objects
1079
1080sub all_objects(@) {
1081 @_, map all_objects ($_->inv), @_
1082}
1083
1084# TODO: compatibility cruft, remove when no longer needed
1085cf::player->attach (
1086 on_load => sub {
1087 my ($pl, $path) = @_;
1088
1089 for my $o (all_objects $pl->ob) {
1090 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1091 $o->set_ob_key_value ("_perl_data");
1092
1093 %$o = %{ Storable::thaw pack "H*", $value };
1094 }
1095 }
1096 },
1097);
1098
1099#############################################################################
1100 917
1101=head2 CORE EXTENSIONS 918=head2 CORE EXTENSIONS
1102 919
1103Functions and methods that extend core crossfire objects. 920Functions and methods that extend core crossfire objects.
1104 921
922=cut
923
924package cf::player;
925
926use Coro::AIO;
927
1105=head3 cf::player 928=head3 cf::player
1106 929
1107=over 4 930=over 4
1108 931
1109=item cf::player::exists $login 932=item cf::player::find $login
1110 933
1111Returns true when the given account exists. 934Returns the given player object, loading it if necessary (might block).
1112 935
1113=cut 936=cut
1114 937
1115sub cf::player::exists($) { 938sub playerdir($) {
1116 cf::player::find $_[0] 939 cf::localdir
1117 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 940 . "/"
941 . cf::playerdir
942 . "/"
943 . (ref $_[0] ? $_[0]->ob->name : $_[0])
944}
945
946sub path($) {
947 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
948
949 (playerdir $login) . "/$login.pl"
950}
951
952sub find_active($) {
953 $cf::PLAYER{$_[0]}
954 and $cf::PLAYER{$_[0]}->active
955 and $cf::PLAYER{$_[0]}
956}
957
958sub exists($) {
959 my ($login) = @_;
960
961 $cf::PLAYER{$login}
962 or cf::sync_job { !aio_stat $login }
963}
964
965sub find($) {
966 return $cf::PLAYER{$_[0]} || do {
967 my $login = $_[0];
968
969 my $guard = cf::lock_acquire "user_find:$login";
970
971 $cf::PLAYER{$_[0]} || do {
972 my $pl = load_pl path $login
973 or return;
974 $cf::PLAYER{$login} = $pl
975 }
976 }
977}
978
979sub save($) {
980 my ($pl) = @_;
981
982 return if $pl->{deny_save};
983
984 my $path = path $pl;
985 my $guard = cf::lock_acquire "user_save:$path";
986
987 return if $pl->{deny_save};
988
989 aio_mkdir playerdir $pl, 0770;
990 $pl->{last_save} = $cf::RUNTIME;
991
992 $pl->save_pl ($path);
993 Coro::cede;
994}
995
996sub new($) {
997 my ($login) = @_;
998
999 my $self = create;
1000
1001 $self->ob->name ($login);
1002 $self->{deny_save} = 1;
1003
1004 $cf::PLAYER{$login} = $self;
1005
1006 $self
1007}
1008
1009=item $pl->quit_character
1010
1011Nukes the player without looking back. If logged in, the connection will
1012be destroyed. May block for a long time.
1013
1014=cut
1015
1016sub quit_character {
1017 my ($pl) = @_;
1018
1019 $pl->{deny_save} = 1;
1020 $pl->password ("*"); # this should lock out the player until we nuked the dir
1021
1022 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1023 $pl->deactivate;
1024 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1025 $pl->ns->destroy if $pl->ns;
1026
1027 my $path = playerdir $pl;
1028 my $temp = "$path~$cf::RUNTIME~deleting~";
1029 aio_rename $path, $temp;
1030 delete $cf::PLAYER{$pl->ob->name};
1031 $pl->destroy;
1032 IO::AIO::aio_rmtree $temp;
1033}
1034
1035=item cf::player::list_logins
1036
1037Returns am arrayref of all valid playernames in the system, can take a
1038while and may block, so not sync_job-capable, ever.
1039
1040=cut
1041
1042sub list_logins {
1043 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1044 or return [];
1045
1046 my @logins;
1047
1048 for my $login (@$dirs) {
1049 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1050 aio_read $fh, 0, 512, my $buf, 0 or next;
1051 $buf !~ /^password -------------$/m or next; # official not-valid tag
1052
1053 utf8::decode $login;
1054 push @logins, $login;
1055 }
1056
1057 \@logins
1058}
1059
1060=item $player->maps
1061
1062Returns an arrayref of map paths that are private for this
1063player. May block.
1064
1065=cut
1066
1067sub maps($) {
1068 my ($pl) = @_;
1069
1070 my $files = aio_readdir playerdir $pl
1071 or return;
1072
1073 my @paths;
1074
1075 for (@$files) {
1076 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o;
1079
1080 s/\.map$//;
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 }
1083
1084 \@paths
1118} 1085}
1119 1086
1120=item $player->ext_reply ($msgid, $msgtype, %msg) 1087=item $player->ext_reply ($msgid, $msgtype, %msg)
1121 1088
1122Sends an ext reply to the player. 1089Sends an ext reply to the player.
1123 1090
1124=cut 1091=cut
1125 1092
1126sub cf::player::ext_reply($$$%) { 1093sub ext_reply($$$%) {
1127 my ($self, $id, %msg) = @_; 1094 my ($self, $id, %msg) = @_;
1128 1095
1129 $msg{msgid} = $id; 1096 $msg{msgid} = $id;
1130 1097
1131 $self->send ("ext " . to_json \%msg); 1098 $self->send ("ext " . cf::to_json \%msg);
1132} 1099}
1100
1101package cf;
1133 1102
1134=back 1103=back
1135 1104
1136 1105
1137=head3 cf::map 1106=head3 cf::map
1143package cf::map; 1112package cf::map;
1144 1113
1145use Fcntl; 1114use Fcntl;
1146use Coro::AIO; 1115use Coro::AIO;
1147 1116
1117use overload
1118 '""' => \&as_string;
1119
1148our $MAX_RESET = 3600; 1120our $MAX_RESET = 3600;
1149our $DEFAULT_RESET = 3000; 1121our $DEFAULT_RESET = 3000;
1150 1122
1151sub generate_random_map { 1123sub generate_random_map {
1152 my ($path, $rmp) = @_; 1124 my ($self, $rmp) = @_;
1153 1125
1154 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1155 cf::map::_create_random_map 1127 $self->_create_random_map (
1156 $path,
1157 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1158 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1159 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1160 $rmp->{exit_on_final_map}, 1131 $rmp->{exit_on_final_map},
1161 $rmp->{xsize}, $rmp->{ysize}, 1132 $rmp->{xsize}, $rmp->{ysize},
1162 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1133 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1163 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1134 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1164 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1135 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1165 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1136 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1166 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1167 (cf::region::find $rmp->{region}) 1138 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 )
1140}
1141
1142sub register {
1143 my (undef, $regex) = @_;
1144 my $pkg = caller;
1145
1146 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__;
1148
1149 $EXT_MAP{$pkg} = qr<$regex>;
1150}
1151
1152# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)};
1154
1155sub thawer_merge {
1156 # we have to keep some variables in memory intact
1157 local $_[0]{path};
1158 local $_[0]{deny_save};
1159 local $_[0]{deny_reset};
1160
1161 $_[0]->SUPER::thawer_merge ($_[1]);
1162}
1163
1164sub normalise {
1165 my ($path, $base) = @_;
1166
1167 # map plan:
1168 #
1169 # /! non-realised random map exit (special hack!)
1170 # {... are special paths that are not being touched
1171 # ?xxx/... are special absolute paths
1172 # ?random/... random maps
1173 # /... normal maps
1174 # ~user/... per-player map of a specific user
1175
1176 $path =~ s/$PATH_SEP/\//go;
1177
1178 # treat it as relative path if it starts with
1179 # something that looks reasonable
1180 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1181 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1182
1183 $base =~ s{[^/]+/?$}{};
1184 $path = "$base/$path";
1185 }
1186
1187 for ($path) {
1188 redo if s{//}{/};
1189 redo if s{/\.?/}{/};
1190 redo if s{/[^/]+/\.\./}{/};
1191 }
1192
1193 $path
1194}
1195
1196sub new_from_path {
1197 my (undef, $path, $base) = @_;
1198
1199 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1200
1201 $path = normalise $path, $base;
1202
1203 for my $pkg (keys %EXT_MAP) {
1204 if ($path =~ $EXT_MAP{$pkg}) {
1205 my $self = bless cf::map::new, $pkg;
1206 $self->{path} = $path; $self->path ($path);
1207 $self->init; # pass $1 etc.
1208 return $self;
1209 }
1210 }
1211
1212 Carp::carp "unable to resolve path '$path'.";
1213 ()
1214}
1215
1216sub init {
1217 my ($self) = @_;
1218
1219 $self
1220}
1221
1222sub as_string {
1223 my ($self) = @_;
1224
1225 "$self->{path}"
1226}
1227
1228# the displayed name, this is a one way mapping
1229sub visible_name {
1230 &as_string
1231}
1232
1233# the original (read-only) location
1234sub load_path {
1235 my ($self) = @_;
1236
1237 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1238}
1239
1240# the temporary/swap location
1241sub save_path {
1242 my ($self) = @_;
1243
1244 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1245 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1246}
1247
1248# the unique path, undef == no special unique path
1249sub uniq_path {
1250 my ($self) = @_;
1251
1252 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1253 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1168} 1254}
1169 1255
1170# and all this just because we cannot iterate over 1256# and all this just because we cannot iterate over
1171# all maps in C++... 1257# all maps in C++...
1172sub change_all_map_light { 1258sub change_all_map_light {
1174 1260
1175 $_->change_map_light ($change) 1261 $_->change_map_light ($change)
1176 for grep $_->outdoor, values %cf::MAP; 1262 for grep $_->outdoor, values %cf::MAP;
1177} 1263}
1178 1264
1265sub unlink_save {
1266 my ($self) = @_;
1267
1268 utf8::encode (my $save = $self->save_path);
1269 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1270 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1271}
1272
1179sub try_load_header($) { 1273sub load_header_from($) {
1180 my ($path) = @_; 1274 my ($self, $path) = @_;
1181 1275
1182 utf8::encode $path; 1276 utf8::encode $path;
1183 aio_open $path, O_RDONLY, 0 1277 aio_open $path, O_RDONLY, 0
1184 or return; 1278 or return;
1185 1279
1186 my $map = cf::map::new 1280 $self->_load_header ($path)
1187 or return; 1281 or return;
1188 1282
1189 $map->load_header ($path) 1283 $self->{load_path} = $path;
1284
1285 1
1286}
1287
1288sub load_orig {
1289 my ($self) = @_;
1290
1291 $self->load_header_from ($self->load_path)
1292}
1293
1294sub load_temp {
1295 my ($self) = @_;
1296
1297 $self->load_header_from ($self->save_path)
1298}
1299
1300sub load_header {
1301 my ($self) = @_;
1302
1303 if ($self->load_temp) {
1304 $self->last_access ((delete $self->{last_access})
1305 || $cf::RUNTIME); #d#
1306 # safety
1307 $self->{instantiate_time} = $cf::RUNTIME
1308 if $self->{instantiate_time} > $cf::RUNTIME;
1309 } else {
1310 $self->load_orig
1190 or return; 1311 or return;
1191 1312
1192 $map->{load_path} = $path; 1313 $self->{load_original} = 1;
1314 $self->{instantiate_time} = $cf::RUNTIME;
1315 $self->last_access ($cf::RUNTIME);
1316 $self->instantiate;
1317 }
1193 1318
1194 $map 1319 1
1195} 1320}
1196 1321
1197sub find; 1322sub find;
1198sub find { 1323sub find {
1199 my ($path, $origin) = @_; 1324 my ($path, $origin) = @_;
1200 1325
1201 #warn "find<$path,$origin>\n";#d#
1202
1203 $path = new cf::path $path, $origin && $origin->path; 1326 $path = normalise $path, $origin && $origin->path;
1204 my $key = $path->as_string;
1205 1327
1206 cf::lock_wait "map_find:$key"; 1328 cf::lock_wait "map_find:$path";
1207 1329
1208 $cf::MAP{$key} || do { 1330 $cf::MAP{$path} || do {
1209 my $guard = cf::lock_acquire "map_find:$key"; 1331 my $guard = cf::lock_acquire "map_find:$path";
1210 1332 my $map = new_from_path cf::map $path
1211 # do it the slow way
1212 my $map = try_load_header $path->save_path;
1213
1214 Coro::cede;
1215
1216 if ($map) {
1217 $map->last_access ((delete $map->{last_access})
1218 || $cf::RUNTIME); #d#
1219 # safety
1220 $map->{instantiate_time} = $cf::RUNTIME
1221 if $map->{instantiate_time} > $cf::RUNTIME;
1222 } else {
1223 if (my $rmp = $path->random_map_params) {
1224 $map = generate_random_map $key, $rmp;
1225 } else {
1226 $map = try_load_header $path->load_path;
1227 }
1228
1229 $map or return; 1333 or return;
1230 1334
1231 $map->{load_original} = 1;
1232 $map->{instantiate_time} = $cf::RUNTIME;
1233 $map->last_access ($cf::RUNTIME);
1234 $map->instantiate;
1235
1236 # per-player maps become, after loading, normal maps
1237 $map->per_player (0) if $path->{user_rel};
1238 }
1239
1240 $map->path ($key);
1241 $map->{path} = $path;
1242 $map->{last_save} = $cf::RUNTIME; 1335 $map->{last_save} = $cf::RUNTIME;
1243 1336
1244 Coro::cede; 1337 $map->load_header
1338 or return;
1245 1339
1246 if ($map->should_reset) { 1340 if ($map->should_reset) {
1341 $cf::WAIT_FOR_TICK->wait;
1247 $map->reset; 1342 $map->reset;
1248 undef $guard; 1343 undef $guard;
1249 $map = find $path 1344 $map = find $path
1250 or return; 1345 or return;
1251 } 1346 }
1252 1347
1253 $cf::MAP{$key} = $map 1348 $cf::MAP{$path} = $map
1254 } 1349 }
1255} 1350}
1256 1351
1257sub load { 1352sub load {
1258 my ($self) = @_; 1353 my ($self) = @_;
1259 1354
1260 my $path = $self->{path}; 1355 my $path = $self->{path};
1261 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1356 my $guard = cf::lock_acquire "map_load:$path";
1262 1357
1263 return if $self->in_memory != cf::MAP_SWAPPED; 1358 return if $self->in_memory != cf::MAP_SWAPPED;
1264 1359
1265 $self->in_memory (cf::MAP_LOADING); 1360 $self->in_memory (cf::MAP_LOADING);
1266 1361
1267 $self->alloc; 1362 $self->alloc;
1268 $self->load_objects ($self->{load_path}, 1) 1363 $self->_load_objects ($self->{load_path}, 1)
1269 or return; 1364 or return;
1270 1365
1271 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1366 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1272 if delete $self->{load_original}; 1367 if delete $self->{load_original};
1273 1368
1274 if (my $uniq = $path->uniq_path) { 1369 if (my $uniq = $self->uniq_path) {
1275 utf8::encode $uniq; 1370 utf8::encode $uniq;
1276 if (aio_open $uniq, O_RDONLY, 0) { 1371 if (aio_open $uniq, O_RDONLY, 0) {
1277 $self->clear_unique_items; 1372 $self->clear_unique_items;
1278 $self->load_objects ($uniq, 0); 1373 $self->_load_objects ($uniq, 0);
1279 } 1374 }
1280 } 1375 }
1281 1376
1282 Coro::cede; 1377 Coro::cede;
1283 1378
1284 # now do the right thing for maps 1379 # now do the right thing for maps
1285 $self->link_multipart_objects; 1380 $self->link_multipart_objects;
1286 1381
1287 if ($self->{path}->is_style_map) { 1382 unless ($self->{deny_activate}) {
1288 $self->{deny_save} = 1; 1383 $self->decay_objects;
1289 $self->{deny_reset} = 1;
1290 } else {
1291 $self->fix_auto_apply; 1384 $self->fix_auto_apply;
1292 $self->decay_objects;
1293 $self->update_buttons; 1385 $self->update_buttons;
1386 Coro::cede;
1294 $self->set_darkness_map; 1387 $self->set_darkness_map;
1295 $self->difficulty ($self->estimate_difficulty) 1388 $self->difficulty ($self->estimate_difficulty)
1296 unless $self->difficulty; 1389 unless $self->difficulty;
1390 Coro::cede;
1297 $self->activate; 1391 $self->activate;
1298 } 1392 }
1299 1393
1300 Coro::cede;
1301
1302 $self->in_memory (cf::MAP_IN_MEMORY); 1394 $self->in_memory (cf::MAP_IN_MEMORY);
1395}
1396
1397sub customise_for {
1398 my ($self, $ob) = @_;
1399
1400 return find "~" . $ob->name . "/" . $self->{path}
1401 if $self->per_player;
1402
1403 $self
1404}
1405
1406# find and load all maps in the 3x3 area around a map
1407sub load_diag {
1408 my ($map) = @_;
1409
1410 my @diag; # diagonal neighbours
1411
1412 for (0 .. 3) {
1413 my $neigh = $map->tile_path ($_)
1414 or next;
1415 $neigh = find $neigh, $map
1416 or next;
1417 $neigh->load;
1418
1419 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1420 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1421 }
1422
1423 for (@diag) {
1424 my $neigh = find @$_
1425 or next;
1426 $neigh->load;
1427 }
1303} 1428}
1304 1429
1305sub find_sync { 1430sub find_sync {
1306 my ($path, $origin) = @_; 1431 my ($path, $origin) = @_;
1307 1432
1308 cf::sync_job { cf::map::find $path, $origin } 1433 cf::sync_job { find $path, $origin }
1309} 1434}
1310 1435
1311sub do_load_sync { 1436sub do_load_sync {
1312 my ($map) = @_; 1437 my ($map) = @_;
1313 1438
1314 cf::sync_job { $map->load }; 1439 cf::sync_job { $map->load };
1315} 1440}
1316 1441
1442our %MAP_PREFETCH;
1443our $MAP_PREFETCHER = Coro::async {
1444 while () {
1445 for my $path (keys %MAP_PREFETCH) {
1446 my $map = find $path
1447 or next;
1448 $map->load;
1449
1450 delete $MAP_PREFETCH{$path};
1451 }
1452 Coro::schedule;
1453 }
1454};
1455
1456sub find_async {
1457 my ($path, $origin) = @_;
1458
1459 $path = normalise $path, $origin && $origin->{path};
1460
1461 if (my $map = $cf::MAP{$path}) {
1462 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1463 }
1464
1465 $MAP_PREFETCH{$path} = 0;
1466 $MAP_PREFETCHER->ready;
1467
1468 ()
1469}
1470
1317sub save { 1471sub save {
1318 my ($self) = @_; 1472 my ($self) = @_;
1319 1473
1474 my $lock = cf::lock_acquire "map_data:" . $self->path;
1475
1320 $self->{last_save} = $cf::RUNTIME; 1476 $self->{last_save} = $cf::RUNTIME;
1321 1477
1322 return unless $self->dirty; 1478 return unless $self->dirty;
1323 1479
1324 my $save = $self->{path}->save_path; utf8::encode $save; 1480 my $save = $self->save_path; utf8::encode $save;
1325 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1481 my $uniq = $self->uniq_path; utf8::encode $uniq;
1326 1482
1327 $self->{load_path} = $save; 1483 $self->{load_path} = $save;
1328 1484
1329 return if $self->{deny_save}; 1485 return if $self->{deny_save};
1330 1486
1331 local $self->{last_access} = $self->last_access;#d# 1487 local $self->{last_access} = $self->last_access;#d#
1332 1488
1489 cf::async {
1490 $_->contr->save for $self->players;
1491 };
1492
1333 if ($uniq) { 1493 if ($uniq) {
1334 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1494 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1335 $self->save_objects ($uniq, cf::IO_UNIQUES); 1495 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1336 } else { 1496 } else {
1337 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1497 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1338 } 1498 }
1339} 1499}
1340 1500
1341sub swap_out { 1501sub swap_out {
1342 my ($self) = @_; 1502 my ($self) = @_;
1343 1503
1344 # save first because save cedes 1504 # save first because save cedes
1345 $self->save; 1505 $self->save;
1506
1507 my $lock = cf::lock_acquire "map_data:" . $self->path;
1346 1508
1347 return if $self->players; 1509 return if $self->players;
1348 return if $self->in_memory != cf::MAP_IN_MEMORY; 1510 return if $self->in_memory != cf::MAP_IN_MEMORY;
1349 return if $self->{deny_save}; 1511 return if $self->{deny_save};
1350 1512
1354 1516
1355sub reset_at { 1517sub reset_at {
1356 my ($self) = @_; 1518 my ($self) = @_;
1357 1519
1358 # TODO: safety, remove and allow resettable per-player maps 1520 # TODO: safety, remove and allow resettable per-player maps
1359 return 1e99 if $self->{path}{user_rel}; 1521 return 1e99 if $self->isa ("ext::map_per_player");#d#
1360 return 1e99 if $self->{deny_reset}; 1522 return 1e99 if $self->{deny_reset};
1361 1523
1362 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1524 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1363 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1525 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1364 1526
1369 my ($self) = @_; 1531 my ($self) = @_;
1370 1532
1371 $self->reset_at <= $cf::RUNTIME 1533 $self->reset_at <= $cf::RUNTIME
1372} 1534}
1373 1535
1374sub unlink_save {
1375 my ($self) = @_;
1376
1377 utf8::encode (my $save = $self->{path}->save_path);
1378 aioreq_pri 3; IO::AIO::aio_unlink $save;
1379 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1380}
1381
1382sub rename { 1536sub rename {
1383 my ($self, $new_path) = @_; 1537 my ($self, $new_path) = @_;
1384 1538
1539 normalise $new_path;
1540
1385 $self->unlink_save; 1541 $self->unlink_save;
1386 1542
1387 delete $cf::MAP{$self->path}; 1543 delete $cf::MAP{$self->path};
1388 $self->{path} = new cf::path $new_path; 1544 $self->{path} = $new_path; $self->path ($self->{path});
1389 $self->path ($self->{path}->as_string);
1390 $cf::MAP{$self->path} = $self; 1545 $cf::MAP{$self->path} = $self;
1391 1546
1392 $self->save; 1547 $self->save;
1393} 1548}
1394 1549
1395sub reset { 1550sub reset {
1396 my ($self) = @_; 1551 my ($self) = @_;
1397 1552
1553 my $lock = cf::lock_acquire "map_data:$self->{path}";
1554
1398 return if $self->players; 1555 return if $self->players;
1399 return if $self->{path}{user_rel};#d# 1556 return if $self->isa ("ext::map_per_player");#d#
1400 1557
1401 warn "resetting map ", $self->path;#d# 1558 warn "resetting map ", $self->path;#d#
1402 1559
1403 delete $cf::MAP{$self->path}; 1560 delete $cf::MAP{$self->path};
1561
1562 $self->in_memory (cf::MAP_SWAPPED);
1563 $self->clear;
1404 1564
1405 $_->clear_links_to ($self) for values %cf::MAP; 1565 $_->clear_links_to ($self) for values %cf::MAP;
1406 1566
1407 $self->unlink_save; 1567 $self->unlink_save;
1408 $self->destroy; 1568 $self->destroy;
1417 $self->reset_timeout (1); 1577 $self->reset_timeout (1);
1418 $self->rename ("{nuke}/" . ($nuke_counter++)); 1578 $self->rename ("{nuke}/" . ($nuke_counter++));
1419 $self->reset; # polite request, might not happen 1579 $self->reset; # polite request, might not happen
1420} 1580}
1421 1581
1422sub customise_for { 1582=item cf::map::unique_maps
1423 my ($map, $ob) = @_;
1424 1583
1425 if ($map->per_player) { 1584Returns an arrayref of paths of all shared maps that have
1426 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1585instantiated unique items. May block.
1427 }
1428 1586
1429 $map 1587=cut
1430}
1431 1588
1432sub emergency_save { 1589sub unique_maps() {
1433 my $freeze_guard = cf::freeze_mainloop; 1590 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1591 or return;
1434 1592
1435 warn "enter emergency map save\n"; 1593 my @paths;
1436 1594
1437 cf::sync_job { 1595 for (@$files) {
1438 warn "begin emergency map save\n"; 1596 utf8::decode $_;
1439 $_->save for values %cf::MAP; 1597 next if /\.pst$/;
1598 next unless /^$PATH_SEP/o;
1599
1600 s/\.map$//;
1601 push @paths, $_;
1440 }; 1602 }
1441 1603
1442 warn "end emergency map save\n"; 1604 \@paths
1443} 1605}
1444 1606
1445package cf; 1607package cf;
1446 1608
1447=back 1609=back
1448 1610
1611=head3 cf::object
1612
1613=cut
1614
1615package cf::object;
1616
1617=over 4
1618
1619=item $ob->inv_recursive
1620
1621Returns the inventory of the object _and_ their inventories, recursively.
1622
1623=cut
1624
1625sub inv_recursive_;
1626sub inv_recursive_ {
1627 map { $_, inv_recursive_ $_->inv } @_
1628}
1629
1630sub inv_recursive {
1631 inv_recursive_ inv $_[0]
1632}
1633
1634package cf;
1635
1636=back
1449 1637
1450=head3 cf::object::player 1638=head3 cf::object::player
1451 1639
1452=over 4 1640=over 4
1453 1641
1493 1681
1494=item $player_object->enter_link 1682=item $player_object->enter_link
1495 1683
1496Freezes the player and moves him/her to a special map (C<{link}>). 1684Freezes the player and moves him/her to a special map (C<{link}>).
1497 1685
1498The player should be reaosnably safe there for short amounts of time. You 1686The player should be reasonably safe there for short amounts of time. You
1499I<MUST> call C<leave_link> as soon as possible, though. 1687I<MUST> call C<leave_link> as soon as possible, though.
1500 1688
1689Will never block.
1690
1501=item $player_object->leave_link ($map, $x, $y) 1691=item $player_object->leave_link ($map, $x, $y)
1502 1692
1503Moves the player out of the specila link map onto the given map. If the 1693Moves the player out of the special C<{link}> map onto the specified
1504map is not valid (or omitted), the player will be moved back to the 1694map. If the map is not valid (or omitted), the player will be moved back
1505location he/she was before the call to C<enter_link>, or, if that fails, 1695to the location he/she was before the call to C<enter_link>, or, if that
1506to the emergency map position. 1696fails, to the emergency map position.
1507 1697
1508Might block. 1698Might block.
1509 1699
1510=cut 1700=cut
1701
1702sub link_map {
1703 unless ($LINK_MAP) {
1704 $LINK_MAP = cf::map::find "{link}"
1705 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1706 $LINK_MAP->load;
1707 }
1708
1709 $LINK_MAP
1710}
1511 1711
1512sub cf::object::player::enter_link { 1712sub cf::object::player::enter_link {
1513 my ($self) = @_; 1713 my ($self) = @_;
1514 1714
1515 $self->deactivate_recursive; 1715 $self->deactivate_recursive;
1516 1716
1517 return if $self->map == $LINK_MAP; 1717 return if UNIVERSAL::isa $self->map, "ext::map_link";
1518 1718
1519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1719 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1520 if $self->map; 1720 if $self->map;
1521 1721
1522 $self->enter_map ($LINK_MAP, 20, 20); 1722 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1523} 1723}
1524 1724
1525sub cf::object::player::leave_link { 1725sub cf::object::player::leave_link {
1526 my ($self, $map, $x, $y) = @_; 1726 my ($self, $map, $x, $y) = @_;
1527 1727
1545 # use -1 or undef as default coordinates, not 0, 0 1745 # use -1 or undef as default coordinates, not 0, 0
1546 ($x, $y) = ($map->enter_x, $map->enter_y) 1746 ($x, $y) = ($map->enter_x, $map->enter_y)
1547 if $x <=0 && $y <= 0; 1747 if $x <=0 && $y <= 0;
1548 1748
1549 $map->load; 1749 $map->load;
1750 $map->load_diag;
1550 1751
1752 return unless $self->contr->active;
1551 $self->activate_recursive; 1753 $self->activate_recursive;
1552 $self->enter_map ($map, $x, $y); 1754 $self->enter_map ($map, $x, $y);
1553} 1755}
1554 1756
1555cf::player->attach ( 1757cf::player->attach (
1568 1770
1569 # try to abort aborted map switching on player login :) 1771 # try to abort aborted map switching on player login :)
1570 # should happen only on crashes 1772 # should happen only on crashes
1571 if ($pl->ob->{_link_pos}) { 1773 if ($pl->ob->{_link_pos}) {
1572 $pl->ob->enter_link; 1774 $pl->ob->enter_link;
1573 cf::async { 1775 (async {
1574 # we need this sleep as the login has a concurrent enter_exit running 1776 # we need this sleep as the login has a concurrent enter_exit running
1575 # and this sleep increases chances of the player not ending up in scorn 1777 # and this sleep increases chances of the player not ending up in scorn
1778 $pl->ob->reply (undef,
1779 "There was an internal problem at your last logout, "
1780 . "the server will try to bring you to your intended destination in a second.",
1781 cf::NDI_RED);
1576 Coro::Timer::sleep 1; 1782 Coro::Timer::sleep 1;
1577 $pl->ob->leave_link; 1783 $pl->ob->leave_link;
1578 }; 1784 })->prio (2);
1579 } 1785 }
1580 }, 1786 },
1581); 1787);
1582 1788
1583=item $player_object->goto_map ($path, $x, $y) 1789=item $player_object->goto ($path, $x, $y)
1584 1790
1585=cut 1791=cut
1586 1792
1587sub cf::object::player::goto_map { 1793sub cf::object::player::goto {
1588 my ($self, $path, $x, $y) = @_; 1794 my ($self, $path, $x, $y) = @_;
1589 1795
1590 $self->enter_link; 1796 $self->enter_link;
1591 1797
1592 (cf::async { 1798 (async {
1593 $path = new cf::path $path;
1594
1595 my $map = cf::map::find $path->as_string; 1799 my $map = cf::map::find $path;
1596 $map = $map->customise_for ($self) if $map; 1800 $map = $map->customise_for ($self) if $map;
1597 1801
1598# warn "entering ", $map->path, " at ($x, $y)\n" 1802# warn "entering ", $map->path, " at ($x, $y)\n"
1599# if $map; 1803# if $map;
1600 1804
1601 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1805 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1602 1806
1603 $self->leave_link ($map, $x, $y); 1807 $self->leave_link ($map, $x, $y);
1604 })->prio (1); 1808 })->prio (1);
1605} 1809}
1606 1810
1659 1863
1660 return unless $self->type == cf::PLAYER; 1864 return unless $self->type == cf::PLAYER;
1661 1865
1662 $self->enter_link; 1866 $self->enter_link;
1663 1867
1664 (cf::async { 1868 (async {
1665 $self->deactivate_recursive; # just to be sure 1869 $self->deactivate_recursive; # just to be sure
1666 unless (eval { 1870 unless (eval {
1667 prepare_random_map $exit 1871 prepare_random_map $exit
1668 if $exit->slaying eq "/!"; 1872 if $exit->slaying eq "/!";
1669 1873
1670 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1874 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1671 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1875 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1672 1876
1673 1; 1877 1;
1674 }) { 1878 }) {
1675 $self->message ("Something went wrong deep within the crossfire server. " 1879 $self->message ("Something went wrong deep within the crossfire server. "
1676 . "I'll try to bring you back to the map you were before. " 1880 . "I'll try to bring you back to the map you were before. "
1677 . "Please report this to the dungeon master", 1881 . "Please report this to the dungeon master!",
1678 cf::NDI_UNIQUE | cf::NDI_RED); 1882 cf::NDI_UNIQUE | cf::NDI_RED);
1679 1883
1680 warn "ERROR in enter_exit: $@"; 1884 warn "ERROR in enter_exit: $@";
1681 $self->leave_link; 1885 $self->leave_link;
1682 } 1886 }
1750 } 1954 }
1751 } 1955 }
1752 }, 1956 },
1753); 1957);
1754 1958
1755=item $client->coro (\&cb) 1959=item $client->async (\&cb)
1756 1960
1757Create a new coroutine, running the specified callback. The coroutine will 1961Create a new coroutine, running the specified callback. The coroutine will
1758be automatically cancelled when the client gets destroyed (e.g. on logout, 1962be automatically cancelled when the client gets destroyed (e.g. on logout,
1759or loss of connection). 1963or loss of connection).
1760 1964
1761=cut 1965=cut
1762 1966
1763sub cf::client::coro { 1967sub cf::client::async {
1764 my ($self, $cb) = @_; 1968 my ($self, $cb) = @_;
1765 1969
1766 my $coro = &cf::async ($cb); 1970 my $coro = &Coro::async ($cb);
1767 1971
1768 $coro->on_destroy (sub { 1972 $coro->on_destroy (sub {
1769 delete $self->{_coro}{$coro+0}; 1973 delete $self->{_coro}{$coro+0};
1770 }); 1974 });
1771 1975
2009 local $/; 2213 local $/;
2010 *CFG = YAML::Syck::Load <$fh>; 2214 *CFG = YAML::Syck::Load <$fh>;
2011 2215
2012 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2216 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2013 2217
2218 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2219 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2220
2014 if (exists $CFG{mlockall}) { 2221 if (exists $CFG{mlockall}) {
2015 eval { 2222 eval {
2016 $CFG{mlockall} ? &mlockall : &munlockall 2223 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2017 and die "WARNING: m(un)lockall failed: $!\n"; 2224 and die "WARNING: m(un)lockall failed: $!\n";
2018 }; 2225 };
2019 warn $@ if $@; 2226 warn $@ if $@;
2020 } 2227 }
2021} 2228}
2022 2229
2023sub main { 2230sub main {
2024 # we must not ever block the main coroutine 2231 # we must not ever block the main coroutine
2025 local $Coro::idle = sub { 2232 local $Coro::idle = sub {
2026 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2233 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2027 (Coro::unblock_sub {
2028 Event::one_event; 2234 async { Event::one_event };
2029 })->();
2030 }; 2235 };
2031 2236
2032 cfg_load; 2237 cfg_load;
2033 db_load; 2238 db_load;
2034 load_extensions; 2239 load_extensions;
2035 Event::loop; 2240 Event::loop;
2036} 2241}
2037 2242
2038############################################################################# 2243#############################################################################
2039# initialisation 2244# initialisation and cleanup
2245
2246# install some emergency cleanup handlers
2247BEGIN {
2248 for my $signal (qw(INT HUP TERM)) {
2249 Event->signal (
2250 data => WF_AUTOCANCEL,
2251 signal => $signal,
2252 cb => sub {
2253 cf::cleanup "SIG$signal";
2254 },
2255 );
2256 }
2257}
2258
2259sub emergency_save() {
2260 my $freeze_guard = cf::freeze_mainloop;
2261
2262 warn "enter emergency perl save\n";
2263
2264 cf::sync_job {
2265 # use a peculiar iteration method to avoid tripping on perl
2266 # refcount bugs in for. also avoids problems with players
2267 # and maps saved/destroyed asynchronously.
2268 warn "begin emergency player save\n";
2269 for my $login (keys %cf::PLAYER) {
2270 my $pl = $cf::PLAYER{$login} or next;
2271 $pl->valid or next;
2272 $pl->save;
2273 }
2274 warn "end emergency player save\n";
2275
2276 warn "begin emergency map save\n";
2277 for my $path (keys %cf::MAP) {
2278 my $map = $cf::MAP{$path} or next;
2279 $map->valid or next;
2280 $map->save;
2281 }
2282 warn "end emergency map save\n";
2283 };
2284
2285 warn "leave emergency perl save\n";
2286}
2040 2287
2041sub reload() { 2288sub reload() {
2042 # can/must only be called in main 2289 # can/must only be called in main
2043 if ($Coro::current != $Coro::main) { 2290 if ($Coro::current != $Coro::main) {
2044 warn "can only reload from main coroutine\n"; 2291 warn "can only reload from main coroutine\n";
2045 return; 2292 return;
2046 } 2293 }
2047 2294
2048 warn "reloading..."; 2295 warn "reloading...";
2049 2296
2297 warn "freezing server";
2050 my $guard = freeze_mainloop; 2298 my $guard = freeze_mainloop;
2051 cf::emergency_save; 2299 cf::emergency_save;
2052 2300
2301 warn "sync database to disk";
2302 cf::db_sync;
2303 IO::AIO::flush;
2304
2053 eval { 2305 eval {
2054 # if anything goes wrong in here, we should simply crash as we already saved 2306 # if anything goes wrong in here, we should simply crash as we already saved
2055 2307
2056 # cancel all watchers 2308 warn "cancel all watchers";
2057 for (Event::all_watchers) { 2309 for (Event::all_watchers) {
2058 $_->cancel if $_->data & WF_AUTOCANCEL; 2310 $_->cancel if $_->data & WF_AUTOCANCEL;
2059 } 2311 }
2060 2312
2061 # cancel all extension coros 2313 warn "cancel all extension coros";
2062 $_->cancel for values %EXT_CORO; 2314 $_->cancel for values %EXT_CORO;
2063 %EXT_CORO = (); 2315 %EXT_CORO = ();
2064 2316
2317 warn "remove commands";
2318 %COMMAND = ();
2319
2320 warn "remove ext commands";
2321 %EXTCMD = ();
2322
2065 # unload all extensions 2323 warn "unload/nuke all extensions";
2066 for (@exts) { 2324 for my $pkg (@EXTS) {
2067 warn "unloading <$_>"; 2325 warn "... unloading $pkg";
2068 unload_extension $_; 2326
2327 if (my $cb = $pkg->can ("unload")) {
2328 eval {
2329 $cb->($pkg);
2330 1
2331 } or warn "$pkg unloaded, but with errors: $@";
2069 } 2332 }
2070 2333
2334 warn "... nuking $pkg";
2335 Symbol::delete_package $pkg;
2336 }
2337
2071 # unload all modules loaded from $LIBDIR 2338 warn "unload all perl modules loaded from $LIBDIR";
2072 while (my ($k, $v) = each %INC) { 2339 while (my ($k, $v) = each %INC) {
2073 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2340 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2074 2341
2075 warn "removing <$k>"; 2342 warn "removing <$k>";
2076 delete $INC{$k}; 2343 delete $INC{$k};
2083 } 2350 }
2084 2351
2085 Symbol::delete_package $k; 2352 Symbol::delete_package $k;
2086 } 2353 }
2087 2354
2088 # sync database to disk
2089 cf::db_sync;
2090 IO::AIO::flush;
2091
2092 # get rid of safe::, as good as possible 2355 warn "get rid of safe::, as good as possible";
2093 Symbol::delete_package "safe::$_" 2356 Symbol::delete_package "safe::$_"
2094 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2357 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2095 2358
2096 # remove register_script_function callbacks
2097 # TODO
2098
2099 # unload cf.pm "a bit" 2359 warn "unload cf.pm \"a bit\"";
2100 delete $INC{"cf.pm"}; 2360 delete $INC{"cf.pm"};
2101 2361
2102 # don't, removes xs symbols, too, 2362 # don't, removes xs symbols, too,
2103 # and global variables created in xs 2363 # and global variables created in xs
2104 #Symbol::delete_package __PACKAGE__; 2364 #Symbol::delete_package __PACKAGE__;
2105 2365
2106 # reload cf.pm
2107 warn "reloading cf.pm"; 2366 warn "reloading cf.pm";
2108 require cf; 2367 require cf;
2109 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2368 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2110 2369
2111 # load config and database again 2370 warn "load config and database again";
2112 cf::cfg_load; 2371 cf::cfg_load;
2113 cf::db_load; 2372 cf::db_load;
2114 2373
2115 # load extensions
2116 warn "load extensions"; 2374 warn "load extensions";
2117 cf::load_extensions; 2375 cf::load_extensions;
2118 2376
2119 # reattach attachments to objects 2377 warn "reattach attachments to objects/players";
2120 warn "reattach";
2121 _global_reattach; 2378 _global_reattach;
2379 warn "reattach attachments to maps";
2380 reattach $_ for values %MAP;
2122 }; 2381 };
2123 2382
2124 if ($@) { 2383 if ($@) {
2125 warn $@; 2384 warn $@;
2126 warn "error while reloading, exiting."; 2385 warn "error while reloading, exiting.";
2127 exit 1; 2386 exit 1;
2128 } 2387 }
2129 2388
2130 warn "reloaded successfully"; 2389 warn "reloaded";
2131}; 2390};
2132
2133#############################################################################
2134
2135unless ($LINK_MAP) {
2136 $LINK_MAP = cf::map::new;
2137
2138 $LINK_MAP->width (41);
2139 $LINK_MAP->height (41);
2140 $LINK_MAP->alloc;
2141 $LINK_MAP->path ("{link}");
2142 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2143 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2144
2145 # dirty hack because... archetypes are not yet loaded
2146 Event->timer (
2147 after => 2,
2148 cb => sub {
2149 $_[0]->w->cancel;
2150
2151 # provide some exits "home"
2152 my $exit = cf::object::new "exit";
2153
2154 $exit->slaying ($EMERGENCY_POSITION->[0]);
2155 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2156 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2157
2158 $LINK_MAP->insert ($exit->clone, 19, 19);
2159 $LINK_MAP->insert ($exit->clone, 19, 20);
2160 $LINK_MAP->insert ($exit->clone, 19, 21);
2161 $LINK_MAP->insert ($exit->clone, 20, 19);
2162 $LINK_MAP->insert ($exit->clone, 20, 21);
2163 $LINK_MAP->insert ($exit->clone, 21, 19);
2164 $LINK_MAP->insert ($exit->clone, 21, 20);
2165 $LINK_MAP->insert ($exit->clone, 21, 21);
2166
2167 $exit->destroy;
2168 });
2169
2170 $LINK_MAP->{deny_save} = 1;
2171 $LINK_MAP->{deny_reset} = 1;
2172
2173 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2174}
2175
2176register "<global>", __PACKAGE__;
2177 2391
2178register_command "reload" => sub { 2392register_command "reload" => sub {
2179 my ($who, $arg) = @_; 2393 my ($who, $arg) = @_;
2180 2394
2181 if ($who->flag (FLAG_WIZ)) { 2395 if ($who->flag (FLAG_WIZ)) {
2191 reentrant => 0, 2405 reentrant => 0,
2192 prio => 0, 2406 prio => 0,
2193 at => $NEXT_TICK || $TICK, 2407 at => $NEXT_TICK || $TICK,
2194 data => WF_AUTOCANCEL, 2408 data => WF_AUTOCANCEL,
2195 cb => sub { 2409 cb => sub {
2410 $NOW = Event::time;
2411
2196 cf::server_tick; # one server iteration 2412 cf::server_tick; # one server iteration
2197 $RUNTIME += $TICK; 2413 $RUNTIME += $TICK;
2198 $NEXT_TICK += $TICK; 2414 $NEXT_TICK += $TICK;
2415
2416 $WAIT_FOR_TICK->broadcast;
2417 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2199 2418
2200 # if we are delayed by four ticks or more, skip them all 2419 # if we are delayed by four ticks or more, skip them all
2201 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2420 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2202 2421
2203 $TICK_WATCHER->at ($NEXT_TICK); 2422 $TICK_WATCHER->at ($NEXT_TICK);
2205 }, 2424 },
2206); 2425);
2207 2426
2208IO::AIO::max_poll_time $TICK * 0.2; 2427IO::AIO::max_poll_time $TICK * 0.2;
2209 2428
2210Event->io ( 2429$AIO_POLL_WATCHER = Event->io (
2211 fd => IO::AIO::poll_fileno, 2430 fd => IO::AIO::poll_fileno,
2212 poll => 'r', 2431 poll => 'r',
2213 prio => 5, 2432 prio => 5,
2214 data => WF_AUTOCANCEL, 2433 data => WF_AUTOCANCEL,
2215 cb => \&IO::AIO::poll_cb, 2434 cb => \&IO::AIO::poll_cb,
2216); 2435);
2217 2436
2218Event->timer ( 2437$WRITE_RUNTIME_WATCHER = Event->timer (
2219 data => WF_AUTOCANCEL, 2438 data => WF_AUTOCANCEL,
2220 after => 0, 2439 after => 0,
2221 interval => 10, 2440 interval => 10,
2222 cb => sub { 2441 cb => sub {
2223 (Coro::unblock_sub { 2442 (Coro::unblock_sub {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines