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.163 by root, Thu Jan 11 01:01:56 2007 UTC vs.
Revision 1.210 by root, Mon Feb 12 01:32:49 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;
19 19
20use BDB ();
20use Data::Dumper; 21use Data::Dumper;
21use Digest::MD5; 22use Digest::MD5;
22use Fcntl; 23use Fcntl;
23use IO::AIO 2.32 (); 24use IO::AIO 2.32 ();
24use YAML::Syck (); 25use YAML::Syck ();
25use Time::HiRes; 26use Time::HiRes;
27use Compress::LZF;
28
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
26 30
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 31use Event; $Event::Eval = 1; # no idea why this is required, but it is
28 32
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 34
… …
44our @EVENT; 48our @EVENT;
45our $LIBDIR = datadir . "/ext"; 49our $LIBDIR = datadir . "/ext";
46 50
47our $TICK = MAX_TIME * 1e-6; 51our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 52our $TICK_WATCHER;
53our $AIO_POLL_WATCHER;
54our $WRITE_RUNTIME_WATCHER;
49our $NEXT_TICK; 55our $NEXT_TICK;
50our $NOW; 56our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off
58
59our $BDB_POLL_WATCHER;
60our $DB_ENV;
51 61
52our %CFG; 62our %CFG;
53 63
54our $UPTIME; $UPTIME ||= time; 64our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 65our $RUNTIME;
56 66
57our %PLAYER; # all users 67our %PLAYER; # all users
58our %MAP; # all maps 68our %MAP; # all maps
59our $LINK_MAP; # the special {link} map 69our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random"; 70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
61 72
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
75
76# used to convert map paths into valid unix filenames by replacing / by ∕
77our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
64 78
65binmode STDOUT; 79binmode STDOUT;
66binmode STDERR; 80binmode STDERR;
67 81
68# read virtual server time, if available 82# read virtual server time, if available
… …
75mkdir cf::localdir; 89mkdir cf::localdir;
76mkdir cf::localdir . "/" . cf::playerdir; 90mkdir cf::localdir . "/" . cf::playerdir;
77mkdir cf::localdir . "/" . cf::tmpdir; 91mkdir cf::localdir . "/" . cf::tmpdir;
78mkdir cf::localdir . "/" . cf::uniquedir; 92mkdir cf::localdir . "/" . cf::uniquedir;
79mkdir $RANDOM_MAPS; 93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
80 95
81# a special map that is always available
82our $LINK_MAP;
83our $EMERGENCY_POSITION; 96our $EMERGENCY_POSITION;
97
98sub cf::map::normalise;
84 99
85############################################################################# 100#############################################################################
86 101
87=head2 GLOBAL VARIABLES 102=head2 GLOBAL VARIABLES
88 103
… …
256} 271}
257 272
258sub freeze_mainloop { 273sub freeze_mainloop {
259 return unless $TICK_WATCHER->is_active; 274 return unless $TICK_WATCHER->is_active;
260 275
261 my $guard = Coro::guard { $TICK_WATCHER->start }; 276 my $guard = Coro::guard {
277 $TICK_WATCHER->start;
278 $WRITE_RUNTIME_WATCHER->start;
279 };
280 $WRITE_RUNTIME_WATCHER->stop;
262 $TICK_WATCHER->stop; 281 $TICK_WATCHER->stop;
263 $guard 282 $guard
264} 283}
265 284
266=item cf::async { BLOCK } 285=item cf::async { BLOCK }
… …
342 my $runtime = cf::localdir . "/runtime"; 361 my $runtime = cf::localdir . "/runtime";
343 362
344 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
345 or return; 364 or return;
346 365
366 my $value = $cf::RUNTIME + 90 + 10;
347 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 367 # 10 is the runtime save interval, for a monotonic clock
368 # 60 allows for the watchdog to kill the server.
369
348 (aio_write $fh, 0, (length $value), $value, 0) <= 0 370 (aio_write $fh, 0, (length $value), $value, 0) <= 0
349 and return; 371 and return;
350 372
373 # always fsync - this file is important
351 aio_fsync $fh 374 aio_fsync $fh
352 and return; 375 and return;
353 376
354 close $fh 377 close $fh
355 or return; 378 or return;
… …
361} 384}
362 385
363=back 386=back
364 387
365=cut 388=cut
366
367#############################################################################
368
369package cf::path;
370
371use overload
372 '""' => \&as_string;
373
374# used to convert map paths into valid unix filenames by repalcing / by ∕
375our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
376
377sub register {
378 my ($pkg, $prefix) = @_;
379
380 $EXT_MAP{$prefix} = $pkg;
381}
382
383sub new {
384 my ($class, $path, $base) = @_;
385
386 return $path if ref $path;
387
388 my $self = {};
389
390 # {... are special paths that are not being touched
391 # ?xxx/... are special absolute paths
392 # ?random/... random maps
393 # /! non-realised random map exit
394 # /... normal maps
395 # ~/... per-player maps without a specific player (DO NOT USE)
396 # ~user/... per-player map of a specific user
397
398 $path =~ s/$PATH_SEP/\//go;
399
400 if ($path =~ /^{/) {
401 # fine as it is
402 } else {
403 if ($path =~ s{^~([^/]+)?}{}) {
404 # ~user
405 $self->{user_rel} = 1;
406
407 if (defined $1) {
408 $self->{user} = $1;
409 } elsif ($base =~ m{^~([^/]+)/}) {
410 $self->{user} = $1;
411 } else {
412 warn "cannot resolve user-relative path without user <$path,$base>\n";
413 }
414 } elsif ($path =~ s{^\?([^/]+)/}{}) {
415 # ?...
416 $self->{ext} = $1;
417 if (my $ext = $EXT_MAP{$1}) {
418 bless $self, $ext;
419 }
420 } elsif ($path =~ /^\//) {
421 # /...
422 # already absolute
423 } else {
424 # relative
425 $base =~ s{[^/]+/?$}{};
426 return $class->new ("$base/$path");
427 }
428
429 for ($path) {
430 redo if s{/\.?/}{/};
431 redo if s{/[^/]+/\.\./}{/};
432 }
433 }
434
435 $self->{path} = $path;
436
437 if ("HASH" eq ref $self) {
438 bless $self, $class;
439 } else {
440 $self->init;
441 }
442
443 for my $ext (values %EXT_MAP) {
444 if (my $subst = $ext->substitute ($self)) {
445 return $subst;
446 }
447 }
448
449 $self
450}
451
452sub init {
453 # nop
454}
455
456sub substitute {
457 ()
458}
459
460# the name / primary key / in-game path
461sub as_string {
462 my ($self) = @_;
463
464 $self->{user_rel} ? "~$self->{user}$self->{path}"
465 : $self->{ext} ? "?$self->{ext}/$self->{path}"
466 : $self->{path}
467}
468
469# the displayed name, this is a one way mapping
470sub visible_name {
471 &as_string
472}
473
474# escape the /'s in the path
475sub _escaped_path {
476 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
477
478 $path
479}
480
481# the original (read-only) location
482sub load_path {
483 my ($self) = @_;
484
485 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
486}
487
488# the temporary/swap location
489sub save_path {
490 my ($self) = @_;
491
492 $self->{user_rel}
493 ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
494 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
495}
496
497# the unique path, undef == no special unique path
498sub uniq_path {
499 my ($self) = @_;
500
501 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
502}
503
504# this is somewhat ugly, but style maps do need special treatment
505sub is_style_map {
506 $_[0]{path} =~ m{^/styles/}
507}
508
509sub load_orig {
510 my ($self) = @_;
511
512 &cf::map::load_map_header ($self->load_path)
513}
514
515sub load_temp {
516 my ($self) = @_;
517
518 &cf::map::load_map_header ($self->save_path)
519}
520
521package cf;
522 389
523############################################################################# 390#############################################################################
524 391
525=head2 ATTACHABLE OBJECTS 392=head2 ATTACHABLE OBJECTS
526 393
… …
652our @CB_TYPE = (); # registry for type (cf-object class) based events 519our @CB_TYPE = (); # registry for type (cf-object class) based events
653our @CB_MAP = (); 520our @CB_MAP = ();
654 521
655my %attachment; 522my %attachment;
656 523
524sub cf::attachable::thawer_merge {
525 # simply override everything except _meta
526 local $_[0]{_meta};
527 %{$_[0]} = %{$_[1]};
528}
529
657sub _attach_cb($$$$) { 530sub _attach_cb($$$$) {
658 my ($registry, $event, $prio, $cb) = @_; 531 my ($registry, $event, $prio, $cb) = @_;
659 532
660 use sort 'stable'; 533 use sort 'stable';
661 534
… …
832# object support 705# object support
833 706
834sub reattach { 707sub reattach {
835 # basically do the same as instantiate, without calling instantiate 708 # basically do the same as instantiate, without calling instantiate
836 my ($obj) = @_; 709 my ($obj) = @_;
710
711 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
837 712
838 my $registry = $obj->registry; 713 my $registry = $obj->registry;
839 714
840 @$registry = (); 715 @$registry = ();
841 716
… …
888 $filename, length $$rdata, scalar @$objs; 763 $filename, length $$rdata, scalar @$objs;
889 764
890 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 765 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
891 chmod SAVE_MODE, $fh; 766 chmod SAVE_MODE, $fh;
892 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 767 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
893 aio_fsync $fh; 768 aio_fsync $fh if $cf::USE_FSYNC;
894 close $fh; 769 close $fh;
895 770
896 if (@$objs) { 771 if (@$objs) {
897 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 772 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
898 chmod SAVE_MODE, $fh; 773 chmod SAVE_MODE, $fh;
899 my $data = Storable::nfreeze { version => 1, objs => $objs }; 774 my $data = Storable::nfreeze { version => 1, objs => $objs };
900 aio_write $fh, 0, (length $data), $data, 0; 775 aio_write $fh, 0, (length $data), $data, 0;
901 aio_fsync $fh; 776 aio_fsync $fh if $cf::USE_FSYNC;
902 close $fh; 777 close $fh;
903 aio_rename "$filename.pst~", "$filename.pst"; 778 aio_rename "$filename.pst~", "$filename.pst";
904 } 779 }
905 } else { 780 } else {
906 aio_unlink "$filename.pst"; 781 aio_unlink "$filename.pst";
… …
912 } 787 }
913 } else { 788 } else {
914 aio_unlink $filename; 789 aio_unlink $filename;
915 aio_unlink "$filename.pst"; 790 aio_unlink "$filename.pst";
916 } 791 }
792
793 #d##TODO# nuke non .map-files if exist
794 if ($filename =~ s/\.map$//) {
795 aio_unlink $filename;
796 aio_unlink "$filename.pst";
797 }
917 } 798 }
918} 799}
919 800
920sub object_freezer_as_string { 801sub object_freezer_as_string {
921 my ($rdata, $objs) = @_; 802 my ($rdata, $objs) = @_;
… …
927 808
928sub object_thawer_load { 809sub object_thawer_load {
929 my ($filename) = @_; 810 my ($filename) = @_;
930 811
931 my ($data, $av); 812 my ($data, $av);
813
814 #d#TODO remove .map if file does not exist
815 aio_stat $filename and $filename =~ s/\.map$//;
932 816
933 (aio_load $filename, $data) >= 0 817 (aio_load $filename, $data) >= 0
934 or return; 818 or return;
935 819
936 unless (aio_stat "$filename.pst") { 820 unless (aio_stat "$filename.pst") {
… …
1028 "package $pkg; use strict; use utf8;\n" 912 "package $pkg; use strict; use utf8;\n"
1029 . "#line 1 \"$path\"\n{\n" 913 . "#line 1 \"$path\"\n{\n"
1030 . (do { local $/; <$fh> }) 914 . (do { local $/; <$fh> })
1031 . "\n};\n1"; 915 . "\n};\n1";
1032 916
1033 eval $source 917 unless (eval $source) {
1034 or die $@ ? "$path: $@\n" 918 my $msg = $@ ? "$path: $@\n"
1035 : "extension disabled.\n"; 919 : "extension disabled.\n";
920 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
921 warn $@;
922 warn "mandatory extension failed to load, exiting.\n";
923 exit 1;
924 }
925 die $@;
926 }
1036 927
1037 push @EXTS, $pkg; 928 push @EXTS, $pkg;
1038} 929}
1039 930
1040sub load_extensions { 931sub load_extensions {
… …
1046 } or warn "$ext not loaded: $@"; 937 } or warn "$ext not loaded: $@";
1047 } 938 }
1048} 939}
1049 940
1050############################################################################# 941#############################################################################
1051# load/save/clean perl data associated with a map
1052
1053*cf::mapsupport::on_clean = sub {
1054 my ($map) = @_;
1055
1056 my $path = $map->tmpname;
1057 defined $path or return;
1058
1059 unlink "$path.pst";
1060};
1061
1062cf::map->attach (prio => -10000, package => cf::mapsupport::);
1063
1064#############################################################################
1065 942
1066=head2 CORE EXTENSIONS 943=head2 CORE EXTENSIONS
1067 944
1068Functions and methods that extend core crossfire objects. 945Functions and methods that extend core crossfire objects.
1069 946
… …
1105 982
1106sub exists($) { 983sub exists($) {
1107 my ($login) = @_; 984 my ($login) = @_;
1108 985
1109 $cf::PLAYER{$login} 986 $cf::PLAYER{$login}
1110 or cf::sync_job { !aio_stat $login } 987 or cf::sync_job { !aio_stat path $login }
1111} 988}
1112 989
1113sub find($) { 990sub find($) {
1114 return $cf::PLAYER{$_[0]} || do { 991 return $cf::PLAYER{$_[0]} || do {
1115 my $login = $_[0]; 992 my $login = $_[0];
… …
1205 \@logins 1082 \@logins
1206} 1083}
1207 1084
1208=item $player->maps 1085=item $player->maps
1209 1086
1210Returns an arrayref of cf::path's of all maps that are private for this 1087Returns an arrayref of map paths that are private for this
1211player. May block. 1088player. May block.
1212 1089
1213=cut 1090=cut
1214 1091
1215sub maps($) { 1092sub maps($) {
1216 my ($pl) = @_; 1093 my ($pl) = @_;
1094
1095 $pl = ref $pl ? $pl->ob->name : $pl;
1217 1096
1218 my $files = aio_readdir playerdir $pl 1097 my $files = aio_readdir playerdir $pl
1219 or return; 1098 or return;
1220 1099
1221 my @paths; 1100 my @paths;
… …
1223 for (@$files) { 1102 for (@$files) {
1224 utf8::decode $_; 1103 utf8::decode $_;
1225 next if /\.(?:pl|pst)$/; 1104 next if /\.(?:pl|pst)$/;
1226 next unless /^$PATH_SEP/o; 1105 next unless /^$PATH_SEP/o;
1227 1106
1228 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1107 push @paths, cf::map::normalise "~$pl/$_";
1229 } 1108 }
1230 1109
1231 \@paths 1110 \@paths
1232} 1111}
1233 1112
… …
1259package cf::map; 1138package cf::map;
1260 1139
1261use Fcntl; 1140use Fcntl;
1262use Coro::AIO; 1141use Coro::AIO;
1263 1142
1143use overload
1144 '""' => \&as_string,
1145 fallback => 1;
1146
1264our $MAX_RESET = 3600; 1147our $MAX_RESET = 3600;
1265our $DEFAULT_RESET = 3000; 1148our $DEFAULT_RESET = 3000;
1266 1149
1267sub generate_random_map { 1150sub generate_random_map {
1268 my ($path, $rmp) = @_; 1151 my ($self, $rmp) = @_;
1269
1270 # mit "rum" bekleckern, nicht 1152 # mit "rum" bekleckern, nicht
1271 cf::map::_create_random_map ( 1153 $self->_create_random_map (
1272 $path,
1273 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1154 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1274 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1155 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1275 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1156 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1276 $rmp->{exit_on_final_map}, 1157 $rmp->{exit_on_final_map},
1277 $rmp->{xsize}, $rmp->{ysize}, 1158 $rmp->{xsize}, $rmp->{ysize},
… …
1282 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1163 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1283 (cf::region::find $rmp->{region}), $rmp->{custom} 1164 (cf::region::find $rmp->{region}), $rmp->{custom}
1284 ) 1165 )
1285} 1166}
1286 1167
1168=item cf::map->register ($regex, $prio)
1169
1170Register a handler for the map path matching the given regex at the
1171givne priority (higher is better, built-in handlers have priority 0, the
1172default).
1173
1174=cut
1175
1176sub register {
1177 my (undef, $regex, $prio) = @_;
1178 my $pkg = caller;
1179
1180 no strict;
1181 push @{"$pkg\::ISA"}, __PACKAGE__;
1182
1183 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1184}
1185
1186# also paths starting with '/'
1187$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1188
1189sub thawer_merge {
1190 my ($self, $merge) = @_;
1191
1192 # we have to keep some variables in memory intact
1193 local $self->{path};
1194 local $self->{load_path};
1195 local $self->{deny_save};
1196 local $self->{deny_reset};
1197
1198 $self->SUPER::thawer_merge ($merge);
1199}
1200
1201sub normalise {
1202 my ($path, $base) = @_;
1203
1204 $path = "$path"; # make sure its a string
1205
1206 $path =~ s/\.map$//;
1207
1208 # map plan:
1209 #
1210 # /! non-realised random map exit (special hack!)
1211 # {... are special paths that are not being touched
1212 # ?xxx/... are special absolute paths
1213 # ?random/... random maps
1214 # /... normal maps
1215 # ~user/... per-player map of a specific user
1216
1217 $path =~ s/$PATH_SEP/\//go;
1218
1219 # treat it as relative path if it starts with
1220 # something that looks reasonable
1221 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1222 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1223
1224 $base =~ s{[^/]+/?$}{};
1225 $path = "$base/$path";
1226 }
1227
1228 for ($path) {
1229 redo if s{//}{/};
1230 redo if s{/\.?/}{/};
1231 redo if s{/[^/]+/\.\./}{/};
1232 }
1233
1234 $path
1235}
1236
1237sub new_from_path {
1238 my (undef, $path, $base) = @_;
1239
1240 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1241
1242 $path = normalise $path, $base;
1243
1244 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1245 if ($path =~ $EXT_MAP{$pkg}[1]) {
1246 my $self = bless cf::map::new, $pkg;
1247 $self->{path} = $path; $self->path ($path);
1248 $self->init; # pass $1 etc.
1249 return $self;
1250 }
1251 }
1252
1253 Carp::carp "unable to resolve path '$path' (base '$base').";
1254 ()
1255}
1256
1257sub init {
1258 my ($self) = @_;
1259
1260 $self
1261}
1262
1263sub as_string {
1264 my ($self) = @_;
1265
1266 "$self->{path}"
1267}
1268
1269# the displayed name, this is a one way mapping
1270sub visible_name {
1271 &as_string
1272}
1273
1274# the original (read-only) location
1275sub load_path {
1276 my ($self) = @_;
1277
1278 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1279}
1280
1281# the temporary/swap location
1282sub save_path {
1283 my ($self) = @_;
1284
1285 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1286 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1287}
1288
1289# the unique path, undef == no special unique path
1290sub uniq_path {
1291 my ($self) = @_;
1292
1293 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1294 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1295}
1296
1287# and all this just because we cannot iterate over 1297# and all this just because we cannot iterate over
1288# all maps in C++... 1298# all maps in C++...
1289sub change_all_map_light { 1299sub change_all_map_light {
1290 my ($change) = @_; 1300 my ($change) = @_;
1291 1301
1292 $_->change_map_light ($change) 1302 $_->change_map_light ($change)
1293 for grep $_->outdoor, values %cf::MAP; 1303 for grep $_->outdoor, values %cf::MAP;
1294} 1304}
1295 1305
1306sub unlink_save {
1307 my ($self) = @_;
1308
1309 utf8::encode (my $save = $self->save_path);
1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1311 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1312
1313 #d#TODO remove .map and also nuke
1314 $save =~ s/\.map// or return;#d#
1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1316 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1317}
1318
1296sub load_map_header($) { 1319sub load_header_from($) {
1297 my ($path) = @_; 1320 my ($self, $path) = @_;
1298 1321
1299 utf8::encode $path; 1322 utf8::encode $path;
1300 aio_open $path, O_RDONLY, 0 1323 #aio_open $path, O_RDONLY, 0
1324 # or return;
1325
1326 $self->_load_header ($path)
1301 or return; 1327 or return;
1302 1328
1303 my $map = cf::map::new 1329 $self->{load_path} = $path;
1330
1331 1
1332}
1333
1334sub load_header_orig {
1335 my ($self) = @_;
1336
1337 $self->load_header_from ($self->load_path)
1338}
1339
1340sub load_header_temp {
1341 my ($self) = @_;
1342
1343 $self->load_header_from ($self->save_path)
1344}
1345
1346sub prepare_temp {
1347 my ($self) = @_;
1348
1349 $self->last_access ((delete $self->{last_access})
1350 || $cf::RUNTIME); #d#
1351 # safety
1352 $self->{instantiate_time} = $cf::RUNTIME
1353 if $self->{instantiate_time} > $cf::RUNTIME;
1354}
1355
1356sub prepare_orig {
1357 my ($self) = @_;
1358
1359 $self->{load_original} = 1;
1360 $self->{instantiate_time} = $cf::RUNTIME;
1361 $self->last_access ($cf::RUNTIME);
1362 $self->instantiate;
1363}
1364
1365sub load_header {
1366 my ($self) = @_;
1367
1368 if ($self->load_header_temp) {
1369 $self->prepare_temp;
1370 } else {
1371 $self->load_header_orig
1304 or return; 1372 or return;
1373 $self->prepare_orig;
1374 }
1305 1375
1306 # for better error messages only, will be overwritten later 1376 1
1307 $map->path ($path);
1308
1309 $map->load_header ($path)
1310 or return;
1311
1312 $map->{load_path} = $path;
1313
1314 $map
1315} 1377}
1316 1378
1317sub find; 1379sub find;
1318sub find { 1380sub find {
1319 my ($path, $origin) = @_; 1381 my ($path, $origin) = @_;
1320 1382
1321 #warn "find<$path,$origin>\n";#d#
1322
1323 $path = new cf::path $path, $origin && $origin->path; 1383 $path = normalise $path, $origin && $origin->path;
1324 my $key = $path->as_string;
1325 1384
1326 cf::lock_wait "map_find:$key"; 1385 cf::lock_wait "map_find:$path";
1327 1386
1328 $cf::MAP{$key} || do { 1387 $cf::MAP{$path} || do {
1329 my $guard = cf::lock_acquire "map_find:$key"; 1388 my $guard = cf::lock_acquire "map_find:$path";
1330 1389 my $map = new_from_path cf::map $path
1331 # do it the slow way
1332 my $map = $path->load_temp;
1333
1334 Coro::cede;
1335
1336 if ($map) {
1337 $map->last_access ((delete $map->{last_access})
1338 || $cf::RUNTIME); #d#
1339 # safety
1340 $map->{instantiate_time} = $cf::RUNTIME
1341 if $map->{instantiate_time} > $cf::RUNTIME;
1342 } else {
1343 $map = $path->load_orig
1344 or return; 1390 or return;
1345 1391
1346 $map->{load_original} = 1;
1347 $map->{instantiate_time} = $cf::RUNTIME;
1348 $map->last_access ($cf::RUNTIME);
1349 $map->instantiate;
1350
1351 # per-player maps become, after loading, normal maps
1352 $map->per_player (0) if $path->{user_rel};
1353 }
1354
1355 $map->path ($key);
1356 $map->{path} = $path;
1357 $map->{last_save} = $cf::RUNTIME; 1392 $map->{last_save} = $cf::RUNTIME;
1358 1393
1359 Coro::cede; 1394 $map->load_header
1395 or return;
1360 1396
1361 if ($map->should_reset) { 1397 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1398 # doing this can freeze the server in a sync job, obviously
1399 #$cf::WAIT_FOR_TICK->wait;
1362 $map->reset; 1400 $map->reset;
1363 undef $guard; 1401 undef $guard;
1364 $map = find $path 1402 return find $path;
1365 or return;
1366 } 1403 }
1367 1404
1368 $cf::MAP{$key} = $map 1405 $cf::MAP{$path} = $map
1369 } 1406 }
1370} 1407}
1408
1409sub pre_load { }
1410sub post_load { }
1371 1411
1372sub load { 1412sub load {
1373 my ($self) = @_; 1413 my ($self) = @_;
1374 1414
1415 local $self->{deny_reset} = 1; # loading can take a long time
1416
1375 my $path = $self->{path}; 1417 my $path = $self->{path};
1376 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1418 my $guard = cf::lock_acquire "map_load:$path";
1377 1419
1378 return if $self->in_memory != cf::MAP_SWAPPED; 1420 return if $self->in_memory != cf::MAP_SWAPPED;
1379 1421
1380 $self->in_memory (cf::MAP_LOADING); 1422 $self->in_memory (cf::MAP_LOADING);
1381 1423
1382 $self->alloc; 1424 $self->alloc;
1425
1426 $self->pre_load;
1427
1383 $self->load_objects ($self->{load_path}, 1) 1428 $self->_load_objects ($self->{load_path}, 1)
1384 or return; 1429 or return;
1385 1430
1386 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1431 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1387 if delete $self->{load_original}; 1432 if delete $self->{load_original};
1388 1433
1389 if (my $uniq = $path->uniq_path) { 1434 if (my $uniq = $self->uniq_path) {
1390 utf8::encode $uniq; 1435 utf8::encode $uniq;
1391 if (aio_open $uniq, O_RDONLY, 0) { 1436 if (aio_open $uniq, O_RDONLY, 0) {
1392 $self->clear_unique_items; 1437 $self->clear_unique_items;
1393 $self->load_objects ($uniq, 0); 1438 $self->_load_objects ($uniq, 0);
1394 } 1439 }
1395 } 1440 }
1396 1441
1397 Coro::cede; 1442 Coro::cede;
1398 1443
1399 # now do the right thing for maps 1444 # now do the right thing for maps
1400 $self->link_multipart_objects; 1445 $self->link_multipart_objects;
1401 1446
1402 if ($self->{path}->is_style_map) { 1447 unless ($self->{deny_activate}) {
1403 $self->{deny_save} = 1; 1448 $self->decay_objects;
1404 $self->{deny_reset} = 1;
1405 } else {
1406 $self->fix_auto_apply; 1449 $self->fix_auto_apply;
1407 $self->decay_objects;
1408 $self->update_buttons; 1450 $self->update_buttons;
1451 Coro::cede;
1409 $self->set_darkness_map; 1452 $self->set_darkness_map;
1410 $self->difficulty ($self->estimate_difficulty) 1453 $self->difficulty ($self->estimate_difficulty)
1411 unless $self->difficulty; 1454 unless $self->difficulty;
1455 Coro::cede;
1412 $self->activate; 1456 $self->activate;
1413 } 1457 }
1414 1458
1415 Coro::cede; 1459 $self->post_load;
1416 1460
1417 $self->in_memory (cf::MAP_IN_MEMORY); 1461 $self->in_memory (cf::MAP_IN_MEMORY);
1462}
1463
1464sub customise_for {
1465 my ($self, $ob) = @_;
1466
1467 return find "~" . $ob->name . "/" . $self->{path}
1468 if $self->per_player;
1469
1470 $self
1418} 1471}
1419 1472
1420# find and load all maps in the 3x3 area around a map 1473# find and load all maps in the 3x3 area around a map
1421sub load_diag { 1474sub load_diag {
1422 my ($map) = @_; 1475 my ($map) = @_;
… …
1452 1505
1453 cf::sync_job { $map->load }; 1506 cf::sync_job { $map->load };
1454} 1507}
1455 1508
1456our %MAP_PREFETCH; 1509our %MAP_PREFETCH;
1457our $MAP_PREFETCHER = Coro::async { 1510our $MAP_PREFETCHER = undef;
1458 while () {
1459 while (%MAP_PREFETCH) {
1460 my $key = each %MAP_PREFETCH
1461 or next;
1462 my $path = delete $MAP_PREFETCH{$key};
1463
1464 my $map = find $path
1465 or next;
1466 $map->load;
1467 }
1468 Coro::schedule;
1469 }
1470};
1471 1511
1472sub find_async { 1512sub find_async {
1473 my ($path, $origin) = @_; 1513 my ($path, $origin) = @_;
1474 1514
1475 $path = new cf::path $path, $origin && $origin->path; 1515 $path = normalise $path, $origin && $origin->{path};
1476 my $key = $path->as_string;
1477 1516
1478 if (my $map = $cf::MAP{$key}) { 1517 if (my $map = $cf::MAP{$path}) {
1479 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1518 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1480 } 1519 }
1481 1520
1482 $MAP_PREFETCH{$key} = $path; 1521 undef $MAP_PREFETCH{$path};
1522 $MAP_PREFETCHER ||= cf::async {
1523 while (%MAP_PREFETCH) {
1524 for my $path (keys %MAP_PREFETCH) {
1525 my $map = find $path
1526 or next;
1527 $map->load;
1528
1529 delete $MAP_PREFETCH{$path};
1530 }
1531 }
1532 undef $MAP_PREFETCHER;
1533 };
1483 $MAP_PREFETCHER->ready; 1534 $MAP_PREFETCHER->prio (6);
1484 1535
1485 () 1536 ()
1486} 1537}
1487 1538
1488sub save { 1539sub save {
… …
1492 1543
1493 $self->{last_save} = $cf::RUNTIME; 1544 $self->{last_save} = $cf::RUNTIME;
1494 1545
1495 return unless $self->dirty; 1546 return unless $self->dirty;
1496 1547
1497 my $save = $self->{path}->save_path; utf8::encode $save; 1548 my $save = $self->save_path; utf8::encode $save;
1498 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1549 my $uniq = $self->uniq_path; utf8::encode $uniq;
1499 1550
1500 $self->{load_path} = $save; 1551 $self->{load_path} = $save;
1501 1552
1502 return if $self->{deny_save}; 1553 return if $self->{deny_save};
1503 1554
… …
1506 cf::async { 1557 cf::async {
1507 $_->contr->save for $self->players; 1558 $_->contr->save for $self->players;
1508 }; 1559 };
1509 1560
1510 if ($uniq) { 1561 if ($uniq) {
1511 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1562 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1512 $self->save_objects ($uniq, cf::IO_UNIQUES); 1563 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1513 } else { 1564 } else {
1514 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1565 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1515 } 1566 }
1516} 1567}
1517 1568
1518sub swap_out { 1569sub swap_out {
1519 my ($self) = @_; 1570 my ($self) = @_;
… …
1533 1584
1534sub reset_at { 1585sub reset_at {
1535 my ($self) = @_; 1586 my ($self) = @_;
1536 1587
1537 # TODO: safety, remove and allow resettable per-player maps 1588 # TODO: safety, remove and allow resettable per-player maps
1538 return 1e99 if $self->{path}{user_rel}; 1589 return 1e99 if $self->isa ("ext::map_per_player");#d#
1539 return 1e99 if $self->{deny_reset}; 1590 return 1e99 if $self->{deny_reset};
1540 1591
1541 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1592 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1542 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1593 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1543 1594
… …
1548 my ($self) = @_; 1599 my ($self) = @_;
1549 1600
1550 $self->reset_at <= $cf::RUNTIME 1601 $self->reset_at <= $cf::RUNTIME
1551} 1602}
1552 1603
1553sub unlink_save {
1554 my ($self) = @_;
1555
1556 utf8::encode (my $save = $self->{path}->save_path);
1557 aioreq_pri 3; IO::AIO::aio_unlink $save;
1558 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1559}
1560
1561sub rename {
1562 my ($self, $new_path) = @_;
1563
1564 $self->unlink_save;
1565
1566 delete $cf::MAP{$self->path};
1567 $self->{path} = new cf::path $new_path;
1568 $self->path ($self->{path}->as_string);
1569 $cf::MAP{$self->path} = $self;
1570
1571 $self->save;
1572}
1573
1574sub reset { 1604sub reset {
1575 my ($self) = @_; 1605 my ($self) = @_;
1576 1606
1577 my $lock = cf::lock_acquire "map_data:" . $self->path; 1607 my $lock = cf::lock_acquire "map_data:$self->{path}";
1578 1608
1579 return if $self->players; 1609 return if $self->players;
1580 return if $self->{path}{user_rel};#d# 1610 return if $self->isa ("ext::map_per_player");#d#
1581 1611
1582 warn "resetting map ", $self->path;#d# 1612 warn "resetting map ", $self->path;#d#
1583 1613
1614 $self->in_memory (cf::MAP_SWAPPED);
1615
1616 # need to save uniques path
1617 unless ($self->{deny_save}) {
1618 my $uniq = $self->uniq_path; utf8::encode $uniq;
1619
1620 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1621 if $uniq;
1622 }
1623
1584 delete $cf::MAP{$self->path}; 1624 delete $cf::MAP{$self->path};
1625
1626 $self->clear;
1585 1627
1586 $_->clear_links_to ($self) for values %cf::MAP; 1628 $_->clear_links_to ($self) for values %cf::MAP;
1587 1629
1588 $self->unlink_save; 1630 $self->unlink_save;
1589 $self->destroy; 1631 $self->destroy;
… …
1592my $nuke_counter = "aaaa"; 1634my $nuke_counter = "aaaa";
1593 1635
1594sub nuke { 1636sub nuke {
1595 my ($self) = @_; 1637 my ($self) = @_;
1596 1638
1639 delete $cf::MAP{$self->path};
1640
1641 $self->unlink_save;
1642
1643 bless $self, "cf::map";
1644 delete $self->{deny_reset};
1597 $self->{deny_save} = 1; 1645 $self->{deny_save} = 1;
1598 $self->reset_timeout (1); 1646 $self->reset_timeout (1);
1599 $self->rename ("{nuke}/" . ($nuke_counter++)); 1647 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1648
1649 $cf::MAP{$self->path} = $self;
1650
1600 $self->reset; # polite request, might not happen 1651 $self->reset; # polite request, might not happen
1601} 1652}
1602 1653
1603sub customise_for {
1604 my ($map, $ob) = @_;
1605
1606 if ($map->per_player) {
1607 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1608 }
1609
1610 $map
1611}
1612
1613=item cf::map::unique_maps 1654=item cf::map::unique_maps
1614 1655
1615Returns an arrayref of cf::path's of all shared maps that have 1656Returns an arrayref of paths of all shared maps that have
1616instantiated unique items. May block. 1657instantiated unique items. May block.
1617 1658
1618=cut 1659=cut
1619 1660
1620sub unique_maps() { 1661sub unique_maps() {
… …
1626 for (@$files) { 1667 for (@$files) {
1627 utf8::decode $_; 1668 utf8::decode $_;
1628 next if /\.pst$/; 1669 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1670 next unless /^$PATH_SEP/o;
1630 1671
1631 push @paths, new cf::path $_; 1672 push @paths, cf::map::normalise $_;
1632 } 1673 }
1633 1674
1634 \@paths 1675 \@paths
1635} 1676}
1636 1677
… …
1711 1752
1712=item $player_object->enter_link 1753=item $player_object->enter_link
1713 1754
1714Freezes the player and moves him/her to a special map (C<{link}>). 1755Freezes the player and moves him/her to a special map (C<{link}>).
1715 1756
1716The player should be reaosnably safe there for short amounts of time. You 1757The player should be reasonably safe there for short amounts of time. You
1717I<MUST> call C<leave_link> as soon as possible, though. 1758I<MUST> call C<leave_link> as soon as possible, though.
1718 1759
1760Will never block.
1761
1719=item $player_object->leave_link ($map, $x, $y) 1762=item $player_object->leave_link ($map, $x, $y)
1720 1763
1721Moves the player out of the specila link map onto the given map. If the 1764Moves the player out of the special C<{link}> map onto the specified
1722map is not valid (or omitted), the player will be moved back to the 1765map. If the map is not valid (or omitted), the player will be moved back
1723location he/she was before the call to C<enter_link>, or, if that fails, 1766to the location he/she was before the call to C<enter_link>, or, if that
1724to the emergency map position. 1767fails, to the emergency map position.
1725 1768
1726Might block. 1769Might block.
1727 1770
1728=cut 1771=cut
1772
1773sub link_map {
1774 unless ($LINK_MAP) {
1775 $LINK_MAP = cf::map::find "{link}"
1776 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1777 $LINK_MAP->load;
1778 }
1779
1780 $LINK_MAP
1781}
1729 1782
1730sub cf::object::player::enter_link { 1783sub cf::object::player::enter_link {
1731 my ($self) = @_; 1784 my ($self) = @_;
1732 1785
1733 $self->deactivate_recursive; 1786 $self->deactivate_recursive;
1734 1787
1735 return if $self->map == $LINK_MAP; 1788 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1789
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1790 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1791 if $self->map;
1739 1792
1740 $self->enter_map ($LINK_MAP, 20, 20); 1793 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1741} 1794}
1742 1795
1743sub cf::object::player::leave_link { 1796sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1797 my ($self, $map, $x, $y) = @_;
1745 1798
… …
1809=cut 1862=cut
1810 1863
1811sub cf::object::player::goto { 1864sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1865 my ($self, $path, $x, $y) = @_;
1813 1866
1814 $path = new cf::path $path;
1815
1816 $self->enter_link; 1867 $self->enter_link;
1817 1868
1818 (async { 1869 (async {
1870 my $map = eval {
1819 my $map = cf::map::find $path->as_string; 1871 my $map = cf::map::find $path;
1820 $map = $map->customise_for ($self) if $map; 1872 $map = $map->customise_for ($self) if $map;
1821 1873 $map
1822# warn "entering ", $map->path, " at ($x, $y)\n" 1874 } or
1823# if $map;
1824
1825 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1875 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1826 1876
1827 $self->leave_link ($map, $x, $y); 1877 $self->leave_link ($map, $x, $y);
1828 })->prio (1); 1878 })->prio (1);
1829} 1879}
1830 1880
… …
1834 1884
1835sub parse_random_map_params { 1885sub parse_random_map_params {
1836 my ($spec) = @_; 1886 my ($spec) = @_;
1837 1887
1838 my $rmp = { # defaults 1888 my $rmp = { # defaults
1839 xsize => 10, 1889 xsize => (cf::rndm 15, 40),
1840 ysize => 10, 1890 ysize => (cf::rndm 15, 40),
1891 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1892 #layout => string,
1841 }; 1893 };
1842 1894
1843 for (split /\n/, $spec) { 1895 for (split /\n/, $spec) {
1844 my ($k, $v) = split /\s+/, $_, 2; 1896 my ($k, $v) = split /\s+/, $_, 2;
1845 1897
… …
1849 $rmp 1901 $rmp
1850} 1902}
1851 1903
1852sub prepare_random_map { 1904sub prepare_random_map {
1853 my ($exit) = @_; 1905 my ($exit) = @_;
1906
1907 my $guard = cf::lock_acquire "exit_prepare:$exit";
1854 1908
1855 # all this does is basically replace the /! path by 1909 # all this does is basically replace the /! path by
1856 # a new random map path (?random/...) with a seed 1910 # a new random map path (?random/...) with a seed
1857 # that depends on the exit object 1911 # that depends on the exit object
1858 1912
1859 my $rmp = parse_random_map_params $exit->msg; 1913 my $rmp = parse_random_map_params $exit->msg;
1860 1914
1861 if ($exit->map) { 1915 if ($exit->map) {
1862 $rmp->{region} = $exit->map->region_name; 1916 $rmp->{region} = $exit->region->name;
1863 $rmp->{origin_map} = $exit->map->path; 1917 $rmp->{origin_map} = $exit->map->path;
1864 $rmp->{origin_x} = $exit->x; 1918 $rmp->{origin_x} = $exit->x;
1865 $rmp->{origin_y} = $exit->y; 1919 $rmp->{origin_y} = $exit->y;
1866 } 1920 }
1867 1921
1868 $rmp->{random_seed} ||= $exit->random_seed; 1922 $rmp->{random_seed} ||= $exit->random_seed;
1869 1923
1870 my $data = cf::to_json $rmp; 1924 my $data = cf::to_json $rmp;
1871 my $md5 = Digest::MD5::md5_hex $data; 1925 my $md5 = Digest::MD5::md5_hex $data;
1926 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1872 1927
1873 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1928 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1874 aio_write $fh, 0, (length $data), $data, 0; 1929 aio_write $fh, 0, (length $data), $data, 0;
1930 undef $fh;
1931 aio_rename "$meta~", $meta;
1875 1932
1876 $exit->slaying ("?random/$md5"); 1933 $exit->slaying ("?random/$md5");
1877 $exit->msg (undef); 1934 $exit->msg (undef);
1878 } 1935 }
1879} 1936}
1880 1937
1881sub cf::object::player::enter_exit { 1938sub cf::object::player::enter_exit {
1882 my ($self, $exit) = @_; 1939 my ($self, $exit) = @_;
1883 1940
1884 return unless $self->type == cf::PLAYER; 1941 return unless $self->type == cf::PLAYER;
1942
1943 if ($exit->slaying eq "/!") {
1944 #TODO: this should de-fi-ni-te-ly not be a sync-job
1945 cf::sync_job { prepare_random_map $exit };
1946 }
1947
1948 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1949 my $hp = $exit->stats->hp;
1950 my $sp = $exit->stats->sp;
1885 1951
1886 $self->enter_link; 1952 $self->enter_link;
1887 1953
1888 (async { 1954 (async {
1889 $self->deactivate_recursive; # just to be sure 1955 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 1956 unless (eval {
1891 prepare_random_map $exit 1957 $self->goto ($slaying, $hp, $sp);
1892 if $exit->slaying eq "/!";
1893
1894 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1895 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1896 1958
1897 1; 1959 1;
1898 }) { 1960 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 1961 $self->message ("Something went wrong deep within the crossfire server. "
1900 . "I'll try to bring you back to the map you were before. " 1962 . "I'll try to bring you back to the map you were before. "
… …
1961 # get handled first 2023 # get handled first
1962 my $queue = delete $ns->{query_queue} 2024 my $queue = delete $ns->{query_queue}
1963 or return; # be conservative, not sure how that can happen, but we saw a crash here 2025 or return; # be conservative, not sure how that can happen, but we saw a crash here
1964 2026
1965 (shift @$queue)->[1]->($msg); 2027 (shift @$queue)->[1]->($msg);
2028 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1966 2029
1967 push @{ $ns->{query_queue} }, @$queue; 2030 push @{ $ns->{query_queue} }, @$queue;
1968 2031
1969 if (@{ $ns->{query_queue} } == @$queue) { 2032 if (@{ $ns->{query_queue} } == @$queue) {
1970 if (@$queue) { 2033 if (@$queue) {
… …
2131The parameter C<$family> should best start with the name of the extension 2194The parameter C<$family> should best start with the name of the extension
2132using it, it should be unique. 2195using it, it should be unique.
2133 2196
2134=over 4 2197=over 4
2135 2198
2136=item $hashref = cf::db_get $family
2137
2138Return a hashref for use by the extension C<$family>, which can be
2139modified. After modifications, you have to call C<cf::db_dirty> or
2140C<cf::db_sync>.
2141
2142=item $value = cf::db_get $family => $key 2199=item $value = cf::db_get $family => $key
2143 2200
2144Returns a single value from the database 2201Returns a single value from the database.
2145
2146=item cf::db_put $family => $hashref
2147
2148Stores the given family hashref into the database. Updates are delayed, if
2149you want the data to be synced to disk immediately, use C<cf::db_sync>.
2150 2202
2151=item cf::db_put $family => $key => $value 2203=item cf::db_put $family => $key => $value
2152 2204
2153Stores the given C<$value> in the family hash. Updates are delayed, if you 2205Stores the given C<$value> in the family.
2154want the data to be synced to disk immediately, use C<cf::db_sync>.
2155
2156=item cf::db_dirty
2157
2158Marks the database as dirty, to be updated at a later time.
2159
2160=item cf::db_sync
2161
2162Immediately write the database to disk I<if it is dirty>.
2163 2206
2164=cut 2207=cut
2165 2208
2166our $DB; 2209our $DB;
2167 2210
2168{ 2211sub db_init {
2212 unless ($DB) {
2213 $DB = BDB::db_create $DB_ENV;
2214
2215 cf::sync_job {
2216 eval {
2217 $DB->set_flags (BDB::CHKSUM);
2218
2219 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2220 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2221 cf::cleanup "db_open(db): $!" if $!;
2222 };
2223 cf::cleanup "db_open(db): $@" if $@;
2224 };
2225
2169 my $path = cf::localdir . "/database.pst"; 2226 my $path = cf::localdir . "/database.pst";
2227 if (stat $path) {
2228 cf::sync_job {
2229 my $pst = Storable::retrieve $path;
2170 2230
2171 sub db_load() { 2231 cf::db_put (board => data => $pst->{board});
2172 $DB = stat $path ? Storable::retrieve $path : { }; 2232 cf::db_put (guildrules => data => $pst->{guildrules});
2173 } 2233 cf::db_put (rent => balance => $pst->{rent}{balance});
2234 BDB::db_env_txn_checkpoint $DB_ENV;
2174 2235
2175 my $pid; 2236 unlink $path;
2176
2177 sub db_save() {
2178 waitpid $pid, 0 if $pid;
2179 if (0 == ($pid = fork)) {
2180 $DB->{_meta}{version} = 1;
2181 Storable::nstore $DB, "$path~";
2182 rename "$path~", $path;
2183 cf::_exit 0 if defined $pid;
2184 } 2237 };
2185 }
2186
2187 my $dirty;
2188
2189 sub db_sync() {
2190 db_save if $dirty;
2191 undef $dirty;
2192 }
2193
2194 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2195 db_sync;
2196 });
2197
2198 sub db_dirty() {
2199 $dirty = 1;
2200 $idle->start;
2201 }
2202
2203 sub db_get($;$) {
2204 @_ >= 2
2205 ? $DB->{$_[0]}{$_[1]}
2206 : ($DB->{$_[0]} ||= { })
2207 }
2208
2209 sub db_put($$;$) {
2210 if (@_ >= 3) {
2211 $DB->{$_[0]}{$_[1]} = $_[2];
2212 } else {
2213 $DB->{$_[0]} = $_[1];
2214 }
2215 db_dirty;
2216 }
2217
2218 cf::global->attach (
2219 prio => 10000,
2220 on_cleanup => sub {
2221 db_sync;
2222 }, 2238 }
2223 ); 2239 }
2240}
2241
2242sub db_get($$) {
2243 my $key = "$_[0]/$_[1]";
2244
2245 cf::sync_job {
2246 BDB::db_get $DB, undef, $key, my $data;
2247
2248 $! ? ()
2249 : Compress::LZF::sthaw $data
2250 }
2251}
2252
2253sub db_put($$$) {
2254 BDB::dbreq_pri 4;
2255 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2224} 2256}
2225 2257
2226############################################################################# 2258#############################################################################
2227# the server's main() 2259# the server's init and main functions
2260
2261sub load_resources {
2262 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2263 or die "unable to load regions file\n";#d#
2264}
2228 2265
2229sub cfg_load { 2266sub cfg_load {
2230 open my $fh, "<:utf8", cf::confdir . "/config" 2267 open my $fh, "<:utf8", cf::confdir . "/config"
2231 or return; 2268 or return;
2232 2269
… …
2245 }; 2282 };
2246 warn $@ if $@; 2283 warn $@ if $@;
2247 } 2284 }
2248} 2285}
2249 2286
2287sub init {
2288 load_resources;
2289}
2290
2250sub main { 2291sub main {
2251 # we must not ever block the main coroutine 2292 # we must not ever block the main coroutine
2252 local $Coro::idle = sub { 2293 local $Coro::idle = sub {
2253 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2294 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2295 (async {
2254 async { Event::one_event }; 2296 Event::one_event;
2297 })->prio (Coro::PRIO_MAX);
2255 }; 2298 };
2256 2299
2257 cfg_load; 2300 cfg_load;
2258 db_load; 2301 db_init;
2259 load_extensions; 2302 load_extensions;
2303
2304 $TICK_WATCHER->start;
2260 Event::loop; 2305 Event::loop;
2261} 2306}
2262 2307
2263############################################################################# 2308#############################################################################
2264# initialisation and cleanup 2309# initialisation and cleanup
2265 2310
2266# install some emergency cleanup handlers 2311# install some emergency cleanup handlers
2267BEGIN { 2312BEGIN {
2268 for my $signal (qw(INT HUP TERM)) { 2313 for my $signal (qw(INT HUP TERM)) {
2269 Event->signal ( 2314 Event->signal (
2315 reentrant => 0,
2270 data => WF_AUTOCANCEL, 2316 data => WF_AUTOCANCEL,
2271 signal => $signal, 2317 signal => $signal,
2318 prio => 0,
2272 cb => sub { 2319 cb => sub {
2273 cf::cleanup "SIG$signal"; 2320 cf::cleanup "SIG$signal";
2274 }, 2321 },
2275 ); 2322 );
2276 } 2323 }
2277} 2324}
… …
2282 warn "enter emergency perl save\n"; 2329 warn "enter emergency perl save\n";
2283 2330
2284 cf::sync_job { 2331 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl 2332 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players 2333 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously. 2334 # and maps saved/destroyed asynchronously.
2288 warn "begin emergency player save\n"; 2335 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) { 2336 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next; 2337 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next; 2338 $pl->valid or next;
2292 $pl->save; 2339 $pl->save;
… …
2298 my $map = $cf::MAP{$path} or next; 2345 my $map = $cf::MAP{$path} or next;
2299 $map->valid or next; 2346 $map->valid or next;
2300 $map->save; 2347 $map->save;
2301 } 2348 }
2302 warn "end emergency map save\n"; 2349 warn "end emergency map save\n";
2350
2351 warn "begin emergency database checkpoint\n";
2352 BDB::db_env_txn_checkpoint $DB_ENV;
2353 warn "end emergency database checkpoint\n";
2303 }; 2354 };
2304 2355
2305 warn "leave emergency perl save\n"; 2356 warn "leave emergency perl save\n";
2306} 2357}
2307 2358
2308sub reload() { 2359sub reload() {
2309 # can/must only be called in main 2360 # can/must only be called in main
2310 if ($Coro::current != $Coro::main) { 2361 if ($Coro::current != $Coro::main) {
2311 warn "can only reload from main coroutine\n"; 2362 warn "can only reload from main coroutine";
2312 return; 2363 return;
2313 } 2364 }
2314 2365
2315 warn "reloading..."; 2366 warn "reloading...";
2316 2367
2317 warn "freezing server"; 2368 warn "cancelling server ticker";
2318 my $guard = freeze_mainloop; 2369 $TICK_WATCHER->cancel;
2370
2319 cf::emergency_save; 2371 cf::emergency_save;
2320
2321 warn "sync database to disk";
2322 cf::db_sync;
2323 IO::AIO::flush;
2324 2372
2325 eval { 2373 eval {
2326 # if anything goes wrong in here, we should simply crash as we already saved 2374 # if anything goes wrong in here, we should simply crash as we already saved
2327 2375
2328 warn "cancel all watchers"; 2376 warn "cancelling all WF_AUTOCANCEL watchers";
2329 for (Event::all_watchers) { 2377 for (Event::all_watchers) {
2330 $_->cancel if $_->data & WF_AUTOCANCEL; 2378 $_->cancel if $_->data & WF_AUTOCANCEL;
2331 } 2379 }
2332 2380
2381 warn "syncing database to disk";
2382 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2383
2384 warn "flushing outstanding aio requests";
2385 for (;;) {
2386 BDB::flush;
2387 IO::AIO::flush;
2388 Coro::cede;
2389 last unless IO::AIO::nreqs || BDB::nreqs;
2390 warn "iterate...";
2391 }
2392
2333 warn "cancel all extension coros"; 2393 warn "cancelling all extension coros";
2334 $_->cancel for values %EXT_CORO; 2394 $_->cancel for values %EXT_CORO;
2335 %EXT_CORO = (); 2395 %EXT_CORO = ();
2336 2396
2337 warn "remove commands"; 2397 warn "removing commands";
2338 %COMMAND = (); 2398 %COMMAND = ();
2339 2399
2340 warn "remove ext commands"; 2400 warn "removing ext commands";
2341 %EXTCMD = (); 2401 %EXTCMD = ();
2342 2402
2343 warn "unload/nuke all extensions"; 2403 warn "unloading/nuking all extensions";
2344 for my $pkg (@EXTS) { 2404 for my $pkg (@EXTS) {
2345 warn "... unloading $pkg"; 2405 warn "... unloading $pkg";
2346 2406
2347 if (my $cb = $pkg->can ("unload")) { 2407 if (my $cb = $pkg->can ("unload")) {
2348 eval { 2408 eval {
… …
2353 2413
2354 warn "... nuking $pkg"; 2414 warn "... nuking $pkg";
2355 Symbol::delete_package $pkg; 2415 Symbol::delete_package $pkg;
2356 } 2416 }
2357 2417
2358 warn "unload all perl modules loaded from $LIBDIR"; 2418 warn "unloading all perl modules loaded from $LIBDIR";
2359 while (my ($k, $v) = each %INC) { 2419 while (my ($k, $v) = each %INC) {
2360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2420 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2361 2421
2362 warn "removing <$k>"; 2422 warn "... unloading $k";
2363 delete $INC{$k}; 2423 delete $INC{$k};
2364 2424
2365 $k =~ s/\.pm$//; 2425 $k =~ s/\.pm$//;
2366 $k =~ s/\//::/g; 2426 $k =~ s/\//::/g;
2367 2427
… …
2370 } 2430 }
2371 2431
2372 Symbol::delete_package $k; 2432 Symbol::delete_package $k;
2373 } 2433 }
2374 2434
2375 warn "get rid of safe::, as good as possible"; 2435 warn "getting rid of safe::, as good as possible";
2376 Symbol::delete_package "safe::$_" 2436 Symbol::delete_package "safe::$_"
2377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2437 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2378 2438
2379 warn "unload cf.pm \"a bit\""; 2439 warn "unloading cf.pm \"a bit\"";
2380 delete $INC{"cf.pm"}; 2440 delete $INC{"cf.pm"};
2381 2441
2382 # don't, removes xs symbols, too, 2442 # don't, removes xs symbols, too,
2383 # and global variables created in xs 2443 # and global variables created in xs
2384 #Symbol::delete_package __PACKAGE__; 2444 #Symbol::delete_package __PACKAGE__;
2385 2445
2446 warn "unload completed, starting to reload now";
2447
2386 warn "reloading cf.pm"; 2448 warn "reloading cf.pm";
2387 require cf; 2449 require cf;
2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2450 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2389 2451
2390 warn "load config and database again"; 2452 warn "loading config and database again";
2391 cf::cfg_load; 2453 cf::cfg_load;
2392 cf::db_load;
2393 2454
2394 warn "load extensions"; 2455 warn "loading extensions";
2395 cf::load_extensions; 2456 cf::load_extensions;
2396 2457
2397 warn "reattach attachments to objects/players"; 2458 warn "reattaching attachments to objects/players";
2398 _global_reattach; 2459 _global_reattach;
2399 warn "reattach attachments to maps"; 2460 warn "reattaching attachments to maps";
2400 reattach $_ for values %MAP; 2461 reattach $_ for values %MAP;
2462
2463 warn "loading reloadable resources";
2464 load_resources;
2465
2466 warn "restarting server ticker";
2467
2468 $TICK_WATCHER->start;
2401 }; 2469 };
2402 2470
2403 if ($@) { 2471 if ($@) {
2404 warn $@; 2472 warn $@;
2405 warn "error while reloading, exiting."; 2473 warn "error while reloading, exiting.";
… …
2407 } 2475 }
2408 2476
2409 warn "reloaded"; 2477 warn "reloaded";
2410}; 2478};
2411 2479
2412############################################################################# 2480our $RELOAD_WATCHER; # used only during reload
2413
2414unless ($LINK_MAP) {
2415 $LINK_MAP = cf::map::new;
2416
2417 $LINK_MAP->width (41);
2418 $LINK_MAP->height (41);
2419 $LINK_MAP->alloc;
2420 $LINK_MAP->path ("{link}");
2421 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2422 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2423
2424 # dirty hack because... archetypes are not yet loaded
2425 Event->timer (
2426 after => 10,
2427 cb => sub {
2428 $_[0]->w->cancel;
2429
2430 # provide some exits "home"
2431 my $exit = cf::object::new "exit";
2432
2433 $exit->slaying ($EMERGENCY_POSITION->[0]);
2434 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2435 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2436
2437 $LINK_MAP->insert ($exit->clone, 19, 19);
2438 $LINK_MAP->insert ($exit->clone, 19, 20);
2439 $LINK_MAP->insert ($exit->clone, 19, 21);
2440 $LINK_MAP->insert ($exit->clone, 20, 19);
2441 $LINK_MAP->insert ($exit->clone, 20, 21);
2442 $LINK_MAP->insert ($exit->clone, 21, 19);
2443 $LINK_MAP->insert ($exit->clone, 21, 20);
2444 $LINK_MAP->insert ($exit->clone, 21, 21);
2445
2446 $exit->destroy;
2447 });
2448
2449 $LINK_MAP->{deny_save} = 1;
2450 $LINK_MAP->{deny_reset} = 1;
2451
2452 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2453}
2454 2481
2455register_command "reload" => sub { 2482register_command "reload" => sub {
2456 my ($who, $arg) = @_; 2483 my ($who, $arg) = @_;
2457 2484
2458 if ($who->flag (FLAG_WIZ)) { 2485 if ($who->flag (FLAG_WIZ)) {
2459 $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 {
2460 reload; 2496 reload;
2461 $who->message ("end of reload."); 2497 undef $RELOAD_WATCHER;
2498 },
2499 );
2462 } 2500 }
2463}; 2501};
2464 2502
2465unshift @INC, $LIBDIR; 2503unshift @INC, $LIBDIR;
2504
2505my $bug_warning = 0;
2466 2506
2467$TICK_WATCHER = Event->timer ( 2507$TICK_WATCHER = Event->timer (
2468 reentrant => 0, 2508 reentrant => 0,
2509 parked => 1,
2469 prio => 0, 2510 prio => 0,
2470 at => $NEXT_TICK || $TICK, 2511 at => $NEXT_TICK || $TICK,
2471 data => WF_AUTOCANCEL, 2512 data => WF_AUTOCANCEL,
2472 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
2473 $NOW = Event::time; 2520 $NOW = Event::time;
2474 2521
2475 cf::server_tick; # one server iteration 2522 cf::server_tick; # one server iteration
2476 $RUNTIME += $TICK; 2523 $RUNTIME += $TICK;
2477 $NEXT_TICK += $TICK; 2524 $NEXT_TICK += $TICK;
2478 2525
2479 $WAIT_FOR_TICK->broadcast; 2526 $WAIT_FOR_TICK->broadcast;
2480 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 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#
2481 2534
2482 # 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
2483 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2536 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2484 2537
2485 $TICK_WATCHER->at ($NEXT_TICK); 2538 $TICK_WATCHER->at ($NEXT_TICK);
2486 $TICK_WATCHER->start; 2539 $TICK_WATCHER->start;
2487 }, 2540 },
2488); 2541);
2489 2542
2543{
2544 BDB::max_poll_time $TICK * 0.1;
2545 $BDB_POLL_WATCHER = Event->io (
2546 reentrant => 0,
2547 fd => BDB::poll_fileno,
2548 poll => 'r',
2549 prio => 0,
2550 data => WF_AUTOCANCEL,
2551 cb => \&BDB::poll_cb,
2552 );
2553 BDB::min_parallel 8;
2554
2555 BDB::set_sync_prepare {
2556 my $status;
2557 my $current = $Coro::current;
2558 (
2559 sub {
2560 $status = $!;
2561 $current->ready; undef $current;
2562 },
2563 sub {
2564 Coro::schedule while defined $current;
2565 $! = $status;
2566 },
2567 )
2568 };
2569
2570 unless ($DB_ENV) {
2571 $DB_ENV = BDB::db_env_create;
2572
2573 cf::sync_job {
2574 eval {
2575 BDB::db_env_open
2576 $DB_ENV,
2577 $BDB_ENV_DIR,
2578 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2579 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2580 0666;
2581
2582 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2583
2584 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2585 $DB_ENV->set_lk_detect;
2586 };
2587
2588 cf::cleanup "db_env_open(db): $@" if $@;
2589 };
2590 }
2591}
2592
2593{
2594 IO::AIO::min_parallel 8;
2595
2596 undef $Coro::AIO::WATCHER;
2490IO::AIO::max_poll_time $TICK * 0.2; 2597 IO::AIO::max_poll_time $TICK * 0.1;
2491 2598 $AIO_POLL_WATCHER = Event->io (
2492Event->io ( 2599 reentrant => 0,
2493 fd => IO::AIO::poll_fileno, 2600 fd => IO::AIO::poll_fileno,
2494 poll => 'r', 2601 poll => 'r',
2495 prio => 5, 2602 prio => 6,
2496 data => WF_AUTOCANCEL, 2603 data => WF_AUTOCANCEL,
2497 cb => \&IO::AIO::poll_cb, 2604 cb => \&IO::AIO::poll_cb,
2498); 2605 );
2606}
2499 2607
2500Event->timer ( 2608$WRITE_RUNTIME_WATCHER = Event->timer (
2609 reentrant => 0,
2501 data => WF_AUTOCANCEL, 2610 data => WF_AUTOCANCEL,
2502 after => 0, 2611 after => 1,
2503 interval => 10, 2612 interval => 10,
2504 cb => sub { 2613 prio => 6, # keep it lowest so it acts like a watchdog
2505 (Coro::unblock_sub { 2614 cb => Coro::unblock_sub {
2506 write_runtime 2615 write_runtime
2507 or warn "ERROR: unable to write runtime file: $!"; 2616 or warn "ERROR: unable to write runtime file: $!";
2508 })->();
2509 }, 2617 },
2510); 2618);
2511 2619
2512END { cf::emergency_save } 2620END { cf::emergency_save }
2513 2621

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines