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.138 by root, Fri Jan 5 17:07:17 2007 UTC vs.
Revision 1.178 by root, Thu Jan 18 00:06:55 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3 (); 13use Coro 3.4 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
37our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
38 43
39our @EVENT; 44our @EVENT;
40our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
41 46
42our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
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
224} 259}
225 260
226sub freeze_mainloop { 261sub freeze_mainloop {
227 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
228 263
229 my $guard = Coro::guard { $TICK_WATCHER->start }; 264 my $guard = Coro::guard {
265 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 };
268 $WRITE_RUNTIME_WATCHER->stop;
230 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
231 $guard 270 $guard
232} 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 }
233 282
234=item cf::sync_job { BLOCK } 283=item cf::sync_job { BLOCK }
235 284
236The design of crossfire+ requires that the main coro ($Coro::main) is 285The design of crossfire+ requires that the main coro ($Coro::main) is
237always able to handle events or runnable, as crossfire+ is only partly 286always able to handle events or runnable, as crossfire+ is only partly
256 my $freeze_guard = freeze_mainloop; 305 my $freeze_guard = freeze_mainloop;
257 306
258 my $busy = 1; 307 my $busy = 1;
259 my @res; 308 my @res;
260 309
261 (Coro::async_pool { 310 (async {
262 @res = eval { $job->() }; 311 @res = eval { $job->() };
263 warn $@ if $@; 312 warn $@ if $@;
264 undef $busy; 313 undef $busy;
265 })->prio (Coro::PRIO_MAX); 314 })->prio (Coro::PRIO_MAX);
266 315
267 while ($busy) { 316 while ($busy) {
268 Coro::cede_notself; 317 Coro::cede or Event::one_event;
269 Event::one_event unless Coro::nready;
270 } 318 }
271 319
272 wantarray ? @res : $res[0] 320 wantarray ? @res : $res[0]
273 } else { 321 } else {
274 # we are in another coroutine, how wonderful, everything just works 322 # we are in another coroutine, how wonderful, everything just works
275 323
276 $job->() 324 $job->()
277 } 325 }
278} 326}
279 327
280=item $coro = cf::coro { BLOCK } 328=item $coro = cf::async_ext { BLOCK }
281 329
282Creates (and readies) and returns a new coro. This coro is automcatially 330Like async, but this coro is automatically being canceled when the
283being canceled when the extension calling this is being unloaded. 331extension calling this is being unloaded.
284 332
285=cut 333=cut
286 334
287sub coro(&) { 335sub async_ext(&) {
288 my $cb = shift; 336 my $cb = shift;
289 337
290 my $coro = &Coro::async_pool ($cb); 338 my $coro = &Coro::async ($cb);
291 339
292 $coro->on_destroy (sub { 340 $coro->on_destroy (sub {
293 delete $EXT_CORO{$coro+0}; 341 delete $EXT_CORO{$coro+0};
294 }); 342 });
295 $EXT_CORO{$coro+0} = $coro; 343 $EXT_CORO{$coro+0} = $coro;
320} 368}
321 369
322=back 370=back
323 371
324=cut 372=cut
325
326#############################################################################
327
328package cf::path;
329
330sub new {
331 my ($class, $path, $base) = @_;
332
333 $path = $path->as_string if ref $path;
334
335 my $self = bless { }, $class;
336
337 # {... are special paths that are not touched
338 # ?xxx/... are special absolute paths
339 # ?random/... random maps
340 # /! non-realised random map exit
341 # /... normal maps
342 # ~/... per-player maps without a specific player (DO NOT USE)
343 # ~user/... per-player map of a specific user
344
345 if ($path =~ /^{/) {
346 # fine as it is
347 } elsif ($path =~ s{^\?random/}{}) {
348 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
349 $self->{random} = cf::from_json $data;
350 } else {
351 if ($path =~ s{^~([^/]+)?}{}) {
352 $self->{user_rel} = 1;
353
354 if (defined $1) {
355 $self->{user} = $1;
356 } elsif ($base =~ m{^~([^/]+)/}) {
357 $self->{user} = $1;
358 } else {
359 warn "cannot resolve user-relative path without user <$path,$base>\n";
360 }
361 } elsif ($path =~ /^\//) {
362 # already absolute
363 } else {
364 $base =~ s{[^/]+/?$}{};
365 return $class->new ("$base/$path");
366 }
367
368 for ($path) {
369 redo if s{/\.?/}{/};
370 redo if s{/[^/]+/\.\./}{/};
371 }
372 }
373
374 $self->{path} = $path;
375
376 $self
377}
378
379# the name / primary key / in-game path
380sub as_string {
381 my ($self) = @_;
382
383 $self->{user_rel} ? "~$self->{user}$self->{path}"
384 : $self->{random} ? "?random/$self->{path}"
385 : $self->{path}
386}
387
388# the displayed name, this is a one way mapping
389sub visible_name {
390 my ($self) = @_;
391
392# if (my $rmp = $self->{random}) {
393# # todo: be more intelligent about this
394# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
395# } else {
396 $self->as_string
397# }
398}
399
400# escape the /'s in the path
401sub _escaped_path {
402 # ∕ is U+2215
403 (my $path = $_[0]{path}) =~ s/\//∕/g;
404 $path
405}
406
407# the original (read-only) location
408sub load_path {
409 my ($self) = @_;
410
411 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
412}
413
414# the temporary/swap location
415sub save_path {
416 my ($self) = @_;
417
418 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
419 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
420 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
421}
422
423# the unique path, might be eq to save_path
424sub uniq_path {
425 my ($self) = @_;
426
427 $self->{user_rel} || $self->{random}
428 ? undef
429 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
430}
431
432# return random map parameters, or undef
433sub random_map_params {
434 my ($self) = @_;
435
436 $self->{random}
437}
438
439# this is somewhat ugly, but style maps do need special treatment
440sub is_style_map {
441 $_[0]{path} =~ m{^/styles/}
442}
443
444package cf;
445 373
446############################################################################# 374#############################################################################
447 375
448=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
449 377
575our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
576our @CB_MAP = (); 504our @CB_MAP = ();
577 505
578my %attachment; 506my %attachment;
579 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
580sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
581 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
582 516
583 use sort 'stable'; 517 use sort 'stable';
584 518
755# object support 689# object support
756 690
757sub reattach { 691sub reattach {
758 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
759 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
760 696
761 my $registry = $obj->registry; 697 my $registry = $obj->registry;
762 698
763 @$registry = (); 699 @$registry = ();
764 700
896=cut 832=cut
897 833
898sub register_extcmd { 834sub register_extcmd {
899 my ($name, $cb) = @_; 835 my ($name, $cb) = @_;
900 836
901 my $caller = caller;
902 #warn "registering extcmd '$name' to '$caller'";
903
904 $EXTCMD{$name} = [$cb, $caller]; 837 $EXTCMD{$name} = $cb;
905} 838}
906 839
907cf::player->attach ( 840cf::player->attach (
908 on_command => sub { 841 on_command => sub {
909 my ($pl, $name, $params) = @_; 842 my ($pl, $name, $params) = @_;
922 855
923 my $msg = eval { from_json $buf }; 856 my $msg = eval { from_json $buf };
924 857
925 if (ref $msg) { 858 if (ref $msg) {
926 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 859 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
927 if (my %reply = $cb->[0]->($pl, $msg)) { 860 if (my %reply = $cb->($pl, $msg)) {
928 $pl->ext_reply ($msg->{msgid}, %reply); 861 $pl->ext_reply ($msg->{msgid}, %reply);
929 } 862 }
930 } 863 }
931 } else { 864 } else {
932 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 865 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
934 867
935 cf::override; 868 cf::override;
936 }, 869 },
937); 870);
938 871
939sub register {
940 my ($base, $pkg) = @_;
941
942 #TODO
943}
944
945sub load_extension { 872sub load_extension {
946 my ($path) = @_; 873 my ($path) = @_;
947 874
948 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 875 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
949 my $base = $1; 876 my $base = $1;
950 my $pkg = $1; 877 my $pkg = $1;
951 $pkg =~ s/[^[:word:]]/_/g; 878 $pkg =~ s/[^[:word:]]/_/g;
952 $pkg = "ext::$pkg"; 879 $pkg = "ext::$pkg";
953 880
954 warn "loading '$path' into '$pkg'\n"; 881 warn "... loading '$path' into '$pkg'\n";
955 882
956 open my $fh, "<:utf8", $path 883 open my $fh, "<:utf8", $path
957 or die "$path: $!"; 884 or die "$path: $!";
958 885
959 my $source = 886 my $source =
960 "package $pkg; use strict; use utf8;\n" 887 "package $pkg; use strict; use utf8;\n"
961 . "#line 1 \"$path\"\n{\n" 888 . "#line 1 \"$path\"\n{\n"
962 . (do { local $/; <$fh> }) 889 . (do { local $/; <$fh> })
963 . "\n};\n1"; 890 . "\n};\n1";
964 891
965 eval $source 892 unless (eval $source) {
966 or die $@ ? "$path: $@\n" 893 my $msg = $@ ? "$path: $@\n"
967 : "extension disabled.\n"; 894 : "extension disabled.\n";
968 895 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
969 push @exts, $pkg; 896 warn $@;
970 $ext_pkg{$base} = $pkg; 897 warn "mandatory extension failed to load, exiting.\n";
971 898 exit 1;
972# no strict 'refs'; 899 }
973# @{"$pkg\::ISA"} = ext::; 900 die $@;
974
975 register $base, $pkg;
976}
977
978sub unload_extension {
979 my ($pkg) = @_;
980
981 warn "removing extension $pkg\n";
982
983 # remove hooks
984 #TODO
985# for my $idx (0 .. $#PLUGIN_EVENT) {
986# delete $hook[$idx]{$pkg};
987# } 901 }
988 902
989 # remove commands 903 push @EXTS, $pkg;
990 for my $name (keys %COMMAND) {
991 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
992
993 if (@cb) {
994 $COMMAND{$name} = \@cb;
995 } else {
996 delete $COMMAND{$name};
997 }
998 }
999
1000 # remove extcmds
1001 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1002 delete $EXTCMD{$name};
1003 }
1004
1005 if (my $cb = $pkg->can ("unload")) {
1006 eval {
1007 $cb->($pkg);
1008 1
1009 } or warn "$pkg unloaded, but with errors: $@";
1010 }
1011
1012 Symbol::delete_package $pkg;
1013} 904}
1014 905
1015sub load_extensions { 906sub load_extensions {
1016 for my $ext (<$LIBDIR/*.ext>) { 907 for my $ext (<$LIBDIR/*.ext>) {
1017 next unless -r $ext; 908 next unless -r $ext;
1021 } or warn "$ext not loaded: $@"; 912 } or warn "$ext not loaded: $@";
1022 } 913 }
1023} 914}
1024 915
1025############################################################################# 916#############################################################################
1026# load/save/clean perl data associated with a map
1027
1028*cf::mapsupport::on_clean = sub {
1029 my ($map) = @_;
1030
1031 my $path = $map->tmpname;
1032 defined $path or return;
1033
1034 unlink "$path.pst";
1035};
1036
1037cf::map->attach (prio => -10000, package => cf::mapsupport::);
1038
1039#############################################################################
1040# load/save perl data associated with player->ob objects
1041
1042sub all_objects(@) {
1043 @_, map all_objects ($_->inv), @_
1044}
1045
1046# TODO: compatibility cruft, remove when no longer needed
1047cf::player->attach (
1048 on_load => sub {
1049 my ($pl, $path) = @_;
1050
1051 for my $o (all_objects $pl->ob) {
1052 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1053 $o->set_ob_key_value ("_perl_data");
1054
1055 %$o = %{ Storable::thaw pack "H*", $value };
1056 }
1057 }
1058 },
1059);
1060
1061#############################################################################
1062 917
1063=head2 CORE EXTENSIONS 918=head2 CORE EXTENSIONS
1064 919
1065Functions and methods that extend core crossfire objects. 920Functions and methods that extend core crossfire objects.
1066 921
922=cut
923
924package cf::player;
925
926use Coro::AIO;
927
1067=head3 cf::player 928=head3 cf::player
1068 929
1069=over 4 930=over 4
1070 931
1071=item cf::player::exists $login 932=item cf::player::find $login
1072 933
1073Returns true when the given account exists. 934Returns the given player object, loading it if necessary (might block).
1074 935
1075=cut 936=cut
1076 937
1077sub cf::player::exists($) { 938sub playerdir($) {
1078 cf::player::find $_[0] 939 cf::localdir
1079 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
1080} 1085}
1081 1086
1082=item $player->ext_reply ($msgid, $msgtype, %msg) 1087=item $player->ext_reply ($msgid, $msgtype, %msg)
1083 1088
1084Sends an ext reply to the player. 1089Sends an ext reply to the player.
1085 1090
1086=cut 1091=cut
1087 1092
1088sub cf::player::ext_reply($$$%) { 1093sub ext_reply($$$%) {
1089 my ($self, $id, %msg) = @_; 1094 my ($self, $id, %msg) = @_;
1090 1095
1091 $msg{msgid} = $id; 1096 $msg{msgid} = $id;
1092 1097
1093 $self->send ("ext " . to_json \%msg); 1098 $self->send ("ext " . cf::to_json \%msg);
1094} 1099}
1100
1101package cf;
1095 1102
1096=back 1103=back
1097 1104
1098 1105
1099=head3 cf::map 1106=head3 cf::map
1105package cf::map; 1112package cf::map;
1106 1113
1107use Fcntl; 1114use Fcntl;
1108use Coro::AIO; 1115use Coro::AIO;
1109 1116
1117use overload
1118 '""' => \&as_string,
1119 fallback => 1;
1120
1110our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1111our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1112 1123
1113sub generate_random_map { 1124sub generate_random_map {
1114 my ($path, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1115
1116 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1117 cf::map::_create_random_map 1127 $self->_create_random_map (
1118 $path,
1119 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1120 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1121 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1122 $rmp->{exit_on_final_map}, 1131 $rmp->{exit_on_final_map},
1123 $rmp->{xsize}, $rmp->{ysize}, 1132 $rmp->{xsize}, $rmp->{ysize},
1124 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1133 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1125 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1134 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1126 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1135 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1127 $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},
1128 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1129 (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 my ($self, $merge) = @_;
1157
1158 # we have to keep some variables in memory intact
1159 local $self->{path};
1160 local $self->{load_path};
1161 local $self->{deny_save};
1162 local $self->{deny_reset};
1163
1164 $self->SUPER::thawer_merge ($merge);
1165}
1166
1167sub normalise {
1168 my ($path, $base) = @_;
1169
1170 # map plan:
1171 #
1172 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched
1174 # ?xxx/... are special absolute paths
1175 # ?random/... random maps
1176 # /... normal maps
1177 # ~user/... per-player map of a specific user
1178
1179 $path =~ s/$PATH_SEP/\//go;
1180
1181 # treat it as relative path if it starts with
1182 # something that looks reasonable
1183 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1184 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1185
1186 $base =~ s{[^/]+/?$}{};
1187 $path = "$base/$path";
1188 }
1189
1190 for ($path) {
1191 redo if s{//}{/};
1192 redo if s{/\.?/}{/};
1193 redo if s{/[^/]+/\.\./}{/};
1194 }
1195
1196 $path
1197}
1198
1199sub new_from_path {
1200 my (undef, $path, $base) = @_;
1201
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203
1204 $path = normalise $path, $base;
1205
1206 for my $pkg (keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) {
1208 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc.
1211 return $self;
1212 }
1213 }
1214
1215 Carp::carp "unable to resolve path '$path'.";
1216 ()
1217}
1218
1219sub init {
1220 my ($self) = @_;
1221
1222 $self
1223}
1224
1225sub as_string {
1226 my ($self) = @_;
1227
1228 "$self->{path}"
1229}
1230
1231# the displayed name, this is a one way mapping
1232sub visible_name {
1233 &as_string
1234}
1235
1236# the original (read-only) location
1237sub load_path {
1238 my ($self) = @_;
1239
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1241}
1242
1243# the temporary/swap location
1244sub save_path {
1245 my ($self) = @_;
1246
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1249}
1250
1251# the unique path, undef == no special unique path
1252sub uniq_path {
1253 my ($self) = @_;
1254
1255 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1256 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1130} 1257}
1131 1258
1132# and all this just because we cannot iterate over 1259# and all this just because we cannot iterate over
1133# all maps in C++... 1260# all maps in C++...
1134sub change_all_map_light { 1261sub change_all_map_light {
1136 1263
1137 $_->change_map_light ($change) 1264 $_->change_map_light ($change)
1138 for grep $_->outdoor, values %cf::MAP; 1265 for grep $_->outdoor, values %cf::MAP;
1139} 1266}
1140 1267
1268sub unlink_save {
1269 my ($self) = @_;
1270
1271 utf8::encode (my $save = $self->save_path);
1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1274}
1275
1141sub try_load_header($) { 1276sub load_header_from($) {
1142 my ($path) = @_; 1277 my ($self, $path) = @_;
1143 1278
1144 utf8::encode $path; 1279 utf8::encode $path;
1145 aio_open $path, O_RDONLY, 0 1280 aio_open $path, O_RDONLY, 0
1146 or return; 1281 or return;
1147 1282
1148 my $map = cf::map::new 1283 $self->_load_header ($path)
1149 or return; 1284 or return;
1150 1285
1151 # for better error messages only, will be overwritten 1286 $self->{load_path} = $path;
1152 $map->path ($path);
1153 1287
1154 $map->load_header ($path) 1288 1
1289}
1290
1291sub load_orig {
1292 my ($self) = @_;
1293
1294 $self->load_header_from ($self->load_path)
1295}
1296
1297sub load_temp {
1298 my ($self) = @_;
1299
1300 $self->load_header_from ($self->save_path)
1301}
1302
1303sub load_header {
1304 my ($self) = @_;
1305
1306 if ($self->load_temp) {
1307 $self->last_access ((delete $self->{last_access})
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else {
1313 $self->load_orig
1155 or return; 1314 or return;
1156 1315
1157 $map->{load_path} = $path; 1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 }
1158 1321
1159 $map 1322 1
1160} 1323}
1161 1324
1162sub find; 1325sub find;
1163sub find { 1326sub find {
1164 my ($path, $origin) = @_; 1327 my ($path, $origin) = @_;
1165 1328
1166 #warn "find<$path,$origin>\n";#d#
1167
1168 $path = new cf::path $path, $origin && $origin->path; 1329 $path = normalise $path, $origin && $origin->path;
1169 my $key = $path->as_string;
1170 1330
1171 cf::lock_wait "map_find:$key"; 1331 cf::lock_wait "map_find:$path";
1172 1332
1173 $cf::MAP{$key} || do { 1333 $cf::MAP{$path} || do {
1174 my $guard = cf::lock_acquire "map_find:$key"; 1334 my $guard = cf::lock_acquire "map_find:$path";
1175 1335 my $map = new_from_path cf::map $path
1176 # do it the slow way
1177 my $map = try_load_header $path->save_path;
1178
1179 Coro::cede;
1180
1181 if ($map) {
1182 $map->last_access ((delete $map->{last_access})
1183 || $cf::RUNTIME); #d#
1184 # safety
1185 $map->{instantiate_time} = $cf::RUNTIME
1186 if $map->{instantiate_time} > $cf::RUNTIME;
1187 } else {
1188 if (my $rmp = $path->random_map_params) {
1189 $map = generate_random_map $key, $rmp;
1190 } else {
1191 $map = try_load_header $path->load_path;
1192 }
1193
1194 $map or return; 1336 or return;
1195 1337
1196 $map->{load_original} = 1;
1197 $map->{instantiate_time} = $cf::RUNTIME;
1198 $map->last_access ($cf::RUNTIME);
1199 $map->instantiate;
1200
1201 # per-player maps become, after loading, normal maps
1202 $map->per_player (0) if $path->{user_rel};
1203 }
1204
1205 $map->path ($key);
1206 $map->{path} = $path;
1207 $map->{last_save} = $cf::RUNTIME; 1338 $map->{last_save} = $cf::RUNTIME;
1208 1339
1209 Coro::cede; 1340 $map->load_header
1341 or return;
1210 1342
1211 if ($map->should_reset) { 1343 if ($map->should_reset) {
1344 $cf::WAIT_FOR_TICK->wait;
1212 $map->reset; 1345 $map->reset;
1213 undef $guard; 1346 undef $guard;
1214 $map = find $path 1347 $map = find $path
1215 or return; 1348 or return;
1216 } 1349 }
1217 1350
1218 $cf::MAP{$key} = $map 1351 $cf::MAP{$path} = $map
1219 } 1352 }
1220} 1353}
1221 1354
1222sub load { 1355sub load {
1223 my ($self) = @_; 1356 my ($self) = @_;
1224 1357
1225 my $path = $self->{path}; 1358 my $path = $self->{path};
1226 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1359 my $guard = cf::lock_acquire "map_load:$path";
1227 1360
1228 return if $self->in_memory != cf::MAP_SWAPPED; 1361 return if $self->in_memory != cf::MAP_SWAPPED;
1229 1362
1230 $self->in_memory (cf::MAP_LOADING); 1363 $self->in_memory (cf::MAP_LOADING);
1231 1364
1232 $self->alloc; 1365 $self->alloc;
1233 $self->load_objects ($self->{load_path}, 1) 1366 $self->_load_objects ($self->{load_path}, 1)
1234 or return; 1367 or return;
1235 1368
1236 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1237 if delete $self->{load_original}; 1370 if delete $self->{load_original};
1238 1371
1239 if (my $uniq = $path->uniq_path) { 1372 if (my $uniq = $self->uniq_path) {
1240 utf8::encode $uniq; 1373 utf8::encode $uniq;
1241 if (aio_open $uniq, O_RDONLY, 0) { 1374 if (aio_open $uniq, O_RDONLY, 0) {
1242 $self->clear_unique_items; 1375 $self->clear_unique_items;
1243 $self->load_objects ($uniq, 0); 1376 $self->_load_objects ($uniq, 0);
1244 } 1377 }
1245 } 1378 }
1246 1379
1247 Coro::cede; 1380 Coro::cede;
1248 1381
1249 # now do the right thing for maps 1382 # now do the right thing for maps
1250 $self->link_multipart_objects; 1383 $self->link_multipart_objects;
1251 1384
1252 if ($self->{path}->is_style_map) { 1385 unless ($self->{deny_activate}) {
1253 $self->{deny_save} = 1; 1386 $self->decay_objects;
1254 $self->{deny_reset} = 1;
1255 } else {
1256 $self->fix_auto_apply; 1387 $self->fix_auto_apply;
1257 $self->decay_objects;
1258 $self->update_buttons; 1388 $self->update_buttons;
1389 Coro::cede;
1259 $self->set_darkness_map; 1390 $self->set_darkness_map;
1260 $self->difficulty ($self->estimate_difficulty) 1391 $self->difficulty ($self->estimate_difficulty)
1261 unless $self->difficulty; 1392 unless $self->difficulty;
1393 Coro::cede;
1262 $self->activate; 1394 $self->activate;
1263 } 1395 }
1264 1396
1265 Coro::cede;
1266
1267 $self->in_memory (cf::MAP_IN_MEMORY); 1397 $self->in_memory (cf::MAP_IN_MEMORY);
1398}
1399
1400sub customise_for {
1401 my ($self, $ob) = @_;
1402
1403 return find "~" . $ob->name . "/" . $self->{path}
1404 if $self->per_player;
1405
1406 $self
1407}
1408
1409# find and load all maps in the 3x3 area around a map
1410sub load_diag {
1411 my ($map) = @_;
1412
1413 my @diag; # diagonal neighbours
1414
1415 for (0 .. 3) {
1416 my $neigh = $map->tile_path ($_)
1417 or next;
1418 $neigh = find $neigh, $map
1419 or next;
1420 $neigh->load;
1421
1422 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1423 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1424 }
1425
1426 for (@diag) {
1427 my $neigh = find @$_
1428 or next;
1429 $neigh->load;
1430 }
1268} 1431}
1269 1432
1270sub find_sync { 1433sub find_sync {
1271 my ($path, $origin) = @_; 1434 my ($path, $origin) = @_;
1272 1435
1273 cf::sync_job { cf::map::find $path, $origin } 1436 cf::sync_job { find $path, $origin }
1274} 1437}
1275 1438
1276sub do_load_sync { 1439sub do_load_sync {
1277 my ($map) = @_; 1440 my ($map) = @_;
1278 1441
1279 cf::sync_job { $map->load }; 1442 cf::sync_job { $map->load };
1280} 1443}
1281 1444
1445our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async {
1447 while () {
1448 for my $path (keys %MAP_PREFETCH) {
1449 my $map = find $path
1450 or next;
1451 $map->load;
1452
1453 delete $MAP_PREFETCH{$path};
1454 }
1455 Coro::schedule;
1456 }
1457};
1458
1459sub find_async {
1460 my ($path, $origin) = @_;
1461
1462 $path = normalise $path, $origin && $origin->{path};
1463
1464 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 }
1467
1468 $MAP_PREFETCH{$path} = 0;
1469 $MAP_PREFETCHER->ready;
1470
1471 ()
1472}
1473
1282sub save { 1474sub save {
1283 my ($self) = @_; 1475 my ($self) = @_;
1284 1476
1285 my $lock = cf::lock_acquire "map_data:" . $self->path; 1477 my $lock = cf::lock_acquire "map_data:" . $self->path;
1286 1478
1287 $self->{last_save} = $cf::RUNTIME; 1479 $self->{last_save} = $cf::RUNTIME;
1288 1480
1289 return unless $self->dirty; 1481 return unless $self->dirty;
1290 1482
1291 my $save = $self->{path}->save_path; utf8::encode $save; 1483 my $save = $self->save_path; utf8::encode $save;
1292 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1484 my $uniq = $self->uniq_path; utf8::encode $uniq;
1293 1485
1294 $self->{load_path} = $save; 1486 $self->{load_path} = $save;
1295 1487
1296 return if $self->{deny_save}; 1488 return if $self->{deny_save};
1297 1489
1298 local $self->{last_access} = $self->last_access;#d# 1490 local $self->{last_access} = $self->last_access;#d#
1299 1491
1492 cf::async {
1493 $_->contr->save for $self->players;
1494 };
1495
1300 if ($uniq) { 1496 if ($uniq) {
1301 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1497 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1302 $self->save_objects ($uniq, cf::IO_UNIQUES); 1498 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1303 } else { 1499 } else {
1304 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1500 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1305 } 1501 }
1306} 1502}
1307 1503
1308sub swap_out { 1504sub swap_out {
1309 my ($self) = @_; 1505 my ($self) = @_;
1323 1519
1324sub reset_at { 1520sub reset_at {
1325 my ($self) = @_; 1521 my ($self) = @_;
1326 1522
1327 # TODO: safety, remove and allow resettable per-player maps 1523 # TODO: safety, remove and allow resettable per-player maps
1328 return 1e99 if $self->{path}{user_rel}; 1524 return 1e99 if $self->isa ("ext::map_per_player");#d#
1329 return 1e99 if $self->{deny_reset}; 1525 return 1e99 if $self->{deny_reset};
1330 1526
1331 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1527 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1332 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1528 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1333 1529
1338 my ($self) = @_; 1534 my ($self) = @_;
1339 1535
1340 $self->reset_at <= $cf::RUNTIME 1536 $self->reset_at <= $cf::RUNTIME
1341} 1537}
1342 1538
1343sub unlink_save {
1344 my ($self) = @_;
1345
1346 utf8::encode (my $save = $self->{path}->save_path);
1347 aioreq_pri 3; IO::AIO::aio_unlink $save;
1348 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1349}
1350
1351sub rename {
1352 my ($self, $new_path) = @_;
1353
1354 $self->unlink_save;
1355
1356 delete $cf::MAP{$self->path};
1357 $self->{path} = new cf::path $new_path;
1358 $self->path ($self->{path}->as_string);
1359 $cf::MAP{$self->path} = $self;
1360
1361 $self->save;
1362}
1363
1364sub reset { 1539sub reset {
1365 my ($self) = @_; 1540 my ($self) = @_;
1366 1541
1367 my $lock = cf::lock_acquire "map_data:" . $self->path; 1542 my $lock = cf::lock_acquire "map_data:$self->{path}";
1368 1543
1369 return if $self->players; 1544 return if $self->players;
1370 return if $self->{path}{user_rel};#d# 1545 return if $self->isa ("ext::map_per_player");#d#
1371 1546
1372 warn "resetting map ", $self->path;#d# 1547 warn "resetting map ", $self->path;#d#
1373 1548
1374 delete $cf::MAP{$self->path}; 1549 delete $cf::MAP{$self->path};
1550
1551 $self->in_memory (cf::MAP_SWAPPED);
1552 $self->clear;
1375 1553
1376 $_->clear_links_to ($self) for values %cf::MAP; 1554 $_->clear_links_to ($self) for values %cf::MAP;
1377 1555
1378 $self->unlink_save; 1556 $self->unlink_save;
1379 $self->destroy; 1557 $self->destroy;
1382my $nuke_counter = "aaaa"; 1560my $nuke_counter = "aaaa";
1383 1561
1384sub nuke { 1562sub nuke {
1385 my ($self) = @_; 1563 my ($self) = @_;
1386 1564
1565 delete $cf::MAP{$self->path};
1566
1567 $self->unlink_save;
1568
1569 bless $self, "cf::map";
1570 delete $self->{deny_reset};
1387 $self->{deny_save} = 1; 1571 $self->{deny_save} = 1;
1388 $self->reset_timeout (1); 1572 $self->reset_timeout (1);
1389 $self->rename ("{nuke}/" . ($nuke_counter++)); 1573 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1574
1575 $cf::MAP{$self->path} = $self;
1576
1390 $self->reset; # polite request, might not happen 1577 $self->reset; # polite request, might not happen
1391} 1578}
1392 1579
1393sub customise_for { 1580=item cf::map::unique_maps
1394 my ($map, $ob) = @_;
1395 1581
1396 if ($map->per_player) { 1582Returns an arrayref of paths of all shared maps that have
1397 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1583instantiated unique items. May block.
1398 }
1399 1584
1400 $map 1585=cut
1401}
1402 1586
1403sub emergency_save { 1587sub unique_maps() {
1404 my $freeze_guard = cf::freeze_mainloop; 1588 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1589 or return;
1405 1590
1406 warn "enter emergency map save\n"; 1591 my @paths;
1407 1592
1408 cf::sync_job { 1593 for (@$files) {
1409 warn "begin emergency map save\n"; 1594 utf8::decode $_;
1410 $_->save for values %cf::MAP; 1595 next if /\.pst$/;
1596 next unless /^$PATH_SEP/o;
1597
1598 s/\.map$//;
1599 push @paths, $_;
1411 }; 1600 }
1412 1601
1413 warn "end emergency map save\n"; 1602 \@paths
1414} 1603}
1415 1604
1416package cf; 1605package cf;
1417 1606
1418=back 1607=back
1419 1608
1609=head3 cf::object
1610
1611=cut
1612
1613package cf::object;
1614
1615=over 4
1616
1617=item $ob->inv_recursive
1618
1619Returns the inventory of the object _and_ their inventories, recursively.
1620
1621=cut
1622
1623sub inv_recursive_;
1624sub inv_recursive_ {
1625 map { $_, inv_recursive_ $_->inv } @_
1626}
1627
1628sub inv_recursive {
1629 inv_recursive_ inv $_[0]
1630}
1631
1632package cf;
1633
1634=back
1420 1635
1421=head3 cf::object::player 1636=head3 cf::object::player
1422 1637
1423=over 4 1638=over 4
1424 1639
1464 1679
1465=item $player_object->enter_link 1680=item $player_object->enter_link
1466 1681
1467Freezes the player and moves him/her to a special map (C<{link}>). 1682Freezes the player and moves him/her to a special map (C<{link}>).
1468 1683
1469The player should be reaosnably safe there for short amounts of time. You 1684The player should be reasonably safe there for short amounts of time. You
1470I<MUST> call C<leave_link> as soon as possible, though. 1685I<MUST> call C<leave_link> as soon as possible, though.
1471 1686
1687Will never block.
1688
1472=item $player_object->leave_link ($map, $x, $y) 1689=item $player_object->leave_link ($map, $x, $y)
1473 1690
1474Moves the player out of the specila link map onto the given map. If the 1691Moves the player out of the special C<{link}> map onto the specified
1475map is not valid (or omitted), the player will be moved back to the 1692map. If the map is not valid (or omitted), the player will be moved back
1476location he/she was before the call to C<enter_link>, or, if that fails, 1693to the location he/she was before the call to C<enter_link>, or, if that
1477to the emergency map position. 1694fails, to the emergency map position.
1478 1695
1479Might block. 1696Might block.
1480 1697
1481=cut 1698=cut
1699
1700sub link_map {
1701 unless ($LINK_MAP) {
1702 $LINK_MAP = cf::map::find "{link}"
1703 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1704 $LINK_MAP->load;
1705 }
1706
1707 $LINK_MAP
1708}
1482 1709
1483sub cf::object::player::enter_link { 1710sub cf::object::player::enter_link {
1484 my ($self) = @_; 1711 my ($self) = @_;
1485 1712
1486 $self->deactivate_recursive; 1713 $self->deactivate_recursive;
1487 1714
1488 return if $self->map == $LINK_MAP; 1715 return if UNIVERSAL::isa $self->map, "ext::map_link";
1489 1716
1490 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1491 if $self->map; 1718 if $self->map;
1492 1719
1493 $self->enter_map ($LINK_MAP, 20, 20); 1720 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1494} 1721}
1495 1722
1496sub cf::object::player::leave_link { 1723sub cf::object::player::leave_link {
1497 my ($self, $map, $x, $y) = @_; 1724 my ($self, $map, $x, $y) = @_;
1498 1725
1516 # use -1 or undef as default coordinates, not 0, 0 1743 # use -1 or undef as default coordinates, not 0, 0
1517 ($x, $y) = ($map->enter_x, $map->enter_y) 1744 ($x, $y) = ($map->enter_x, $map->enter_y)
1518 if $x <=0 && $y <= 0; 1745 if $x <=0 && $y <= 0;
1519 1746
1520 $map->load; 1747 $map->load;
1748 $map->load_diag;
1521 1749
1750 return unless $self->contr->active;
1522 $self->activate_recursive; 1751 $self->activate_recursive;
1523 $self->enter_map ($map, $x, $y); 1752 $self->enter_map ($map, $x, $y);
1524} 1753}
1525 1754
1526cf::player->attach ( 1755cf::player->attach (
1539 1768
1540 # try to abort aborted map switching on player login :) 1769 # try to abort aborted map switching on player login :)
1541 # should happen only on crashes 1770 # should happen only on crashes
1542 if ($pl->ob->{_link_pos}) { 1771 if ($pl->ob->{_link_pos}) {
1543 $pl->ob->enter_link; 1772 $pl->ob->enter_link;
1544 Coro::async_pool { 1773 (async {
1545 # we need this sleep as the login has a concurrent enter_exit running 1774 # we need this sleep as the login has a concurrent enter_exit running
1546 # and this sleep increases chances of the player not ending up in scorn 1775 # and this sleep increases chances of the player not ending up in scorn
1776 $pl->ob->reply (undef,
1777 "There was an internal problem at your last logout, "
1778 . "the server will try to bring you to your intended destination in a second.",
1779 cf::NDI_RED);
1547 Coro::Timer::sleep 1; 1780 Coro::Timer::sleep 1;
1548 $pl->ob->leave_link; 1781 $pl->ob->leave_link;
1549 }; 1782 })->prio (2);
1550 } 1783 }
1551 }, 1784 },
1552); 1785);
1553 1786
1554=item $player_object->goto ($path, $x, $y) 1787=item $player_object->goto ($path, $x, $y)
1558sub cf::object::player::goto { 1791sub cf::object::player::goto {
1559 my ($self, $path, $x, $y) = @_; 1792 my ($self, $path, $x, $y) = @_;
1560 1793
1561 $self->enter_link; 1794 $self->enter_link;
1562 1795
1563 (Coro::async_pool { 1796 (async {
1564 $path = new cf::path $path;
1565
1566 my $map = cf::map::find $path->as_string; 1797 my $map = cf::map::find $path;
1567 $map = $map->customise_for ($self) if $map; 1798 $map = $map->customise_for ($self) if $map;
1568 1799
1569# warn "entering ", $map->path, " at ($x, $y)\n" 1800# warn "entering ", $map->path, " at ($x, $y)\n"
1570# if $map; 1801# if $map;
1571 1802
1572 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1803 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1573 1804
1574 $self->leave_link ($map, $x, $y); 1805 $self->leave_link ($map, $x, $y);
1575 })->prio (1); 1806 })->prio (1);
1576} 1807}
1577 1808
1581 1812
1582sub parse_random_map_params { 1813sub parse_random_map_params {
1583 my ($spec) = @_; 1814 my ($spec) = @_;
1584 1815
1585 my $rmp = { # defaults 1816 my $rmp = { # defaults
1586 xsize => 10, 1817 xsize => -1,
1587 ysize => 10, 1818 ysize => -1,
1588 }; 1819 };
1589 1820
1590 for (split /\n/, $spec) { 1821 for (split /\n/, $spec) {
1591 my ($k, $v) = split /\s+/, $_, 2; 1822 my ($k, $v) = split /\s+/, $_, 2;
1592 1823
1614 1845
1615 $rmp->{random_seed} ||= $exit->random_seed; 1846 $rmp->{random_seed} ||= $exit->random_seed;
1616 1847
1617 my $data = cf::to_json $rmp; 1848 my $data = cf::to_json $rmp;
1618 my $md5 = Digest::MD5::md5_hex $data; 1849 my $md5 = Digest::MD5::md5_hex $data;
1850 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1619 1851
1620 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1852 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1621 aio_write $fh, 0, (length $data), $data, 0; 1853 aio_write $fh, 0, (length $data), $data, 0;
1854 undef $fh;
1855 aio_rename "$meta~", $meta;
1622 1856
1623 $exit->slaying ("?random/$md5"); 1857 $exit->slaying ("?random/$md5");
1624 $exit->msg (undef); 1858 $exit->msg (undef);
1625 } 1859 }
1626} 1860}
1630 1864
1631 return unless $self->type == cf::PLAYER; 1865 return unless $self->type == cf::PLAYER;
1632 1866
1633 $self->enter_link; 1867 $self->enter_link;
1634 1868
1635 (Coro::async_pool { 1869 (async {
1636 $self->deactivate_recursive; # just to be sure 1870 $self->deactivate_recursive; # just to be sure
1637 unless (eval { 1871 unless (eval {
1638 prepare_random_map $exit 1872 prepare_random_map $exit
1639 if $exit->slaying eq "/!"; 1873 if $exit->slaying eq "/!";
1640 1874
1641 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1875 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1642 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1876 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1643 1877
1644 1; 1878 1;
1645 }) { 1879 }) {
1646 $self->message ("Something went wrong deep within the crossfire server. " 1880 $self->message ("Something went wrong deep within the crossfire server. "
1647 . "I'll try to bring you back to the map you were before. " 1881 . "I'll try to bring you back to the map you were before. "
1648 . "Please report this to the dungeon master", 1882 . "Please report this to the dungeon master!",
1649 cf::NDI_UNIQUE | cf::NDI_RED); 1883 cf::NDI_UNIQUE | cf::NDI_RED);
1650 1884
1651 warn "ERROR in enter_exit: $@"; 1885 warn "ERROR in enter_exit: $@";
1652 $self->leave_link; 1886 $self->leave_link;
1653 } 1887 }
1721 } 1955 }
1722 } 1956 }
1723 }, 1957 },
1724); 1958);
1725 1959
1726=item $client->coro (\&cb) 1960=item $client->async (\&cb)
1727 1961
1728Create a new coroutine, running the specified callback. The coroutine will 1962Create a new coroutine, running the specified callback. The coroutine will
1729be automatically cancelled when the client gets destroyed (e.g. on logout, 1963be automatically cancelled when the client gets destroyed (e.g. on logout,
1730or loss of connection). 1964or loss of connection).
1731 1965
1732=cut 1966=cut
1733 1967
1734sub cf::client::coro { 1968sub cf::client::async {
1735 my ($self, $cb) = @_; 1969 my ($self, $cb) = @_;
1736 1970
1737 my $coro = &Coro::async_pool ($cb); 1971 my $coro = &Coro::async ($cb);
1738 1972
1739 $coro->on_destroy (sub { 1973 $coro->on_destroy (sub {
1740 delete $self->{_coro}{$coro+0}; 1974 delete $self->{_coro}{$coro+0};
1741 }); 1975 });
1742 1976
1980 local $/; 2214 local $/;
1981 *CFG = YAML::Syck::Load <$fh>; 2215 *CFG = YAML::Syck::Load <$fh>;
1982 2216
1983 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2217 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1984 2218
2219 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2220 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2221
1985 if (exists $CFG{mlockall}) { 2222 if (exists $CFG{mlockall}) {
1986 eval { 2223 eval {
1987 $CFG{mlockall} ? &mlockall : &munlockall 2224 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1988 and die "WARNING: m(un)lockall failed: $!\n"; 2225 and die "WARNING: m(un)lockall failed: $!\n";
1989 }; 2226 };
1990 warn $@ if $@; 2227 warn $@ if $@;
1991 } 2228 }
1992} 2229}
1993 2230
1994sub main { 2231sub main {
1995 # we must not ever block the main coroutine 2232 # we must not ever block the main coroutine
1996 local $Coro::idle = sub { 2233 local $Coro::idle = sub {
1997 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2234 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1998 (Coro::unblock_sub { 2235 (async {
1999 Event::one_event; 2236 Event::one_event;
2000 })->(); 2237 })->prio (Coro::PRIO_MAX);
2001 }; 2238 };
2002 2239
2003 cfg_load; 2240 cfg_load;
2004 db_load; 2241 db_load;
2005 load_extensions; 2242 load_extensions;
2006 Event::loop; 2243 Event::loop;
2007} 2244}
2008 2245
2009############################################################################# 2246#############################################################################
2010# initialisation 2247# initialisation and cleanup
2248
2249# install some emergency cleanup handlers
2250BEGIN {
2251 for my $signal (qw(INT HUP TERM)) {
2252 Event->signal (
2253 data => WF_AUTOCANCEL,
2254 signal => $signal,
2255 cb => sub {
2256 cf::cleanup "SIG$signal";
2257 },
2258 );
2259 }
2260}
2261
2262sub emergency_save() {
2263 my $freeze_guard = cf::freeze_mainloop;
2264
2265 warn "enter emergency perl save\n";
2266
2267 cf::sync_job {
2268 # use a peculiar iteration method to avoid tripping on perl
2269 # refcount bugs in for. also avoids problems with players
2270 # and maps saved/destroyed asynchronously.
2271 warn "begin emergency player save\n";
2272 for my $login (keys %cf::PLAYER) {
2273 my $pl = $cf::PLAYER{$login} or next;
2274 $pl->valid or next;
2275 $pl->save;
2276 }
2277 warn "end emergency player save\n";
2278
2279 warn "begin emergency map save\n";
2280 for my $path (keys %cf::MAP) {
2281 my $map = $cf::MAP{$path} or next;
2282 $map->valid or next;
2283 $map->save;
2284 }
2285 warn "end emergency map save\n";
2286 };
2287
2288 warn "leave emergency perl save\n";
2289}
2011 2290
2012sub reload() { 2291sub reload() {
2013 # can/must only be called in main 2292 # can/must only be called in main
2014 if ($Coro::current != $Coro::main) { 2293 if ($Coro::current != $Coro::main) {
2015 warn "can only reload from main coroutine\n"; 2294 warn "can only reload from main coroutine\n";
2016 return; 2295 return;
2017 } 2296 }
2018 2297
2019 warn "reloading..."; 2298 warn "reloading...";
2020 2299
2300 warn "freezing server";
2021 my $guard = freeze_mainloop; 2301 my $guard = freeze_mainloop;
2022 cf::emergency_save; 2302 cf::emergency_save;
2023 2303
2304 warn "sync database to disk";
2305 cf::db_sync;
2306 IO::AIO::flush;
2307
2024 eval { 2308 eval {
2025 # if anything goes wrong in here, we should simply crash as we already saved 2309 # if anything goes wrong in here, we should simply crash as we already saved
2026 2310
2027 # cancel all watchers 2311 warn "cancel all watchers";
2028 for (Event::all_watchers) { 2312 for (Event::all_watchers) {
2029 $_->cancel if $_->data & WF_AUTOCANCEL; 2313 $_->cancel if $_->data & WF_AUTOCANCEL;
2030 } 2314 }
2031 2315
2032 # cancel all extension coros 2316 warn "cancel all extension coros";
2033 $_->cancel for values %EXT_CORO; 2317 $_->cancel for values %EXT_CORO;
2034 %EXT_CORO = (); 2318 %EXT_CORO = ();
2035 2319
2320 warn "remove commands";
2321 %COMMAND = ();
2322
2323 warn "remove ext commands";
2324 %EXTCMD = ();
2325
2036 # unload all extensions 2326 warn "unload/nuke all extensions";
2037 for (@exts) { 2327 for my $pkg (@EXTS) {
2038 warn "unloading <$_>"; 2328 warn "... unloading $pkg";
2039 unload_extension $_; 2329
2330 if (my $cb = $pkg->can ("unload")) {
2331 eval {
2332 $cb->($pkg);
2333 1
2334 } or warn "$pkg unloaded, but with errors: $@";
2040 } 2335 }
2041 2336
2337 warn "... nuking $pkg";
2338 Symbol::delete_package $pkg;
2339 }
2340
2042 # unload all modules loaded from $LIBDIR 2341 warn "unload all perl modules loaded from $LIBDIR";
2043 while (my ($k, $v) = each %INC) { 2342 while (my ($k, $v) = each %INC) {
2044 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2343 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2045 2344
2046 warn "removing <$k>"; 2345 warn "removing <$k>";
2047 delete $INC{$k}; 2346 delete $INC{$k};
2054 } 2353 }
2055 2354
2056 Symbol::delete_package $k; 2355 Symbol::delete_package $k;
2057 } 2356 }
2058 2357
2059 # sync database to disk
2060 cf::db_sync;
2061 IO::AIO::flush;
2062
2063 # get rid of safe::, as good as possible 2358 warn "get rid of safe::, as good as possible";
2064 Symbol::delete_package "safe::$_" 2359 Symbol::delete_package "safe::$_"
2065 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2360 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2066 2361
2067 # remove register_script_function callbacks
2068 # TODO
2069
2070 # unload cf.pm "a bit" 2362 warn "unload cf.pm \"a bit\"";
2071 delete $INC{"cf.pm"}; 2363 delete $INC{"cf.pm"};
2072 2364
2073 # don't, removes xs symbols, too, 2365 # don't, removes xs symbols, too,
2074 # and global variables created in xs 2366 # and global variables created in xs
2075 #Symbol::delete_package __PACKAGE__; 2367 #Symbol::delete_package __PACKAGE__;
2076 2368
2077 # reload cf.pm
2078 warn "reloading cf.pm"; 2369 warn "reloading cf.pm";
2079 require cf; 2370 require cf;
2080 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2371 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2081 2372
2082 # load config and database again 2373 warn "load config and database again";
2083 cf::cfg_load; 2374 cf::cfg_load;
2084 cf::db_load; 2375 cf::db_load;
2085 2376
2086 # load extensions
2087 warn "load extensions"; 2377 warn "load extensions";
2088 cf::load_extensions; 2378 cf::load_extensions;
2089 2379
2090 # reattach attachments to objects 2380 warn "reattach attachments to objects/players";
2091 warn "reattach";
2092 _global_reattach; 2381 _global_reattach;
2382 warn "reattach attachments to maps";
2383 reattach $_ for values %MAP;
2093 }; 2384 };
2094 2385
2095 if ($@) { 2386 if ($@) {
2096 warn $@; 2387 warn $@;
2097 warn "error while reloading, exiting."; 2388 warn "error while reloading, exiting.";
2098 exit 1; 2389 exit 1;
2099 } 2390 }
2100 2391
2101 warn "reloaded successfully"; 2392 warn "reloaded";
2102}; 2393};
2103 2394
2104############################################################################# 2395our $RELOAD_WATCHER; # used only during reload
2105
2106unless ($LINK_MAP) {
2107 $LINK_MAP = cf::map::new;
2108
2109 $LINK_MAP->width (41);
2110 $LINK_MAP->height (41);
2111 $LINK_MAP->alloc;
2112 $LINK_MAP->path ("{link}");
2113 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2114 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2115
2116 # dirty hack because... archetypes are not yet loaded
2117 Event->timer (
2118 after => 2,
2119 cb => sub {
2120 $_[0]->w->cancel;
2121
2122 # provide some exits "home"
2123 my $exit = cf::object::new "exit";
2124
2125 $exit->slaying ($EMERGENCY_POSITION->[0]);
2126 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2127 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2128
2129 $LINK_MAP->insert ($exit->clone, 19, 19);
2130 $LINK_MAP->insert ($exit->clone, 19, 20);
2131 $LINK_MAP->insert ($exit->clone, 19, 21);
2132 $LINK_MAP->insert ($exit->clone, 20, 19);
2133 $LINK_MAP->insert ($exit->clone, 20, 21);
2134 $LINK_MAP->insert ($exit->clone, 21, 19);
2135 $LINK_MAP->insert ($exit->clone, 21, 20);
2136 $LINK_MAP->insert ($exit->clone, 21, 21);
2137
2138 $exit->destroy;
2139 });
2140
2141 $LINK_MAP->{deny_save} = 1;
2142 $LINK_MAP->{deny_reset} = 1;
2143
2144 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2145}
2146
2147register "<global>", __PACKAGE__;
2148 2396
2149register_command "reload" => sub { 2397register_command "reload" => sub {
2150 my ($who, $arg) = @_; 2398 my ($who, $arg) = @_;
2151 2399
2152 if ($who->flag (FLAG_WIZ)) { 2400 if ($who->flag (FLAG_WIZ)) {
2153 $who->message ("start of reload."); 2401 $who->message ("reloading server.");
2402
2403 # doing reload synchronously and two reloads happen back-to-back,
2404 # coro crashes during coro_state_free->destroy here.
2405
2406 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2154 reload; 2407 reload;
2155 $who->message ("end of reload."); 2408 undef $RELOAD_WATCHER;
2409 });
2156 } 2410 }
2157}; 2411};
2158 2412
2159unshift @INC, $LIBDIR; 2413unshift @INC, $LIBDIR;
2160 2414
2162 reentrant => 0, 2416 reentrant => 0,
2163 prio => 0, 2417 prio => 0,
2164 at => $NEXT_TICK || $TICK, 2418 at => $NEXT_TICK || $TICK,
2165 data => WF_AUTOCANCEL, 2419 data => WF_AUTOCANCEL,
2166 cb => sub { 2420 cb => sub {
2421 $NOW = Event::time;
2422
2167 cf::server_tick; # one server iteration 2423 cf::server_tick; # one server iteration
2168 $RUNTIME += $TICK; 2424 $RUNTIME += $TICK;
2169 $NEXT_TICK += $TICK; 2425 $NEXT_TICK += $TICK;
2426
2427 $WAIT_FOR_TICK->broadcast;
2428 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2170 2429
2171 # if we are delayed by four ticks or more, skip them all 2430 # if we are delayed by four ticks or more, skip them all
2172 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2431 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2173 2432
2174 $TICK_WATCHER->at ($NEXT_TICK); 2433 $TICK_WATCHER->at ($NEXT_TICK);
2176 }, 2435 },
2177); 2436);
2178 2437
2179IO::AIO::max_poll_time $TICK * 0.2; 2438IO::AIO::max_poll_time $TICK * 0.2;
2180 2439
2181Event->io ( 2440$AIO_POLL_WATCHER = Event->io (
2182 fd => IO::AIO::poll_fileno, 2441 fd => IO::AIO::poll_fileno,
2183 poll => 'r', 2442 poll => 'r',
2184 prio => 5, 2443 prio => 5,
2185 data => WF_AUTOCANCEL, 2444 data => WF_AUTOCANCEL,
2186 cb => \&IO::AIO::poll_cb, 2445 cb => \&IO::AIO::poll_cb,
2187); 2446);
2188 2447
2189Event->timer ( 2448$WRITE_RUNTIME_WATCHER = Event->timer (
2190 data => WF_AUTOCANCEL, 2449 data => WF_AUTOCANCEL,
2191 after => 0, 2450 after => 0,
2192 interval => 10, 2451 interval => 10,
2193 cb => sub { 2452 cb => sub {
2194 (Coro::unblock_sub { 2453 (Coro::unblock_sub {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines