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.140 by root, Fri Jan 5 20:04:02 2007 UTC vs.
Revision 1.184 by root, Fri Jan 19 22:47:57 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 (Coro::PRIO_MAX); # 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 35
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34
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}
233 272
234=item cf::async { BLOCK } 273=item cf::async { BLOCK }
273 warn $@ if $@; 312 warn $@ if $@;
274 undef $busy; 313 undef $busy;
275 })->prio (Coro::PRIO_MAX); 314 })->prio (Coro::PRIO_MAX);
276 315
277 while ($busy) { 316 while ($busy) {
278 unless (Coro::cede) { 317 Coro::cede or Event::one_event;
279 Coro::nready ? Event::one_event 0 : Event::one_event;
280 Coro::cede_notself unless Coro::cede;
281 }
282 } 318 }
283 319
284 wantarray ? @res : $res[0] 320 wantarray ? @res : $res[0]
285 } else { 321 } else {
286 # we are in another coroutine, how wonderful, everything just works 322 # we are in another coroutine, how wonderful, everything just works
289 } 325 }
290} 326}
291 327
292=item $coro = cf::async_ext { BLOCK } 328=item $coro = cf::async_ext { BLOCK }
293 329
294Like async, but this coro is automcatially being canceled when the 330Like async, but this coro is automatically being canceled when the
295extension calling this is being unloaded. 331extension calling this is being unloaded.
296 332
297=cut 333=cut
298 334
299sub async_ext(&) { 335sub async_ext(&) {
332} 368}
333 369
334=back 370=back
335 371
336=cut 372=cut
337
338#############################################################################
339
340package cf::path;
341
342sub new {
343 my ($class, $path, $base) = @_;
344
345 $path = $path->as_string if ref $path;
346
347 my $self = bless { }, $class;
348
349 # {... are special paths that are not touched
350 # ?xxx/... are special absolute paths
351 # ?random/... random maps
352 # /! non-realised random map exit
353 # /... normal maps
354 # ~/... per-player maps without a specific player (DO NOT USE)
355 # ~user/... per-player map of a specific user
356
357 if ($path =~ /^{/) {
358 # fine as it is
359 } elsif ($path =~ s{^\?random/}{}) {
360 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
361 $self->{random} = cf::from_json $data;
362 } else {
363 if ($path =~ s{^~([^/]+)?}{}) {
364 $self->{user_rel} = 1;
365
366 if (defined $1) {
367 $self->{user} = $1;
368 } elsif ($base =~ m{^~([^/]+)/}) {
369 $self->{user} = $1;
370 } else {
371 warn "cannot resolve user-relative path without user <$path,$base>\n";
372 }
373 } elsif ($path =~ /^\//) {
374 # already absolute
375 } else {
376 $base =~ s{[^/]+/?$}{};
377 return $class->new ("$base/$path");
378 }
379
380 for ($path) {
381 redo if s{/\.?/}{/};
382 redo if s{/[^/]+/\.\./}{/};
383 }
384 }
385
386 $self->{path} = $path;
387
388 $self
389}
390
391# the name / primary key / in-game path
392sub as_string {
393 my ($self) = @_;
394
395 $self->{user_rel} ? "~$self->{user}$self->{path}"
396 : $self->{random} ? "?random/$self->{path}"
397 : $self->{path}
398}
399
400# the displayed name, this is a one way mapping
401sub visible_name {
402 my ($self) = @_;
403
404# if (my $rmp = $self->{random}) {
405# # todo: be more intelligent about this
406# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
407# } else {
408 $self->as_string
409# }
410}
411
412# escape the /'s in the path
413sub _escaped_path {
414 # ∕ is U+2215
415 (my $path = $_[0]{path}) =~ s/\//∕/g;
416 $path
417}
418
419# the original (read-only) location
420sub load_path {
421 my ($self) = @_;
422
423 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
424}
425
426# the temporary/swap location
427sub save_path {
428 my ($self) = @_;
429
430 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
431 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
432 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
433}
434
435# the unique path, might be eq to save_path
436sub uniq_path {
437 my ($self) = @_;
438
439 $self->{user_rel} || $self->{random}
440 ? undef
441 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
442}
443
444# return random map parameters, or undef
445sub random_map_params {
446 my ($self) = @_;
447
448 $self->{random}
449}
450
451# this is somewhat ugly, but style maps do need special treatment
452sub is_style_map {
453 $_[0]{path} =~ m{^/styles/}
454}
455
456package cf;
457 373
458############################################################################# 374#############################################################################
459 375
460=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
461 377
587our @CB_TYPE = (); # registry for type (cf-object class) based events 503our @CB_TYPE = (); # registry for type (cf-object class) based events
588our @CB_MAP = (); 504our @CB_MAP = ();
589 505
590my %attachment; 506my %attachment;
591 507
508sub cf::attachable::thawer_merge {
509 # simply override everything except _meta
510 local $_[0]{_meta};
511 %{$_[0]} = %{$_[1]};
512}
513
592sub _attach_cb($$$$) { 514sub _attach_cb($$$$) {
593 my ($registry, $event, $prio, $cb) = @_; 515 my ($registry, $event, $prio, $cb) = @_;
594 516
595 use sort 'stable'; 517 use sort 'stable';
596 518
767# object support 689# object support
768 690
769sub reattach { 691sub reattach {
770 # basically do the same as instantiate, without calling instantiate 692 # basically do the same as instantiate, without calling instantiate
771 my ($obj) = @_; 693 my ($obj) = @_;
694
695 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
772 696
773 my $registry = $obj->registry; 697 my $registry = $obj->registry;
774 698
775 @$registry = (); 699 @$registry = ();
776 700
908=cut 832=cut
909 833
910sub register_extcmd { 834sub register_extcmd {
911 my ($name, $cb) = @_; 835 my ($name, $cb) = @_;
912 836
913 my $caller = caller;
914 #warn "registering extcmd '$name' to '$caller'";
915
916 $EXTCMD{$name} = [$cb, $caller]; 837 $EXTCMD{$name} = $cb;
917} 838}
918 839
919cf::player->attach ( 840cf::player->attach (
920 on_command => sub { 841 on_command => sub {
921 my ($pl, $name, $params) = @_; 842 my ($pl, $name, $params) = @_;
934 855
935 my $msg = eval { from_json $buf }; 856 my $msg = eval { from_json $buf };
936 857
937 if (ref $msg) { 858 if (ref $msg) {
938 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 859 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
939 if (my %reply = $cb->[0]->($pl, $msg)) { 860 if (my %reply = $cb->($pl, $msg)) {
940 $pl->ext_reply ($msg->{msgid}, %reply); 861 $pl->ext_reply ($msg->{msgid}, %reply);
941 } 862 }
942 } 863 }
943 } else { 864 } else {
944 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 865 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
946 867
947 cf::override; 868 cf::override;
948 }, 869 },
949); 870);
950 871
951sub register {
952 my ($base, $pkg) = @_;
953
954 #TODO
955}
956
957sub load_extension { 872sub load_extension {
958 my ($path) = @_; 873 my ($path) = @_;
959 874
960 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 875 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
961 my $base = $1; 876 my $base = $1;
962 my $pkg = $1; 877 my $pkg = $1;
963 $pkg =~ s/[^[:word:]]/_/g; 878 $pkg =~ s/[^[:word:]]/_/g;
964 $pkg = "ext::$pkg"; 879 $pkg = "ext::$pkg";
965 880
966 warn "loading '$path' into '$pkg'\n"; 881 warn "... loading '$path' into '$pkg'\n";
967 882
968 open my $fh, "<:utf8", $path 883 open my $fh, "<:utf8", $path
969 or die "$path: $!"; 884 or die "$path: $!";
970 885
971 my $source = 886 my $source =
972 "package $pkg; use strict; use utf8;\n" 887 "package $pkg; use strict; use utf8;\n"
973 . "#line 1 \"$path\"\n{\n" 888 . "#line 1 \"$path\"\n{\n"
974 . (do { local $/; <$fh> }) 889 . (do { local $/; <$fh> })
975 . "\n};\n1"; 890 . "\n};\n1";
976 891
977 eval $source 892 unless (eval $source) {
978 or die $@ ? "$path: $@\n" 893 my $msg = $@ ? "$path: $@\n"
979 : "extension disabled.\n"; 894 : "extension disabled.\n";
980 895 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
981 push @exts, $pkg; 896 warn $@;
982 $ext_pkg{$base} = $pkg; 897 warn "mandatory extension failed to load, exiting.\n";
983 898 exit 1;
984# no strict 'refs'; 899 }
985# @{"$pkg\::ISA"} = ext::; 900 die $@;
986
987 register $base, $pkg;
988}
989
990sub unload_extension {
991 my ($pkg) = @_;
992
993 warn "removing extension $pkg\n";
994
995 # remove hooks
996 #TODO
997# for my $idx (0 .. $#PLUGIN_EVENT) {
998# delete $hook[$idx]{$pkg};
999# } 901 }
1000 902
1001 # remove commands 903 push @EXTS, $pkg;
1002 for my $name (keys %COMMAND) {
1003 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1004
1005 if (@cb) {
1006 $COMMAND{$name} = \@cb;
1007 } else {
1008 delete $COMMAND{$name};
1009 }
1010 }
1011
1012 # remove extcmds
1013 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1014 delete $EXTCMD{$name};
1015 }
1016
1017 if (my $cb = $pkg->can ("unload")) {
1018 eval {
1019 $cb->($pkg);
1020 1
1021 } or warn "$pkg unloaded, but with errors: $@";
1022 }
1023
1024 Symbol::delete_package $pkg;
1025} 904}
1026 905
1027sub load_extensions { 906sub load_extensions {
1028 for my $ext (<$LIBDIR/*.ext>) { 907 for my $ext (<$LIBDIR/*.ext>) {
1029 next unless -r $ext; 908 next unless -r $ext;
1033 } or warn "$ext not loaded: $@"; 912 } or warn "$ext not loaded: $@";
1034 } 913 }
1035} 914}
1036 915
1037############################################################################# 916#############################################################################
1038# load/save/clean perl data associated with a map
1039
1040*cf::mapsupport::on_clean = sub {
1041 my ($map) = @_;
1042
1043 my $path = $map->tmpname;
1044 defined $path or return;
1045
1046 unlink "$path.pst";
1047};
1048
1049cf::map->attach (prio => -10000, package => cf::mapsupport::);
1050
1051#############################################################################
1052# load/save perl data associated with player->ob objects
1053
1054sub all_objects(@) {
1055 @_, map all_objects ($_->inv), @_
1056}
1057
1058# TODO: compatibility cruft, remove when no longer needed
1059cf::player->attach (
1060 on_load => sub {
1061 my ($pl, $path) = @_;
1062
1063 for my $o (all_objects $pl->ob) {
1064 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1065 $o->set_ob_key_value ("_perl_data");
1066
1067 %$o = %{ Storable::thaw pack "H*", $value };
1068 }
1069 }
1070 },
1071);
1072
1073#############################################################################
1074 917
1075=head2 CORE EXTENSIONS 918=head2 CORE EXTENSIONS
1076 919
1077Functions and methods that extend core crossfire objects. 920Functions and methods that extend core crossfire objects.
1078 921
922=cut
923
924package cf::player;
925
926use Coro::AIO;
927
1079=head3 cf::player 928=head3 cf::player
1080 929
1081=over 4 930=over 4
1082 931
1083=item cf::player::exists $login 932=item cf::player::find $login
1084 933
1085Returns true when the given account exists. 934Returns the given player object, loading it if necessary (might block).
1086 935
1087=cut 936=cut
1088 937
1089sub cf::player::exists($) { 938sub playerdir($) {
1090 cf::player::find $_[0] 939 cf::localdir
1091 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 path $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
1092} 1085}
1093 1086
1094=item $player->ext_reply ($msgid, $msgtype, %msg) 1087=item $player->ext_reply ($msgid, $msgtype, %msg)
1095 1088
1096Sends an ext reply to the player. 1089Sends an ext reply to the player.
1097 1090
1098=cut 1091=cut
1099 1092
1100sub cf::player::ext_reply($$$%) { 1093sub ext_reply($$$%) {
1101 my ($self, $id, %msg) = @_; 1094 my ($self, $id, %msg) = @_;
1102 1095
1103 $msg{msgid} = $id; 1096 $msg{msgid} = $id;
1104 1097
1105 $self->send ("ext " . to_json \%msg); 1098 $self->send ("ext " . cf::to_json \%msg);
1106} 1099}
1100
1101package cf;
1107 1102
1108=back 1103=back
1109 1104
1110 1105
1111=head3 cf::map 1106=head3 cf::map
1117package cf::map; 1112package cf::map;
1118 1113
1119use Fcntl; 1114use Fcntl;
1120use Coro::AIO; 1115use Coro::AIO;
1121 1116
1117use overload
1118 '""' => \&as_string,
1119 fallback => 1;
1120
1122our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1123our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1124 1123
1125sub generate_random_map { 1124sub generate_random_map {
1126 my ($path, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1127
1128 # mit "rum" bekleckern, nicht 1126 # mit "rum" bekleckern, nicht
1129 cf::map::_create_random_map 1127 $self->_create_random_map (
1130 $path,
1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1134 $rmp->{exit_on_final_map}, 1131 $rmp->{exit_on_final_map},
1135 $rmp->{xsize}, $rmp->{ysize}, 1132 $rmp->{xsize}, $rmp->{ysize},
1136 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1133 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1137 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1134 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1138 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1135 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1139 $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},
1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1141 (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
1142} 1257}
1143 1258
1144# and all this just because we cannot iterate over 1259# and all this just because we cannot iterate over
1145# all maps in C++... 1260# all maps in C++...
1146sub change_all_map_light { 1261sub change_all_map_light {
1148 1263
1149 $_->change_map_light ($change) 1264 $_->change_map_light ($change)
1150 for grep $_->outdoor, values %cf::MAP; 1265 for grep $_->outdoor, values %cf::MAP;
1151} 1266}
1152 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
1153sub try_load_header($) { 1276sub load_header_from($) {
1154 my ($path) = @_; 1277 my ($self, $path) = @_;
1155 1278
1156 utf8::encode $path; 1279 utf8::encode $path;
1157 aio_open $path, O_RDONLY, 0 1280 aio_open $path, O_RDONLY, 0
1158 or return; 1281 or return;
1159 1282
1160 my $map = cf::map::new 1283 $self->_load_header ($path)
1161 or return; 1284 or return;
1162 1285
1163 # for better error messages only, will be overwritten 1286 $self->{load_path} = $path;
1164 $map->path ($path);
1165 1287
1166 $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
1167 or return; 1314 or return;
1168 1315
1169 $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 }
1170 1321
1171 $map 1322 1
1172} 1323}
1173 1324
1174sub find; 1325sub find;
1175sub find { 1326sub find {
1176 my ($path, $origin) = @_; 1327 my ($path, $origin) = @_;
1177 1328
1178 #warn "find<$path,$origin>\n";#d#
1179
1180 $path = new cf::path $path, $origin && $origin->path; 1329 $path = normalise $path, $origin && $origin->path;
1181 my $key = $path->as_string;
1182 1330
1183 cf::lock_wait "map_find:$key"; 1331 cf::lock_wait "map_find:$path";
1184 1332
1185 $cf::MAP{$key} || do { 1333 $cf::MAP{$path} || do {
1186 my $guard = cf::lock_acquire "map_find:$key"; 1334 my $guard = cf::lock_acquire "map_find:$path";
1187 1335 my $map = new_from_path cf::map $path
1188 # do it the slow way
1189 my $map = try_load_header $path->save_path;
1190
1191 Coro::cede;
1192
1193 if ($map) {
1194 $map->last_access ((delete $map->{last_access})
1195 || $cf::RUNTIME); #d#
1196 # safety
1197 $map->{instantiate_time} = $cf::RUNTIME
1198 if $map->{instantiate_time} > $cf::RUNTIME;
1199 } else {
1200 if (my $rmp = $path->random_map_params) {
1201 $map = generate_random_map $key, $rmp;
1202 } else {
1203 $map = try_load_header $path->load_path;
1204 }
1205
1206 $map or return; 1336 or return;
1207 1337
1208 $map->{load_original} = 1;
1209 $map->{instantiate_time} = $cf::RUNTIME;
1210 $map->last_access ($cf::RUNTIME);
1211 $map->instantiate;
1212
1213 # per-player maps become, after loading, normal maps
1214 $map->per_player (0) if $path->{user_rel};
1215 }
1216
1217 $map->path ($key);
1218 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME; 1338 $map->{last_save} = $cf::RUNTIME;
1220 1339
1221 Coro::cede; 1340 $map->load_header
1341 or return;
1222 1342
1223 if ($map->should_reset) { 1343 if ($map->should_reset) {
1344 $cf::WAIT_FOR_TICK->wait;
1224 $map->reset; 1345 $map->reset;
1225 undef $guard; 1346 undef $guard;
1226 $map = find $path 1347 $map = find $path
1227 or return; 1348 or return;
1228 } 1349 }
1229 1350
1230 $cf::MAP{$key} = $map 1351 $cf::MAP{$path} = $map
1231 } 1352 }
1232} 1353}
1233 1354
1234sub load { 1355sub load {
1235 my ($self) = @_; 1356 my ($self) = @_;
1236 1357
1237 my $path = $self->{path}; 1358 my $path = $self->{path};
1238 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1359 my $guard = cf::lock_acquire "map_load:$path";
1239 1360
1240 return if $self->in_memory != cf::MAP_SWAPPED; 1361 return if $self->in_memory != cf::MAP_SWAPPED;
1241 1362
1242 $self->in_memory (cf::MAP_LOADING); 1363 $self->in_memory (cf::MAP_LOADING);
1243 1364
1244 $self->alloc; 1365 $self->alloc;
1245 $self->load_objects ($self->{load_path}, 1) 1366 $self->_load_objects ($self->{load_path}, 1)
1246 or return; 1367 or return;
1247 1368
1248 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1249 if delete $self->{load_original}; 1370 if delete $self->{load_original};
1250 1371
1251 if (my $uniq = $path->uniq_path) { 1372 if (my $uniq = $self->uniq_path) {
1252 utf8::encode $uniq; 1373 utf8::encode $uniq;
1253 if (aio_open $uniq, O_RDONLY, 0) { 1374 if (aio_open $uniq, O_RDONLY, 0) {
1254 $self->clear_unique_items; 1375 $self->clear_unique_items;
1255 $self->load_objects ($uniq, 0); 1376 $self->_load_objects ($uniq, 0);
1256 } 1377 }
1257 } 1378 }
1258 1379
1259 Coro::cede; 1380 Coro::cede;
1260 1381
1261 # now do the right thing for maps 1382 # now do the right thing for maps
1262 $self->link_multipart_objects; 1383 $self->link_multipart_objects;
1263 1384
1264 if ($self->{path}->is_style_map) { 1385 unless ($self->{deny_activate}) {
1265 $self->{deny_save} = 1; 1386 $self->decay_objects;
1266 $self->{deny_reset} = 1;
1267 } else {
1268 $self->fix_auto_apply; 1387 $self->fix_auto_apply;
1269 $self->decay_objects;
1270 $self->update_buttons; 1388 $self->update_buttons;
1389 Coro::cede;
1271 $self->set_darkness_map; 1390 $self->set_darkness_map;
1272 $self->difficulty ($self->estimate_difficulty) 1391 $self->difficulty ($self->estimate_difficulty)
1273 unless $self->difficulty; 1392 unless $self->difficulty;
1393 Coro::cede;
1274 $self->activate; 1394 $self->activate;
1275 } 1395 }
1276 1396
1277 Coro::cede;
1278
1279 $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 }
1280} 1431}
1281 1432
1282sub find_sync { 1433sub find_sync {
1283 my ($path, $origin) = @_; 1434 my ($path, $origin) = @_;
1284 1435
1285 cf::sync_job { cf::map::find $path, $origin } 1436 cf::sync_job { find $path, $origin }
1286} 1437}
1287 1438
1288sub do_load_sync { 1439sub do_load_sync {
1289 my ($map) = @_; 1440 my ($map) = @_;
1290 1441
1291 cf::sync_job { $map->load }; 1442 cf::sync_job { $map->load };
1292} 1443}
1293 1444
1445our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = undef;
1447
1448sub find_async {
1449 my ($path, $origin) = @_;
1450
1451 $path = normalise $path, $origin && $origin->{path};
1452
1453 if (my $map = $cf::MAP{$path}) {
1454 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1455 }
1456
1457 undef $MAP_PREFETCH{$path};
1458 $MAP_PREFETCHER ||= cf::async {
1459 while (%MAP_PREFETCH) {
1460 for my $path (keys %MAP_PREFETCH) {
1461 my $map = find $path
1462 or next;
1463 $map->load;
1464
1465 delete $MAP_PREFETCH{$path};
1466 }
1467 }
1468 undef $MAP_PREFETCHER;
1469 };
1470
1471 ()
1472}
1473
1294sub save { 1474sub save {
1295 my ($self) = @_; 1475 my ($self) = @_;
1296 1476
1297 my $lock = cf::lock_acquire "map_data:" . $self->path; 1477 my $lock = cf::lock_acquire "map_data:" . $self->path;
1298 1478
1299 $self->{last_save} = $cf::RUNTIME; 1479 $self->{last_save} = $cf::RUNTIME;
1300 1480
1301 return unless $self->dirty; 1481 return unless $self->dirty;
1302 1482
1303 my $save = $self->{path}->save_path; utf8::encode $save; 1483 my $save = $self->save_path; utf8::encode $save;
1304 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1484 my $uniq = $self->uniq_path; utf8::encode $uniq;
1305 1485
1306 $self->{load_path} = $save; 1486 $self->{load_path} = $save;
1307 1487
1308 return if $self->{deny_save}; 1488 return if $self->{deny_save};
1309 1489
1310 local $self->{last_access} = $self->last_access;#d# 1490 local $self->{last_access} = $self->last_access;#d#
1311 1491
1492 cf::async {
1493 $_->contr->save for $self->players;
1494 };
1495
1312 if ($uniq) { 1496 if ($uniq) {
1313 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1497 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1314 $self->save_objects ($uniq, cf::IO_UNIQUES); 1498 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1315 } else { 1499 } else {
1316 $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);
1317 } 1501 }
1318} 1502}
1319 1503
1320sub swap_out { 1504sub swap_out {
1321 my ($self) = @_; 1505 my ($self) = @_;
1335 1519
1336sub reset_at { 1520sub reset_at {
1337 my ($self) = @_; 1521 my ($self) = @_;
1338 1522
1339 # TODO: safety, remove and allow resettable per-player maps 1523 # TODO: safety, remove and allow resettable per-player maps
1340 return 1e99 if $self->{path}{user_rel}; 1524 return 1e99 if $self->isa ("ext::map_per_player");#d#
1341 return 1e99 if $self->{deny_reset}; 1525 return 1e99 if $self->{deny_reset};
1342 1526
1343 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1527 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1344 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;
1345 1529
1350 my ($self) = @_; 1534 my ($self) = @_;
1351 1535
1352 $self->reset_at <= $cf::RUNTIME 1536 $self->reset_at <= $cf::RUNTIME
1353} 1537}
1354 1538
1355sub unlink_save {
1356 my ($self) = @_;
1357
1358 utf8::encode (my $save = $self->{path}->save_path);
1359 aioreq_pri 3; IO::AIO::aio_unlink $save;
1360 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1361}
1362
1363sub rename {
1364 my ($self, $new_path) = @_;
1365
1366 $self->unlink_save;
1367
1368 delete $cf::MAP{$self->path};
1369 $self->{path} = new cf::path $new_path;
1370 $self->path ($self->{path}->as_string);
1371 $cf::MAP{$self->path} = $self;
1372
1373 $self->save;
1374}
1375
1376sub reset { 1539sub reset {
1377 my ($self) = @_; 1540 my ($self) = @_;
1378 1541
1379 my $lock = cf::lock_acquire "map_data:" . $self->path; 1542 my $lock = cf::lock_acquire "map_data:$self->{path}";
1380 1543
1381 return if $self->players; 1544 return if $self->players;
1382 return if $self->{path}{user_rel};#d# 1545 return if $self->isa ("ext::map_per_player");#d#
1383 1546
1384 warn "resetting map ", $self->path;#d# 1547 warn "resetting map ", $self->path;#d#
1385 1548
1386 delete $cf::MAP{$self->path}; 1549 delete $cf::MAP{$self->path};
1550
1551 $self->in_memory (cf::MAP_SWAPPED);
1552 $self->clear;
1387 1553
1388 $_->clear_links_to ($self) for values %cf::MAP; 1554 $_->clear_links_to ($self) for values %cf::MAP;
1389 1555
1390 $self->unlink_save; 1556 $self->unlink_save;
1391 $self->destroy; 1557 $self->destroy;
1394my $nuke_counter = "aaaa"; 1560my $nuke_counter = "aaaa";
1395 1561
1396sub nuke { 1562sub nuke {
1397 my ($self) = @_; 1563 my ($self) = @_;
1398 1564
1565 delete $cf::MAP{$self->path};
1566
1567 $self->unlink_save;
1568
1569 bless $self, "cf::map";
1570 delete $self->{deny_reset};
1399 $self->{deny_save} = 1; 1571 $self->{deny_save} = 1;
1400 $self->reset_timeout (1); 1572 $self->reset_timeout (1);
1401 $self->rename ("{nuke}/" . ($nuke_counter++)); 1573 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1574
1575 $cf::MAP{$self->path} = $self;
1576
1402 $self->reset; # polite request, might not happen 1577 $self->reset; # polite request, might not happen
1403} 1578}
1404 1579
1405sub customise_for { 1580=item cf::map::unique_maps
1406 my ($map, $ob) = @_;
1407 1581
1408 if ($map->per_player) { 1582Returns an arrayref of paths of all shared maps that have
1409 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1583instantiated unique items. May block.
1410 }
1411 1584
1412 $map 1585=cut
1413}
1414 1586
1415sub emergency_save { 1587sub unique_maps() {
1416 my $freeze_guard = cf::freeze_mainloop; 1588 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1589 or return;
1417 1590
1418 warn "enter emergency map save\n"; 1591 my @paths;
1419 1592
1420 cf::sync_job { 1593 for (@$files) {
1421 warn "begin emergency map save\n"; 1594 utf8::decode $_;
1422 $_->save for values %cf::MAP; 1595 next if /\.pst$/;
1596 next unless /^$PATH_SEP/o;
1597
1598 s/\.map$//;
1599 push @paths, $_;
1423 }; 1600 }
1424 1601
1425 warn "end emergency map save\n"; 1602 \@paths
1426} 1603}
1427 1604
1428package cf; 1605package cf;
1429 1606
1430=back 1607=back
1431 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
1432 1635
1433=head3 cf::object::player 1636=head3 cf::object::player
1434 1637
1435=over 4 1638=over 4
1436 1639
1476 1679
1477=item $player_object->enter_link 1680=item $player_object->enter_link
1478 1681
1479Freezes 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}>).
1480 1683
1481The 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
1482I<MUST> call C<leave_link> as soon as possible, though. 1685I<MUST> call C<leave_link> as soon as possible, though.
1483 1686
1687Will never block.
1688
1484=item $player_object->leave_link ($map, $x, $y) 1689=item $player_object->leave_link ($map, $x, $y)
1485 1690
1486Moves 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
1487map 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
1488location 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
1489to the emergency map position. 1694fails, to the emergency map position.
1490 1695
1491Might block. 1696Might block.
1492 1697
1493=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}
1494 1709
1495sub cf::object::player::enter_link { 1710sub cf::object::player::enter_link {
1496 my ($self) = @_; 1711 my ($self) = @_;
1497 1712
1498 $self->deactivate_recursive; 1713 $self->deactivate_recursive;
1499 1714
1500 return if $self->map == $LINK_MAP; 1715 return if UNIVERSAL::isa $self->map, "ext::map_link";
1501 1716
1502 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1503 if $self->map; 1718 if $self->map;
1504 1719
1505 $self->enter_map ($LINK_MAP, 20, 20); 1720 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1506} 1721}
1507 1722
1508sub cf::object::player::leave_link { 1723sub cf::object::player::leave_link {
1509 my ($self, $map, $x, $y) = @_; 1724 my ($self, $map, $x, $y) = @_;
1510 1725
1528 # use -1 or undef as default coordinates, not 0, 0 1743 # use -1 or undef as default coordinates, not 0, 0
1529 ($x, $y) = ($map->enter_x, $map->enter_y) 1744 ($x, $y) = ($map->enter_x, $map->enter_y)
1530 if $x <=0 && $y <= 0; 1745 if $x <=0 && $y <= 0;
1531 1746
1532 $map->load; 1747 $map->load;
1748 $map->load_diag;
1533 1749
1750 return unless $self->contr->active;
1534 $self->activate_recursive; 1751 $self->activate_recursive;
1535 $self->enter_map ($map, $x, $y); 1752 $self->enter_map ($map, $x, $y);
1536} 1753}
1537 1754
1538cf::player->attach ( 1755cf::player->attach (
1550 my ($pl) = @_; 1767 my ($pl) = @_;
1551 1768
1552 # try to abort aborted map switching on player login :) 1769 # try to abort aborted map switching on player login :)
1553 # should happen only on crashes 1770 # should happen only on crashes
1554 if ($pl->ob->{_link_pos}) { 1771 if ($pl->ob->{_link_pos}) {
1555
1556 $pl->ob->enter_link; 1772 $pl->ob->enter_link;
1557 (async { 1773 (async {
1558 # 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
1559 # 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
1560 $pl->ob->reply (undef, 1776 $pl->ob->reply (undef,
1576 my ($self, $path, $x, $y) = @_; 1792 my ($self, $path, $x, $y) = @_;
1577 1793
1578 $self->enter_link; 1794 $self->enter_link;
1579 1795
1580 (async { 1796 (async {
1581 $path = new cf::path $path;
1582
1583 my $map = cf::map::find $path->as_string; 1797 my $map = cf::map::find $path;
1584 $map = $map->customise_for ($self) if $map; 1798 $map = $map->customise_for ($self) if $map;
1585 1799
1586# warn "entering ", $map->path, " at ($x, $y)\n" 1800# warn "entering ", $map->path, " at ($x, $y)\n"
1587# if $map; 1801# if $map;
1588 1802
1589 $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);
1590 1804
1591 $self->leave_link ($map, $x, $y); 1805 $self->leave_link ($map, $x, $y);
1592 })->prio (1); 1806 })->prio (1);
1593} 1807}
1594 1808
1598 1812
1599sub parse_random_map_params { 1813sub parse_random_map_params {
1600 my ($spec) = @_; 1814 my ($spec) = @_;
1601 1815
1602 my $rmp = { # defaults 1816 my $rmp = { # defaults
1603 xsize => 10, 1817 xsize => (cf::rndm 15, 40),
1604 ysize => 10, 1818 ysize => (cf::rndm 15, 40),
1819 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1820 #layout => string,
1605 }; 1821 };
1606 1822
1607 for (split /\n/, $spec) { 1823 for (split /\n/, $spec) {
1608 my ($k, $v) = split /\s+/, $_, 2; 1824 my ($k, $v) = split /\s+/, $_, 2;
1609 1825
1613 $rmp 1829 $rmp
1614} 1830}
1615 1831
1616sub prepare_random_map { 1832sub prepare_random_map {
1617 my ($exit) = @_; 1833 my ($exit) = @_;
1834
1835 my $guard = cf::lock_acquire "exit_prepare:$exit";
1618 1836
1619 # all this does is basically replace the /! path by 1837 # all this does is basically replace the /! path by
1620 # a new random map path (?random/...) with a seed 1838 # a new random map path (?random/...) with a seed
1621 # that depends on the exit object 1839 # that depends on the exit object
1622 1840
1631 1849
1632 $rmp->{random_seed} ||= $exit->random_seed; 1850 $rmp->{random_seed} ||= $exit->random_seed;
1633 1851
1634 my $data = cf::to_json $rmp; 1852 my $data = cf::to_json $rmp;
1635 my $md5 = Digest::MD5::md5_hex $data; 1853 my $md5 = Digest::MD5::md5_hex $data;
1854 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1636 1855
1637 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1856 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1638 aio_write $fh, 0, (length $data), $data, 0; 1857 aio_write $fh, 0, (length $data), $data, 0;
1858 undef $fh;
1859 aio_rename "$meta~", $meta;
1639 1860
1640 $exit->slaying ("?random/$md5"); 1861 $exit->slaying ("?random/$md5");
1641 $exit->msg (undef); 1862 $exit->msg (undef);
1642 } 1863 }
1643} 1864}
1653 $self->deactivate_recursive; # just to be sure 1874 $self->deactivate_recursive; # just to be sure
1654 unless (eval { 1875 unless (eval {
1655 prepare_random_map $exit 1876 prepare_random_map $exit
1656 if $exit->slaying eq "/!"; 1877 if $exit->slaying eq "/!";
1657 1878
1658 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1879 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1659 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1880 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1660 1881
1661 1; 1882 1;
1662 }) { 1883 }) {
1663 $self->message ("Something went wrong deep within the crossfire server. " 1884 $self->message ("Something went wrong deep within the crossfire server. "
1664 . "I'll try to bring you back to the map you were before. " 1885 . "I'll try to bring you back to the map you were before. "
1665 . "Please report this to the dungeon master", 1886 . "Please report this to the dungeon master!",
1666 cf::NDI_UNIQUE | cf::NDI_RED); 1887 cf::NDI_UNIQUE | cf::NDI_RED);
1667 1888
1668 warn "ERROR in enter_exit: $@"; 1889 warn "ERROR in enter_exit: $@";
1669 $self->leave_link; 1890 $self->leave_link;
1670 } 1891 }
1953 sub db_sync() { 2174 sub db_sync() {
1954 db_save if $dirty; 2175 db_save if $dirty;
1955 undef $dirty; 2176 undef $dirty;
1956 } 2177 }
1957 2178
1958 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2179 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
1959 db_sync; 2180 db_sync;
1960 }); 2181 });
1961 2182
1962 sub db_dirty() { 2183 sub db_dirty() {
1963 $dirty = 1; 2184 $dirty = 1;
2002 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2223 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2003 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 2224 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2004 2225
2005 if (exists $CFG{mlockall}) { 2226 if (exists $CFG{mlockall}) {
2006 eval { 2227 eval {
2007 $CFG{mlockall} ? &mlockall : &munlockall 2228 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2008 and die "WARNING: m(un)lockall failed: $!\n"; 2229 and die "WARNING: m(un)lockall failed: $!\n";
2009 }; 2230 };
2010 warn $@ if $@; 2231 warn $@ if $@;
2011 } 2232 }
2012} 2233}
2013 2234
2014sub main { 2235sub main {
2015 # we must not ever block the main coroutine 2236 # we must not ever block the main coroutine
2016 local $Coro::idle = sub { 2237 local $Coro::idle = sub {
2017 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2238 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2239 (async {
2018 async { Event::one_event }; 2240 Event::one_event;
2241 })->prio (Coro::PRIO_MAX);
2019 }; 2242 };
2020 2243
2021 cfg_load; 2244 cfg_load;
2022 db_load; 2245 db_load;
2023 load_extensions; 2246 load_extensions;
2247
2248 $TICK_WATCHER->start;
2024 Event::loop; 2249 Event::loop;
2025} 2250}
2026 2251
2027############################################################################# 2252#############################################################################
2028# initialisation 2253# initialisation and cleanup
2254
2255# install some emergency cleanup handlers
2256BEGIN {
2257 for my $signal (qw(INT HUP TERM)) {
2258 Event->signal (
2259 data => WF_AUTOCANCEL,
2260 signal => $signal,
2261 cb => sub {
2262 cf::cleanup "SIG$signal";
2263 },
2264 );
2265 }
2266}
2267
2268sub emergency_save() {
2269 my $freeze_guard = cf::freeze_mainloop;
2270
2271 warn "enter emergency perl save\n";
2272
2273 cf::sync_job {
2274 # use a peculiar iteration method to avoid tripping on perl
2275 # refcount bugs in for. also avoids problems with players
2276 # and maps saved/destroyed asynchronously.
2277 warn "begin emergency player save\n";
2278 for my $login (keys %cf::PLAYER) {
2279 my $pl = $cf::PLAYER{$login} or next;
2280 $pl->valid or next;
2281 $pl->save;
2282 }
2283 warn "end emergency player save\n";
2284
2285 warn "begin emergency map save\n";
2286 for my $path (keys %cf::MAP) {
2287 my $map = $cf::MAP{$path} or next;
2288 $map->valid or next;
2289 $map->save;
2290 }
2291 warn "end emergency map save\n";
2292 };
2293
2294 warn "leave emergency perl save\n";
2295}
2029 2296
2030sub reload() { 2297sub reload() {
2031 # can/must only be called in main 2298 # can/must only be called in main
2032 if ($Coro::current != $Coro::main) { 2299 if ($Coro::current != $Coro::main) {
2033 warn "can only reload from main coroutine\n"; 2300 warn "can only reload from main coroutine";
2034 return; 2301 return;
2035 } 2302 }
2036 2303
2037 warn "reloading..."; 2304 warn "reloading...";
2038 2305
2039 my $guard = freeze_mainloop; 2306 warn "cancelling server ticker";
2307 $TICK_WATCHER->cancel;
2308
2040 cf::emergency_save; 2309 cf::emergency_save;
2041 2310
2042 eval { 2311 eval {
2043 # if anything goes wrong in here, we should simply crash as we already saved 2312 # if anything goes wrong in here, we should simply crash as we already saved
2044 2313
2045 # cancel all watchers 2314 warn "syncing database to disk";
2315 cf::db_sync;
2316
2317 warn "cancelling all WF_AUTOCANCEL watchers";
2046 for (Event::all_watchers) { 2318 for (Event::all_watchers) {
2047 $_->cancel if $_->data & WF_AUTOCANCEL; 2319 $_->cancel if $_->data & WF_AUTOCANCEL;
2048 } 2320 }
2049 2321
2322 warn "flushing outstanding aio requests";
2323 for (;;) {
2324 IO::AIO::flush;
2325 Coro::cede;
2326 last unless IO::AIO::nreqs;
2327 warn "iterate...";
2328 }
2329
2050 # cancel all extension coros 2330 warn "cancelling all extension coros";
2051 $_->cancel for values %EXT_CORO; 2331 $_->cancel for values %EXT_CORO;
2052 %EXT_CORO = (); 2332 %EXT_CORO = ();
2053 2333
2054 # unload all extensions 2334 warn "removing commands";
2055 for (@exts) { 2335 %COMMAND = ();
2336
2337 warn "removing ext commands";
2338 %EXTCMD = ();
2339
2340 warn "unloading/nuking all extensions";
2341 for my $pkg (@EXTS) {
2056 warn "unloading <$_>"; 2342 warn "... unloading $pkg";
2057 unload_extension $_; 2343
2344 if (my $cb = $pkg->can ("unload")) {
2345 eval {
2346 $cb->($pkg);
2347 1
2348 } or warn "$pkg unloaded, but with errors: $@";
2058 } 2349 }
2059 2350
2351 warn "... nuking $pkg";
2352 Symbol::delete_package $pkg;
2353 }
2354
2060 # unload all modules loaded from $LIBDIR 2355 warn "unloading all perl modules loaded from $LIBDIR";
2061 while (my ($k, $v) = each %INC) { 2356 while (my ($k, $v) = each %INC) {
2062 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2357 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2063 2358
2064 warn "removing <$k>"; 2359 warn "... unloading $k";
2065 delete $INC{$k}; 2360 delete $INC{$k};
2066 2361
2067 $k =~ s/\.pm$//; 2362 $k =~ s/\.pm$//;
2068 $k =~ s/\//::/g; 2363 $k =~ s/\//::/g;
2069 2364
2072 } 2367 }
2073 2368
2074 Symbol::delete_package $k; 2369 Symbol::delete_package $k;
2075 } 2370 }
2076 2371
2077 # sync database to disk
2078 cf::db_sync;
2079 IO::AIO::flush;
2080
2081 # get rid of safe::, as good as possible 2372 warn "getting rid of safe::, as good as possible";
2082 Symbol::delete_package "safe::$_" 2373 Symbol::delete_package "safe::$_"
2083 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2374 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2084 2375
2085 # remove register_script_function callbacks
2086 # TODO
2087
2088 # unload cf.pm "a bit" 2376 warn "unloading cf.pm \"a bit\"";
2089 delete $INC{"cf.pm"}; 2377 delete $INC{"cf.pm"};
2090 2378
2091 # don't, removes xs symbols, too, 2379 # don't, removes xs symbols, too,
2092 # and global variables created in xs 2380 # and global variables created in xs
2093 #Symbol::delete_package __PACKAGE__; 2381 #Symbol::delete_package __PACKAGE__;
2094 2382
2095 # reload cf.pm 2383 warn "unload completed, starting to reload now";
2384
2096 warn "reloading cf.pm"; 2385 warn "reloading cf.pm";
2097 require cf; 2386 require cf;
2098 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2387 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2099 2388
2100 # load config and database again 2389 warn "loading config and database again";
2101 cf::cfg_load; 2390 cf::cfg_load;
2102 cf::db_load; 2391 cf::db_load;
2103 2392
2104 # load extensions
2105 warn "load extensions"; 2393 warn "loading extensions";
2106 cf::load_extensions; 2394 cf::load_extensions;
2107 2395
2108 # reattach attachments to objects 2396 warn "reattaching attachments to objects/players";
2109 warn "reattach";
2110 _global_reattach; 2397 _global_reattach;
2398 warn "reattaching attachments to maps";
2399 reattach $_ for values %MAP;
2400
2401 warn "restarting server ticker";
2402
2403 $TICK_WATCHER->start;
2111 }; 2404 };
2112 2405
2113 if ($@) { 2406 if ($@) {
2114 warn $@; 2407 warn $@;
2115 warn "error while reloading, exiting."; 2408 warn "error while reloading, exiting.";
2116 exit 1; 2409 exit 1;
2117 } 2410 }
2118 2411
2119 warn "reloaded successfully"; 2412 warn "reloaded";
2120}; 2413};
2121 2414
2122############################################################################# 2415our $RELOAD_WATCHER; # used only during reload
2123
2124unless ($LINK_MAP) {
2125 $LINK_MAP = cf::map::new;
2126
2127 $LINK_MAP->width (41);
2128 $LINK_MAP->height (41);
2129 $LINK_MAP->alloc;
2130 $LINK_MAP->path ("{link}");
2131 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2132 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2133
2134 # dirty hack because... archetypes are not yet loaded
2135 Event->timer (
2136 after => 2,
2137 cb => sub {
2138 $_[0]->w->cancel;
2139
2140 # provide some exits "home"
2141 my $exit = cf::object::new "exit";
2142
2143 $exit->slaying ($EMERGENCY_POSITION->[0]);
2144 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2145 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2146
2147 $LINK_MAP->insert ($exit->clone, 19, 19);
2148 $LINK_MAP->insert ($exit->clone, 19, 20);
2149 $LINK_MAP->insert ($exit->clone, 19, 21);
2150 $LINK_MAP->insert ($exit->clone, 20, 19);
2151 $LINK_MAP->insert ($exit->clone, 20, 21);
2152 $LINK_MAP->insert ($exit->clone, 21, 19);
2153 $LINK_MAP->insert ($exit->clone, 21, 20);
2154 $LINK_MAP->insert ($exit->clone, 21, 21);
2155
2156 $exit->destroy;
2157 });
2158
2159 $LINK_MAP->{deny_save} = 1;
2160 $LINK_MAP->{deny_reset} = 1;
2161
2162 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2163}
2164
2165register "<global>", __PACKAGE__;
2166 2416
2167register_command "reload" => sub { 2417register_command "reload" => sub {
2168 my ($who, $arg) = @_; 2418 my ($who, $arg) = @_;
2169 2419
2170 if ($who->flag (FLAG_WIZ)) { 2420 if ($who->flag (FLAG_WIZ)) {
2171 $who->message ("start of reload."); 2421 $who->message ("reloading server.");
2422
2423 # doing reload synchronously and two reloads happen back-to-back,
2424 # coro crashes during coro_state_free->destroy here.
2425
2426 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2172 reload; 2427 reload;
2173 $who->message ("end of reload."); 2428 undef $RELOAD_WATCHER;
2429 });
2174 } 2430 }
2175}; 2431};
2176 2432
2177unshift @INC, $LIBDIR; 2433unshift @INC, $LIBDIR;
2434
2435my $bug_warning = 0;
2178 2436
2179$TICK_WATCHER = Event->timer ( 2437$TICK_WATCHER = Event->timer (
2180 reentrant => 0, 2438 reentrant => 0,
2439 parked => 1,
2181 prio => 0, 2440 prio => 0,
2182 at => $NEXT_TICK || $TICK, 2441 at => $NEXT_TICK || $TICK,
2183 data => WF_AUTOCANCEL, 2442 data => WF_AUTOCANCEL,
2184 cb => sub { 2443 cb => sub {
2444 if ($Coro::current != $Coro::main) {
2445 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2446 unless ++$bug_warning > 10;
2447 return;
2448 }
2449
2450 $NOW = Event::time;
2451
2185 cf::server_tick; # one server iteration 2452 cf::server_tick; # one server iteration
2186 $RUNTIME += $TICK; 2453 $RUNTIME += $TICK;
2187 $NEXT_TICK += $TICK; 2454 $NEXT_TICK += $TICK;
2455
2456 $WAIT_FOR_TICK->broadcast;
2457 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2188 2458
2189 # if we are delayed by four ticks or more, skip them all 2459 # if we are delayed by four ticks or more, skip them all
2190 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2460 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2191 2461
2192 $TICK_WATCHER->at ($NEXT_TICK); 2462 $TICK_WATCHER->at ($NEXT_TICK);
2194 }, 2464 },
2195); 2465);
2196 2466
2197IO::AIO::max_poll_time $TICK * 0.2; 2467IO::AIO::max_poll_time $TICK * 0.2;
2198 2468
2199Event->io ( 2469$AIO_POLL_WATCHER = Event->io (
2200 fd => IO::AIO::poll_fileno, 2470 fd => IO::AIO::poll_fileno,
2201 poll => 'r', 2471 poll => 'r',
2202 prio => 5, 2472 prio => 5,
2203 data => WF_AUTOCANCEL, 2473 data => WF_AUTOCANCEL,
2204 cb => \&IO::AIO::poll_cb, 2474 cb => \&IO::AIO::poll_cb,
2205); 2475);
2206 2476
2207Event->timer ( 2477$WRITE_RUNTIME_WATCHER = Event->timer (
2208 data => WF_AUTOCANCEL, 2478 data => WF_AUTOCANCEL,
2209 after => 0, 2479 after => 1,
2210 interval => 10, 2480 interval => 10,
2211 cb => sub { 2481 cb => Coro::unblock_sub {
2212 (Coro::unblock_sub {
2213 write_runtime 2482 write_runtime
2214 or warn "ERROR: unable to write runtime file: $!"; 2483 or warn "ERROR: unable to write runtime file: $!";
2215 })->();
2216 }, 2484 },
2217); 2485);
2218 2486
2219END { cf::emergency_save } 2487END { cf::emergency_save }
2220 2488

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines