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.173 by root, Sun Jan 14 18:00:34 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 fallback => 1;
1120
1148our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1149our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1150 1123
1151sub generate_random_map { 1124sub generate_random_map {
1152 my ($path, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1153 1126
1154 # mit "rum" bekleckern, nicht 1127 # mit "rum" bekleckern, nicht
1155 cf::map::_create_random_map 1128 $self->_create_random_map (
1156 $path,
1157 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1158 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1159 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1160 $rmp->{exit_on_final_map}, 1132 $rmp->{exit_on_final_map},
1161 $rmp->{xsize}, $rmp->{ysize}, 1133 $rmp->{xsize}, $rmp->{ysize},
1162 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1134 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1163 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1135 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1164 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1136 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1165 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1137 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1166 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1167 (cf::region::find $rmp->{region}) 1139 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 )
1141}
1142
1143sub register {
1144 my (undef, $regex) = @_;
1145 my $pkg = caller;
1146
1147 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__;
1149
1150 $EXT_MAP{$pkg} = qr<$regex>;
1151}
1152
1153# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)};
1155
1156sub thawer_merge {
1157 my ($self, $merge) = @_;
1158
1159 # we have to keep some variables in memory intact
1160 local $self->{path};
1161 local $self->{load_path};
1162 local $self->{deny_save};
1163 local $self->{deny_reset};
1164
1165 $self->SUPER::thawer_merge ($merge);
1166}
1167
1168sub normalise {
1169 my ($path, $base) = @_;
1170
1171 # map plan:
1172 #
1173 # /! non-realised random map exit (special hack!)
1174 # {... are special paths that are not being touched
1175 # ?xxx/... are special absolute paths
1176 # ?random/... random maps
1177 # /... normal maps
1178 # ~user/... per-player map of a specific user
1179
1180 $path =~ s/$PATH_SEP/\//go;
1181
1182 # treat it as relative path if it starts with
1183 # something that looks reasonable
1184 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1185 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1186
1187 $base =~ s{[^/]+/?$}{};
1188 $path = "$base/$path";
1189 }
1190
1191 for ($path) {
1192 redo if s{//}{/};
1193 redo if s{/\.?/}{/};
1194 redo if s{/[^/]+/\.\./}{/};
1195 }
1196
1197 $path
1198}
1199
1200sub new_from_path {
1201 my (undef, $path, $base) = @_;
1202
1203 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1204
1205 $path = normalise $path, $base;
1206
1207 for my $pkg (keys %EXT_MAP) {
1208 if ($path =~ $EXT_MAP{$pkg}) {
1209 my $self = bless cf::map::new, $pkg;
1210 $self->{path} = $path; $self->path ($path);
1211 $self->init; # pass $1 etc.
1212 return $self;
1213 }
1214 }
1215
1216 Carp::carp "unable to resolve path '$path'.";
1217 ()
1218}
1219
1220sub init {
1221 my ($self) = @_;
1222
1223 $self
1224}
1225
1226sub as_string {
1227 my ($self) = @_;
1228
1229 "$self->{path}"
1230}
1231
1232# the displayed name, this is a one way mapping
1233sub visible_name {
1234 &as_string
1235}
1236
1237# the original (read-only) location
1238sub load_path {
1239 my ($self) = @_;
1240
1241 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1242}
1243
1244# the temporary/swap location
1245sub save_path {
1246 my ($self) = @_;
1247
1248 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1249 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1250}
1251
1252# the unique path, undef == no special unique path
1253sub uniq_path {
1254 my ($self) = @_;
1255
1256 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1257 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1168} 1258}
1169 1259
1170# and all this just because we cannot iterate over 1260# and all this just because we cannot iterate over
1171# all maps in C++... 1261# all maps in C++...
1172sub change_all_map_light { 1262sub change_all_map_light {
1174 1264
1175 $_->change_map_light ($change) 1265 $_->change_map_light ($change)
1176 for grep $_->outdoor, values %cf::MAP; 1266 for grep $_->outdoor, values %cf::MAP;
1177} 1267}
1178 1268
1269sub unlink_save {
1270 my ($self) = @_;
1271
1272 utf8::encode (my $save = $self->save_path);
1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1274 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1275}
1276
1179sub try_load_header($) { 1277sub load_header_from($) {
1180 my ($path) = @_; 1278 my ($self, $path) = @_;
1181 1279
1182 utf8::encode $path; 1280 utf8::encode $path;
1183 aio_open $path, O_RDONLY, 0 1281 aio_open $path, O_RDONLY, 0
1184 or return; 1282 or return;
1185 1283
1186 my $map = cf::map::new 1284 $self->_load_header ($path)
1187 or return; 1285 or return;
1188 1286
1189 $map->load_header ($path) 1287 $self->{load_path} = $path;
1288
1289 1
1290}
1291
1292sub load_orig {
1293 my ($self) = @_;
1294
1295 $self->load_header_from ($self->load_path)
1296}
1297
1298sub load_temp {
1299 my ($self) = @_;
1300
1301 $self->load_header_from ($self->save_path)
1302}
1303
1304sub load_header {
1305 my ($self) = @_;
1306
1307 if ($self->load_temp) {
1308 $self->last_access ((delete $self->{last_access})
1309 || $cf::RUNTIME); #d#
1310 # safety
1311 $self->{instantiate_time} = $cf::RUNTIME
1312 if $self->{instantiate_time} > $cf::RUNTIME;
1313 } else {
1314 $self->load_orig
1190 or return; 1315 or return;
1191 1316
1192 $map->{load_path} = $path; 1317 $self->{load_original} = 1;
1318 $self->{instantiate_time} = $cf::RUNTIME;
1319 $self->last_access ($cf::RUNTIME);
1320 $self->instantiate;
1321 }
1193 1322
1194 $map 1323 1
1195} 1324}
1196 1325
1197sub find; 1326sub find;
1198sub find { 1327sub find {
1199 my ($path, $origin) = @_; 1328 my ($path, $origin) = @_;
1200 1329
1201 #warn "find<$path,$origin>\n";#d#
1202
1203 $path = new cf::path $path, $origin && $origin->path; 1330 $path = normalise $path, $origin && $origin->path;
1204 my $key = $path->as_string;
1205 1331
1206 cf::lock_wait "map_find:$key"; 1332 cf::lock_wait "map_find:$path";
1207 1333
1208 $cf::MAP{$key} || do { 1334 $cf::MAP{$path} || do {
1209 my $guard = cf::lock_acquire "map_find:$key"; 1335 my $guard = cf::lock_acquire "map_find:$path";
1210 1336 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; 1337 or return;
1230 1338
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; 1339 $map->{last_save} = $cf::RUNTIME;
1243 1340
1244 Coro::cede; 1341 $map->load_header
1342 or return;
1245 1343
1246 if ($map->should_reset) { 1344 if ($map->should_reset) {
1345 $cf::WAIT_FOR_TICK->wait;
1247 $map->reset; 1346 $map->reset;
1248 undef $guard; 1347 undef $guard;
1249 $map = find $path 1348 $map = find $path
1250 or return; 1349 or return;
1251 } 1350 }
1252 1351
1253 $cf::MAP{$key} = $map 1352 $cf::MAP{$path} = $map
1254 } 1353 }
1255} 1354}
1256 1355
1257sub load { 1356sub load {
1258 my ($self) = @_; 1357 my ($self) = @_;
1259 1358
1260 my $path = $self->{path}; 1359 my $path = $self->{path};
1261 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1360 my $guard = cf::lock_acquire "map_load:$path";
1262 1361
1263 return if $self->in_memory != cf::MAP_SWAPPED; 1362 return if $self->in_memory != cf::MAP_SWAPPED;
1264 1363
1265 $self->in_memory (cf::MAP_LOADING); 1364 $self->in_memory (cf::MAP_LOADING);
1266 1365
1267 $self->alloc; 1366 $self->alloc;
1268 $self->load_objects ($self->{load_path}, 1) 1367 $self->_load_objects ($self->{load_path}, 1)
1269 or return; 1368 or return;
1270 1369
1271 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1370 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1272 if delete $self->{load_original}; 1371 if delete $self->{load_original};
1273 1372
1274 if (my $uniq = $path->uniq_path) { 1373 if (my $uniq = $self->uniq_path) {
1275 utf8::encode $uniq; 1374 utf8::encode $uniq;
1276 if (aio_open $uniq, O_RDONLY, 0) { 1375 if (aio_open $uniq, O_RDONLY, 0) {
1277 $self->clear_unique_items; 1376 $self->clear_unique_items;
1278 $self->load_objects ($uniq, 0); 1377 $self->_load_objects ($uniq, 0);
1279 } 1378 }
1280 } 1379 }
1281 1380
1282 Coro::cede; 1381 Coro::cede;
1283 1382
1284 # now do the right thing for maps 1383 # now do the right thing for maps
1285 $self->link_multipart_objects; 1384 $self->link_multipart_objects;
1286 1385
1287 if ($self->{path}->is_style_map) { 1386 unless ($self->{deny_activate}) {
1288 $self->{deny_save} = 1; 1387 $self->decay_objects;
1289 $self->{deny_reset} = 1;
1290 } else {
1291 $self->fix_auto_apply; 1388 $self->fix_auto_apply;
1292 $self->decay_objects;
1293 $self->update_buttons; 1389 $self->update_buttons;
1390 Coro::cede;
1294 $self->set_darkness_map; 1391 $self->set_darkness_map;
1295 $self->difficulty ($self->estimate_difficulty) 1392 $self->difficulty ($self->estimate_difficulty)
1296 unless $self->difficulty; 1393 unless $self->difficulty;
1394 Coro::cede;
1297 $self->activate; 1395 $self->activate;
1298 } 1396 }
1299 1397
1300 Coro::cede;
1301
1302 $self->in_memory (cf::MAP_IN_MEMORY); 1398 $self->in_memory (cf::MAP_IN_MEMORY);
1399}
1400
1401sub customise_for {
1402 my ($self, $ob) = @_;
1403
1404 return find "~" . $ob->name . "/" . $self->{path}
1405 if $self->per_player;
1406
1407 $self
1408}
1409
1410# find and load all maps in the 3x3 area around a map
1411sub load_diag {
1412 my ($map) = @_;
1413
1414 my @diag; # diagonal neighbours
1415
1416 for (0 .. 3) {
1417 my $neigh = $map->tile_path ($_)
1418 or next;
1419 $neigh = find $neigh, $map
1420 or next;
1421 $neigh->load;
1422
1423 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1424 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1425 }
1426
1427 for (@diag) {
1428 my $neigh = find @$_
1429 or next;
1430 $neigh->load;
1431 }
1303} 1432}
1304 1433
1305sub find_sync { 1434sub find_sync {
1306 my ($path, $origin) = @_; 1435 my ($path, $origin) = @_;
1307 1436
1308 cf::sync_job { cf::map::find $path, $origin } 1437 cf::sync_job { find $path, $origin }
1309} 1438}
1310 1439
1311sub do_load_sync { 1440sub do_load_sync {
1312 my ($map) = @_; 1441 my ($map) = @_;
1313 1442
1314 cf::sync_job { $map->load }; 1443 cf::sync_job { $map->load };
1315} 1444}
1316 1445
1446our %MAP_PREFETCH;
1447our $MAP_PREFETCHER = Coro::async {
1448 while () {
1449 for my $path (keys %MAP_PREFETCH) {
1450 my $map = find $path
1451 or next;
1452 $map->load;
1453
1454 delete $MAP_PREFETCH{$path};
1455 }
1456 Coro::schedule;
1457 }
1458};
1459
1460sub find_async {
1461 my ($path, $origin) = @_;
1462
1463 $path = normalise $path, $origin && $origin->{path};
1464
1465 if (my $map = $cf::MAP{$path}) {
1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1467 }
1468
1469 $MAP_PREFETCH{$path} = 0;
1470 $MAP_PREFETCHER->ready;
1471
1472 ()
1473}
1474
1317sub save { 1475sub save {
1318 my ($self) = @_; 1476 my ($self) = @_;
1319 1477
1478 my $lock = cf::lock_acquire "map_data:" . $self->path;
1479
1320 $self->{last_save} = $cf::RUNTIME; 1480 $self->{last_save} = $cf::RUNTIME;
1321 1481
1322 return unless $self->dirty; 1482 return unless $self->dirty;
1323 1483
1324 my $save = $self->{path}->save_path; utf8::encode $save; 1484 my $save = $self->save_path; utf8::encode $save;
1325 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1485 my $uniq = $self->uniq_path; utf8::encode $uniq;
1326 1486
1327 $self->{load_path} = $save; 1487 $self->{load_path} = $save;
1328 1488
1329 return if $self->{deny_save}; 1489 return if $self->{deny_save};
1330 1490
1331 local $self->{last_access} = $self->last_access;#d# 1491 local $self->{last_access} = $self->last_access;#d#
1332 1492
1493 cf::async {
1494 $_->contr->save for $self->players;
1495 };
1496
1333 if ($uniq) { 1497 if ($uniq) {
1334 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1498 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1335 $self->save_objects ($uniq, cf::IO_UNIQUES); 1499 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1336 } else { 1500 } else {
1337 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1501 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1338 } 1502 }
1339} 1503}
1340 1504
1341sub swap_out { 1505sub swap_out {
1342 my ($self) = @_; 1506 my ($self) = @_;
1343 1507
1344 # save first because save cedes 1508 # save first because save cedes
1345 $self->save; 1509 $self->save;
1510
1511 my $lock = cf::lock_acquire "map_data:" . $self->path;
1346 1512
1347 return if $self->players; 1513 return if $self->players;
1348 return if $self->in_memory != cf::MAP_IN_MEMORY; 1514 return if $self->in_memory != cf::MAP_IN_MEMORY;
1349 return if $self->{deny_save}; 1515 return if $self->{deny_save};
1350 1516
1354 1520
1355sub reset_at { 1521sub reset_at {
1356 my ($self) = @_; 1522 my ($self) = @_;
1357 1523
1358 # TODO: safety, remove and allow resettable per-player maps 1524 # TODO: safety, remove and allow resettable per-player maps
1359 return 1e99 if $self->{path}{user_rel}; 1525 return 1e99 if $self->isa ("ext::map_per_player");#d#
1360 return 1e99 if $self->{deny_reset}; 1526 return 1e99 if $self->{deny_reset};
1361 1527
1362 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1528 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1363 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1529 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1364 1530
1369 my ($self) = @_; 1535 my ($self) = @_;
1370 1536
1371 $self->reset_at <= $cf::RUNTIME 1537 $self->reset_at <= $cf::RUNTIME
1372} 1538}
1373 1539
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 { 1540sub rename {
1383 my ($self, $new_path) = @_; 1541 my ($self, $new_path) = @_;
1384 1542
1543 normalise $new_path;
1544
1385 $self->unlink_save; 1545 $self->unlink_save;
1386 1546
1387 delete $cf::MAP{$self->path}; 1547 delete $cf::MAP{$self->path};
1388 $self->{path} = new cf::path $new_path; 1548 $self->{path} = $new_path; $self->path ($self->{path});
1389 $self->path ($self->{path}->as_string);
1390 $cf::MAP{$self->path} = $self; 1549 $cf::MAP{$self->path} = $self;
1391 1550
1392 $self->save; 1551 $self->save;
1393} 1552}
1394 1553
1395sub reset { 1554sub reset {
1396 my ($self) = @_; 1555 my ($self) = @_;
1397 1556
1557 my $lock = cf::lock_acquire "map_data:$self->{path}";
1558
1398 return if $self->players; 1559 return if $self->players;
1399 return if $self->{path}{user_rel};#d# 1560 return if $self->isa ("ext::map_per_player");#d#
1400 1561
1401 warn "resetting map ", $self->path;#d# 1562 warn "resetting map ", $self->path;#d#
1402 1563
1403 delete $cf::MAP{$self->path}; 1564 delete $cf::MAP{$self->path};
1565
1566 $self->in_memory (cf::MAP_SWAPPED);
1567 $self->clear;
1404 1568
1405 $_->clear_links_to ($self) for values %cf::MAP; 1569 $_->clear_links_to ($self) for values %cf::MAP;
1406 1570
1407 $self->unlink_save; 1571 $self->unlink_save;
1408 $self->destroy; 1572 $self->destroy;
1417 $self->reset_timeout (1); 1581 $self->reset_timeout (1);
1418 $self->rename ("{nuke}/" . ($nuke_counter++)); 1582 $self->rename ("{nuke}/" . ($nuke_counter++));
1419 $self->reset; # polite request, might not happen 1583 $self->reset; # polite request, might not happen
1420} 1584}
1421 1585
1422sub customise_for { 1586=item cf::map::unique_maps
1423 my ($map, $ob) = @_;
1424 1587
1425 if ($map->per_player) { 1588Returns an arrayref of paths of all shared maps that have
1426 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1589instantiated unique items. May block.
1427 }
1428 1590
1429 $map 1591=cut
1430}
1431 1592
1432sub emergency_save { 1593sub unique_maps() {
1433 my $freeze_guard = cf::freeze_mainloop; 1594 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1595 or return;
1434 1596
1435 warn "enter emergency map save\n"; 1597 my @paths;
1436 1598
1437 cf::sync_job { 1599 for (@$files) {
1438 warn "begin emergency map save\n"; 1600 utf8::decode $_;
1439 $_->save for values %cf::MAP; 1601 next if /\.pst$/;
1602 next unless /^$PATH_SEP/o;
1603
1604 s/\.map$//;
1605 push @paths, $_;
1440 }; 1606 }
1441 1607
1442 warn "end emergency map save\n"; 1608 \@paths
1443} 1609}
1444 1610
1445package cf; 1611package cf;
1446 1612
1447=back 1613=back
1448 1614
1615=head3 cf::object
1616
1617=cut
1618
1619package cf::object;
1620
1621=over 4
1622
1623=item $ob->inv_recursive
1624
1625Returns the inventory of the object _and_ their inventories, recursively.
1626
1627=cut
1628
1629sub inv_recursive_;
1630sub inv_recursive_ {
1631 map { $_, inv_recursive_ $_->inv } @_
1632}
1633
1634sub inv_recursive {
1635 inv_recursive_ inv $_[0]
1636}
1637
1638package cf;
1639
1640=back
1449 1641
1450=head3 cf::object::player 1642=head3 cf::object::player
1451 1643
1452=over 4 1644=over 4
1453 1645
1493 1685
1494=item $player_object->enter_link 1686=item $player_object->enter_link
1495 1687
1496Freezes the player and moves him/her to a special map (C<{link}>). 1688Freezes the player and moves him/her to a special map (C<{link}>).
1497 1689
1498The player should be reaosnably safe there for short amounts of time. You 1690The player should be reasonably safe there for short amounts of time. You
1499I<MUST> call C<leave_link> as soon as possible, though. 1691I<MUST> call C<leave_link> as soon as possible, though.
1500 1692
1693Will never block.
1694
1501=item $player_object->leave_link ($map, $x, $y) 1695=item $player_object->leave_link ($map, $x, $y)
1502 1696
1503Moves the player out of the specila link map onto the given map. If the 1697Moves 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 1698map. 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, 1699to the location he/she was before the call to C<enter_link>, or, if that
1506to the emergency map position. 1700fails, to the emergency map position.
1507 1701
1508Might block. 1702Might block.
1509 1703
1510=cut 1704=cut
1705
1706sub link_map {
1707 unless ($LINK_MAP) {
1708 $LINK_MAP = cf::map::find "{link}"
1709 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1710 $LINK_MAP->load;
1711 }
1712
1713 $LINK_MAP
1714}
1511 1715
1512sub cf::object::player::enter_link { 1716sub cf::object::player::enter_link {
1513 my ($self) = @_; 1717 my ($self) = @_;
1514 1718
1515 $self->deactivate_recursive; 1719 $self->deactivate_recursive;
1516 1720
1517 return if $self->map == $LINK_MAP; 1721 return if UNIVERSAL::isa $self->map, "ext::map_link";
1518 1722
1519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1723 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1520 if $self->map; 1724 if $self->map;
1521 1725
1522 $self->enter_map ($LINK_MAP, 20, 20); 1726 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1523} 1727}
1524 1728
1525sub cf::object::player::leave_link { 1729sub cf::object::player::leave_link {
1526 my ($self, $map, $x, $y) = @_; 1730 my ($self, $map, $x, $y) = @_;
1527 1731
1545 # use -1 or undef as default coordinates, not 0, 0 1749 # use -1 or undef as default coordinates, not 0, 0
1546 ($x, $y) = ($map->enter_x, $map->enter_y) 1750 ($x, $y) = ($map->enter_x, $map->enter_y)
1547 if $x <=0 && $y <= 0; 1751 if $x <=0 && $y <= 0;
1548 1752
1549 $map->load; 1753 $map->load;
1754 $map->load_diag;
1550 1755
1756 return unless $self->contr->active;
1551 $self->activate_recursive; 1757 $self->activate_recursive;
1552 $self->enter_map ($map, $x, $y); 1758 $self->enter_map ($map, $x, $y);
1553} 1759}
1554 1760
1555cf::player->attach ( 1761cf::player->attach (
1568 1774
1569 # try to abort aborted map switching on player login :) 1775 # try to abort aborted map switching on player login :)
1570 # should happen only on crashes 1776 # should happen only on crashes
1571 if ($pl->ob->{_link_pos}) { 1777 if ($pl->ob->{_link_pos}) {
1572 $pl->ob->enter_link; 1778 $pl->ob->enter_link;
1573 cf::async { 1779 (async {
1574 # we need this sleep as the login has a concurrent enter_exit running 1780 # 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 1781 # and this sleep increases chances of the player not ending up in scorn
1782 $pl->ob->reply (undef,
1783 "There was an internal problem at your last logout, "
1784 . "the server will try to bring you to your intended destination in a second.",
1785 cf::NDI_RED);
1576 Coro::Timer::sleep 1; 1786 Coro::Timer::sleep 1;
1577 $pl->ob->leave_link; 1787 $pl->ob->leave_link;
1578 }; 1788 })->prio (2);
1579 } 1789 }
1580 }, 1790 },
1581); 1791);
1582 1792
1583=item $player_object->goto_map ($path, $x, $y) 1793=item $player_object->goto ($path, $x, $y)
1584 1794
1585=cut 1795=cut
1586 1796
1587sub cf::object::player::goto_map { 1797sub cf::object::player::goto {
1588 my ($self, $path, $x, $y) = @_; 1798 my ($self, $path, $x, $y) = @_;
1589 1799
1590 $self->enter_link; 1800 $self->enter_link;
1591 1801
1592 (cf::async { 1802 (async {
1593 $path = new cf::path $path;
1594
1595 my $map = cf::map::find $path->as_string; 1803 my $map = cf::map::find $path;
1596 $map = $map->customise_for ($self) if $map; 1804 $map = $map->customise_for ($self) if $map;
1597 1805
1598# warn "entering ", $map->path, " at ($x, $y)\n" 1806# warn "entering ", $map->path, " at ($x, $y)\n"
1599# if $map; 1807# if $map;
1600 1808
1601 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1809 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1602 1810
1603 $self->leave_link ($map, $x, $y); 1811 $self->leave_link ($map, $x, $y);
1604 })->prio (1); 1812 })->prio (1);
1605} 1813}
1606 1814
1659 1867
1660 return unless $self->type == cf::PLAYER; 1868 return unless $self->type == cf::PLAYER;
1661 1869
1662 $self->enter_link; 1870 $self->enter_link;
1663 1871
1664 (cf::async { 1872 (async {
1665 $self->deactivate_recursive; # just to be sure 1873 $self->deactivate_recursive; # just to be sure
1666 unless (eval { 1874 unless (eval {
1667 prepare_random_map $exit 1875 prepare_random_map $exit
1668 if $exit->slaying eq "/!"; 1876 if $exit->slaying eq "/!";
1669 1877
1670 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1878 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); 1879 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1672 1880
1673 1; 1881 1;
1674 }) { 1882 }) {
1675 $self->message ("Something went wrong deep within the crossfire server. " 1883 $self->message ("Something went wrong deep within the crossfire server. "
1676 . "I'll try to bring you back to the map you were before. " 1884 . "I'll try to bring you back to the map you were before. "
1677 . "Please report this to the dungeon master", 1885 . "Please report this to the dungeon master!",
1678 cf::NDI_UNIQUE | cf::NDI_RED); 1886 cf::NDI_UNIQUE | cf::NDI_RED);
1679 1887
1680 warn "ERROR in enter_exit: $@"; 1888 warn "ERROR in enter_exit: $@";
1681 $self->leave_link; 1889 $self->leave_link;
1682 } 1890 }
1750 } 1958 }
1751 } 1959 }
1752 }, 1960 },
1753); 1961);
1754 1962
1755=item $client->coro (\&cb) 1963=item $client->async (\&cb)
1756 1964
1757Create a new coroutine, running the specified callback. The coroutine will 1965Create a new coroutine, running the specified callback. The coroutine will
1758be automatically cancelled when the client gets destroyed (e.g. on logout, 1966be automatically cancelled when the client gets destroyed (e.g. on logout,
1759or loss of connection). 1967or loss of connection).
1760 1968
1761=cut 1969=cut
1762 1970
1763sub cf::client::coro { 1971sub cf::client::async {
1764 my ($self, $cb) = @_; 1972 my ($self, $cb) = @_;
1765 1973
1766 my $coro = &cf::async ($cb); 1974 my $coro = &Coro::async ($cb);
1767 1975
1768 $coro->on_destroy (sub { 1976 $coro->on_destroy (sub {
1769 delete $self->{_coro}{$coro+0}; 1977 delete $self->{_coro}{$coro+0};
1770 }); 1978 });
1771 1979
2009 local $/; 2217 local $/;
2010 *CFG = YAML::Syck::Load <$fh>; 2218 *CFG = YAML::Syck::Load <$fh>;
2011 2219
2012 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2220 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2013 2221
2222 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2223 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2224
2014 if (exists $CFG{mlockall}) { 2225 if (exists $CFG{mlockall}) {
2015 eval { 2226 eval {
2016 $CFG{mlockall} ? &mlockall : &munlockall 2227 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2017 and die "WARNING: m(un)lockall failed: $!\n"; 2228 and die "WARNING: m(un)lockall failed: $!\n";
2018 }; 2229 };
2019 warn $@ if $@; 2230 warn $@ if $@;
2020 } 2231 }
2021} 2232}
2022 2233
2023sub main { 2234sub main {
2024 # we must not ever block the main coroutine 2235 # we must not ever block the main coroutine
2025 local $Coro::idle = sub { 2236 local $Coro::idle = sub {
2026 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2237 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2027 (Coro::unblock_sub {
2028 Event::one_event; 2238 async { Event::one_event };
2029 })->();
2030 }; 2239 };
2031 2240
2032 cfg_load; 2241 cfg_load;
2033 db_load; 2242 db_load;
2034 load_extensions; 2243 load_extensions;
2035 Event::loop; 2244 Event::loop;
2036} 2245}
2037 2246
2038############################################################################# 2247#############################################################################
2039# initialisation 2248# initialisation and cleanup
2249
2250# install some emergency cleanup handlers
2251BEGIN {
2252 for my $signal (qw(INT HUP TERM)) {
2253 Event->signal (
2254 data => WF_AUTOCANCEL,
2255 signal => $signal,
2256 cb => sub {
2257 cf::cleanup "SIG$signal";
2258 },
2259 );
2260 }
2261}
2262
2263sub emergency_save() {
2264 my $freeze_guard = cf::freeze_mainloop;
2265
2266 warn "enter emergency perl save\n";
2267
2268 cf::sync_job {
2269 # use a peculiar iteration method to avoid tripping on perl
2270 # refcount bugs in for. also avoids problems with players
2271 # and maps saved/destroyed asynchronously.
2272 warn "begin emergency player save\n";
2273 for my $login (keys %cf::PLAYER) {
2274 my $pl = $cf::PLAYER{$login} or next;
2275 $pl->valid or next;
2276 $pl->save;
2277 }
2278 warn "end emergency player save\n";
2279
2280 warn "begin emergency map save\n";
2281 for my $path (keys %cf::MAP) {
2282 my $map = $cf::MAP{$path} or next;
2283 $map->valid or next;
2284 $map->save;
2285 }
2286 warn "end emergency map save\n";
2287 };
2288
2289 warn "leave emergency perl save\n";
2290}
2040 2291
2041sub reload() { 2292sub reload() {
2042 # can/must only be called in main 2293 # can/must only be called in main
2043 if ($Coro::current != $Coro::main) { 2294 if ($Coro::current != $Coro::main) {
2044 warn "can only reload from main coroutine\n"; 2295 warn "can only reload from main coroutine\n";
2045 return; 2296 return;
2046 } 2297 }
2047 2298
2048 warn "reloading..."; 2299 warn "reloading...";
2049 2300
2301 warn "freezing server";
2050 my $guard = freeze_mainloop; 2302 my $guard = freeze_mainloop;
2051 cf::emergency_save; 2303 cf::emergency_save;
2052 2304
2305 warn "sync database to disk";
2306 cf::db_sync;
2307 IO::AIO::flush;
2308
2053 eval { 2309 eval {
2054 # if anything goes wrong in here, we should simply crash as we already saved 2310 # if anything goes wrong in here, we should simply crash as we already saved
2055 2311
2056 # cancel all watchers 2312 warn "cancel all watchers";
2057 for (Event::all_watchers) { 2313 for (Event::all_watchers) {
2058 $_->cancel if $_->data & WF_AUTOCANCEL; 2314 $_->cancel if $_->data & WF_AUTOCANCEL;
2059 } 2315 }
2060 2316
2061 # cancel all extension coros 2317 warn "cancel all extension coros";
2062 $_->cancel for values %EXT_CORO; 2318 $_->cancel for values %EXT_CORO;
2063 %EXT_CORO = (); 2319 %EXT_CORO = ();
2064 2320
2321 warn "remove commands";
2322 %COMMAND = ();
2323
2324 warn "remove ext commands";
2325 %EXTCMD = ();
2326
2065 # unload all extensions 2327 warn "unload/nuke all extensions";
2066 for (@exts) { 2328 for my $pkg (@EXTS) {
2067 warn "unloading <$_>"; 2329 warn "... unloading $pkg";
2068 unload_extension $_; 2330
2331 if (my $cb = $pkg->can ("unload")) {
2332 eval {
2333 $cb->($pkg);
2334 1
2335 } or warn "$pkg unloaded, but with errors: $@";
2069 } 2336 }
2070 2337
2338 warn "... nuking $pkg";
2339 Symbol::delete_package $pkg;
2340 }
2341
2071 # unload all modules loaded from $LIBDIR 2342 warn "unload all perl modules loaded from $LIBDIR";
2072 while (my ($k, $v) = each %INC) { 2343 while (my ($k, $v) = each %INC) {
2073 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2344 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2074 2345
2075 warn "removing <$k>"; 2346 warn "removing <$k>";
2076 delete $INC{$k}; 2347 delete $INC{$k};
2083 } 2354 }
2084 2355
2085 Symbol::delete_package $k; 2356 Symbol::delete_package $k;
2086 } 2357 }
2087 2358
2088 # sync database to disk
2089 cf::db_sync;
2090 IO::AIO::flush;
2091
2092 # get rid of safe::, as good as possible 2359 warn "get rid of safe::, as good as possible";
2093 Symbol::delete_package "safe::$_" 2360 Symbol::delete_package "safe::$_"
2094 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2361 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2095 2362
2096 # remove register_script_function callbacks
2097 # TODO
2098
2099 # unload cf.pm "a bit" 2363 warn "unload cf.pm \"a bit\"";
2100 delete $INC{"cf.pm"}; 2364 delete $INC{"cf.pm"};
2101 2365
2102 # don't, removes xs symbols, too, 2366 # don't, removes xs symbols, too,
2103 # and global variables created in xs 2367 # and global variables created in xs
2104 #Symbol::delete_package __PACKAGE__; 2368 #Symbol::delete_package __PACKAGE__;
2105 2369
2106 # reload cf.pm
2107 warn "reloading cf.pm"; 2370 warn "reloading cf.pm";
2108 require cf; 2371 require cf;
2109 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2372 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2110 2373
2111 # load config and database again 2374 warn "load config and database again";
2112 cf::cfg_load; 2375 cf::cfg_load;
2113 cf::db_load; 2376 cf::db_load;
2114 2377
2115 # load extensions
2116 warn "load extensions"; 2378 warn "load extensions";
2117 cf::load_extensions; 2379 cf::load_extensions;
2118 2380
2119 # reattach attachments to objects 2381 warn "reattach attachments to objects/players";
2120 warn "reattach";
2121 _global_reattach; 2382 _global_reattach;
2383 warn "reattach attachments to maps";
2384 reattach $_ for values %MAP;
2122 }; 2385 };
2123 2386
2124 if ($@) { 2387 if ($@) {
2125 warn $@; 2388 warn $@;
2126 warn "error while reloading, exiting."; 2389 warn "error while reloading, exiting.";
2127 exit 1; 2390 exit 1;
2128 } 2391 }
2129 2392
2130 warn "reloaded successfully"; 2393 warn "reloaded";
2131}; 2394};
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 2395
2178register_command "reload" => sub { 2396register_command "reload" => sub {
2179 my ($who, $arg) = @_; 2397 my ($who, $arg) = @_;
2180 2398
2181 if ($who->flag (FLAG_WIZ)) { 2399 if ($who->flag (FLAG_WIZ)) {
2191 reentrant => 0, 2409 reentrant => 0,
2192 prio => 0, 2410 prio => 0,
2193 at => $NEXT_TICK || $TICK, 2411 at => $NEXT_TICK || $TICK,
2194 data => WF_AUTOCANCEL, 2412 data => WF_AUTOCANCEL,
2195 cb => sub { 2413 cb => sub {
2414 $NOW = Event::time;
2415
2196 cf::server_tick; # one server iteration 2416 cf::server_tick; # one server iteration
2197 $RUNTIME += $TICK; 2417 $RUNTIME += $TICK;
2198 $NEXT_TICK += $TICK; 2418 $NEXT_TICK += $TICK;
2419
2420 $WAIT_FOR_TICK->broadcast;
2421 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2199 2422
2200 # if we are delayed by four ticks or more, skip them all 2423 # if we are delayed by four ticks or more, skip them all
2201 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2424 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2202 2425
2203 $TICK_WATCHER->at ($NEXT_TICK); 2426 $TICK_WATCHER->at ($NEXT_TICK);
2205 }, 2428 },
2206); 2429);
2207 2430
2208IO::AIO::max_poll_time $TICK * 0.2; 2431IO::AIO::max_poll_time $TICK * 0.2;
2209 2432
2210Event->io ( 2433$AIO_POLL_WATCHER = Event->io (
2211 fd => IO::AIO::poll_fileno, 2434 fd => IO::AIO::poll_fileno,
2212 poll => 'r', 2435 poll => 'r',
2213 prio => 5, 2436 prio => 5,
2214 data => WF_AUTOCANCEL, 2437 data => WF_AUTOCANCEL,
2215 cb => \&IO::AIO::poll_cb, 2438 cb => \&IO::AIO::poll_cb,
2216); 2439);
2217 2440
2218Event->timer ( 2441$WRITE_RUNTIME_WATCHER = Event->timer (
2219 data => WF_AUTOCANCEL, 2442 data => WF_AUTOCANCEL,
2220 after => 0, 2443 after => 0,
2221 interval => 10, 2444 interval => 10,
2222 cb => sub { 2445 cb => sub {
2223 (Coro::unblock_sub { 2446 (Coro::unblock_sub {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines