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.165 by root, Fri Jan 12 22:09:22 2007 UTC vs.
Revision 1.209 by root, Mon Feb 12 01:25:55 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3 (); 13use Coro 3.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 $self->{user_rel} || $self->{ext}
502 ? undef
503 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
504}
505
506sub customise_for {
507 my ($self, $map, $ob) = @_;
508
509 if ($map->per_player) {
510 return cf::map::find ("~" . $ob->name . "/" . $map->{path}{path});
511 }
512
513 $map
514}
515
516# this is somewhat ugly, but style maps do need special treatment
517sub is_style_map {
518 $_[0]{path} =~ m{^/styles/}
519}
520
521sub load_orig {
522 my ($self) = @_;
523
524 &cf::map::load_map_header ($self->load_path)
525}
526
527sub load_temp {
528 my ($self) = @_;
529
530 &cf::map::load_map_header ($self->save_path)
531}
532
533sub unlink_save {
534 my ($self) = @_;
535
536 utf8::encode (my $save = $self->save_path);
537 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
538 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
539}
540
541package cf;
542 389
543############################################################################# 390#############################################################################
544 391
545=head2 ATTACHABLE OBJECTS 392=head2 ATTACHABLE OBJECTS
546 393
… …
672our @CB_TYPE = (); # registry for type (cf-object class) based events 519our @CB_TYPE = (); # registry for type (cf-object class) based events
673our @CB_MAP = (); 520our @CB_MAP = ();
674 521
675my %attachment; 522my %attachment;
676 523
524sub cf::attachable::thawer_merge {
525 # simply override everything except _meta
526 local $_[0]{_meta};
527 %{$_[0]} = %{$_[1]};
528}
529
677sub _attach_cb($$$$) { 530sub _attach_cb($$$$) {
678 my ($registry, $event, $prio, $cb) = @_; 531 my ($registry, $event, $prio, $cb) = @_;
679 532
680 use sort 'stable'; 533 use sort 'stable';
681 534
… …
852# object support 705# object support
853 706
854sub reattach { 707sub reattach {
855 # basically do the same as instantiate, without calling instantiate 708 # basically do the same as instantiate, without calling instantiate
856 my ($obj) = @_; 709 my ($obj) = @_;
710
711 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
857 712
858 my $registry = $obj->registry; 713 my $registry = $obj->registry;
859 714
860 @$registry = (); 715 @$registry = ();
861 716
… …
908 $filename, length $$rdata, scalar @$objs; 763 $filename, length $$rdata, scalar @$objs;
909 764
910 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 765 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
911 chmod SAVE_MODE, $fh; 766 chmod SAVE_MODE, $fh;
912 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 767 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
913 aio_fsync $fh; 768 aio_fsync $fh if $cf::USE_FSYNC;
914 close $fh; 769 close $fh;
915 770
916 if (@$objs) { 771 if (@$objs) {
917 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) {
918 chmod SAVE_MODE, $fh; 773 chmod SAVE_MODE, $fh;
919 my $data = Storable::nfreeze { version => 1, objs => $objs }; 774 my $data = Storable::nfreeze { version => 1, objs => $objs };
920 aio_write $fh, 0, (length $data), $data, 0; 775 aio_write $fh, 0, (length $data), $data, 0;
921 aio_fsync $fh; 776 aio_fsync $fh if $cf::USE_FSYNC;
922 close $fh; 777 close $fh;
923 aio_rename "$filename.pst~", "$filename.pst"; 778 aio_rename "$filename.pst~", "$filename.pst";
924 } 779 }
925 } else { 780 } else {
926 aio_unlink "$filename.pst"; 781 aio_unlink "$filename.pst";
… …
932 } 787 }
933 } else { 788 } else {
934 aio_unlink $filename; 789 aio_unlink $filename;
935 aio_unlink "$filename.pst"; 790 aio_unlink "$filename.pst";
936 } 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 }
937 } 798 }
938} 799}
939 800
940sub object_freezer_as_string { 801sub object_freezer_as_string {
941 my ($rdata, $objs) = @_; 802 my ($rdata, $objs) = @_;
… …
947 808
948sub object_thawer_load { 809sub object_thawer_load {
949 my ($filename) = @_; 810 my ($filename) = @_;
950 811
951 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$//;
952 816
953 (aio_load $filename, $data) >= 0 817 (aio_load $filename, $data) >= 0
954 or return; 818 or return;
955 819
956 unless (aio_stat "$filename.pst") { 820 unless (aio_stat "$filename.pst") {
… …
1048 "package $pkg; use strict; use utf8;\n" 912 "package $pkg; use strict; use utf8;\n"
1049 . "#line 1 \"$path\"\n{\n" 913 . "#line 1 \"$path\"\n{\n"
1050 . (do { local $/; <$fh> }) 914 . (do { local $/; <$fh> })
1051 . "\n};\n1"; 915 . "\n};\n1";
1052 916
1053 eval $source 917 unless (eval $source) {
1054 or die $@ ? "$path: $@\n" 918 my $msg = $@ ? "$path: $@\n"
1055 : "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 }
1056 927
1057 push @EXTS, $pkg; 928 push @EXTS, $pkg;
1058} 929}
1059 930
1060sub load_extensions { 931sub load_extensions {
… …
1066 } or warn "$ext not loaded: $@"; 937 } or warn "$ext not loaded: $@";
1067 } 938 }
1068} 939}
1069 940
1070############################################################################# 941#############################################################################
1071# load/save/clean perl data associated with a map
1072
1073*cf::mapsupport::on_clean = sub {
1074 my ($map) = @_;
1075
1076 my $path = $map->tmpname;
1077 defined $path or return;
1078
1079 unlink "$path.pst";
1080};
1081
1082cf::map->attach (prio => -10000, package => cf::mapsupport::);
1083
1084#############################################################################
1085 942
1086=head2 CORE EXTENSIONS 943=head2 CORE EXTENSIONS
1087 944
1088Functions and methods that extend core crossfire objects. 945Functions and methods that extend core crossfire objects.
1089 946
… …
1125 982
1126sub exists($) { 983sub exists($) {
1127 my ($login) = @_; 984 my ($login) = @_;
1128 985
1129 $cf::PLAYER{$login} 986 $cf::PLAYER{$login}
1130 or cf::sync_job { !aio_stat $login } 987 or cf::sync_job { !aio_stat path $login }
1131} 988}
1132 989
1133sub find($) { 990sub find($) {
1134 return $cf::PLAYER{$_[0]} || do { 991 return $cf::PLAYER{$_[0]} || do {
1135 my $login = $_[0]; 992 my $login = $_[0];
… …
1225 \@logins 1082 \@logins
1226} 1083}
1227 1084
1228=item $player->maps 1085=item $player->maps
1229 1086
1230Returns 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
1231player. May block. 1088player. May block.
1232 1089
1233=cut 1090=cut
1234 1091
1235sub maps($) { 1092sub maps($) {
1236 my ($pl) = @_; 1093 my ($pl) = @_;
1094
1095 $pl = ref $pl ? $pl->ob->name : $pl;
1237 1096
1238 my $files = aio_readdir playerdir $pl 1097 my $files = aio_readdir playerdir $pl
1239 or return; 1098 or return;
1240 1099
1241 my @paths; 1100 my @paths;
… …
1243 for (@$files) { 1102 for (@$files) {
1244 utf8::decode $_; 1103 utf8::decode $_;
1245 next if /\.(?:pl|pst)$/; 1104 next if /\.(?:pl|pst)$/;
1246 next unless /^$PATH_SEP/o; 1105 next unless /^$PATH_SEP/o;
1247 1106
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1107 push @paths, cf::map::normalise "~$pl/$_";
1249 } 1108 }
1250 1109
1251 \@paths 1110 \@paths
1252} 1111}
1253 1112
… …
1279package cf::map; 1138package cf::map;
1280 1139
1281use Fcntl; 1140use Fcntl;
1282use Coro::AIO; 1141use Coro::AIO;
1283 1142
1143use overload
1144 '""' => \&as_string,
1145 fallback => 1;
1146
1284our $MAX_RESET = 3600; 1147our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1148our $DEFAULT_RESET = 3000;
1286 1149
1287sub generate_random_map { 1150sub generate_random_map {
1288 my ($path, $rmp) = @_; 1151 my ($self, $rmp) = @_;
1289
1290 # mit "rum" bekleckern, nicht 1152 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map ( 1153 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1154 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1155 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1156 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1157 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1158 $rmp->{xsize}, $rmp->{ysize},
… …
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1163 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region}), $rmp->{custom} 1164 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 ) 1165 )
1305} 1166}
1306 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
1307# and all this just because we cannot iterate over 1297# and all this just because we cannot iterate over
1308# all maps in C++... 1298# all maps in C++...
1309sub change_all_map_light { 1299sub change_all_map_light {
1310 my ($change) = @_; 1300 my ($change) = @_;
1311 1301
1312 $_->change_map_light ($change) 1302 $_->change_map_light ($change)
1313 for grep $_->outdoor, values %cf::MAP; 1303 for grep $_->outdoor, values %cf::MAP;
1314} 1304}
1315 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
1316sub load_map_header($) { 1319sub load_header_from($) {
1317 my ($path) = @_; 1320 my ($self, $path) = @_;
1318 1321
1319 utf8::encode $path; 1322 utf8::encode $path;
1320 aio_open $path, O_RDONLY, 0 1323 #aio_open $path, O_RDONLY, 0
1324 # or return;
1325
1326 $self->_load_header ($path)
1321 or return; 1327 or return;
1322 1328
1323 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
1324 or return; 1372 or return;
1373 $self->prepare_orig;
1374 }
1325 1375
1326 # for better error messages only, will be overwritten later 1376 1
1327 $map->path ($path);
1328
1329 $map->load_header ($path)
1330 or return;
1331
1332 $map->{load_path} = $path;
1333
1334 $map
1335} 1377}
1336 1378
1337sub find; 1379sub find;
1338sub find { 1380sub find {
1339 my ($path, $origin) = @_; 1381 my ($path, $origin) = @_;
1340 1382
1341 #warn "find<$path,$origin>\n";#d#
1342
1343 $path = new cf::path $path, $origin && $origin->path; 1383 $path = normalise $path, $origin && $origin->path;
1344 my $key = $path->as_string;
1345 1384
1346 cf::lock_wait "map_find:$key"; 1385 cf::lock_wait "map_find:$path";
1347 1386
1348 $cf::MAP{$key} || do { 1387 $cf::MAP{$path} || do {
1349 my $guard = cf::lock_acquire "map_find:$key"; 1388 my $guard = cf::lock_acquire "map_find:$path";
1350 1389 my $map = new_from_path cf::map $path
1351 # do it the slow way
1352 my $map = $path->load_temp;
1353
1354 Coro::cede;
1355
1356 if ($map) {
1357 $map->last_access ((delete $map->{last_access})
1358 || $cf::RUNTIME); #d#
1359 # safety
1360 $map->{instantiate_time} = $cf::RUNTIME
1361 if $map->{instantiate_time} > $cf::RUNTIME;
1362 } else {
1363 $map = $path->load_orig
1364 or return; 1390 or return;
1365 1391
1366 $map->{load_original} = 1;
1367 $map->{instantiate_time} = $cf::RUNTIME;
1368 $map->last_access ($cf::RUNTIME);
1369 $map->instantiate;
1370
1371 # per-player maps become, after loading, normal maps
1372 $map->per_player (0) if $path->{user_rel};
1373 }
1374
1375 $map->path ($key);
1376 $map->{path} = $path;
1377 $map->{last_save} = $cf::RUNTIME; 1392 $map->{last_save} = $cf::RUNTIME;
1378 1393
1379 Coro::cede; 1394 $map->load_header
1395 or return;
1380 1396
1381 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;
1382 $map->reset; 1400 $map->reset;
1383 undef $guard; 1401 undef $guard;
1384 $map = find $path 1402 return find $path;
1385 or return;
1386 } 1403 }
1387 1404
1388 $cf::MAP{$key} = $map 1405 $cf::MAP{$path} = $map
1389 } 1406 }
1390} 1407}
1408
1409sub pre_load { }
1410sub post_load { }
1391 1411
1392sub load { 1412sub load {
1393 my ($self) = @_; 1413 my ($self) = @_;
1394 1414
1415 local $self->{deny_reset} = 1; # loading can take a long time
1416
1395 my $path = $self->{path}; 1417 my $path = $self->{path};
1396 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1418 my $guard = cf::lock_acquire "map_load:$path";
1397 1419
1398 return if $self->in_memory != cf::MAP_SWAPPED; 1420 return if $self->in_memory != cf::MAP_SWAPPED;
1399 1421
1400 $self->in_memory (cf::MAP_LOADING); 1422 $self->in_memory (cf::MAP_LOADING);
1401 1423
1402 $self->alloc; 1424 $self->alloc;
1425
1426 $self->pre_load;
1427
1403 $self->load_objects ($self->{load_path}, 1) 1428 $self->_load_objects ($self->{load_path}, 1)
1404 or return; 1429 or return;
1405 1430
1406 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1431 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1407 if delete $self->{load_original}; 1432 if delete $self->{load_original};
1408 1433
1409 if (my $uniq = $path->uniq_path) { 1434 if (my $uniq = $self->uniq_path) {
1410 utf8::encode $uniq; 1435 utf8::encode $uniq;
1411 if (aio_open $uniq, O_RDONLY, 0) { 1436 if (aio_open $uniq, O_RDONLY, 0) {
1412 $self->clear_unique_items; 1437 $self->clear_unique_items;
1413 $self->load_objects ($uniq, 0); 1438 $self->_load_objects ($uniq, 0);
1414 } 1439 }
1415 } 1440 }
1416 1441
1417 Coro::cede; 1442 Coro::cede;
1418 1443
1419 # now do the right thing for maps 1444 # now do the right thing for maps
1420 $self->link_multipart_objects; 1445 $self->link_multipart_objects;
1421 1446
1422 if ($self->{path}->is_style_map) { 1447 unless ($self->{deny_activate}) {
1423 $self->{deny_save} = 1;
1424 $self->{deny_reset} = 1;
1425 } else {
1426 $self->decay_objects; 1448 $self->decay_objects;
1427 $self->fix_auto_apply; 1449 $self->fix_auto_apply;
1428 $self->update_buttons; 1450 $self->update_buttons;
1451 Coro::cede;
1429 $self->set_darkness_map; 1452 $self->set_darkness_map;
1430 $self->difficulty ($self->estimate_difficulty) 1453 $self->difficulty ($self->estimate_difficulty)
1431 unless $self->difficulty; 1454 unless $self->difficulty;
1455 Coro::cede;
1432 $self->activate; 1456 $self->activate;
1433 } 1457 }
1434 1458
1435 Coro::cede; 1459 $self->post_load;
1436 1460
1437 $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
1438} 1471}
1439 1472
1440# 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
1441sub load_diag { 1474sub load_diag {
1442 my ($map) = @_; 1475 my ($map) = @_;
… …
1472 1505
1473 cf::sync_job { $map->load }; 1506 cf::sync_job { $map->load };
1474} 1507}
1475 1508
1476our %MAP_PREFETCH; 1509our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = Coro::async { 1510our $MAP_PREFETCHER = undef;
1478 while () {
1479 while (%MAP_PREFETCH) {
1480 my $key = each %MAP_PREFETCH
1481 or next;
1482 my $path = delete $MAP_PREFETCH{$key};
1483
1484 my $map = find $path
1485 or next;
1486 $map->load;
1487 }
1488 Coro::schedule;
1489 }
1490};
1491 1511
1492sub find_async { 1512sub find_async {
1493 my ($path, $origin) = @_; 1513 my ($path, $origin) = @_;
1494 1514
1495 $path = new cf::path $path, $origin && $origin->path; 1515 $path = normalise $path, $origin && $origin->{path};
1496 my $key = $path->as_string;
1497 1516
1498 if (my $map = $cf::MAP{$key}) { 1517 if (my $map = $cf::MAP{$path}) {
1499 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1518 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1500 } 1519 }
1501 1520
1502 $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 };
1503 $MAP_PREFETCHER->ready; 1534 $MAP_PREFETCHER->prio (6);
1504 1535
1505 () 1536 ()
1506} 1537}
1507 1538
1508sub save { 1539sub save {
… …
1512 1543
1513 $self->{last_save} = $cf::RUNTIME; 1544 $self->{last_save} = $cf::RUNTIME;
1514 1545
1515 return unless $self->dirty; 1546 return unless $self->dirty;
1516 1547
1517 my $save = $self->{path}->save_path; utf8::encode $save; 1548 my $save = $self->save_path; utf8::encode $save;
1518 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1549 my $uniq = $self->uniq_path; utf8::encode $uniq;
1519 1550
1520 $self->{load_path} = $save; 1551 $self->{load_path} = $save;
1521 1552
1522 return if $self->{deny_save}; 1553 return if $self->{deny_save};
1523 1554
… …
1526 cf::async { 1557 cf::async {
1527 $_->contr->save for $self->players; 1558 $_->contr->save for $self->players;
1528 }; 1559 };
1529 1560
1530 if ($uniq) { 1561 if ($uniq) {
1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1562 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1532 $self->save_objects ($uniq, cf::IO_UNIQUES); 1563 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1533 } else { 1564 } else {
1534 $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);
1535 } 1566 }
1536} 1567}
1537 1568
1538sub swap_out { 1569sub swap_out {
1539 my ($self) = @_; 1570 my ($self) = @_;
… …
1553 1584
1554sub reset_at { 1585sub reset_at {
1555 my ($self) = @_; 1586 my ($self) = @_;
1556 1587
1557 # TODO: safety, remove and allow resettable per-player maps 1588 # TODO: safety, remove and allow resettable per-player maps
1558 return 1e99 if $self->{path}{user_rel}; 1589 return 1e99 if $self->isa ("ext::map_per_player");#d#
1559 return 1e99 if $self->{deny_reset}; 1590 return 1e99 if $self->{deny_reset};
1560 1591
1561 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1592 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1562 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;
1563 1594
… …
1568 my ($self) = @_; 1599 my ($self) = @_;
1569 1600
1570 $self->reset_at <= $cf::RUNTIME 1601 $self->reset_at <= $cf::RUNTIME
1571} 1602}
1572 1603
1573sub rename {
1574 my ($self, $new_path) = @_;
1575
1576 $self->{path}->unlink_save;
1577
1578 delete $cf::MAP{$self->path};
1579 $self->{path} = new cf::path $new_path;
1580 $self->path ($self->{path}->as_string);
1581 $cf::MAP{$self->path} = $self;
1582
1583 $self->save;
1584}
1585
1586sub reset { 1604sub reset {
1587 my ($self) = @_; 1605 my ($self) = @_;
1588 1606
1589 my $lock = cf::lock_acquire "map_data:" . $self->path; 1607 my $lock = cf::lock_acquire "map_data:$self->{path}";
1590 1608
1591 return if $self->players; 1609 return if $self->players;
1592 return if $self->{path}{user_rel};#d# 1610 return if $self->isa ("ext::map_per_player");#d#
1593 1611
1594 warn "resetting map ", $self->path;#d# 1612 warn "resetting map ", $self->path;#d#
1595 1613
1596 delete $cf::MAP{$self->path}; 1614 delete $cf::MAP{$self->path};
1597 1615
1616 $self->in_memory (cf::MAP_SWAPPED);
1617 $self->clear;
1618
1598 $_->clear_links_to ($self) for values %cf::MAP; 1619 $_->clear_links_to ($self) for values %cf::MAP;
1599 1620
1600 $self->{path}->unlink_save; 1621 $self->unlink_save;
1601 $self->destroy; 1622 $self->destroy;
1602} 1623}
1603 1624
1604my $nuke_counter = "aaaa"; 1625my $nuke_counter = "aaaa";
1605 1626
1606sub nuke { 1627sub nuke {
1607 my ($self) = @_; 1628 my ($self) = @_;
1608 1629
1630 delete $cf::MAP{$self->path};
1631
1632 $self->unlink_save;
1633
1634 bless $self, "cf::map";
1635 delete $self->{deny_reset};
1609 $self->{deny_save} = 1; 1636 $self->{deny_save} = 1;
1610 $self->reset_timeout (1); 1637 $self->reset_timeout (1);
1611 $self->rename ("{nuke}/" . ($nuke_counter++)); 1638 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1639
1640 $cf::MAP{$self->path} = $self;
1641
1612 $self->reset; # polite request, might not happen 1642 $self->reset; # polite request, might not happen
1613} 1643}
1614 1644
1615=item cf::map::unique_maps 1645=item cf::map::unique_maps
1616 1646
1617Returns an arrayref of cf::path's of all shared maps that have 1647Returns an arrayref of paths of all shared maps that have
1618instantiated unique items. May block. 1648instantiated unique items. May block.
1619 1649
1620=cut 1650=cut
1621 1651
1622sub unique_maps() { 1652sub unique_maps() {
… …
1628 for (@$files) { 1658 for (@$files) {
1629 utf8::decode $_; 1659 utf8::decode $_;
1630 next if /\.pst$/; 1660 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1661 next unless /^$PATH_SEP/o;
1632 1662
1633 push @paths, new cf::path $_; 1663 push @paths, cf::map::normalise $_;
1634 } 1664 }
1635 1665
1636 \@paths 1666 \@paths
1637} 1667}
1638 1668
… …
1713 1743
1714=item $player_object->enter_link 1744=item $player_object->enter_link
1715 1745
1716Freezes the player and moves him/her to a special map (C<{link}>). 1746Freezes the player and moves him/her to a special map (C<{link}>).
1717 1747
1718The player should be reaosnably safe there for short amounts of time. You 1748The player should be reasonably safe there for short amounts of time. You
1719I<MUST> call C<leave_link> as soon as possible, though. 1749I<MUST> call C<leave_link> as soon as possible, though.
1720 1750
1751Will never block.
1752
1721=item $player_object->leave_link ($map, $x, $y) 1753=item $player_object->leave_link ($map, $x, $y)
1722 1754
1723Moves the player out of the specila link map onto the given map. If the 1755Moves the player out of the special C<{link}> map onto the specified
1724map is not valid (or omitted), the player will be moved back to the 1756map. If the map is not valid (or omitted), the player will be moved back
1725location he/she was before the call to C<enter_link>, or, if that fails, 1757to the location he/she was before the call to C<enter_link>, or, if that
1726to the emergency map position. 1758fails, to the emergency map position.
1727 1759
1728Might block. 1760Might block.
1729 1761
1730=cut 1762=cut
1763
1764sub link_map {
1765 unless ($LINK_MAP) {
1766 $LINK_MAP = cf::map::find "{link}"
1767 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1768 $LINK_MAP->load;
1769 }
1770
1771 $LINK_MAP
1772}
1731 1773
1732sub cf::object::player::enter_link { 1774sub cf::object::player::enter_link {
1733 my ($self) = @_; 1775 my ($self) = @_;
1734 1776
1735 $self->deactivate_recursive; 1777 $self->deactivate_recursive;
1736 1778
1737 return if $self->map == $LINK_MAP; 1779 return if UNIVERSAL::isa $self->map, "ext::map_link";
1738 1780
1739 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1781 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1740 if $self->map; 1782 if $self->map;
1741 1783
1742 $self->enter_map ($LINK_MAP, 20, 20); 1784 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1743} 1785}
1744 1786
1745sub cf::object::player::leave_link { 1787sub cf::object::player::leave_link {
1746 my ($self, $map, $x, $y) = @_; 1788 my ($self, $map, $x, $y) = @_;
1747 1789
… …
1811=cut 1853=cut
1812 1854
1813sub cf::object::player::goto { 1855sub cf::object::player::goto {
1814 my ($self, $path, $x, $y) = @_; 1856 my ($self, $path, $x, $y) = @_;
1815 1857
1816 $path = new cf::path $path;
1817
1818 $self->enter_link; 1858 $self->enter_link;
1819 1859
1820 (async { 1860 (async {
1861 my $map = eval {
1821 my $map = cf::map::find $path->as_string; 1862 my $map = cf::map::find $path;
1822 $map = $map->{path}->customise_for ($map, $self) if $map; 1863 $map = $map->customise_for ($self) if $map;
1823 1864 $map
1824# warn "entering ", $map->path, " at ($x, $y)\n" 1865 } or
1825# if $map;
1826
1827 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1866 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1828 1867
1829 $self->leave_link ($map, $x, $y); 1868 $self->leave_link ($map, $x, $y);
1830 })->prio (1); 1869 })->prio (1);
1831} 1870}
1832 1871
… …
1836 1875
1837sub parse_random_map_params { 1876sub parse_random_map_params {
1838 my ($spec) = @_; 1877 my ($spec) = @_;
1839 1878
1840 my $rmp = { # defaults 1879 my $rmp = { # defaults
1841 xsize => 10, 1880 xsize => (cf::rndm 15, 40),
1842 ysize => 10, 1881 ysize => (cf::rndm 15, 40),
1882 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1883 #layout => string,
1843 }; 1884 };
1844 1885
1845 for (split /\n/, $spec) { 1886 for (split /\n/, $spec) {
1846 my ($k, $v) = split /\s+/, $_, 2; 1887 my ($k, $v) = split /\s+/, $_, 2;
1847 1888
… …
1851 $rmp 1892 $rmp
1852} 1893}
1853 1894
1854sub prepare_random_map { 1895sub prepare_random_map {
1855 my ($exit) = @_; 1896 my ($exit) = @_;
1897
1898 my $guard = cf::lock_acquire "exit_prepare:$exit";
1856 1899
1857 # all this does is basically replace the /! path by 1900 # all this does is basically replace the /! path by
1858 # a new random map path (?random/...) with a seed 1901 # a new random map path (?random/...) with a seed
1859 # that depends on the exit object 1902 # that depends on the exit object
1860 1903
1861 my $rmp = parse_random_map_params $exit->msg; 1904 my $rmp = parse_random_map_params $exit->msg;
1862 1905
1863 if ($exit->map) { 1906 if ($exit->map) {
1864 $rmp->{region} = $exit->map->region_name; 1907 $rmp->{region} = $exit->region->name;
1865 $rmp->{origin_map} = $exit->map->path; 1908 $rmp->{origin_map} = $exit->map->path;
1866 $rmp->{origin_x} = $exit->x; 1909 $rmp->{origin_x} = $exit->x;
1867 $rmp->{origin_y} = $exit->y; 1910 $rmp->{origin_y} = $exit->y;
1868 } 1911 }
1869 1912
1870 $rmp->{random_seed} ||= $exit->random_seed; 1913 $rmp->{random_seed} ||= $exit->random_seed;
1871 1914
1872 my $data = cf::to_json $rmp; 1915 my $data = cf::to_json $rmp;
1873 my $md5 = Digest::MD5::md5_hex $data; 1916 my $md5 = Digest::MD5::md5_hex $data;
1917 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1874 1918
1875 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1919 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1876 aio_write $fh, 0, (length $data), $data, 0; 1920 aio_write $fh, 0, (length $data), $data, 0;
1921 undef $fh;
1922 aio_rename "$meta~", $meta;
1877 1923
1878 $exit->slaying ("?random/$md5"); 1924 $exit->slaying ("?random/$md5");
1879 $exit->msg (undef); 1925 $exit->msg (undef);
1880 } 1926 }
1881} 1927}
1882 1928
1883sub cf::object::player::enter_exit { 1929sub cf::object::player::enter_exit {
1884 my ($self, $exit) = @_; 1930 my ($self, $exit) = @_;
1885 1931
1886 return unless $self->type == cf::PLAYER; 1932 return unless $self->type == cf::PLAYER;
1933
1934 if ($exit->slaying eq "/!") {
1935 #TODO: this should de-fi-ni-te-ly not be a sync-job
1936 cf::sync_job { prepare_random_map $exit };
1937 }
1938
1939 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1940 my $hp = $exit->stats->hp;
1941 my $sp = $exit->stats->sp;
1887 1942
1888 $self->enter_link; 1943 $self->enter_link;
1889 1944
1890 (async { 1945 (async {
1891 $self->deactivate_recursive; # just to be sure 1946 $self->deactivate_recursive; # just to be sure
1892 unless (eval { 1947 unless (eval {
1893 prepare_random_map $exit 1948 $self->goto ($slaying, $hp, $sp);
1894 if $exit->slaying eq "/!";
1895
1896 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1897 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1898 1949
1899 1; 1950 1;
1900 }) { 1951 }) {
1901 $self->message ("Something went wrong deep within the crossfire server. " 1952 $self->message ("Something went wrong deep within the crossfire server. "
1902 . "I'll try to bring you back to the map you were before. " 1953 . "I'll try to bring you back to the map you were before. "
… …
1963 # get handled first 2014 # get handled first
1964 my $queue = delete $ns->{query_queue} 2015 my $queue = delete $ns->{query_queue}
1965 or return; # be conservative, not sure how that can happen, but we saw a crash here 2016 or return; # be conservative, not sure how that can happen, but we saw a crash here
1966 2017
1967 (shift @$queue)->[1]->($msg); 2018 (shift @$queue)->[1]->($msg);
2019 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1968 2020
1969 push @{ $ns->{query_queue} }, @$queue; 2021 push @{ $ns->{query_queue} }, @$queue;
1970 2022
1971 if (@{ $ns->{query_queue} } == @$queue) { 2023 if (@{ $ns->{query_queue} } == @$queue) {
1972 if (@$queue) { 2024 if (@$queue) {
… …
2133The parameter C<$family> should best start with the name of the extension 2185The parameter C<$family> should best start with the name of the extension
2134using it, it should be unique. 2186using it, it should be unique.
2135 2187
2136=over 4 2188=over 4
2137 2189
2138=item $hashref = cf::db_get $family
2139
2140Return a hashref for use by the extension C<$family>, which can be
2141modified. After modifications, you have to call C<cf::db_dirty> or
2142C<cf::db_sync>.
2143
2144=item $value = cf::db_get $family => $key 2190=item $value = cf::db_get $family => $key
2145 2191
2146Returns a single value from the database 2192Returns a single value from the database.
2147
2148=item cf::db_put $family => $hashref
2149
2150Stores the given family hashref into the database. Updates are delayed, if
2151you want the data to be synced to disk immediately, use C<cf::db_sync>.
2152 2193
2153=item cf::db_put $family => $key => $value 2194=item cf::db_put $family => $key => $value
2154 2195
2155Stores the given C<$value> in the family hash. Updates are delayed, if you 2196Stores the given C<$value> in the family.
2156want the data to be synced to disk immediately, use C<cf::db_sync>.
2157
2158=item cf::db_dirty
2159
2160Marks the database as dirty, to be updated at a later time.
2161
2162=item cf::db_sync
2163
2164Immediately write the database to disk I<if it is dirty>.
2165 2197
2166=cut 2198=cut
2167 2199
2168our $DB; 2200our $DB;
2169 2201
2170{ 2202unless ($DB) {
2203 $DB = BDB::db_create $DB_ENV;
2204
2205 cf::sync_job {
2206 eval {
2207 $DB->set_flags (BDB::CHKSUM);
2208
2209 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2210 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2211 cf::cleanup "db_open(db): $!" if $!;
2212 };
2213 cf::cleanup "db_open(db): $@" if $@;
2214 };
2215
2171 my $path = cf::localdir . "/database.pst"; 2216 my $path = cf::localdir . "/database.pst";
2217 if (stat $path) {
2218 cf::sync_job {
2219 my $pst = Storable::retrieve $path;
2172 2220
2173 sub db_load() { 2221 cf::db_put (board => data => $pst->{board});
2174 $DB = stat $path ? Storable::retrieve $path : { }; 2222 cf::db_put (guildrules => data => $pst->{guildrules});
2175 } 2223 cf::db_put (rent => balance => $pst->{rent}{balance});
2224 BDB::db_env_txn_checkpoint $DB_ENV;
2176 2225
2177 my $pid; 2226 unlink $path;
2178
2179 sub db_save() {
2180 waitpid $pid, 0 if $pid;
2181 if (0 == ($pid = fork)) {
2182 $DB->{_meta}{version} = 1;
2183 Storable::nstore $DB, "$path~";
2184 rename "$path~", $path;
2185 cf::_exit 0 if defined $pid;
2186 } 2227 };
2187 }
2188
2189 my $dirty;
2190
2191 sub db_sync() {
2192 db_save if $dirty;
2193 undef $dirty;
2194 }
2195
2196 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2197 db_sync;
2198 }); 2228 }
2229}
2199 2230
2200 sub db_dirty() {
2201 $dirty = 1;
2202 $idle->start;
2203 }
2204
2205 sub db_get($;$) { 2231sub db_get($$) {
2206 @_ >= 2 2232 my $key = "$_[0]/$_[1]";
2207 ? $DB->{$_[0]}{$_[1]}
2208 : ($DB->{$_[0]} ||= { })
2209 }
2210 2233
2234 cf::sync_job {
2235 BDB::db_get $DB, undef, $key, my $data;
2236
2237 $! ? ()
2238 : Compress::LZF::sthaw $data
2239 }
2240}
2241
2211 sub db_put($$;$) { 2242sub db_put($$$) {
2212 if (@_ >= 3) { 2243 BDB::dbreq_pri 4;
2213 $DB->{$_[0]}{$_[1]} = $_[2]; 2244 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2214 } else {
2215 $DB->{$_[0]} = $_[1];
2216 }
2217 db_dirty;
2218 }
2219
2220 cf::global->attach (
2221 prio => 10000,
2222 on_cleanup => sub {
2223 db_sync;
2224 },
2225 );
2226} 2245}
2227 2246
2228############################################################################# 2247#############################################################################
2229# the server's main() 2248# the server's init and main functions
2249
2250sub load_resources {
2251 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2252 or die "unable to load regions file\n";#d#
2253}
2230 2254
2231sub cfg_load { 2255sub cfg_load {
2232 open my $fh, "<:utf8", cf::confdir . "/config" 2256 open my $fh, "<:utf8", cf::confdir . "/config"
2233 or return; 2257 or return;
2234 2258
… …
2247 }; 2271 };
2248 warn $@ if $@; 2272 warn $@ if $@;
2249 } 2273 }
2250} 2274}
2251 2275
2276sub init {
2277 load_resources;
2278}
2279
2252sub main { 2280sub main {
2253 # we must not ever block the main coroutine 2281 # we must not ever block the main coroutine
2254 local $Coro::idle = sub { 2282 local $Coro::idle = sub {
2255 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2283 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2284 (async {
2256 async { Event::one_event }; 2285 Event::one_event;
2286 })->prio (Coro::PRIO_MAX);
2257 }; 2287 };
2258 2288
2259 cfg_load; 2289 cfg_load;
2260 db_load;
2261 load_extensions; 2290 load_extensions;
2291
2292 $TICK_WATCHER->start;
2262 Event::loop; 2293 Event::loop;
2263} 2294}
2264 2295
2265############################################################################# 2296#############################################################################
2266# initialisation and cleanup 2297# initialisation and cleanup
2267 2298
2268# install some emergency cleanup handlers 2299# install some emergency cleanup handlers
2269BEGIN { 2300BEGIN {
2270 for my $signal (qw(INT HUP TERM)) { 2301 for my $signal (qw(INT HUP TERM)) {
2271 Event->signal ( 2302 Event->signal (
2303 reentrant => 0,
2272 data => WF_AUTOCANCEL, 2304 data => WF_AUTOCANCEL,
2273 signal => $signal, 2305 signal => $signal,
2306 prio => 0,
2274 cb => sub { 2307 cb => sub {
2275 cf::cleanup "SIG$signal"; 2308 cf::cleanup "SIG$signal";
2276 }, 2309 },
2277 ); 2310 );
2278 } 2311 }
2279} 2312}
… …
2284 warn "enter emergency perl save\n"; 2317 warn "enter emergency perl save\n";
2285 2318
2286 cf::sync_job { 2319 cf::sync_job {
2287 # use a peculiar iteration method to avoid tripping on perl 2320 # use a peculiar iteration method to avoid tripping on perl
2288 # refcount bugs in for. also avoids problems with players 2321 # refcount bugs in for. also avoids problems with players
2289 # and maps saved/Destroyed asynchronously. 2322 # and maps saved/destroyed asynchronously.
2290 warn "begin emergency player save\n"; 2323 warn "begin emergency player save\n";
2291 for my $login (keys %cf::PLAYER) { 2324 for my $login (keys %cf::PLAYER) {
2292 my $pl = $cf::PLAYER{$login} or next; 2325 my $pl = $cf::PLAYER{$login} or next;
2293 $pl->valid or next; 2326 $pl->valid or next;
2294 $pl->save; 2327 $pl->save;
… …
2300 my $map = $cf::MAP{$path} or next; 2333 my $map = $cf::MAP{$path} or next;
2301 $map->valid or next; 2334 $map->valid or next;
2302 $map->save; 2335 $map->save;
2303 } 2336 }
2304 warn "end emergency map save\n"; 2337 warn "end emergency map save\n";
2338
2339 warn "begin emergency database checkpoint\n";
2340 BDB::db_env_txn_checkpoint $DB_ENV;
2341 warn "end emergency database checkpoint\n";
2305 }; 2342 };
2306 2343
2307 warn "leave emergency perl save\n"; 2344 warn "leave emergency perl save\n";
2308} 2345}
2309 2346
2310sub reload() { 2347sub reload() {
2311 # can/must only be called in main 2348 # can/must only be called in main
2312 if ($Coro::current != $Coro::main) { 2349 if ($Coro::current != $Coro::main) {
2313 warn "can only reload from main coroutine\n"; 2350 warn "can only reload from main coroutine";
2314 return; 2351 return;
2315 } 2352 }
2316 2353
2317 warn "reloading..."; 2354 warn "reloading...";
2318 2355
2319 warn "freezing server"; 2356 warn "cancelling server ticker";
2320 my $guard = freeze_mainloop; 2357 $TICK_WATCHER->cancel;
2358
2321 cf::emergency_save; 2359 cf::emergency_save;
2322
2323 warn "sync database to disk";
2324 cf::db_sync;
2325 IO::AIO::flush;
2326 2360
2327 eval { 2361 eval {
2328 # if anything goes wrong in here, we should simply crash as we already saved 2362 # if anything goes wrong in here, we should simply crash as we already saved
2329 2363
2330 warn "cancel all watchers"; 2364 warn "cancelling all WF_AUTOCANCEL watchers";
2331 for (Event::all_watchers) { 2365 for (Event::all_watchers) {
2332 $_->cancel if $_->data & WF_AUTOCANCEL; 2366 $_->cancel if $_->data & WF_AUTOCANCEL;
2333 } 2367 }
2334 2368
2369 warn "syncing database to disk";
2370 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2371
2372 warn "flushing outstanding aio requests";
2373 for (;;) {
2374 BDB::flush;
2375 IO::AIO::flush;
2376 Coro::cede;
2377 last unless IO::AIO::nreqs || BDB::nreqs;
2378 warn "iterate...";
2379 }
2380
2335 warn "cancel all extension coros"; 2381 warn "cancelling all extension coros";
2336 $_->cancel for values %EXT_CORO; 2382 $_->cancel for values %EXT_CORO;
2337 %EXT_CORO = (); 2383 %EXT_CORO = ();
2338 2384
2339 warn "remove commands"; 2385 warn "removing commands";
2340 %COMMAND = (); 2386 %COMMAND = ();
2341 2387
2342 warn "remove ext commands"; 2388 warn "removing ext commands";
2343 %EXTCMD = (); 2389 %EXTCMD = ();
2344 2390
2345 warn "unload/nuke all extensions"; 2391 warn "unloading/nuking all extensions";
2346 for my $pkg (@EXTS) { 2392 for my $pkg (@EXTS) {
2347 warn "... unloading $pkg"; 2393 warn "... unloading $pkg";
2348 2394
2349 if (my $cb = $pkg->can ("unload")) { 2395 if (my $cb = $pkg->can ("unload")) {
2350 eval { 2396 eval {
… …
2355 2401
2356 warn "... nuking $pkg"; 2402 warn "... nuking $pkg";
2357 Symbol::delete_package $pkg; 2403 Symbol::delete_package $pkg;
2358 } 2404 }
2359 2405
2360 warn "unload all perl modules loaded from $LIBDIR"; 2406 warn "unloading all perl modules loaded from $LIBDIR";
2361 while (my ($k, $v) = each %INC) { 2407 while (my ($k, $v) = each %INC) {
2362 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2408 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2363 2409
2364 warn "removing <$k>"; 2410 warn "... unloading $k";
2365 delete $INC{$k}; 2411 delete $INC{$k};
2366 2412
2367 $k =~ s/\.pm$//; 2413 $k =~ s/\.pm$//;
2368 $k =~ s/\//::/g; 2414 $k =~ s/\//::/g;
2369 2415
… …
2372 } 2418 }
2373 2419
2374 Symbol::delete_package $k; 2420 Symbol::delete_package $k;
2375 } 2421 }
2376 2422
2377 warn "get rid of safe::, as good as possible"; 2423 warn "getting rid of safe::, as good as possible";
2378 Symbol::delete_package "safe::$_" 2424 Symbol::delete_package "safe::$_"
2379 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2425 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2380 2426
2381 warn "unload cf.pm \"a bit\""; 2427 warn "unloading cf.pm \"a bit\"";
2382 delete $INC{"cf.pm"}; 2428 delete $INC{"cf.pm"};
2383 2429
2384 # don't, removes xs symbols, too, 2430 # don't, removes xs symbols, too,
2385 # and global variables created in xs 2431 # and global variables created in xs
2386 #Symbol::delete_package __PACKAGE__; 2432 #Symbol::delete_package __PACKAGE__;
2387 2433
2434 warn "unload completed, starting to reload now";
2435
2388 warn "reloading cf.pm"; 2436 warn "reloading cf.pm";
2389 require cf; 2437 require cf;
2390 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2438 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2391 2439
2392 warn "load config and database again"; 2440 warn "loading config and database again";
2393 cf::cfg_load; 2441 cf::cfg_load;
2394 cf::db_load;
2395 2442
2396 warn "load extensions"; 2443 warn "loading extensions";
2397 cf::load_extensions; 2444 cf::load_extensions;
2398 2445
2399 warn "reattach attachments to objects/players"; 2446 warn "reattaching attachments to objects/players";
2400 _global_reattach; 2447 _global_reattach;
2401 warn "reattach attachments to maps"; 2448 warn "reattaching attachments to maps";
2402 reattach $_ for values %MAP; 2449 reattach $_ for values %MAP;
2450
2451 warn "loading reloadable resources";
2452 load_resources;
2453
2454 warn "restarting server ticker";
2455
2456 $TICK_WATCHER->start;
2403 }; 2457 };
2404 2458
2405 if ($@) { 2459 if ($@) {
2406 warn $@; 2460 warn $@;
2407 warn "error while reloading, exiting."; 2461 warn "error while reloading, exiting.";
… …
2409 } 2463 }
2410 2464
2411 warn "reloaded"; 2465 warn "reloaded";
2412}; 2466};
2413 2467
2414############################################################################# 2468our $RELOAD_WATCHER; # used only during reload
2415
2416unless ($LINK_MAP) {
2417 $LINK_MAP = cf::map::new;
2418
2419 $LINK_MAP->width (41);
2420 $LINK_MAP->height (41);
2421 $LINK_MAP->alloc;
2422 $LINK_MAP->path ("{link}");
2423 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2424 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2425
2426 # dirty hack because... archetypes are not yet loaded
2427 Event->timer (
2428 after => 10,
2429 cb => sub {
2430 $_[0]->w->cancel;
2431
2432 # provide some exits "home"
2433 my $exit = cf::object::new "exit";
2434
2435 $exit->slaying ($EMERGENCY_POSITION->[0]);
2436 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2437 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2438
2439 $LINK_MAP->insert ($exit->clone, 19, 19);
2440 $LINK_MAP->insert ($exit->clone, 19, 20);
2441 $LINK_MAP->insert ($exit->clone, 19, 21);
2442 $LINK_MAP->insert ($exit->clone, 20, 19);
2443 $LINK_MAP->insert ($exit->clone, 20, 21);
2444 $LINK_MAP->insert ($exit->clone, 21, 19);
2445 $LINK_MAP->insert ($exit->clone, 21, 20);
2446 $LINK_MAP->insert ($exit->clone, 21, 21);
2447
2448 $exit->destroy;
2449 });
2450
2451 $LINK_MAP->{deny_save} = 1;
2452 $LINK_MAP->{deny_reset} = 1;
2453
2454 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2455}
2456 2469
2457register_command "reload" => sub { 2470register_command "reload" => sub {
2458 my ($who, $arg) = @_; 2471 my ($who, $arg) = @_;
2459 2472
2460 if ($who->flag (FLAG_WIZ)) { 2473 if ($who->flag (FLAG_WIZ)) {
2461 $who->message ("start of reload."); 2474 $who->message ("reloading server.");
2475
2476 # doing reload synchronously and two reloads happen back-to-back,
2477 # coro crashes during coro_state_free->destroy here.
2478
2479 $RELOAD_WATCHER ||= Event->timer (
2480 reentrant => 0,
2481 after => 0,
2482 data => WF_AUTOCANCEL,
2483 cb => sub {
2462 reload; 2484 reload;
2463 $who->message ("end of reload."); 2485 undef $RELOAD_WATCHER;
2486 },
2487 );
2464 } 2488 }
2465}; 2489};
2466 2490
2467unshift @INC, $LIBDIR; 2491unshift @INC, $LIBDIR;
2492
2493my $bug_warning = 0;
2468 2494
2469$TICK_WATCHER = Event->timer ( 2495$TICK_WATCHER = Event->timer (
2470 reentrant => 0, 2496 reentrant => 0,
2497 parked => 1,
2471 prio => 0, 2498 prio => 0,
2472 at => $NEXT_TICK || $TICK, 2499 at => $NEXT_TICK || $TICK,
2473 data => WF_AUTOCANCEL, 2500 data => WF_AUTOCANCEL,
2474 cb => sub { 2501 cb => sub {
2502 if ($Coro::current != $Coro::main) {
2503 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2504 unless ++$bug_warning > 10;
2505 return;
2506 }
2507
2475 $NOW = Event::time; 2508 $NOW = Event::time;
2476 2509
2477 cf::server_tick; # one server iteration 2510 cf::server_tick; # one server iteration
2478 $RUNTIME += $TICK; 2511 $RUNTIME += $TICK;
2479 $NEXT_TICK += $TICK; 2512 $NEXT_TICK += $TICK;
2480 2513
2481 $WAIT_FOR_TICK->broadcast; 2514 $WAIT_FOR_TICK->broadcast;
2482 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2515 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2516
2517 Event::sweep;
2518 Coro::cede_notself;
2519
2520# my $AFTER = Event::time;
2521# warn $AFTER - $NOW;#d#
2483 2522
2484 # if we are delayed by four ticks or more, skip them all 2523 # if we are delayed by four ticks or more, skip them all
2485 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2524 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2486 2525
2487 $TICK_WATCHER->at ($NEXT_TICK); 2526 $TICK_WATCHER->at ($NEXT_TICK);
2488 $TICK_WATCHER->start; 2527 $TICK_WATCHER->start;
2489 }, 2528 },
2490); 2529);
2491 2530
2531{
2532 BDB::max_poll_time $TICK * 0.1;
2533 $BDB_POLL_WATCHER = Event->io (
2534 reentrant => 0,
2535 fd => BDB::poll_fileno,
2536 poll => 'r',
2537 prio => 0,
2538 data => WF_AUTOCANCEL,
2539 cb => \&BDB::poll_cb,
2540 );
2541 BDB::min_parallel 8;
2542
2543 BDB::set_sync_prepare {
2544 my $status;
2545 my $current = $Coro::current;
2546 (
2547 sub {
2548 $status = $!;
2549 $current->ready; undef $current;
2550 },
2551 sub {
2552 Coro::schedule while defined $current;
2553 $! = $status;
2554 },
2555 )
2556 };
2557
2558 unless ($DB_ENV) {
2559 $DB_ENV = BDB::db_env_create;
2560
2561 cf::sync_job {
2562 eval {
2563 BDB::db_env_open
2564 $DB_ENV,
2565 $BDB_ENV_DIR,
2566 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2567 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2568 0666;
2569
2570 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2571
2572 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2573 $DB_ENV->set_lk_detect;
2574 };
2575
2576 cf::cleanup "db_env_open(db): $@" if $@;
2577 };
2578 }
2579}
2580
2581{
2582 IO::AIO::min_parallel 8;
2583
2584 undef $Coro::AIO::WATCHER;
2492IO::AIO::max_poll_time $TICK * 0.2; 2585 IO::AIO::max_poll_time $TICK * 0.1;
2493 2586 $AIO_POLL_WATCHER = Event->io (
2494Event->io ( 2587 reentrant => 0,
2495 fd => IO::AIO::poll_fileno, 2588 fd => IO::AIO::poll_fileno,
2496 poll => 'r', 2589 poll => 'r',
2497 prio => 5, 2590 prio => 6,
2498 data => WF_AUTOCANCEL, 2591 data => WF_AUTOCANCEL,
2499 cb => \&IO::AIO::poll_cb, 2592 cb => \&IO::AIO::poll_cb,
2500); 2593 );
2594}
2501 2595
2502Event->timer ( 2596$WRITE_RUNTIME_WATCHER = Event->timer (
2597 reentrant => 0,
2503 data => WF_AUTOCANCEL, 2598 data => WF_AUTOCANCEL,
2504 after => 0, 2599 after => 1,
2505 interval => 10, 2600 interval => 10,
2506 cb => sub { 2601 prio => 6, # keep it lowest so it acts like a watchdog
2507 (Coro::unblock_sub { 2602 cb => Coro::unblock_sub {
2508 write_runtime 2603 write_runtime
2509 or warn "ERROR: unable to write runtime file: $!"; 2604 or warn "ERROR: unable to write runtime file: $!";
2510 })->();
2511 }, 2605 },
2512); 2606);
2513 2607
2514END { cf::emergency_save } 2608END { cf::emergency_save }
2515 2609

Diff Legend

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