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.154 by root, Tue Jan 9 15:36:19 2007 UTC vs.
Revision 1.202 by root, Mon Jan 29 20:16:28 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.5 ();
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;
24use YAML::Syck (); 24use YAML::Syck ();
25use Time::HiRes; 25use Time::HiRes;
26 26
27use 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
28 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
29# 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?
30$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
31 33
32$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
33 35
34sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35
36our %COMMAND = (); 36our %COMMAND = ();
37our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
38our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
39 43
40our @EVENT; 44our @EVENT;
41our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
42 46
43our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
44our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
45our $NEXT_TICK; 51our $NEXT_TICK;
46our $NOW; 52our $NOW;
47 53
48our %CFG; 54our %CFG;
49 55
50our $UPTIME; $UPTIME ||= time; 56our $UPTIME; $UPTIME ||= time;
51our $RUNTIME; 57our $RUNTIME;
52 58
53our %PLAYER; # all users 59our %PLAYER; # all users
54our %MAP; # all maps 60our %MAP; # all maps
55our $LINK_MAP; # the special {link} map 61our $LINK_MAP; # the special {link} map, which is always available
56our $RANDOM_MAPS = cf::localdir . "/random"; 62our $RANDOM_MAPS = cf::localdir . "/random";
57our %EXT_CORO; # coroutines bound to extensions 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
58 69
59binmode STDOUT; 70binmode STDOUT;
60binmode STDERR; 71binmode STDERR;
61 72
62# read virtual server time, if available 73# read virtual server time, if available
70mkdir cf::localdir . "/" . cf::playerdir; 81mkdir cf::localdir . "/" . cf::playerdir;
71mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
72mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
73mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
74 85
75# a special map that is always available
76our $LINK_MAP;
77our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
87
88sub cf::map::normalise;
78 89
79############################################################################# 90#############################################################################
80 91
81=head2 GLOBAL VARIABLES 92=head2 GLOBAL VARIABLES
82 93
106 117
107=item %cf::CFG 118=item %cf::CFG
108 119
109Configuration for the server, loaded from C</etc/crossfire/config>, or 120Configuration for the server, loaded from C</etc/crossfire/config>, or
110from wherever your confdir points to. 121from wherever your confdir points to.
122
123=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
124
125These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
126or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
127processing has been done. Call C<< ->wait >> on them to maximise the
128window of cpu time available, or simply to synchronise to the server tick.
111 129
112=back 130=back
113 131
114=cut 132=cut
115 133
146} 164}
147 165
148$Event::DIED = sub { 166$Event::DIED = sub {
149 warn "error in event callback: @_"; 167 warn "error in event callback: @_";
150}; 168};
151
152my %ext_pkg;
153my @exts;
154my @hook;
155 169
156=head2 UTILITY FUNCTIONS 170=head2 UTILITY FUNCTIONS
157 171
158=over 4 172=over 4
159 173
247} 261}
248 262
249sub freeze_mainloop { 263sub freeze_mainloop {
250 return unless $TICK_WATCHER->is_active; 264 return unless $TICK_WATCHER->is_active;
251 265
252 my $guard = Coro::guard { $TICK_WATCHER->start }; 266 my $guard = Coro::guard {
267 $TICK_WATCHER->start;
268 $WRITE_RUNTIME_WATCHER->start;
269 };
270 $WRITE_RUNTIME_WATCHER->stop;
253 $TICK_WATCHER->stop; 271 $TICK_WATCHER->stop;
254 $guard 272 $guard
255} 273}
256 274
257=item cf::async { BLOCK } 275=item cf::async { BLOCK }
309 } 327 }
310} 328}
311 329
312=item $coro = cf::async_ext { BLOCK } 330=item $coro = cf::async_ext { BLOCK }
313 331
314Like async, but this coro is automcatially being canceled when the 332Like async, but this coro is automatically being canceled when the
315extension calling this is being unloaded. 333extension calling this is being unloaded.
316 334
317=cut 335=cut
318 336
319sub async_ext(&) { 337sub async_ext(&) {
333 my $runtime = cf::localdir . "/runtime"; 351 my $runtime = cf::localdir . "/runtime";
334 352
335 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
336 or return; 354 or return;
337 355
356 my $value = $cf::RUNTIME + 90 + 10;
338 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 357 # 10 is the runtime save interval, for a monotonic clock
358 # 60 allows for the watchdog to kill the server.
359
339 (aio_write $fh, 0, (length $value), $value, 0) <= 0 360 (aio_write $fh, 0, (length $value), $value, 0) <= 0
340 and return; 361 and return;
341 362
342 aio_fsync $fh 363 aio_fsync $fh
343 and return; 364 and return;
352} 373}
353 374
354=back 375=back
355 376
356=cut 377=cut
357
358#############################################################################
359
360package cf::path;
361
362# used to convert map paths into valid unix filenames by repalcing / by ∕
363our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
364
365sub new {
366 my ($class, $path, $base) = @_;
367
368 $path = $path->as_string if ref $path;
369
370 my $self = bless { }, $class;
371
372 # {... are special paths that are not touched
373 # ?xxx/... are special absolute paths
374 # ?random/... random maps
375 # /! non-realised random map exit
376 # /... normal maps
377 # ~/... per-player maps without a specific player (DO NOT USE)
378 # ~user/... per-player map of a specific user
379
380 if ($path =~ /^{/) {
381 # fine as it is
382 } elsif ($path =~ s{^\?random/}{}) {
383 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
384 $self->{random} = cf::from_json $data;
385 } else {
386 if ($path =~ s{^~([^/]+)?}{}) {
387 $self->{user_rel} = 1;
388
389 if (defined $1) {
390 $self->{user} = $1;
391 } elsif ($base =~ m{^~([^/]+)/}) {
392 $self->{user} = $1;
393 } else {
394 warn "cannot resolve user-relative path without user <$path,$base>\n";
395 }
396 } elsif ($path =~ /^\//) {
397 # already absolute
398 } else {
399 $base =~ s{[^/]+/?$}{};
400 return $class->new ("$base/$path");
401 }
402
403 for ($path) {
404 redo if s{/\.?/}{/};
405 redo if s{/[^/]+/\.\./}{/};
406 }
407 }
408
409 $self->{path} = $path;
410
411 $self
412}
413
414# the name / primary key / in-game path
415sub as_string {
416 my ($self) = @_;
417
418 $self->{user_rel} ? "~$self->{user}$self->{path}"
419 : $self->{random} ? "?random/$self->{path}"
420 : $self->{path}
421}
422
423# the displayed name, this is a one way mapping
424sub visible_name {
425 my ($self) = @_;
426
427# if (my $rmp = $self->{random}) {
428# # todo: be more intelligent about this
429# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
430# } else {
431 $self->as_string
432# }
433}
434
435# escape the /'s in the path
436sub _escaped_path {
437 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
438 $path
439}
440
441# the original (read-only) location
442sub load_path {
443 my ($self) = @_;
444
445 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
446}
447
448# the temporary/swap location
449sub save_path {
450 my ($self) = @_;
451
452 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
453 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
454 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
455}
456
457# the unique path, might be eq to save_path
458sub uniq_path {
459 my ($self) = @_;
460
461 $self->{user_rel} || $self->{random}
462 ? undef
463 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
464}
465
466# return random map parameters, or undef
467sub random_map_params {
468 my ($self) = @_;
469
470 $self->{random}
471}
472
473# this is somewhat ugly, but style maps do need special treatment
474sub is_style_map {
475 $_[0]{path} =~ m{^/styles/}
476}
477
478package cf;
479 378
480############################################################################# 379#############################################################################
481 380
482=head2 ATTACHABLE OBJECTS 381=head2 ATTACHABLE OBJECTS
483 382
609our @CB_TYPE = (); # registry for type (cf-object class) based events 508our @CB_TYPE = (); # registry for type (cf-object class) based events
610our @CB_MAP = (); 509our @CB_MAP = ();
611 510
612my %attachment; 511my %attachment;
613 512
513sub cf::attachable::thawer_merge {
514 # simply override everything except _meta
515 local $_[0]{_meta};
516 %{$_[0]} = %{$_[1]};
517}
518
614sub _attach_cb($$$$) { 519sub _attach_cb($$$$) {
615 my ($registry, $event, $prio, $cb) = @_; 520 my ($registry, $event, $prio, $cb) = @_;
616 521
617 use sort 'stable'; 522 use sort 'stable';
618 523
789# object support 694# object support
790 695
791sub reattach { 696sub reattach {
792 # basically do the same as instantiate, without calling instantiate 697 # basically do the same as instantiate, without calling instantiate
793 my ($obj) = @_; 698 my ($obj) = @_;
699
700 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
794 701
795 my $registry = $obj->registry; 702 my $registry = $obj->registry;
796 703
797 @$registry = (); 704 @$registry = ();
798 705
869 } 776 }
870 } else { 777 } else {
871 aio_unlink $filename; 778 aio_unlink $filename;
872 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
873 } 780 }
781
782 #d##TODO# nuke non .map-files if exist
783 if ($filename =~ s/\.map$//) {
784 aio_unlink $filename;
785 aio_unlink "$filename.pst";
786 }
874 } 787 }
875} 788}
876 789
877sub object_freezer_as_string { 790sub object_freezer_as_string {
878 my ($rdata, $objs) = @_; 791 my ($rdata, $objs) = @_;
884 797
885sub object_thawer_load { 798sub object_thawer_load {
886 my ($filename) = @_; 799 my ($filename) = @_;
887 800
888 my ($data, $av); 801 my ($data, $av);
802
803 #d#TODO remove .map if file does not exist
804 aio_stat $filename and $filename =~ s/\.map$//;
889 805
890 (aio_load $filename, $data) >= 0 806 (aio_load $filename, $data) >= 0
891 or return; 807 or return;
892 808
893 unless (aio_stat "$filename.pst") { 809 unless (aio_stat "$filename.pst") {
930=cut 846=cut
931 847
932sub register_extcmd { 848sub register_extcmd {
933 my ($name, $cb) = @_; 849 my ($name, $cb) = @_;
934 850
935 my $caller = caller;
936 #warn "registering extcmd '$name' to '$caller'";
937
938 $EXTCMD{$name} = [$cb, $caller]; 851 $EXTCMD{$name} = $cb;
939} 852}
940 853
941cf::player->attach ( 854cf::player->attach (
942 on_command => sub { 855 on_command => sub {
943 my ($pl, $name, $params) = @_; 856 my ($pl, $name, $params) = @_;
956 869
957 my $msg = eval { from_json $buf }; 870 my $msg = eval { from_json $buf };
958 871
959 if (ref $msg) { 872 if (ref $msg) {
960 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 873 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
961 if (my %reply = $cb->[0]->($pl, $msg)) { 874 if (my %reply = $cb->($pl, $msg)) {
962 $pl->ext_reply ($msg->{msgid}, %reply); 875 $pl->ext_reply ($msg->{msgid}, %reply);
963 } 876 }
964 } 877 }
965 } else { 878 } else {
966 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 879 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
968 881
969 cf::override; 882 cf::override;
970 }, 883 },
971); 884);
972 885
973sub register {
974 my ($base, $pkg) = @_;
975
976 #TODO
977}
978
979sub load_extension { 886sub load_extension {
980 my ($path) = @_; 887 my ($path) = @_;
981 888
982 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 889 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
983 my $base = $1; 890 my $base = $1;
984 my $pkg = $1; 891 my $pkg = $1;
985 $pkg =~ s/[^[:word:]]/_/g; 892 $pkg =~ s/[^[:word:]]/_/g;
986 $pkg = "ext::$pkg"; 893 $pkg = "ext::$pkg";
987 894
988 warn "loading '$path' into '$pkg'\n"; 895 warn "... loading '$path' into '$pkg'\n";
989 896
990 open my $fh, "<:utf8", $path 897 open my $fh, "<:utf8", $path
991 or die "$path: $!"; 898 or die "$path: $!";
992 899
993 my $source = 900 my $source =
994 "package $pkg; use strict; use utf8;\n" 901 "package $pkg; use strict; use utf8;\n"
995 . "#line 1 \"$path\"\n{\n" 902 . "#line 1 \"$path\"\n{\n"
996 . (do { local $/; <$fh> }) 903 . (do { local $/; <$fh> })
997 . "\n};\n1"; 904 . "\n};\n1";
998 905
999 eval $source 906 unless (eval $source) {
1000 or die $@ ? "$path: $@\n" 907 my $msg = $@ ? "$path: $@\n"
1001 : "extension disabled.\n"; 908 : "extension disabled.\n";
1002 909 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1003 push @exts, $pkg; 910 warn $@;
1004 $ext_pkg{$base} = $pkg; 911 warn "mandatory extension failed to load, exiting.\n";
1005 912 exit 1;
1006# no strict 'refs'; 913 }
1007# @{"$pkg\::ISA"} = ext::; 914 die $@;
1008
1009 register $base, $pkg;
1010}
1011
1012sub unload_extension {
1013 my ($pkg) = @_;
1014
1015 warn "removing extension $pkg\n";
1016
1017 # remove hooks
1018 #TODO
1019# for my $idx (0 .. $#PLUGIN_EVENT) {
1020# delete $hook[$idx]{$pkg};
1021# } 915 }
1022 916
1023 # remove commands 917 push @EXTS, $pkg;
1024 for my $name (keys %COMMAND) {
1025 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1026
1027 if (@cb) {
1028 $COMMAND{$name} = \@cb;
1029 } else {
1030 delete $COMMAND{$name};
1031 }
1032 }
1033
1034 # remove extcmds
1035 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1036 delete $EXTCMD{$name};
1037 }
1038
1039 if (my $cb = $pkg->can ("unload")) {
1040 eval {
1041 $cb->($pkg);
1042 1
1043 } or warn "$pkg unloaded, but with errors: $@";
1044 }
1045
1046 Symbol::delete_package $pkg;
1047} 918}
1048 919
1049sub load_extensions { 920sub load_extensions {
1050 for my $ext (<$LIBDIR/*.ext>) { 921 for my $ext (<$LIBDIR/*.ext>) {
1051 next unless -r $ext; 922 next unless -r $ext;
1055 } or warn "$ext not loaded: $@"; 926 } or warn "$ext not loaded: $@";
1056 } 927 }
1057} 928}
1058 929
1059############################################################################# 930#############################################################################
1060# load/save/clean perl data associated with a map
1061
1062*cf::mapsupport::on_clean = sub {
1063 my ($map) = @_;
1064
1065 my $path = $map->tmpname;
1066 defined $path or return;
1067
1068 unlink "$path.pst";
1069};
1070
1071cf::map->attach (prio => -10000, package => cf::mapsupport::);
1072
1073#############################################################################
1074# load/save perl data associated with player->ob objects
1075
1076sub all_objects(@) {
1077 @_, map all_objects ($_->inv), @_
1078}
1079
1080# TODO: compatibility cruft, remove when no longer needed
1081cf::player->attach (
1082 on_load => sub {
1083 my ($pl, $path) = @_;
1084
1085 for my $o (all_objects $pl->ob) {
1086 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1087 $o->set_ob_key_value ("_perl_data");
1088
1089 %$o = %{ Storable::thaw pack "H*", $value };
1090 }
1091 }
1092 },
1093);
1094
1095#############################################################################
1096 931
1097=head2 CORE EXTENSIONS 932=head2 CORE EXTENSIONS
1098 933
1099Functions and methods that extend core crossfire objects. 934Functions and methods that extend core crossfire objects.
1100 935
1136 971
1137sub exists($) { 972sub exists($) {
1138 my ($login) = @_; 973 my ($login) = @_;
1139 974
1140 $cf::PLAYER{$login} 975 $cf::PLAYER{$login}
1141 or cf::sync_job { !aio_stat $login } 976 or cf::sync_job { !aio_stat path $login }
1142} 977}
1143 978
1144sub find($) { 979sub find($) {
1145 return $cf::PLAYER{$_[0]} || do { 980 return $cf::PLAYER{$_[0]} || do {
1146 my $login = $_[0]; 981 my $login = $_[0];
1225 my @logins; 1060 my @logins;
1226 1061
1227 for my $login (@$dirs) { 1062 for my $login (@$dirs) {
1228 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1063 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1229 aio_read $fh, 0, 512, my $buf, 0 or next; 1064 aio_read $fh, 0, 512, my $buf, 0 or next;
1230 $buf !~ /^password -------------$/ or next; # official not-valid tag 1065 $buf !~ /^password -------------$/m or next; # official not-valid tag
1231 1066
1232 utf8::decode $login; 1067 utf8::decode $login;
1233 push @logins, $login; 1068 push @logins, $login;
1234 } 1069 }
1235 1070
1236 \@logins 1071 \@logins
1237} 1072}
1238 1073
1239=item $player->maps 1074=item $player->maps
1240 1075
1241Returns an arrayref of cf::path's of all maps that are private for this 1076Returns an arrayref of map paths that are private for this
1242player. May block. 1077player. May block.
1243 1078
1244=cut 1079=cut
1245 1080
1246sub maps($) { 1081sub maps($) {
1247 my ($pl) = @_; 1082 my ($pl) = @_;
1083
1084 $pl = ref $pl ? $pl->ob->name : $pl;
1248 1085
1249 my $files = aio_readdir playerdir $pl 1086 my $files = aio_readdir playerdir $pl
1250 or return; 1087 or return;
1251 1088
1252 my @paths; 1089 my @paths;
1253 1090
1254 for (@$files) { 1091 for (@$files) {
1255 utf8::decode $_; 1092 utf8::decode $_;
1256 next if /\.(?:pl|pst)$/; 1093 next if /\.(?:pl|pst)$/;
1257 next unless /^$PATH_SEP/; 1094 next unless /^$PATH_SEP/o;
1258 1095
1259 s/$PATH_SEP/\//g; 1096 push @paths, cf::map::normalise "~$pl/$_";
1260 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1261 } 1097 }
1262 1098
1263 \@paths 1099 \@paths
1264} 1100}
1265 1101
1291package cf::map; 1127package cf::map;
1292 1128
1293use Fcntl; 1129use Fcntl;
1294use Coro::AIO; 1130use Coro::AIO;
1295 1131
1132use overload
1133 '""' => \&as_string,
1134 fallback => 1;
1135
1296our $MAX_RESET = 3600; 1136our $MAX_RESET = 3600;
1297our $DEFAULT_RESET = 3000; 1137our $DEFAULT_RESET = 3000;
1298 1138
1299sub generate_random_map { 1139sub generate_random_map {
1300 my ($path, $rmp) = @_; 1140 my ($self, $rmp) = @_;
1301
1302 # mit "rum" bekleckern, nicht 1141 # mit "rum" bekleckern, nicht
1303 cf::map::_create_random_map 1142 $self->_create_random_map (
1304 $path,
1305 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1143 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1306 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1144 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1307 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1145 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1308 $rmp->{exit_on_final_map}, 1146 $rmp->{exit_on_final_map},
1309 $rmp->{xsize}, $rmp->{ysize}, 1147 $rmp->{xsize}, $rmp->{ysize},
1310 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1148 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1311 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1149 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1312 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1150 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1313 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1151 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1314 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1152 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1315 (cf::region::find $rmp->{region}) 1153 (cf::region::find $rmp->{region}), $rmp->{custom}
1154 )
1155}
1156
1157=item cf::map->register ($regex, $prio)
1158
1159Register a handler for the map path matching the given regex at the
1160givne priority (higher is better, built-in handlers have priority 0, the
1161default).
1162
1163=cut
1164
1165sub register {
1166 my (undef, $regex, $prio) = @_;
1167 my $pkg = caller;
1168
1169 no strict;
1170 push @{"$pkg\::ISA"}, __PACKAGE__;
1171
1172 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1173}
1174
1175# also paths starting with '/'
1176$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1177
1178sub thawer_merge {
1179 my ($self, $merge) = @_;
1180
1181 # we have to keep some variables in memory intact
1182 local $self->{path};
1183 local $self->{load_path};
1184 local $self->{deny_save};
1185 local $self->{deny_reset};
1186
1187 $self->SUPER::thawer_merge ($merge);
1188}
1189
1190sub normalise {
1191 my ($path, $base) = @_;
1192
1193 $path = "$path"; # make sure its a string
1194
1195 $path =~ s/\.map$//;
1196
1197 # map plan:
1198 #
1199 # /! non-realised random map exit (special hack!)
1200 # {... are special paths that are not being touched
1201 # ?xxx/... are special absolute paths
1202 # ?random/... random maps
1203 # /... normal maps
1204 # ~user/... per-player map of a specific user
1205
1206 $path =~ s/$PATH_SEP/\//go;
1207
1208 # treat it as relative path if it starts with
1209 # something that looks reasonable
1210 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1211 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1212
1213 $base =~ s{[^/]+/?$}{};
1214 $path = "$base/$path";
1215 }
1216
1217 for ($path) {
1218 redo if s{//}{/};
1219 redo if s{/\.?/}{/};
1220 redo if s{/[^/]+/\.\./}{/};
1221 }
1222
1223 $path
1224}
1225
1226sub new_from_path {
1227 my (undef, $path, $base) = @_;
1228
1229 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1230
1231 $path = normalise $path, $base;
1232
1233 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1234 if ($path =~ $EXT_MAP{$pkg}[1]) {
1235 my $self = bless cf::map::new, $pkg;
1236 $self->{path} = $path; $self->path ($path);
1237 $self->init; # pass $1 etc.
1238 return $self;
1239 }
1240 }
1241
1242 Carp::carp "unable to resolve path '$path' (base '$base').";
1243 ()
1244}
1245
1246sub init {
1247 my ($self) = @_;
1248
1249 $self
1250}
1251
1252sub as_string {
1253 my ($self) = @_;
1254
1255 "$self->{path}"
1256}
1257
1258# the displayed name, this is a one way mapping
1259sub visible_name {
1260 &as_string
1261}
1262
1263# the original (read-only) location
1264sub load_path {
1265 my ($self) = @_;
1266
1267 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1268}
1269
1270# the temporary/swap location
1271sub save_path {
1272 my ($self) = @_;
1273
1274 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1275 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1276}
1277
1278# the unique path, undef == no special unique path
1279sub uniq_path {
1280 my ($self) = @_;
1281
1282 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1283 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1316} 1284}
1317 1285
1318# and all this just because we cannot iterate over 1286# and all this just because we cannot iterate over
1319# all maps in C++... 1287# all maps in C++...
1320sub change_all_map_light { 1288sub change_all_map_light {
1322 1290
1323 $_->change_map_light ($change) 1291 $_->change_map_light ($change)
1324 for grep $_->outdoor, values %cf::MAP; 1292 for grep $_->outdoor, values %cf::MAP;
1325} 1293}
1326 1294
1295sub unlink_save {
1296 my ($self) = @_;
1297
1298 utf8::encode (my $save = $self->save_path);
1299 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1300 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1301
1302 #d#TODO remove .map and also nuke
1303 $save =~ s/\.map// or return;#d#
1304 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1305 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1306}
1307
1327sub try_load_header($) { 1308sub load_header_from($) {
1328 my ($path) = @_; 1309 my ($self, $path) = @_;
1329 1310
1330 utf8::encode $path; 1311 utf8::encode $path;
1331 aio_open $path, O_RDONLY, 0 1312 #aio_open $path, O_RDONLY, 0
1313 # or return;
1314
1315 $self->_load_header ($path)
1332 or return; 1316 or return;
1333 1317
1334 my $map = cf::map::new 1318 $self->{load_path} = $path;
1319
1320 1
1321}
1322
1323sub load_header_orig {
1324 my ($self) = @_;
1325
1326 $self->load_header_from ($self->load_path)
1327}
1328
1329sub load_header_temp {
1330 my ($self) = @_;
1331
1332 $self->load_header_from ($self->save_path)
1333}
1334
1335sub prepare_temp {
1336 my ($self) = @_;
1337
1338 $self->last_access ((delete $self->{last_access})
1339 || $cf::RUNTIME); #d#
1340 # safety
1341 $self->{instantiate_time} = $cf::RUNTIME
1342 if $self->{instantiate_time} > $cf::RUNTIME;
1343}
1344
1345sub prepare_orig {
1346 my ($self) = @_;
1347
1348 $self->{load_original} = 1;
1349 $self->{instantiate_time} = $cf::RUNTIME;
1350 $self->last_access ($cf::RUNTIME);
1351 $self->instantiate;
1352}
1353
1354sub load_header {
1355 my ($self) = @_;
1356
1357 if ($self->load_header_temp) {
1358 $self->prepare_temp;
1359 } else {
1360 $self->load_header_orig
1335 or return; 1361 or return;
1362 $self->prepare_orig;
1363 }
1336 1364
1337 # for better error messages only, will be overwritten 1365 1
1338 $map->path ($path);
1339
1340 $map->load_header ($path)
1341 or return;
1342
1343 $map->{load_path} = $path;
1344
1345 $map
1346} 1366}
1347 1367
1348sub find; 1368sub find;
1349sub find { 1369sub find {
1350 my ($path, $origin) = @_; 1370 my ($path, $origin) = @_;
1351 1371
1352 #warn "find<$path,$origin>\n";#d#
1353
1354 $path = new cf::path $path, $origin && $origin->path; 1372 $path = normalise $path, $origin && $origin->path;
1355 my $key = $path->as_string;
1356 1373
1357 cf::lock_wait "map_find:$key"; 1374 cf::lock_wait "map_find:$path";
1358 1375
1359 $cf::MAP{$key} || do { 1376 $cf::MAP{$path} || do {
1360 my $guard = cf::lock_acquire "map_find:$key"; 1377 my $guard = cf::lock_acquire "map_find:$path";
1361 1378 my $map = new_from_path cf::map $path
1362 # do it the slow way
1363 my $map = try_load_header $path->save_path;
1364
1365 Coro::cede;
1366
1367 if ($map) {
1368 $map->last_access ((delete $map->{last_access})
1369 || $cf::RUNTIME); #d#
1370 # safety
1371 $map->{instantiate_time} = $cf::RUNTIME
1372 if $map->{instantiate_time} > $cf::RUNTIME;
1373 } else {
1374 if (my $rmp = $path->random_map_params) {
1375 $map = generate_random_map $key, $rmp;
1376 } else {
1377 $map = try_load_header $path->load_path;
1378 }
1379
1380 $map or return; 1379 or return;
1381 1380
1382 $map->{load_original} = 1;
1383 $map->{instantiate_time} = $cf::RUNTIME;
1384 $map->last_access ($cf::RUNTIME);
1385 $map->instantiate;
1386
1387 # per-player maps become, after loading, normal maps
1388 $map->per_player (0) if $path->{user_rel};
1389 }
1390
1391 $map->path ($key);
1392 $map->{path} = $path;
1393 $map->{last_save} = $cf::RUNTIME; 1381 $map->{last_save} = $cf::RUNTIME;
1394 1382
1395 Coro::cede; 1383 $map->load_header
1384 or return;
1396 1385
1397 if ($map->should_reset) { 1386 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1387 # doing this can freeze the server in a sync job, obviously
1388 #$cf::WAIT_FOR_TICK->wait;
1398 $map->reset; 1389 $map->reset;
1399 undef $guard; 1390 undef $guard;
1400 $map = find $path 1391 return find $path;
1401 or return;
1402 } 1392 }
1403 1393
1404 $cf::MAP{$key} = $map 1394 $cf::MAP{$path} = $map
1405 } 1395 }
1406} 1396}
1397
1398sub pre_load { }
1399sub post_load { }
1407 1400
1408sub load { 1401sub load {
1409 my ($self) = @_; 1402 my ($self) = @_;
1410 1403
1404 local $self->{deny_reset} = 1; # loading can take a long time
1405
1411 my $path = $self->{path}; 1406 my $path = $self->{path};
1412 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1407 my $guard = cf::lock_acquire "map_load:$path";
1413 1408
1414 return if $self->in_memory != cf::MAP_SWAPPED; 1409 return if $self->in_memory != cf::MAP_SWAPPED;
1415 1410
1416 $self->in_memory (cf::MAP_LOADING); 1411 $self->in_memory (cf::MAP_LOADING);
1417 1412
1418 $self->alloc; 1413 $self->alloc;
1414
1415 $self->pre_load;
1416
1419 $self->load_objects ($self->{load_path}, 1) 1417 $self->_load_objects ($self->{load_path}, 1)
1420 or return; 1418 or return;
1421 1419
1422 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1420 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1423 if delete $self->{load_original}; 1421 if delete $self->{load_original};
1424 1422
1425 if (my $uniq = $path->uniq_path) { 1423 if (my $uniq = $self->uniq_path) {
1426 utf8::encode $uniq; 1424 utf8::encode $uniq;
1427 if (aio_open $uniq, O_RDONLY, 0) { 1425 if (aio_open $uniq, O_RDONLY, 0) {
1428 $self->clear_unique_items; 1426 $self->clear_unique_items;
1429 $self->load_objects ($uniq, 0); 1427 $self->_load_objects ($uniq, 0);
1430 } 1428 }
1431 } 1429 }
1432 1430
1433 Coro::cede; 1431 Coro::cede;
1434 1432
1435 # now do the right thing for maps 1433 # now do the right thing for maps
1436 $self->link_multipart_objects; 1434 $self->link_multipart_objects;
1437 1435
1438 if ($self->{path}->is_style_map) { 1436 unless ($self->{deny_activate}) {
1439 $self->{deny_save} = 1; 1437 $self->decay_objects;
1440 $self->{deny_reset} = 1;
1441 } else {
1442 $self->fix_auto_apply; 1438 $self->fix_auto_apply;
1443 $self->decay_objects;
1444 $self->update_buttons; 1439 $self->update_buttons;
1440 Coro::cede;
1445 $self->set_darkness_map; 1441 $self->set_darkness_map;
1446 $self->difficulty ($self->estimate_difficulty) 1442 $self->difficulty ($self->estimate_difficulty)
1447 unless $self->difficulty; 1443 unless $self->difficulty;
1444 Coro::cede;
1448 $self->activate; 1445 $self->activate;
1449 } 1446 }
1450 1447
1451 Coro::cede; 1448 $self->post_load;
1452 1449
1453 $self->in_memory (cf::MAP_IN_MEMORY); 1450 $self->in_memory (cf::MAP_IN_MEMORY);
1451}
1452
1453sub customise_for {
1454 my ($self, $ob) = @_;
1455
1456 return find "~" . $ob->name . "/" . $self->{path}
1457 if $self->per_player;
1458
1459 $self
1460}
1461
1462# find and load all maps in the 3x3 area around a map
1463sub load_diag {
1464 my ($map) = @_;
1465
1466 my @diag; # diagonal neighbours
1467
1468 for (0 .. 3) {
1469 my $neigh = $map->tile_path ($_)
1470 or next;
1471 $neigh = find $neigh, $map
1472 or next;
1473 $neigh->load;
1474
1475 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1476 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1477 }
1478
1479 for (@diag) {
1480 my $neigh = find @$_
1481 or next;
1482 $neigh->load;
1483 }
1454} 1484}
1455 1485
1456sub find_sync { 1486sub find_sync {
1457 my ($path, $origin) = @_; 1487 my ($path, $origin) = @_;
1458 1488
1459 cf::sync_job { cf::map::find $path, $origin } 1489 cf::sync_job { find $path, $origin }
1460} 1490}
1461 1491
1462sub do_load_sync { 1492sub do_load_sync {
1463 my ($map) = @_; 1493 my ($map) = @_;
1464 1494
1465 cf::sync_job { $map->load }; 1495 cf::sync_job { $map->load };
1466} 1496}
1467 1497
1498our %MAP_PREFETCH;
1499our $MAP_PREFETCHER = undef;
1500
1501sub find_async {
1502 my ($path, $origin) = @_;
1503
1504 $path = normalise $path, $origin && $origin->{path};
1505
1506 if (my $map = $cf::MAP{$path}) {
1507 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1508 }
1509
1510 undef $MAP_PREFETCH{$path};
1511 $MAP_PREFETCHER ||= cf::async {
1512 while (%MAP_PREFETCH) {
1513 for my $path (keys %MAP_PREFETCH) {
1514 my $map = find $path
1515 or next;
1516 $map->load;
1517
1518 delete $MAP_PREFETCH{$path};
1519 }
1520 }
1521 undef $MAP_PREFETCHER;
1522 };
1523 $MAP_PREFETCHER->prio (6);
1524
1525 ()
1526}
1527
1468sub save { 1528sub save {
1469 my ($self) = @_; 1529 my ($self) = @_;
1470 1530
1471 my $lock = cf::lock_acquire "map_data:" . $self->path; 1531 my $lock = cf::lock_acquire "map_data:" . $self->path;
1472 1532
1473 $self->{last_save} = $cf::RUNTIME; 1533 $self->{last_save} = $cf::RUNTIME;
1474 1534
1475 return unless $self->dirty; 1535 return unless $self->dirty;
1476 1536
1477 my $save = $self->{path}->save_path; utf8::encode $save; 1537 my $save = $self->save_path; utf8::encode $save;
1478 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1538 my $uniq = $self->uniq_path; utf8::encode $uniq;
1479 1539
1480 $self->{load_path} = $save; 1540 $self->{load_path} = $save;
1481 1541
1482 return if $self->{deny_save}; 1542 return if $self->{deny_save};
1483 1543
1486 cf::async { 1546 cf::async {
1487 $_->contr->save for $self->players; 1547 $_->contr->save for $self->players;
1488 }; 1548 };
1489 1549
1490 if ($uniq) { 1550 if ($uniq) {
1491 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1551 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1492 $self->save_objects ($uniq, cf::IO_UNIQUES); 1552 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1493 } else { 1553 } else {
1494 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1554 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1495 } 1555 }
1496} 1556}
1497 1557
1498sub swap_out { 1558sub swap_out {
1499 my ($self) = @_; 1559 my ($self) = @_;
1513 1573
1514sub reset_at { 1574sub reset_at {
1515 my ($self) = @_; 1575 my ($self) = @_;
1516 1576
1517 # TODO: safety, remove and allow resettable per-player maps 1577 # TODO: safety, remove and allow resettable per-player maps
1518 return 1e99 if $self->{path}{user_rel}; 1578 return 1e99 if $self->isa ("ext::map_per_player");#d#
1519 return 1e99 if $self->{deny_reset}; 1579 return 1e99 if $self->{deny_reset};
1520 1580
1521 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1581 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1522 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1582 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1523 1583
1528 my ($self) = @_; 1588 my ($self) = @_;
1529 1589
1530 $self->reset_at <= $cf::RUNTIME 1590 $self->reset_at <= $cf::RUNTIME
1531} 1591}
1532 1592
1533sub unlink_save {
1534 my ($self) = @_;
1535
1536 utf8::encode (my $save = $self->{path}->save_path);
1537 aioreq_pri 3; IO::AIO::aio_unlink $save;
1538 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1539}
1540
1541sub rename {
1542 my ($self, $new_path) = @_;
1543
1544 $self->unlink_save;
1545
1546 delete $cf::MAP{$self->path};
1547 $self->{path} = new cf::path $new_path;
1548 $self->path ($self->{path}->as_string);
1549 $cf::MAP{$self->path} = $self;
1550
1551 $self->save;
1552}
1553
1554sub reset { 1593sub reset {
1555 my ($self) = @_; 1594 my ($self) = @_;
1556 1595
1557 my $lock = cf::lock_acquire "map_data:" . $self->path; 1596 my $lock = cf::lock_acquire "map_data:$self->{path}";
1558 1597
1559 return if $self->players; 1598 return if $self->players;
1560 return if $self->{path}{user_rel};#d# 1599 return if $self->isa ("ext::map_per_player");#d#
1561 1600
1562 warn "resetting map ", $self->path;#d# 1601 warn "resetting map ", $self->path;#d#
1563 1602
1564 delete $cf::MAP{$self->path}; 1603 delete $cf::MAP{$self->path};
1604
1605 $self->in_memory (cf::MAP_SWAPPED);
1606 $self->clear;
1565 1607
1566 $_->clear_links_to ($self) for values %cf::MAP; 1608 $_->clear_links_to ($self) for values %cf::MAP;
1567 1609
1568 $self->unlink_save; 1610 $self->unlink_save;
1569 $self->destroy; 1611 $self->destroy;
1572my $nuke_counter = "aaaa"; 1614my $nuke_counter = "aaaa";
1573 1615
1574sub nuke { 1616sub nuke {
1575 my ($self) = @_; 1617 my ($self) = @_;
1576 1618
1619 delete $cf::MAP{$self->path};
1620
1621 $self->unlink_save;
1622
1623 bless $self, "cf::map";
1624 delete $self->{deny_reset};
1577 $self->{deny_save} = 1; 1625 $self->{deny_save} = 1;
1578 $self->reset_timeout (1); 1626 $self->reset_timeout (1);
1579 $self->rename ("{nuke}/" . ($nuke_counter++)); 1627 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1628
1629 $cf::MAP{$self->path} = $self;
1630
1580 $self->reset; # polite request, might not happen 1631 $self->reset; # polite request, might not happen
1581} 1632}
1582 1633
1583sub customise_for { 1634=item cf::map::unique_maps
1584 my ($map, $ob) = @_;
1585 1635
1586 if ($map->per_player) { 1636Returns an arrayref of paths of all shared maps that have
1587 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1637instantiated unique items. May block.
1588 }
1589 1638
1590 $map 1639=cut
1591}
1592 1640
1593sub emergency_save { 1641sub unique_maps() {
1594 my $freeze_guard = cf::freeze_mainloop; 1642 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1643 or return;
1595 1644
1596 warn "enter emergency perl save\n"; 1645 my @paths;
1597 1646
1598 cf::sync_job { 1647 for (@$files) {
1599 warn "begin emergency player save\n"; 1648 utf8::decode $_;
1600 $_->save for values %cf::PLAYER; 1649 next if /\.pst$/;
1601 warn "end emergency player save\n"; 1650 next unless /^$PATH_SEP/o;
1602 1651
1603 warn "begin emergency map save\n"; 1652 push @paths, cf::map::normalise $_;
1604 $_->save for values %cf::MAP;
1605 warn "end emergency map save\n";
1606 }; 1653 }
1607 1654
1608 warn "leave emergency perl save\n"; 1655 \@paths
1609} 1656}
1610 1657
1611package cf; 1658package cf;
1612 1659
1613=back 1660=back
1614 1661
1662=head3 cf::object
1663
1664=cut
1665
1666package cf::object;
1667
1668=over 4
1669
1670=item $ob->inv_recursive
1671
1672Returns the inventory of the object _and_ their inventories, recursively.
1673
1674=cut
1675
1676sub inv_recursive_;
1677sub inv_recursive_ {
1678 map { $_, inv_recursive_ $_->inv } @_
1679}
1680
1681sub inv_recursive {
1682 inv_recursive_ inv $_[0]
1683}
1684
1685package cf;
1686
1687=back
1615 1688
1616=head3 cf::object::player 1689=head3 cf::object::player
1617 1690
1618=over 4 1691=over 4
1619 1692
1659 1732
1660=item $player_object->enter_link 1733=item $player_object->enter_link
1661 1734
1662Freezes the player and moves him/her to a special map (C<{link}>). 1735Freezes the player and moves him/her to a special map (C<{link}>).
1663 1736
1664The player should be reaosnably safe there for short amounts of time. You 1737The player should be reasonably safe there for short amounts of time. You
1665I<MUST> call C<leave_link> as soon as possible, though. 1738I<MUST> call C<leave_link> as soon as possible, though.
1666 1739
1740Will never block.
1741
1667=item $player_object->leave_link ($map, $x, $y) 1742=item $player_object->leave_link ($map, $x, $y)
1668 1743
1669Moves the player out of the specila link map onto the given map. If the 1744Moves the player out of the special C<{link}> map onto the specified
1670map is not valid (or omitted), the player will be moved back to the 1745map. If the map is not valid (or omitted), the player will be moved back
1671location he/she was before the call to C<enter_link>, or, if that fails, 1746to the location he/she was before the call to C<enter_link>, or, if that
1672to the emergency map position. 1747fails, to the emergency map position.
1673 1748
1674Might block. 1749Might block.
1675 1750
1676=cut 1751=cut
1752
1753sub link_map {
1754 unless ($LINK_MAP) {
1755 $LINK_MAP = cf::map::find "{link}"
1756 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1757 $LINK_MAP->load;
1758 }
1759
1760 $LINK_MAP
1761}
1677 1762
1678sub cf::object::player::enter_link { 1763sub cf::object::player::enter_link {
1679 my ($self) = @_; 1764 my ($self) = @_;
1680 1765
1681 $self->deactivate_recursive; 1766 $self->deactivate_recursive;
1682 1767
1683 return if $self->map == $LINK_MAP; 1768 return if UNIVERSAL::isa $self->map, "ext::map_link";
1684 1769
1685 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1770 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1686 if $self->map; 1771 if $self->map;
1687 1772
1688 $self->enter_map ($LINK_MAP, 20, 20); 1773 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1689} 1774}
1690 1775
1691sub cf::object::player::leave_link { 1776sub cf::object::player::leave_link {
1692 my ($self, $map, $x, $y) = @_; 1777 my ($self, $map, $x, $y) = @_;
1693 1778
1711 # use -1 or undef as default coordinates, not 0, 0 1796 # use -1 or undef as default coordinates, not 0, 0
1712 ($x, $y) = ($map->enter_x, $map->enter_y) 1797 ($x, $y) = ($map->enter_x, $map->enter_y)
1713 if $x <=0 && $y <= 0; 1798 if $x <=0 && $y <= 0;
1714 1799
1715 $map->load; 1800 $map->load;
1801 $map->load_diag;
1716 1802
1717 return unless $self->contr->active; 1803 return unless $self->contr->active;
1718 $self->activate_recursive; 1804 $self->activate_recursive;
1719 $self->enter_map ($map, $x, $y); 1805 $self->enter_map ($map, $x, $y);
1720} 1806}
1756=cut 1842=cut
1757 1843
1758sub cf::object::player::goto { 1844sub cf::object::player::goto {
1759 my ($self, $path, $x, $y) = @_; 1845 my ($self, $path, $x, $y) = @_;
1760 1846
1761 $path = new cf::path $path;
1762 $path ne "/" or Carp::cluck ("oy");#d#
1763
1764 $self->enter_link; 1847 $self->enter_link;
1765 1848
1766 (async { 1849 (async {
1850 my $map = eval {
1767 my $map = cf::map::find $path->as_string; 1851 my $map = cf::map::find $path;
1768 $map = $map->customise_for ($self) if $map; 1852 $map = $map->customise_for ($self) if $map;
1769 1853 $map
1770# warn "entering ", $map->path, " at ($x, $y)\n" 1854 } or
1771# if $map;
1772
1773 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1855 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1774 1856
1775 $self->leave_link ($map, $x, $y); 1857 $self->leave_link ($map, $x, $y);
1776 })->prio (1); 1858 })->prio (1);
1777} 1859}
1778 1860
1782 1864
1783sub parse_random_map_params { 1865sub parse_random_map_params {
1784 my ($spec) = @_; 1866 my ($spec) = @_;
1785 1867
1786 my $rmp = { # defaults 1868 my $rmp = { # defaults
1787 xsize => 10, 1869 xsize => (cf::rndm 15, 40),
1788 ysize => 10, 1870 ysize => (cf::rndm 15, 40),
1871 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1872 #layout => string,
1789 }; 1873 };
1790 1874
1791 for (split /\n/, $spec) { 1875 for (split /\n/, $spec) {
1792 my ($k, $v) = split /\s+/, $_, 2; 1876 my ($k, $v) = split /\s+/, $_, 2;
1793 1877
1797 $rmp 1881 $rmp
1798} 1882}
1799 1883
1800sub prepare_random_map { 1884sub prepare_random_map {
1801 my ($exit) = @_; 1885 my ($exit) = @_;
1886
1887 my $guard = cf::lock_acquire "exit_prepare:$exit";
1802 1888
1803 # all this does is basically replace the /! path by 1889 # all this does is basically replace the /! path by
1804 # a new random map path (?random/...) with a seed 1890 # a new random map path (?random/...) with a seed
1805 # that depends on the exit object 1891 # that depends on the exit object
1806 1892
1807 my $rmp = parse_random_map_params $exit->msg; 1893 my $rmp = parse_random_map_params $exit->msg;
1808 1894
1809 if ($exit->map) { 1895 if ($exit->map) {
1810 $rmp->{region} = $exit->map->region_name; 1896 $rmp->{region} = $exit->region->name;
1811 $rmp->{origin_map} = $exit->map->path; 1897 $rmp->{origin_map} = $exit->map->path;
1812 $rmp->{origin_x} = $exit->x; 1898 $rmp->{origin_x} = $exit->x;
1813 $rmp->{origin_y} = $exit->y; 1899 $rmp->{origin_y} = $exit->y;
1814 } 1900 }
1815 1901
1816 $rmp->{random_seed} ||= $exit->random_seed; 1902 $rmp->{random_seed} ||= $exit->random_seed;
1817 1903
1818 my $data = cf::to_json $rmp; 1904 my $data = cf::to_json $rmp;
1819 my $md5 = Digest::MD5::md5_hex $data; 1905 my $md5 = Digest::MD5::md5_hex $data;
1906 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1820 1907
1821 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1908 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1822 aio_write $fh, 0, (length $data), $data, 0; 1909 aio_write $fh, 0, (length $data), $data, 0;
1910 undef $fh;
1911 aio_rename "$meta~", $meta;
1823 1912
1824 $exit->slaying ("?random/$md5"); 1913 $exit->slaying ("?random/$md5");
1825 $exit->msg (undef); 1914 $exit->msg (undef);
1826 } 1915 }
1827} 1916}
1828 1917
1829sub cf::object::player::enter_exit { 1918sub cf::object::player::enter_exit {
1830 my ($self, $exit) = @_; 1919 my ($self, $exit) = @_;
1831 1920
1832 return unless $self->type == cf::PLAYER; 1921 return unless $self->type == cf::PLAYER;
1922
1923 if ($exit->slaying eq "/!") {
1924 #TODO: this should de-fi-ni-te-ly not be a sync-job
1925 cf::sync_job { prepare_random_map $exit };
1926 }
1927
1928 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1929 my $hp = $exit->stats->hp;
1930 my $sp = $exit->stats->sp;
1833 1931
1834 $self->enter_link; 1932 $self->enter_link;
1835 1933
1836 (async { 1934 (async {
1837 $self->deactivate_recursive; # just to be sure 1935 $self->deactivate_recursive; # just to be sure
1838 unless (eval { 1936 unless (eval {
1839 prepare_random_map $exit 1937 $self->goto ($slaying, $hp, $sp);
1840 if $exit->slaying eq "/!";
1841
1842 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1843 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1844 1938
1845 1; 1939 1;
1846 }) { 1940 }) {
1847 $self->message ("Something went wrong deep within the crossfire server. " 1941 $self->message ("Something went wrong deep within the crossfire server. "
1848 . "I'll try to bring you back to the map you were before. " 1942 . "I'll try to bring you back to the map you were before. "
1849 . "Please report this to the dungeon master", 1943 . "Please report this to the dungeon master!",
1850 cf::NDI_UNIQUE | cf::NDI_RED); 1944 cf::NDI_UNIQUE | cf::NDI_RED);
1851 1945
1852 warn "ERROR in enter_exit: $@"; 1946 warn "ERROR in enter_exit: $@";
1853 $self->leave_link; 1947 $self->leave_link;
1854 } 1948 }
1909 # get handled first 2003 # get handled first
1910 my $queue = delete $ns->{query_queue} 2004 my $queue = delete $ns->{query_queue}
1911 or return; # be conservative, not sure how that can happen, but we saw a crash here 2005 or return; # be conservative, not sure how that can happen, but we saw a crash here
1912 2006
1913 (shift @$queue)->[1]->($msg); 2007 (shift @$queue)->[1]->($msg);
2008 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1914 2009
1915 push @{ $ns->{query_queue} }, @$queue; 2010 push @{ $ns->{query_queue} }, @$queue;
1916 2011
1917 if (@{ $ns->{query_queue} } == @$queue) { 2012 if (@{ $ns->{query_queue} } == @$queue) {
1918 if (@$queue) { 2013 if (@$queue) {
2137 sub db_sync() { 2232 sub db_sync() {
2138 db_save if $dirty; 2233 db_save if $dirty;
2139 undef $dirty; 2234 undef $dirty;
2140 } 2235 }
2141 2236
2142 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2237 my $idle = Event->idle (
2143 db_sync; 2238 reentrant => 0,
2239 min => 10,
2240 max => 20,
2241 repeat => 0,
2242 data => WF_AUTOCANCEL,
2243 cb => \&db_sync,
2144 }); 2244 );
2145 2245
2146 sub db_dirty() { 2246 sub db_dirty() {
2147 $dirty = 1; 2247 $dirty = 1;
2148 $idle->start; 2248 $idle->start;
2149 } 2249 }
2197 2297
2198sub main { 2298sub main {
2199 # we must not ever block the main coroutine 2299 # we must not ever block the main coroutine
2200 local $Coro::idle = sub { 2300 local $Coro::idle = sub {
2201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2301 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2302 (async {
2202 async { Event::one_event }; 2303 Event::one_event;
2304 })->prio (Coro::PRIO_MAX);
2203 }; 2305 };
2204 2306
2205 cfg_load; 2307 cfg_load;
2206 db_load; 2308 db_load;
2207 load_extensions; 2309 load_extensions;
2310
2311 $TICK_WATCHER->start;
2208 Event::loop; 2312 Event::loop;
2209} 2313}
2210 2314
2211############################################################################# 2315#############################################################################
2212# initialisation 2316# initialisation and cleanup
2317
2318# install some emergency cleanup handlers
2319BEGIN {
2320 for my $signal (qw(INT HUP TERM)) {
2321 Event->signal (
2322 reentrant => 0,
2323 data => WF_AUTOCANCEL,
2324 signal => $signal,
2325 prio => 0,
2326 cb => sub {
2327 cf::cleanup "SIG$signal";
2328 },
2329 );
2330 }
2331}
2332
2333sub emergency_save() {
2334 my $freeze_guard = cf::freeze_mainloop;
2335
2336 warn "enter emergency perl save\n";
2337
2338 cf::sync_job {
2339 # use a peculiar iteration method to avoid tripping on perl
2340 # refcount bugs in for. also avoids problems with players
2341 # and maps saved/destroyed asynchronously.
2342 warn "begin emergency player save\n";
2343 for my $login (keys %cf::PLAYER) {
2344 my $pl = $cf::PLAYER{$login} or next;
2345 $pl->valid or next;
2346 $pl->save;
2347 }
2348 warn "end emergency player save\n";
2349
2350 warn "begin emergency map save\n";
2351 for my $path (keys %cf::MAP) {
2352 my $map = $cf::MAP{$path} or next;
2353 $map->valid or next;
2354 $map->save;
2355 }
2356 warn "end emergency map save\n";
2357 };
2358
2359 warn "leave emergency perl save\n";
2360}
2213 2361
2214sub reload() { 2362sub reload() {
2215 # can/must only be called in main 2363 # can/must only be called in main
2216 if ($Coro::current != $Coro::main) { 2364 if ($Coro::current != $Coro::main) {
2217 warn "can only reload from main coroutine\n"; 2365 warn "can only reload from main coroutine";
2218 return; 2366 return;
2219 } 2367 }
2220 2368
2221 warn "reloading..."; 2369 warn "reloading...";
2222 2370
2223 my $guard = freeze_mainloop; 2371 warn "cancelling server ticker";
2372 $TICK_WATCHER->cancel;
2373
2224 cf::emergency_save; 2374 cf::emergency_save;
2225 2375
2226 eval { 2376 eval {
2227 # if anything goes wrong in here, we should simply crash as we already saved 2377 # if anything goes wrong in here, we should simply crash as we already saved
2228 2378
2229 # cancel all watchers 2379 warn "syncing database to disk";
2380 cf::db_sync;
2381
2382 warn "cancelling all WF_AUTOCANCEL watchers";
2230 for (Event::all_watchers) { 2383 for (Event::all_watchers) {
2231 $_->cancel if $_->data & WF_AUTOCANCEL; 2384 $_->cancel if $_->data & WF_AUTOCANCEL;
2232 } 2385 }
2233 2386
2387 warn "flushing outstanding aio requests";
2388 for (;;) {
2389 IO::AIO::flush;
2390 Coro::cede;
2391 last unless IO::AIO::nreqs;
2392 warn "iterate...";
2393 }
2394
2234 # cancel all extension coros 2395 warn "cancelling all extension coros";
2235 $_->cancel for values %EXT_CORO; 2396 $_->cancel for values %EXT_CORO;
2236 %EXT_CORO = (); 2397 %EXT_CORO = ();
2237 2398
2238 # unload all extensions 2399 warn "removing commands";
2239 for (@exts) { 2400 %COMMAND = ();
2401
2402 warn "removing ext commands";
2403 %EXTCMD = ();
2404
2405 warn "unloading/nuking all extensions";
2406 for my $pkg (@EXTS) {
2240 warn "unloading <$_>"; 2407 warn "... unloading $pkg";
2241 unload_extension $_; 2408
2409 if (my $cb = $pkg->can ("unload")) {
2410 eval {
2411 $cb->($pkg);
2412 1
2413 } or warn "$pkg unloaded, but with errors: $@";
2242 } 2414 }
2243 2415
2416 warn "... nuking $pkg";
2417 Symbol::delete_package $pkg;
2418 }
2419
2244 # unload all modules loaded from $LIBDIR 2420 warn "unloading all perl modules loaded from $LIBDIR";
2245 while (my ($k, $v) = each %INC) { 2421 while (my ($k, $v) = each %INC) {
2246 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2422 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2247 2423
2248 warn "removing <$k>"; 2424 warn "... unloading $k";
2249 delete $INC{$k}; 2425 delete $INC{$k};
2250 2426
2251 $k =~ s/\.pm$//; 2427 $k =~ s/\.pm$//;
2252 $k =~ s/\//::/g; 2428 $k =~ s/\//::/g;
2253 2429
2256 } 2432 }
2257 2433
2258 Symbol::delete_package $k; 2434 Symbol::delete_package $k;
2259 } 2435 }
2260 2436
2261 # sync database to disk
2262 cf::db_sync;
2263 IO::AIO::flush;
2264
2265 # get rid of safe::, as good as possible 2437 warn "getting rid of safe::, as good as possible";
2266 Symbol::delete_package "safe::$_" 2438 Symbol::delete_package "safe::$_"
2267 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2439 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2268 2440
2269 # remove register_script_function callbacks
2270 # TODO
2271
2272 # unload cf.pm "a bit" 2441 warn "unloading cf.pm \"a bit\"";
2273 delete $INC{"cf.pm"}; 2442 delete $INC{"cf.pm"};
2274 2443
2275 # don't, removes xs symbols, too, 2444 # don't, removes xs symbols, too,
2276 # and global variables created in xs 2445 # and global variables created in xs
2277 #Symbol::delete_package __PACKAGE__; 2446 #Symbol::delete_package __PACKAGE__;
2278 2447
2279 # reload cf.pm 2448 warn "unload completed, starting to reload now";
2449
2280 warn "reloading cf.pm"; 2450 warn "reloading cf.pm";
2281 require cf; 2451 require cf;
2282 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2452 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2283 2453
2284 # load config and database again 2454 warn "loading config and database again";
2285 cf::cfg_load; 2455 cf::cfg_load;
2286 cf::db_load; 2456 cf::db_load;
2287 2457
2288 # load extensions
2289 warn "load extensions"; 2458 warn "loading extensions";
2290 cf::load_extensions; 2459 cf::load_extensions;
2291 2460
2292 # reattach attachments to objects 2461 warn "reattaching attachments to objects/players";
2293 warn "reattach";
2294 _global_reattach; 2462 _global_reattach;
2463 warn "reattaching attachments to maps";
2295 reattach $_ for values %MAP; 2464 reattach $_ for values %MAP;
2465
2466 warn "restarting server ticker";
2467
2468 $TICK_WATCHER->start;
2296 }; 2469 };
2297 2470
2298 if ($@) { 2471 if ($@) {
2299 warn $@; 2472 warn $@;
2300 warn "error while reloading, exiting."; 2473 warn "error while reloading, exiting.";
2301 exit 1; 2474 exit 1;
2302 } 2475 }
2303 2476
2304 warn "reloaded successfully"; 2477 warn "reloaded";
2305}; 2478};
2306 2479
2307############################################################################# 2480our $RELOAD_WATCHER; # used only during reload
2308
2309unless ($LINK_MAP) {
2310 $LINK_MAP = cf::map::new;
2311
2312 $LINK_MAP->width (41);
2313 $LINK_MAP->height (41);
2314 $LINK_MAP->alloc;
2315 $LINK_MAP->path ("{link}");
2316 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2317 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2318
2319 # dirty hack because... archetypes are not yet loaded
2320 Event->timer (
2321 after => 10,
2322 cb => sub {
2323 $_[0]->w->cancel;
2324
2325 # provide some exits "home"
2326 my $exit = cf::object::new "exit";
2327
2328 $exit->slaying ($EMERGENCY_POSITION->[0]);
2329 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2330 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2331
2332 $LINK_MAP->insert ($exit->clone, 19, 19);
2333 $LINK_MAP->insert ($exit->clone, 19, 20);
2334 $LINK_MAP->insert ($exit->clone, 19, 21);
2335 $LINK_MAP->insert ($exit->clone, 20, 19);
2336 $LINK_MAP->insert ($exit->clone, 20, 21);
2337 $LINK_MAP->insert ($exit->clone, 21, 19);
2338 $LINK_MAP->insert ($exit->clone, 21, 20);
2339 $LINK_MAP->insert ($exit->clone, 21, 21);
2340
2341 $exit->destroy;
2342 });
2343
2344 $LINK_MAP->{deny_save} = 1;
2345 $LINK_MAP->{deny_reset} = 1;
2346
2347 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2348}
2349
2350register "<global>", __PACKAGE__;
2351 2481
2352register_command "reload" => sub { 2482register_command "reload" => sub {
2353 my ($who, $arg) = @_; 2483 my ($who, $arg) = @_;
2354 2484
2355 if ($who->flag (FLAG_WIZ)) { 2485 if ($who->flag (FLAG_WIZ)) {
2356 $who->message ("start of reload."); 2486 $who->message ("reloading server.");
2487
2488 # doing reload synchronously and two reloads happen back-to-back,
2489 # coro crashes during coro_state_free->destroy here.
2490
2491 $RELOAD_WATCHER ||= Event->timer (
2492 reentrant => 0,
2493 after => 0,
2494 data => WF_AUTOCANCEL,
2495 cb => sub {
2357 reload; 2496 reload;
2358 $who->message ("end of reload."); 2497 undef $RELOAD_WATCHER;
2498 },
2499 );
2359 } 2500 }
2360}; 2501};
2361 2502
2362unshift @INC, $LIBDIR; 2503unshift @INC, $LIBDIR;
2504
2505my $bug_warning = 0;
2363 2506
2364$TICK_WATCHER = Event->timer ( 2507$TICK_WATCHER = Event->timer (
2365 reentrant => 0, 2508 reentrant => 0,
2509 parked => 1,
2366 prio => 0, 2510 prio => 0,
2367 at => $NEXT_TICK || $TICK, 2511 at => $NEXT_TICK || $TICK,
2368 data => WF_AUTOCANCEL, 2512 data => WF_AUTOCANCEL,
2369 cb => sub { 2513 cb => sub {
2514 if ($Coro::current != $Coro::main) {
2515 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2516 unless ++$bug_warning > 10;
2517 return;
2518 }
2519
2520 $NOW = Event::time;
2521
2370 cf::server_tick; # one server iteration 2522 cf::server_tick; # one server iteration
2371 $RUNTIME += $TICK; 2523 $RUNTIME += $TICK;
2372 $NEXT_TICK += $TICK; 2524 $NEXT_TICK += $TICK;
2525
2526 $WAIT_FOR_TICK->broadcast;
2527 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2528
2529 Event::sweep;
2530 Coro::cede_notself;
2531
2532# my $AFTER = Event::time;
2533# warn $AFTER - $NOW;#d#
2373 2534
2374 # if we are delayed by four ticks or more, skip them all 2535 # if we are delayed by four ticks or more, skip them all
2375 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2536 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2376 2537
2377 $TICK_WATCHER->at ($NEXT_TICK); 2538 $TICK_WATCHER->at ($NEXT_TICK);
2378 $TICK_WATCHER->start; 2539 $TICK_WATCHER->start;
2379 }, 2540 },
2380); 2541);
2381 2542
2382IO::AIO::max_poll_time $TICK * 0.2; 2543IO::AIO::max_poll_time $TICK * 0.1;
2383 2544
2384Event->io ( 2545undef $Coro::AIO::WATCHER;
2546$AIO_POLL_WATCHER = Event->io (
2547 reentrant => 0,
2385 fd => IO::AIO::poll_fileno, 2548 fd => IO::AIO::poll_fileno,
2386 poll => 'r', 2549 poll => 'r',
2387 prio => 5, 2550 prio => 6,
2388 data => WF_AUTOCANCEL, 2551 data => WF_AUTOCANCEL,
2389 cb => \&IO::AIO::poll_cb, 2552 cb => \&IO::AIO::poll_cb,
2390); 2553);
2391 2554
2392Event->timer ( 2555$WRITE_RUNTIME_WATCHER = Event->timer (
2556 reentrant => 0,
2393 data => WF_AUTOCANCEL, 2557 data => WF_AUTOCANCEL,
2394 after => 0, 2558 after => 1,
2395 interval => 10, 2559 interval => 10,
2396 cb => sub { 2560 prio => 6, # keep it lowest so it acts like a watchdog
2397 (Coro::unblock_sub { 2561 cb => Coro::unblock_sub {
2398 write_runtime 2562 write_runtime
2399 or warn "ERROR: unable to write runtime file: $!"; 2563 or warn "ERROR: unable to write runtime file: $!";
2400 })->();
2401 }, 2564 },
2402); 2565);
2403 2566
2404END { cf::emergency_save } 2567END { cf::emergency_save }
2405 2568

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines