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.211 by root, Tue Feb 13 16:23:32 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 }
… …
337 356
338 $coro 357 $coro
339} 358}
340 359
341sub write_runtime { 360sub write_runtime {
361 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
362
342 my $runtime = cf::localdir . "/runtime"; 363 my $runtime = cf::localdir . "/runtime";
343 364
344 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 365 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
345 or return; 366 or return;
346 367
368 my $value = $cf::RUNTIME + 90 + 10;
347 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 369 # 10 is the runtime save interval, for a monotonic clock
370 # 60 allows for the watchdog to kill the server.
371
348 (aio_write $fh, 0, (length $value), $value, 0) <= 0 372 (aio_write $fh, 0, (length $value), $value, 0) <= 0
349 and return; 373 and return;
350 374
375 # always fsync - this file is important
351 aio_fsync $fh 376 aio_fsync $fh
352 and return; 377 and return;
353 378
354 close $fh 379 close $fh
355 or return; 380 or return;
… …
361} 386}
362 387
363=back 388=back
364 389
365=cut 390=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 391
543############################################################################# 392#############################################################################
544 393
545=head2 ATTACHABLE OBJECTS 394=head2 ATTACHABLE OBJECTS
546 395
… …
672our @CB_TYPE = (); # registry for type (cf-object class) based events 521our @CB_TYPE = (); # registry for type (cf-object class) based events
673our @CB_MAP = (); 522our @CB_MAP = ();
674 523
675my %attachment; 524my %attachment;
676 525
526sub cf::attachable::thawer_merge {
527 # simply override everything except _meta
528 local $_[0]{_meta};
529 %{$_[0]} = %{$_[1]};
530}
531
677sub _attach_cb($$$$) { 532sub _attach_cb($$$$) {
678 my ($registry, $event, $prio, $cb) = @_; 533 my ($registry, $event, $prio, $cb) = @_;
679 534
680 use sort 'stable'; 535 use sort 'stable';
681 536
… …
852# object support 707# object support
853 708
854sub reattach { 709sub reattach {
855 # basically do the same as instantiate, without calling instantiate 710 # basically do the same as instantiate, without calling instantiate
856 my ($obj) = @_; 711 my ($obj) = @_;
712
713 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
857 714
858 my $registry = $obj->registry; 715 my $registry = $obj->registry;
859 716
860 @$registry = (); 717 @$registry = ();
861 718
… …
908 $filename, length $$rdata, scalar @$objs; 765 $filename, length $$rdata, scalar @$objs;
909 766
910 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 767 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
911 chmod SAVE_MODE, $fh; 768 chmod SAVE_MODE, $fh;
912 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 769 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
913 aio_fsync $fh; 770 aio_fsync $fh if $cf::USE_FSYNC;
914 close $fh; 771 close $fh;
915 772
916 if (@$objs) { 773 if (@$objs) {
917 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 774 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
918 chmod SAVE_MODE, $fh; 775 chmod SAVE_MODE, $fh;
919 my $data = Storable::nfreeze { version => 1, objs => $objs }; 776 my $data = Storable::nfreeze { version => 1, objs => $objs };
920 aio_write $fh, 0, (length $data), $data, 0; 777 aio_write $fh, 0, (length $data), $data, 0;
921 aio_fsync $fh; 778 aio_fsync $fh if $cf::USE_FSYNC;
922 close $fh; 779 close $fh;
923 aio_rename "$filename.pst~", "$filename.pst"; 780 aio_rename "$filename.pst~", "$filename.pst";
924 } 781 }
925 } else { 782 } else {
926 aio_unlink "$filename.pst"; 783 aio_unlink "$filename.pst";
… …
932 } 789 }
933 } else { 790 } else {
934 aio_unlink $filename; 791 aio_unlink $filename;
935 aio_unlink "$filename.pst"; 792 aio_unlink "$filename.pst";
936 } 793 }
794
795 #d##TODO# nuke non .map-files if exist
796 if ($filename =~ s/\.map$//) {
797 aio_unlink $filename;
798 aio_unlink "$filename.pst";
799 }
937 } 800 }
938} 801}
939 802
940sub object_freezer_as_string { 803sub object_freezer_as_string {
941 my ($rdata, $objs) = @_; 804 my ($rdata, $objs) = @_;
… …
947 810
948sub object_thawer_load { 811sub object_thawer_load {
949 my ($filename) = @_; 812 my ($filename) = @_;
950 813
951 my ($data, $av); 814 my ($data, $av);
815
816 #d#TODO remove .map if file does not exist
817 aio_stat $filename and $filename =~ s/\.map$//;
952 818
953 (aio_load $filename, $data) >= 0 819 (aio_load $filename, $data) >= 0
954 or return; 820 or return;
955 821
956 unless (aio_stat "$filename.pst") { 822 unless (aio_stat "$filename.pst") {
… …
1048 "package $pkg; use strict; use utf8;\n" 914 "package $pkg; use strict; use utf8;\n"
1049 . "#line 1 \"$path\"\n{\n" 915 . "#line 1 \"$path\"\n{\n"
1050 . (do { local $/; <$fh> }) 916 . (do { local $/; <$fh> })
1051 . "\n};\n1"; 917 . "\n};\n1";
1052 918
1053 eval $source 919 unless (eval $source) {
1054 or die $@ ? "$path: $@\n" 920 my $msg = $@ ? "$path: $@\n"
1055 : "extension disabled.\n"; 921 : "extension disabled.\n";
922 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
923 warn $@;
924 warn "mandatory extension failed to load, exiting.\n";
925 exit 1;
926 }
927 die $@;
928 }
1056 929
1057 push @EXTS, $pkg; 930 push @EXTS, $pkg;
1058} 931}
1059 932
1060sub load_extensions { 933sub load_extensions {
… …
1066 } or warn "$ext not loaded: $@"; 939 } or warn "$ext not loaded: $@";
1067 } 940 }
1068} 941}
1069 942
1070############################################################################# 943#############################################################################
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 944
1086=head2 CORE EXTENSIONS 945=head2 CORE EXTENSIONS
1087 946
1088Functions and methods that extend core crossfire objects. 947Functions and methods that extend core crossfire objects.
1089 948
… …
1125 984
1126sub exists($) { 985sub exists($) {
1127 my ($login) = @_; 986 my ($login) = @_;
1128 987
1129 $cf::PLAYER{$login} 988 $cf::PLAYER{$login}
1130 or cf::sync_job { !aio_stat $login } 989 or cf::sync_job { !aio_stat path $login }
1131} 990}
1132 991
1133sub find($) { 992sub find($) {
1134 return $cf::PLAYER{$_[0]} || do { 993 return $cf::PLAYER{$_[0]} || do {
1135 my $login = $_[0]; 994 my $login = $_[0];
… …
1225 \@logins 1084 \@logins
1226} 1085}
1227 1086
1228=item $player->maps 1087=item $player->maps
1229 1088
1230Returns an arrayref of cf::path's of all maps that are private for this 1089Returns an arrayref of map paths that are private for this
1231player. May block. 1090player. May block.
1232 1091
1233=cut 1092=cut
1234 1093
1235sub maps($) { 1094sub maps($) {
1236 my ($pl) = @_; 1095 my ($pl) = @_;
1096
1097 $pl = ref $pl ? $pl->ob->name : $pl;
1237 1098
1238 my $files = aio_readdir playerdir $pl 1099 my $files = aio_readdir playerdir $pl
1239 or return; 1100 or return;
1240 1101
1241 my @paths; 1102 my @paths;
… …
1243 for (@$files) { 1104 for (@$files) {
1244 utf8::decode $_; 1105 utf8::decode $_;
1245 next if /\.(?:pl|pst)$/; 1106 next if /\.(?:pl|pst)$/;
1246 next unless /^$PATH_SEP/o; 1107 next unless /^$PATH_SEP/o;
1247 1108
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1109 push @paths, cf::map::normalise "~$pl/$_";
1249 } 1110 }
1250 1111
1251 \@paths 1112 \@paths
1252} 1113}
1253 1114
… …
1279package cf::map; 1140package cf::map;
1280 1141
1281use Fcntl; 1142use Fcntl;
1282use Coro::AIO; 1143use Coro::AIO;
1283 1144
1145use overload
1146 '""' => \&as_string,
1147 fallback => 1;
1148
1284our $MAX_RESET = 3600; 1149our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1150our $DEFAULT_RESET = 3000;
1286 1151
1287sub generate_random_map { 1152sub generate_random_map {
1288 my ($path, $rmp) = @_; 1153 my ($self, $rmp) = @_;
1289
1290 # mit "rum" bekleckern, nicht 1154 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map ( 1155 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1156 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1157 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1158 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1159 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1160 $rmp->{xsize}, $rmp->{ysize},
… …
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1165 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region}), $rmp->{custom} 1166 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 ) 1167 )
1305} 1168}
1306 1169
1170=item cf::map->register ($regex, $prio)
1171
1172Register a handler for the map path matching the given regex at the
1173givne priority (higher is better, built-in handlers have priority 0, the
1174default).
1175
1176=cut
1177
1178sub register {
1179 my (undef, $regex, $prio) = @_;
1180 my $pkg = caller;
1181
1182 no strict;
1183 push @{"$pkg\::ISA"}, __PACKAGE__;
1184
1185 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1186}
1187
1188# also paths starting with '/'
1189$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1190
1191sub thawer_merge {
1192 my ($self, $merge) = @_;
1193
1194 # we have to keep some variables in memory intact
1195 local $self->{path};
1196 local $self->{load_path};
1197 local $self->{deny_save};
1198 local $self->{deny_reset};
1199
1200 $self->SUPER::thawer_merge ($merge);
1201}
1202
1203sub normalise {
1204 my ($path, $base) = @_;
1205
1206 $path = "$path"; # make sure its a string
1207
1208 $path =~ s/\.map$//;
1209
1210 # map plan:
1211 #
1212 # /! non-realised random map exit (special hack!)
1213 # {... are special paths that are not being touched
1214 # ?xxx/... are special absolute paths
1215 # ?random/... random maps
1216 # /... normal maps
1217 # ~user/... per-player map of a specific user
1218
1219 $path =~ s/$PATH_SEP/\//go;
1220
1221 # treat it as relative path if it starts with
1222 # something that looks reasonable
1223 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1224 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1225
1226 $base =~ s{[^/]+/?$}{};
1227 $path = "$base/$path";
1228 }
1229
1230 for ($path) {
1231 redo if s{//}{/};
1232 redo if s{/\.?/}{/};
1233 redo if s{/[^/]+/\.\./}{/};
1234 }
1235
1236 $path
1237}
1238
1239sub new_from_path {
1240 my (undef, $path, $base) = @_;
1241
1242 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1243
1244 $path = normalise $path, $base;
1245
1246 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1247 if ($path =~ $EXT_MAP{$pkg}[1]) {
1248 my $self = bless cf::map::new, $pkg;
1249 $self->{path} = $path; $self->path ($path);
1250 $self->init; # pass $1 etc.
1251 return $self;
1252 }
1253 }
1254
1255 Carp::carp "unable to resolve path '$path' (base '$base').";
1256 ()
1257}
1258
1259sub init {
1260 my ($self) = @_;
1261
1262 $self
1263}
1264
1265sub as_string {
1266 my ($self) = @_;
1267
1268 "$self->{path}"
1269}
1270
1271# the displayed name, this is a one way mapping
1272sub visible_name {
1273 &as_string
1274}
1275
1276# the original (read-only) location
1277sub load_path {
1278 my ($self) = @_;
1279
1280 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1281}
1282
1283# the temporary/swap location
1284sub save_path {
1285 my ($self) = @_;
1286
1287 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1288 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1289}
1290
1291# the unique path, undef == no special unique path
1292sub uniq_path {
1293 my ($self) = @_;
1294
1295 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1296 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1297}
1298
1307# and all this just because we cannot iterate over 1299# and all this just because we cannot iterate over
1308# all maps in C++... 1300# all maps in C++...
1309sub change_all_map_light { 1301sub change_all_map_light {
1310 my ($change) = @_; 1302 my ($change) = @_;
1311 1303
1312 $_->change_map_light ($change) 1304 $_->change_map_light ($change)
1313 for grep $_->outdoor, values %cf::MAP; 1305 for grep $_->outdoor, values %cf::MAP;
1314} 1306}
1315 1307
1308sub unlink_save {
1309 my ($self) = @_;
1310
1311 utf8::encode (my $save = $self->save_path);
1312 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1314
1315 #d#TODO remove .map and also nuke
1316 $save =~ s/\.map// or return;#d#
1317 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1318 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1319}
1320
1316sub load_map_header($) { 1321sub load_header_from($) {
1317 my ($path) = @_; 1322 my ($self, $path) = @_;
1318 1323
1319 utf8::encode $path; 1324 utf8::encode $path;
1320 aio_open $path, O_RDONLY, 0 1325 #aio_open $path, O_RDONLY, 0
1326 # or return;
1327
1328 $self->_load_header ($path)
1321 or return; 1329 or return;
1322 1330
1323 my $map = cf::map::new 1331 $self->{load_path} = $path;
1332
1333 1
1334}
1335
1336sub load_header_orig {
1337 my ($self) = @_;
1338
1339 $self->load_header_from ($self->load_path)
1340}
1341
1342sub load_header_temp {
1343 my ($self) = @_;
1344
1345 $self->load_header_from ($self->save_path)
1346}
1347
1348sub prepare_temp {
1349 my ($self) = @_;
1350
1351 $self->last_access ((delete $self->{last_access})
1352 || $cf::RUNTIME); #d#
1353 # safety
1354 $self->{instantiate_time} = $cf::RUNTIME
1355 if $self->{instantiate_time} > $cf::RUNTIME;
1356}
1357
1358sub prepare_orig {
1359 my ($self) = @_;
1360
1361 $self->{load_original} = 1;
1362 $self->{instantiate_time} = $cf::RUNTIME;
1363 $self->last_access ($cf::RUNTIME);
1364 $self->instantiate;
1365}
1366
1367sub load_header {
1368 my ($self) = @_;
1369
1370 if ($self->load_header_temp) {
1371 $self->prepare_temp;
1372 } else {
1373 $self->load_header_orig
1324 or return; 1374 or return;
1375 $self->prepare_orig;
1376 }
1325 1377
1326 # for better error messages only, will be overwritten later 1378 1
1327 $map->path ($path);
1328
1329 $map->load_header ($path)
1330 or return;
1331
1332 $map->{load_path} = $path;
1333
1334 $map
1335} 1379}
1336 1380
1337sub find; 1381sub find;
1338sub find { 1382sub find {
1339 my ($path, $origin) = @_; 1383 my ($path, $origin) = @_;
1340 1384
1341 #warn "find<$path,$origin>\n";#d#
1342
1343 $path = new cf::path $path, $origin && $origin->path; 1385 $path = normalise $path, $origin && $origin->path;
1344 my $key = $path->as_string;
1345 1386
1346 cf::lock_wait "map_find:$key"; 1387 cf::lock_wait "map_find:$path";
1347 1388
1348 $cf::MAP{$key} || do { 1389 $cf::MAP{$path} || do {
1349 my $guard = cf::lock_acquire "map_find:$key"; 1390 my $guard = cf::lock_acquire "map_find:$path";
1350 1391 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; 1392 or return;
1365 1393
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; 1394 $map->{last_save} = $cf::RUNTIME;
1378 1395
1379 Coro::cede; 1396 $map->load_header
1397 or return;
1380 1398
1381 if ($map->should_reset) { 1399 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1400 # doing this can freeze the server in a sync job, obviously
1401 #$cf::WAIT_FOR_TICK->wait;
1382 $map->reset; 1402 $map->reset;
1383 undef $guard; 1403 undef $guard;
1384 $map = find $path 1404 return find $path;
1385 or return;
1386 } 1405 }
1387 1406
1388 $cf::MAP{$key} = $map 1407 $cf::MAP{$path} = $map
1389 } 1408 }
1390} 1409}
1410
1411sub pre_load { }
1412sub post_load { }
1391 1413
1392sub load { 1414sub load {
1393 my ($self) = @_; 1415 my ($self) = @_;
1394 1416
1417 local $self->{deny_reset} = 1; # loading can take a long time
1418
1395 my $path = $self->{path}; 1419 my $path = $self->{path};
1396 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1420 my $guard = cf::lock_acquire "map_load:$path";
1397 1421
1398 return if $self->in_memory != cf::MAP_SWAPPED; 1422 return if $self->in_memory != cf::MAP_SWAPPED;
1399 1423
1400 $self->in_memory (cf::MAP_LOADING); 1424 $self->in_memory (cf::MAP_LOADING);
1401 1425
1402 $self->alloc; 1426 $self->alloc;
1427
1428 $self->pre_load;
1429
1403 $self->load_objects ($self->{load_path}, 1) 1430 $self->_load_objects ($self->{load_path}, 1)
1404 or return; 1431 or return;
1405 1432
1406 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1433 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1407 if delete $self->{load_original}; 1434 if delete $self->{load_original};
1408 1435
1409 if (my $uniq = $path->uniq_path) { 1436 if (my $uniq = $self->uniq_path) {
1410 utf8::encode $uniq; 1437 utf8::encode $uniq;
1411 if (aio_open $uniq, O_RDONLY, 0) { 1438 if (aio_open $uniq, O_RDONLY, 0) {
1412 $self->clear_unique_items; 1439 $self->clear_unique_items;
1413 $self->load_objects ($uniq, 0); 1440 $self->_load_objects ($uniq, 0);
1414 } 1441 }
1415 } 1442 }
1416 1443
1417 Coro::cede; 1444 Coro::cede;
1418 1445
1419 # now do the right thing for maps 1446 # now do the right thing for maps
1420 $self->link_multipart_objects; 1447 $self->link_multipart_objects;
1421 1448
1422 if ($self->{path}->is_style_map) { 1449 unless ($self->{deny_activate}) {
1423 $self->{deny_save} = 1;
1424 $self->{deny_reset} = 1;
1425 } else {
1426 $self->decay_objects; 1450 $self->decay_objects;
1427 $self->fix_auto_apply; 1451 $self->fix_auto_apply;
1428 $self->update_buttons; 1452 $self->update_buttons;
1453 Coro::cede;
1429 $self->set_darkness_map; 1454 $self->set_darkness_map;
1430 $self->difficulty ($self->estimate_difficulty) 1455 $self->difficulty ($self->estimate_difficulty)
1431 unless $self->difficulty; 1456 unless $self->difficulty;
1457 Coro::cede;
1432 $self->activate; 1458 $self->activate;
1433 } 1459 }
1434 1460
1435 Coro::cede; 1461 $self->post_load;
1436 1462
1437 $self->in_memory (cf::MAP_IN_MEMORY); 1463 $self->in_memory (cf::MAP_IN_MEMORY);
1464}
1465
1466sub customise_for {
1467 my ($self, $ob) = @_;
1468
1469 return find "~" . $ob->name . "/" . $self->{path}
1470 if $self->per_player;
1471
1472 $self
1438} 1473}
1439 1474
1440# find and load all maps in the 3x3 area around a map 1475# find and load all maps in the 3x3 area around a map
1441sub load_diag { 1476sub load_diag {
1442 my ($map) = @_; 1477 my ($map) = @_;
… …
1472 1507
1473 cf::sync_job { $map->load }; 1508 cf::sync_job { $map->load };
1474} 1509}
1475 1510
1476our %MAP_PREFETCH; 1511our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = Coro::async { 1512our $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 1513
1492sub find_async { 1514sub find_async {
1493 my ($path, $origin) = @_; 1515 my ($path, $origin) = @_;
1494 1516
1495 $path = new cf::path $path, $origin && $origin->path; 1517 $path = normalise $path, $origin && $origin->{path};
1496 my $key = $path->as_string;
1497 1518
1498 if (my $map = $cf::MAP{$key}) { 1519 if (my $map = $cf::MAP{$path}) {
1499 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1520 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1500 } 1521 }
1501 1522
1502 $MAP_PREFETCH{$key} = $path; 1523 undef $MAP_PREFETCH{$path};
1524 $MAP_PREFETCHER ||= cf::async {
1525 while (%MAP_PREFETCH) {
1526 for my $path (keys %MAP_PREFETCH) {
1527 my $map = find $path
1528 or next;
1529 $map->load;
1530
1531 delete $MAP_PREFETCH{$path};
1532 }
1533 }
1534 undef $MAP_PREFETCHER;
1535 };
1503 $MAP_PREFETCHER->ready; 1536 $MAP_PREFETCHER->prio (6);
1504 1537
1505 () 1538 ()
1506} 1539}
1507 1540
1508sub save { 1541sub save {
… …
1512 1545
1513 $self->{last_save} = $cf::RUNTIME; 1546 $self->{last_save} = $cf::RUNTIME;
1514 1547
1515 return unless $self->dirty; 1548 return unless $self->dirty;
1516 1549
1517 my $save = $self->{path}->save_path; utf8::encode $save; 1550 my $save = $self->save_path; utf8::encode $save;
1518 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1551 my $uniq = $self->uniq_path; utf8::encode $uniq;
1519 1552
1520 $self->{load_path} = $save; 1553 $self->{load_path} = $save;
1521 1554
1522 return if $self->{deny_save}; 1555 return if $self->{deny_save};
1523 1556
… …
1526 cf::async { 1559 cf::async {
1527 $_->contr->save for $self->players; 1560 $_->contr->save for $self->players;
1528 }; 1561 };
1529 1562
1530 if ($uniq) { 1563 if ($uniq) {
1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1564 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1532 $self->save_objects ($uniq, cf::IO_UNIQUES); 1565 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1533 } else { 1566 } else {
1534 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1567 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1535 } 1568 }
1536} 1569}
1537 1570
1538sub swap_out { 1571sub swap_out {
1539 my ($self) = @_; 1572 my ($self) = @_;
… …
1553 1586
1554sub reset_at { 1587sub reset_at {
1555 my ($self) = @_; 1588 my ($self) = @_;
1556 1589
1557 # TODO: safety, remove and allow resettable per-player maps 1590 # TODO: safety, remove and allow resettable per-player maps
1558 return 1e99 if $self->{path}{user_rel}; 1591 return 1e99 if $self->isa ("ext::map_per_player");#d#
1559 return 1e99 if $self->{deny_reset}; 1592 return 1e99 if $self->{deny_reset};
1560 1593
1561 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1594 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1562 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1595 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1563 1596
… …
1568 my ($self) = @_; 1601 my ($self) = @_;
1569 1602
1570 $self->reset_at <= $cf::RUNTIME 1603 $self->reset_at <= $cf::RUNTIME
1571} 1604}
1572 1605
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 { 1606sub reset {
1587 my ($self) = @_; 1607 my ($self) = @_;
1588 1608
1589 my $lock = cf::lock_acquire "map_data:" . $self->path; 1609 my $lock = cf::lock_acquire "map_data:$self->{path}";
1590 1610
1591 return if $self->players; 1611 return if $self->players;
1592 return if $self->{path}{user_rel};#d# 1612 return if $self->isa ("ext::map_per_player");#d#
1593 1613
1594 warn "resetting map ", $self->path;#d# 1614 warn "resetting map ", $self->path;#d#
1595 1615
1616 $self->in_memory (cf::MAP_SWAPPED);
1617
1618 # need to save uniques path
1619 unless ($self->{deny_save}) {
1620 my $uniq = $self->uniq_path; utf8::encode $uniq;
1621
1622 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1623 if $uniq;
1624 }
1625
1596 delete $cf::MAP{$self->path}; 1626 delete $cf::MAP{$self->path};
1597 1627
1628 $self->clear;
1629
1598 $_->clear_links_to ($self) for values %cf::MAP; 1630 $_->clear_links_to ($self) for values %cf::MAP;
1599 1631
1600 $self->{path}->unlink_save; 1632 $self->unlink_save;
1601 $self->destroy; 1633 $self->destroy;
1602} 1634}
1603 1635
1604my $nuke_counter = "aaaa"; 1636my $nuke_counter = "aaaa";
1605 1637
1606sub nuke { 1638sub nuke {
1607 my ($self) = @_; 1639 my ($self) = @_;
1608 1640
1641 delete $cf::MAP{$self->path};
1642
1643 $self->unlink_save;
1644
1645 bless $self, "cf::map";
1646 delete $self->{deny_reset};
1609 $self->{deny_save} = 1; 1647 $self->{deny_save} = 1;
1610 $self->reset_timeout (1); 1648 $self->reset_timeout (1);
1611 $self->rename ("{nuke}/" . ($nuke_counter++)); 1649 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1650
1651 $cf::MAP{$self->path} = $self;
1652
1612 $self->reset; # polite request, might not happen 1653 $self->reset; # polite request, might not happen
1613} 1654}
1614 1655
1615=item cf::map::unique_maps 1656=item cf::map::unique_maps
1616 1657
1617Returns an arrayref of cf::path's of all shared maps that have 1658Returns an arrayref of paths of all shared maps that have
1618instantiated unique items. May block. 1659instantiated unique items. May block.
1619 1660
1620=cut 1661=cut
1621 1662
1622sub unique_maps() { 1663sub unique_maps() {
… …
1628 for (@$files) { 1669 for (@$files) {
1629 utf8::decode $_; 1670 utf8::decode $_;
1630 next if /\.pst$/; 1671 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1672 next unless /^$PATH_SEP/o;
1632 1673
1633 push @paths, new cf::path $_; 1674 push @paths, cf::map::normalise $_;
1634 } 1675 }
1635 1676
1636 \@paths 1677 \@paths
1637} 1678}
1638 1679
… …
1713 1754
1714=item $player_object->enter_link 1755=item $player_object->enter_link
1715 1756
1716Freezes the player and moves him/her to a special map (C<{link}>). 1757Freezes the player and moves him/her to a special map (C<{link}>).
1717 1758
1718The player should be reaosnably safe there for short amounts of time. You 1759The player should be reasonably safe there for short amounts of time. You
1719I<MUST> call C<leave_link> as soon as possible, though. 1760I<MUST> call C<leave_link> as soon as possible, though.
1720 1761
1762Will never block.
1763
1721=item $player_object->leave_link ($map, $x, $y) 1764=item $player_object->leave_link ($map, $x, $y)
1722 1765
1723Moves the player out of the specila link map onto the given map. If the 1766Moves 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 1767map. 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, 1768to the location he/she was before the call to C<enter_link>, or, if that
1726to the emergency map position. 1769fails, to the emergency map position.
1727 1770
1728Might block. 1771Might block.
1729 1772
1730=cut 1773=cut
1774
1775sub link_map {
1776 unless ($LINK_MAP) {
1777 $LINK_MAP = cf::map::find "{link}"
1778 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1779 $LINK_MAP->load;
1780 }
1781
1782 $LINK_MAP
1783}
1731 1784
1732sub cf::object::player::enter_link { 1785sub cf::object::player::enter_link {
1733 my ($self) = @_; 1786 my ($self) = @_;
1734 1787
1735 $self->deactivate_recursive; 1788 $self->deactivate_recursive;
1736 1789
1737 return if $self->map == $LINK_MAP; 1790 return if UNIVERSAL::isa $self->map, "ext::map_link";
1738 1791
1739 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1792 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1740 if $self->map; 1793 if $self->map;
1741 1794
1742 $self->enter_map ($LINK_MAP, 20, 20); 1795 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1743} 1796}
1744 1797
1745sub cf::object::player::leave_link { 1798sub cf::object::player::leave_link {
1746 my ($self, $map, $x, $y) = @_; 1799 my ($self, $map, $x, $y) = @_;
1747 1800
… …
1811=cut 1864=cut
1812 1865
1813sub cf::object::player::goto { 1866sub cf::object::player::goto {
1814 my ($self, $path, $x, $y) = @_; 1867 my ($self, $path, $x, $y) = @_;
1815 1868
1816 $path = new cf::path $path;
1817
1818 $self->enter_link; 1869 $self->enter_link;
1819 1870
1820 (async { 1871 (async {
1872 my $map = eval {
1821 my $map = cf::map::find $path->as_string; 1873 my $map = cf::map::find $path;
1822 $map = $map->{path}->customise_for ($map, $self) if $map; 1874 $map = $map->customise_for ($self) if $map;
1823 1875 $map
1824# warn "entering ", $map->path, " at ($x, $y)\n" 1876 } or
1825# if $map;
1826
1827 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1877 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1828 1878
1829 $self->leave_link ($map, $x, $y); 1879 $self->leave_link ($map, $x, $y);
1830 })->prio (1); 1880 })->prio (1);
1831} 1881}
1832 1882
… …
1836 1886
1837sub parse_random_map_params { 1887sub parse_random_map_params {
1838 my ($spec) = @_; 1888 my ($spec) = @_;
1839 1889
1840 my $rmp = { # defaults 1890 my $rmp = { # defaults
1841 xsize => 10, 1891 xsize => (cf::rndm 15, 40),
1842 ysize => 10, 1892 ysize => (cf::rndm 15, 40),
1893 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1894 #layout => string,
1843 }; 1895 };
1844 1896
1845 for (split /\n/, $spec) { 1897 for (split /\n/, $spec) {
1846 my ($k, $v) = split /\s+/, $_, 2; 1898 my ($k, $v) = split /\s+/, $_, 2;
1847 1899
… …
1851 $rmp 1903 $rmp
1852} 1904}
1853 1905
1854sub prepare_random_map { 1906sub prepare_random_map {
1855 my ($exit) = @_; 1907 my ($exit) = @_;
1908
1909 my $guard = cf::lock_acquire "exit_prepare:$exit";
1856 1910
1857 # all this does is basically replace the /! path by 1911 # all this does is basically replace the /! path by
1858 # a new random map path (?random/...) with a seed 1912 # a new random map path (?random/...) with a seed
1859 # that depends on the exit object 1913 # that depends on the exit object
1860 1914
1861 my $rmp = parse_random_map_params $exit->msg; 1915 my $rmp = parse_random_map_params $exit->msg;
1862 1916
1863 if ($exit->map) { 1917 if ($exit->map) {
1864 $rmp->{region} = $exit->map->region_name; 1918 $rmp->{region} = $exit->region->name;
1865 $rmp->{origin_map} = $exit->map->path; 1919 $rmp->{origin_map} = $exit->map->path;
1866 $rmp->{origin_x} = $exit->x; 1920 $rmp->{origin_x} = $exit->x;
1867 $rmp->{origin_y} = $exit->y; 1921 $rmp->{origin_y} = $exit->y;
1868 } 1922 }
1869 1923
1870 $rmp->{random_seed} ||= $exit->random_seed; 1924 $rmp->{random_seed} ||= $exit->random_seed;
1871 1925
1872 my $data = cf::to_json $rmp; 1926 my $data = cf::to_json $rmp;
1873 my $md5 = Digest::MD5::md5_hex $data; 1927 my $md5 = Digest::MD5::md5_hex $data;
1928 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1874 1929
1875 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1930 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1876 aio_write $fh, 0, (length $data), $data, 0; 1931 aio_write $fh, 0, (length $data), $data, 0;
1932 undef $fh;
1933 aio_rename "$meta~", $meta;
1877 1934
1878 $exit->slaying ("?random/$md5"); 1935 $exit->slaying ("?random/$md5");
1879 $exit->msg (undef); 1936 $exit->msg (undef);
1880 } 1937 }
1881} 1938}
1882 1939
1883sub cf::object::player::enter_exit { 1940sub cf::object::player::enter_exit {
1884 my ($self, $exit) = @_; 1941 my ($self, $exit) = @_;
1885 1942
1886 return unless $self->type == cf::PLAYER; 1943 return unless $self->type == cf::PLAYER;
1944
1945 if ($exit->slaying eq "/!") {
1946 #TODO: this should de-fi-ni-te-ly not be a sync-job
1947 cf::sync_job { prepare_random_map $exit };
1948 }
1949
1950 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1951 my $hp = $exit->stats->hp;
1952 my $sp = $exit->stats->sp;
1887 1953
1888 $self->enter_link; 1954 $self->enter_link;
1889 1955
1890 (async { 1956 (async {
1891 $self->deactivate_recursive; # just to be sure 1957 $self->deactivate_recursive; # just to be sure
1892 unless (eval { 1958 unless (eval {
1893 prepare_random_map $exit 1959 $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 1960
1899 1; 1961 1;
1900 }) { 1962 }) {
1901 $self->message ("Something went wrong deep within the crossfire server. " 1963 $self->message ("Something went wrong deep within the crossfire server. "
1902 . "I'll try to bring you back to the map you were before. " 1964 . "I'll try to bring you back to the map you were before. "
… …
1963 # get handled first 2025 # get handled first
1964 my $queue = delete $ns->{query_queue} 2026 my $queue = delete $ns->{query_queue}
1965 or return; # be conservative, not sure how that can happen, but we saw a crash here 2027 or return; # be conservative, not sure how that can happen, but we saw a crash here
1966 2028
1967 (shift @$queue)->[1]->($msg); 2029 (shift @$queue)->[1]->($msg);
2030 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1968 2031
1969 push @{ $ns->{query_queue} }, @$queue; 2032 push @{ $ns->{query_queue} }, @$queue;
1970 2033
1971 if (@{ $ns->{query_queue} } == @$queue) { 2034 if (@{ $ns->{query_queue} } == @$queue) {
1972 if (@$queue) { 2035 if (@$queue) {
… …
2133The parameter C<$family> should best start with the name of the extension 2196The parameter C<$family> should best start with the name of the extension
2134using it, it should be unique. 2197using it, it should be unique.
2135 2198
2136=over 4 2199=over 4
2137 2200
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 2201=item $value = cf::db_get $family => $key
2145 2202
2146Returns a single value from the database 2203Returns 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 2204
2153=item cf::db_put $family => $key => $value 2205=item cf::db_put $family => $key => $value
2154 2206
2155Stores the given C<$value> in the family hash. Updates are delayed, if you 2207Stores 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 2208
2166=cut 2209=cut
2167 2210
2168our $DB; 2211our $DB;
2169 2212
2170{ 2213sub db_init {
2214 unless ($DB) {
2215 $DB = BDB::db_create $DB_ENV;
2216
2217 cf::sync_job {
2218 eval {
2219 $DB->set_flags (BDB::CHKSUM);
2220
2221 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2222 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2223 cf::cleanup "db_open(db): $!" if $!;
2224 };
2225 cf::cleanup "db_open(db): $@" if $@;
2226 };
2227
2171 my $path = cf::localdir . "/database.pst"; 2228 my $path = cf::localdir . "/database.pst";
2229 if (stat $path) {
2230 cf::sync_job {
2231 my $pst = Storable::retrieve $path;
2172 2232
2173 sub db_load() { 2233 cf::db_put (board => data => $pst->{board});
2174 $DB = stat $path ? Storable::retrieve $path : { }; 2234 cf::db_put (guildrules => data => $pst->{guildrules});
2175 } 2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2176 2237
2177 my $pid; 2238 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 } 2239 };
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 });
2199
2200 sub db_dirty() {
2201 $dirty = 1;
2202 $idle->start;
2203 }
2204
2205 sub db_get($;$) {
2206 @_ >= 2
2207 ? $DB->{$_[0]}{$_[1]}
2208 : ($DB->{$_[0]} ||= { })
2209 }
2210
2211 sub db_put($$;$) {
2212 if (@_ >= 3) {
2213 $DB->{$_[0]}{$_[1]} = $_[2];
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 }, 2240 }
2225 ); 2241 }
2242}
2243
2244sub db_get($$) {
2245 my $key = "$_[0]/$_[1]";
2246
2247 cf::sync_job {
2248 BDB::db_get $DB, undef, $key, my $data;
2249
2250 $! ? ()
2251 : Compress::LZF::sthaw $data
2252 }
2253}
2254
2255sub db_put($$$) {
2256 BDB::dbreq_pri 4;
2257 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2226} 2258}
2227 2259
2228############################################################################# 2260#############################################################################
2229# the server's main() 2261# the server's init and main functions
2262
2263sub load_resources {
2264 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2265 or die "unable to load regions file\n";#d#
2266}
2230 2267
2231sub cfg_load { 2268sub cfg_load {
2232 open my $fh, "<:utf8", cf::confdir . "/config" 2269 open my $fh, "<:utf8", cf::confdir . "/config"
2233 or return; 2270 or return;
2234 2271
… …
2247 }; 2284 };
2248 warn $@ if $@; 2285 warn $@ if $@;
2249 } 2286 }
2250} 2287}
2251 2288
2289sub init {
2290 load_resources;
2291}
2292
2252sub main { 2293sub main {
2253 # we must not ever block the main coroutine 2294 # we must not ever block the main coroutine
2254 local $Coro::idle = sub { 2295 local $Coro::idle = sub {
2255 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2296 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2297 (async {
2256 async { Event::one_event }; 2298 Event::one_event;
2299 })->prio (Coro::PRIO_MAX);
2257 }; 2300 };
2258 2301
2259 cfg_load; 2302 cfg_load;
2260 db_load; 2303 db_init;
2261 load_extensions; 2304 load_extensions;
2305
2306 $TICK_WATCHER->start;
2262 Event::loop; 2307 Event::loop;
2263} 2308}
2264 2309
2265############################################################################# 2310#############################################################################
2266# initialisation and cleanup 2311# initialisation and cleanup
2267 2312
2268# install some emergency cleanup handlers 2313# install some emergency cleanup handlers
2269BEGIN { 2314BEGIN {
2270 for my $signal (qw(INT HUP TERM)) { 2315 for my $signal (qw(INT HUP TERM)) {
2271 Event->signal ( 2316 Event->signal (
2317 reentrant => 0,
2272 data => WF_AUTOCANCEL, 2318 data => WF_AUTOCANCEL,
2273 signal => $signal, 2319 signal => $signal,
2320 prio => 0,
2274 cb => sub { 2321 cb => sub {
2275 cf::cleanup "SIG$signal"; 2322 cf::cleanup "SIG$signal";
2276 }, 2323 },
2277 ); 2324 );
2278 } 2325 }
2279} 2326}
… …
2284 warn "enter emergency perl save\n"; 2331 warn "enter emergency perl save\n";
2285 2332
2286 cf::sync_job { 2333 cf::sync_job {
2287 # use a peculiar iteration method to avoid tripping on perl 2334 # use a peculiar iteration method to avoid tripping on perl
2288 # refcount bugs in for. also avoids problems with players 2335 # refcount bugs in for. also avoids problems with players
2289 # and maps saved/Destroyed asynchronously. 2336 # and maps saved/destroyed asynchronously.
2290 warn "begin emergency player save\n"; 2337 warn "begin emergency player save\n";
2291 for my $login (keys %cf::PLAYER) { 2338 for my $login (keys %cf::PLAYER) {
2292 my $pl = $cf::PLAYER{$login} or next; 2339 my $pl = $cf::PLAYER{$login} or next;
2293 $pl->valid or next; 2340 $pl->valid or next;
2294 $pl->save; 2341 $pl->save;
… …
2300 my $map = $cf::MAP{$path} or next; 2347 my $map = $cf::MAP{$path} or next;
2301 $map->valid or next; 2348 $map->valid or next;
2302 $map->save; 2349 $map->save;
2303 } 2350 }
2304 warn "end emergency map save\n"; 2351 warn "end emergency map save\n";
2352
2353 warn "begin emergency database checkpoint\n";
2354 BDB::db_env_txn_checkpoint $DB_ENV;
2355 warn "end emergency database checkpoint\n";
2305 }; 2356 };
2306 2357
2307 warn "leave emergency perl save\n"; 2358 warn "leave emergency perl save\n";
2359}
2360
2361sub post_cleanup {
2362 my ($make_core) = @_;
2363
2364 warn Carp::longmess "post_cleanup backtrace"
2365 if $make_core;
2308} 2366}
2309 2367
2310sub reload() { 2368sub reload() {
2311 # can/must only be called in main 2369 # can/must only be called in main
2312 if ($Coro::current != $Coro::main) { 2370 if ($Coro::current != $Coro::main) {
2313 warn "can only reload from main coroutine\n"; 2371 warn "can only reload from main coroutine";
2314 return; 2372 return;
2315 } 2373 }
2316 2374
2317 warn "reloading..."; 2375 warn "reloading...";
2318 2376
2319 warn "freezing server"; 2377 warn "cancelling server ticker";
2320 my $guard = freeze_mainloop; 2378 $TICK_WATCHER->cancel;
2379
2321 cf::emergency_save; 2380 cf::emergency_save;
2322
2323 warn "sync database to disk";
2324 cf::db_sync;
2325 IO::AIO::flush;
2326 2381
2327 eval { 2382 eval {
2328 # if anything goes wrong in here, we should simply crash as we already saved 2383 # if anything goes wrong in here, we should simply crash as we already saved
2329 2384
2330 warn "cancel all watchers"; 2385 warn "cancelling all WF_AUTOCANCEL watchers";
2331 for (Event::all_watchers) { 2386 for (Event::all_watchers) {
2332 $_->cancel if $_->data & WF_AUTOCANCEL; 2387 $_->cancel if $_->data & WF_AUTOCANCEL;
2333 } 2388 }
2334 2389
2390 warn "syncing database to disk";
2391 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2392
2393 warn "flushing outstanding aio requests";
2394 for (;;) {
2395 BDB::flush;
2396 IO::AIO::flush;
2397 Coro::cede;
2398 last unless IO::AIO::nreqs || BDB::nreqs;
2399 warn "iterate...";
2400 }
2401
2335 warn "cancel all extension coros"; 2402 warn "cancelling all extension coros";
2336 $_->cancel for values %EXT_CORO; 2403 $_->cancel for values %EXT_CORO;
2337 %EXT_CORO = (); 2404 %EXT_CORO = ();
2338 2405
2339 warn "remove commands"; 2406 warn "removing commands";
2340 %COMMAND = (); 2407 %COMMAND = ();
2341 2408
2342 warn "remove ext commands"; 2409 warn "removing ext commands";
2343 %EXTCMD = (); 2410 %EXTCMD = ();
2344 2411
2345 warn "unload/nuke all extensions"; 2412 warn "unloading/nuking all extensions";
2346 for my $pkg (@EXTS) { 2413 for my $pkg (@EXTS) {
2347 warn "... unloading $pkg"; 2414 warn "... unloading $pkg";
2348 2415
2349 if (my $cb = $pkg->can ("unload")) { 2416 if (my $cb = $pkg->can ("unload")) {
2350 eval { 2417 eval {
… …
2355 2422
2356 warn "... nuking $pkg"; 2423 warn "... nuking $pkg";
2357 Symbol::delete_package $pkg; 2424 Symbol::delete_package $pkg;
2358 } 2425 }
2359 2426
2360 warn "unload all perl modules loaded from $LIBDIR"; 2427 warn "unloading all perl modules loaded from $LIBDIR";
2361 while (my ($k, $v) = each %INC) { 2428 while (my ($k, $v) = each %INC) {
2362 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2429 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2363 2430
2364 warn "removing <$k>"; 2431 warn "... unloading $k";
2365 delete $INC{$k}; 2432 delete $INC{$k};
2366 2433
2367 $k =~ s/\.pm$//; 2434 $k =~ s/\.pm$//;
2368 $k =~ s/\//::/g; 2435 $k =~ s/\//::/g;
2369 2436
… …
2372 } 2439 }
2373 2440
2374 Symbol::delete_package $k; 2441 Symbol::delete_package $k;
2375 } 2442 }
2376 2443
2377 warn "get rid of safe::, as good as possible"; 2444 warn "getting rid of safe::, as good as possible";
2378 Symbol::delete_package "safe::$_" 2445 Symbol::delete_package "safe::$_"
2379 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2446 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2380 2447
2381 warn "unload cf.pm \"a bit\""; 2448 warn "unloading cf.pm \"a bit\"";
2382 delete $INC{"cf.pm"}; 2449 delete $INC{"cf.pm"};
2383 2450
2384 # don't, removes xs symbols, too, 2451 # don't, removes xs symbols, too,
2385 # and global variables created in xs 2452 # and global variables created in xs
2386 #Symbol::delete_package __PACKAGE__; 2453 #Symbol::delete_package __PACKAGE__;
2387 2454
2455 warn "unload completed, starting to reload now";
2456
2388 warn "reloading cf.pm"; 2457 warn "reloading cf.pm";
2389 require cf; 2458 require cf;
2390 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2459 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2391 2460
2392 warn "load config and database again"; 2461 warn "loading config and database again";
2393 cf::cfg_load; 2462 cf::cfg_load;
2394 cf::db_load;
2395 2463
2396 warn "load extensions"; 2464 warn "loading extensions";
2397 cf::load_extensions; 2465 cf::load_extensions;
2398 2466
2399 warn "reattach attachments to objects/players"; 2467 warn "reattaching attachments to objects/players";
2400 _global_reattach; 2468 _global_reattach;
2401 warn "reattach attachments to maps"; 2469 warn "reattaching attachments to maps";
2402 reattach $_ for values %MAP; 2470 reattach $_ for values %MAP;
2471
2472 warn "loading reloadable resources";
2473 load_resources;
2474
2475 warn "restarting server ticker";
2476
2477 $TICK_WATCHER->start;
2403 }; 2478 };
2404 2479
2405 if ($@) { 2480 if ($@) {
2406 warn $@; 2481 warn $@;
2407 warn "error while reloading, exiting."; 2482 warn "error while reloading, exiting.";
… …
2409 } 2484 }
2410 2485
2411 warn "reloaded"; 2486 warn "reloaded";
2412}; 2487};
2413 2488
2414############################################################################# 2489our $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 2490
2457register_command "reload" => sub { 2491register_command "reload" => sub {
2458 my ($who, $arg) = @_; 2492 my ($who, $arg) = @_;
2459 2493
2460 if ($who->flag (FLAG_WIZ)) { 2494 if ($who->flag (FLAG_WIZ)) {
2461 $who->message ("start of reload."); 2495 $who->message ("reloading server.");
2496
2497 # doing reload synchronously and two reloads happen back-to-back,
2498 # coro crashes during coro_state_free->destroy here.
2499
2500 $RELOAD_WATCHER ||= Event->timer (
2501 reentrant => 0,
2502 after => 0,
2503 data => WF_AUTOCANCEL,
2504 cb => sub {
2462 reload; 2505 reload;
2463 $who->message ("end of reload."); 2506 undef $RELOAD_WATCHER;
2507 },
2508 );
2464 } 2509 }
2465}; 2510};
2466 2511
2467unshift @INC, $LIBDIR; 2512unshift @INC, $LIBDIR;
2513
2514my $bug_warning = 0;
2468 2515
2469$TICK_WATCHER = Event->timer ( 2516$TICK_WATCHER = Event->timer (
2470 reentrant => 0, 2517 reentrant => 0,
2518 parked => 1,
2471 prio => 0, 2519 prio => 0,
2472 at => $NEXT_TICK || $TICK, 2520 at => $NEXT_TICK || $TICK,
2473 data => WF_AUTOCANCEL, 2521 data => WF_AUTOCANCEL,
2474 cb => sub { 2522 cb => sub {
2523 if ($Coro::current != $Coro::main) {
2524 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2525 unless ++$bug_warning > 10;
2526 return;
2527 }
2528
2475 $NOW = Event::time; 2529 $NOW = Event::time;
2476 2530
2477 cf::server_tick; # one server iteration 2531 cf::server_tick; # one server iteration
2478 $RUNTIME += $TICK; 2532 $RUNTIME += $TICK;
2479 $NEXT_TICK += $TICK; 2533 $NEXT_TICK += $TICK;
2480 2534
2481 $WAIT_FOR_TICK->broadcast; 2535 $WAIT_FOR_TICK->broadcast;
2482 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2536 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2537
2538 Event::sweep;
2539 Coro::cede_notself;
2540
2541# my $AFTER = Event::time;
2542# warn $AFTER - $NOW;#d#
2483 2543
2484 # if we are delayed by four ticks or more, skip them all 2544 # if we are delayed by four ticks or more, skip them all
2485 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2545 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2486 2546
2487 $TICK_WATCHER->at ($NEXT_TICK); 2547 $TICK_WATCHER->at ($NEXT_TICK);
2488 $TICK_WATCHER->start; 2548 $TICK_WATCHER->start;
2489 }, 2549 },
2490); 2550);
2491 2551
2552{
2553 BDB::max_poll_time $TICK * 0.1;
2554 $BDB_POLL_WATCHER = Event->io (
2555 reentrant => 0,
2556 fd => BDB::poll_fileno,
2557 poll => 'r',
2558 prio => 0,
2559 data => WF_AUTOCANCEL,
2560 cb => \&BDB::poll_cb,
2561 );
2562 BDB::min_parallel 8;
2563
2564 BDB::set_sync_prepare {
2565 my $status;
2566 my $current = $Coro::current;
2567 (
2568 sub {
2569 $status = $!;
2570 $current->ready; undef $current;
2571 },
2572 sub {
2573 Coro::schedule while defined $current;
2574 $! = $status;
2575 },
2576 )
2577 };
2578
2579 unless ($DB_ENV) {
2580 $DB_ENV = BDB::db_env_create;
2581
2582 cf::sync_job {
2583 eval {
2584 BDB::db_env_open
2585 $DB_ENV,
2586 $BDB_ENV_DIR,
2587 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2588 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2589 0666;
2590
2591 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2592
2593 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2594 $DB_ENV->set_lk_detect;
2595 };
2596
2597 cf::cleanup "db_env_open(db): $@" if $@;
2598 };
2599 }
2600}
2601
2602{
2603 IO::AIO::min_parallel 8;
2604
2605 undef $Coro::AIO::WATCHER;
2492IO::AIO::max_poll_time $TICK * 0.2; 2606 IO::AIO::max_poll_time $TICK * 0.1;
2493 2607 $AIO_POLL_WATCHER = Event->io (
2494Event->io ( 2608 reentrant => 0,
2495 fd => IO::AIO::poll_fileno, 2609 fd => IO::AIO::poll_fileno,
2496 poll => 'r', 2610 poll => 'r',
2497 prio => 5, 2611 prio => 6,
2498 data => WF_AUTOCANCEL, 2612 data => WF_AUTOCANCEL,
2499 cb => \&IO::AIO::poll_cb, 2613 cb => \&IO::AIO::poll_cb,
2500); 2614 );
2615}
2501 2616
2502Event->timer ( 2617$WRITE_RUNTIME_WATCHER = Event->timer (
2618 reentrant => 0,
2503 data => WF_AUTOCANCEL, 2619 data => WF_AUTOCANCEL,
2504 after => 0, 2620 after => 1,
2505 interval => 10, 2621 interval => 10,
2506 cb => sub { 2622 prio => 6, # keep it lowest so it acts like a watchdog
2507 (Coro::unblock_sub { 2623 cb => Coro::unblock_sub {
2508 write_runtime 2624 write_runtime
2509 or warn "ERROR: unable to write runtime file: $!"; 2625 or warn "ERROR: unable to write runtime file: $!";
2510 })->();
2511 }, 2626 },
2512); 2627);
2513 2628
2514END { cf::emergency_save } 2629END { cf::emergency_save }
2515 2630

Diff Legend

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