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.161 by root, Thu Jan 11 00:16:58 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 $path
478}
479
480# the original (read-only) location
481sub load_path {
482 my ($self) = @_;
483
484 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
485}
486
487# the temporary/swap location
488sub save_path {
489 my ($self) = @_;
490
491 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
492 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
493 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
494}
495
496# the unique path, undef == no special unique path
497sub uniq_path {
498 my ($self) = @_;
499
500 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
501}
502
503# this is somewhat ugly, but style maps do need special treatment
504sub is_style_map {
505 $_[0]{path} =~ m{^/styles/}
506}
507
508sub load_orig {
509 my ($self) = @_;
510
511 &cf::map::load_map_header ($self->load_path)
512}
513
514sub load_temp {
515 my ($self) = @_;
516
517 &cf::map::load_map_header ($self->save_path)
518}
519
520package cf;
521 391
522############################################################################# 392#############################################################################
523 393
524=head2 ATTACHABLE OBJECTS 394=head2 ATTACHABLE OBJECTS
525 395
… …
651our @CB_TYPE = (); # registry for type (cf-object class) based events 521our @CB_TYPE = (); # registry for type (cf-object class) based events
652our @CB_MAP = (); 522our @CB_MAP = ();
653 523
654my %attachment; 524my %attachment;
655 525
526sub cf::attachable::thawer_merge {
527 # simply override everything except _meta
528 local $_[0]{_meta};
529 %{$_[0]} = %{$_[1]};
530}
531
656sub _attach_cb($$$$) { 532sub _attach_cb($$$$) {
657 my ($registry, $event, $prio, $cb) = @_; 533 my ($registry, $event, $prio, $cb) = @_;
658 534
659 use sort 'stable'; 535 use sort 'stable';
660 536
… …
831# object support 707# object support
832 708
833sub reattach { 709sub reattach {
834 # basically do the same as instantiate, without calling instantiate 710 # basically do the same as instantiate, without calling instantiate
835 my ($obj) = @_; 711 my ($obj) = @_;
712
713 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
836 714
837 my $registry = $obj->registry; 715 my $registry = $obj->registry;
838 716
839 @$registry = (); 717 @$registry = ();
840 718
… …
887 $filename, length $$rdata, scalar @$objs; 765 $filename, length $$rdata, scalar @$objs;
888 766
889 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 767 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
890 chmod SAVE_MODE, $fh; 768 chmod SAVE_MODE, $fh;
891 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 769 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
892 aio_fsync $fh; 770 aio_fsync $fh if $cf::USE_FSYNC;
893 close $fh; 771 close $fh;
894 772
895 if (@$objs) { 773 if (@$objs) {
896 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) {
897 chmod SAVE_MODE, $fh; 775 chmod SAVE_MODE, $fh;
898 my $data = Storable::nfreeze { version => 1, objs => $objs }; 776 my $data = Storable::nfreeze { version => 1, objs => $objs };
899 aio_write $fh, 0, (length $data), $data, 0; 777 aio_write $fh, 0, (length $data), $data, 0;
900 aio_fsync $fh; 778 aio_fsync $fh if $cf::USE_FSYNC;
901 close $fh; 779 close $fh;
902 aio_rename "$filename.pst~", "$filename.pst"; 780 aio_rename "$filename.pst~", "$filename.pst";
903 } 781 }
904 } else { 782 } else {
905 aio_unlink "$filename.pst"; 783 aio_unlink "$filename.pst";
… …
911 } 789 }
912 } else { 790 } else {
913 aio_unlink $filename; 791 aio_unlink $filename;
914 aio_unlink "$filename.pst"; 792 aio_unlink "$filename.pst";
915 } 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 }
916 } 800 }
917} 801}
918 802
919sub object_freezer_as_string { 803sub object_freezer_as_string {
920 my ($rdata, $objs) = @_; 804 my ($rdata, $objs) = @_;
… …
926 810
927sub object_thawer_load { 811sub object_thawer_load {
928 my ($filename) = @_; 812 my ($filename) = @_;
929 813
930 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$//;
931 818
932 (aio_load $filename, $data) >= 0 819 (aio_load $filename, $data) >= 0
933 or return; 820 or return;
934 821
935 unless (aio_stat "$filename.pst") { 822 unless (aio_stat "$filename.pst") {
… …
1027 "package $pkg; use strict; use utf8;\n" 914 "package $pkg; use strict; use utf8;\n"
1028 . "#line 1 \"$path\"\n{\n" 915 . "#line 1 \"$path\"\n{\n"
1029 . (do { local $/; <$fh> }) 916 . (do { local $/; <$fh> })
1030 . "\n};\n1"; 917 . "\n};\n1";
1031 918
1032 eval $source 919 unless (eval $source) {
1033 or die $@ ? "$path: $@\n" 920 my $msg = $@ ? "$path: $@\n"
1034 : "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 }
1035 929
1036 push @EXTS, $pkg; 930 push @EXTS, $pkg;
1037} 931}
1038 932
1039sub load_extensions { 933sub load_extensions {
… …
1045 } or warn "$ext not loaded: $@"; 939 } or warn "$ext not loaded: $@";
1046 } 940 }
1047} 941}
1048 942
1049############################################################################# 943#############################################################################
1050# load/save/clean perl data associated with a map
1051
1052*cf::mapsupport::on_clean = sub {
1053 my ($map) = @_;
1054
1055 my $path = $map->tmpname;
1056 defined $path or return;
1057
1058 unlink "$path.pst";
1059};
1060
1061cf::map->attach (prio => -10000, package => cf::mapsupport::);
1062
1063#############################################################################
1064 944
1065=head2 CORE EXTENSIONS 945=head2 CORE EXTENSIONS
1066 946
1067Functions and methods that extend core crossfire objects. 947Functions and methods that extend core crossfire objects.
1068 948
… …
1104 984
1105sub exists($) { 985sub exists($) {
1106 my ($login) = @_; 986 my ($login) = @_;
1107 987
1108 $cf::PLAYER{$login} 988 $cf::PLAYER{$login}
1109 or cf::sync_job { !aio_stat $login } 989 or cf::sync_job { !aio_stat path $login }
1110} 990}
1111 991
1112sub find($) { 992sub find($) {
1113 return $cf::PLAYER{$_[0]} || do { 993 return $cf::PLAYER{$_[0]} || do {
1114 my $login = $_[0]; 994 my $login = $_[0];
… …
1204 \@logins 1084 \@logins
1205} 1085}
1206 1086
1207=item $player->maps 1087=item $player->maps
1208 1088
1209Returns 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
1210player. May block. 1090player. May block.
1211 1091
1212=cut 1092=cut
1213 1093
1214sub maps($) { 1094sub maps($) {
1215 my ($pl) = @_; 1095 my ($pl) = @_;
1096
1097 $pl = ref $pl ? $pl->ob->name : $pl;
1216 1098
1217 my $files = aio_readdir playerdir $pl 1099 my $files = aio_readdir playerdir $pl
1218 or return; 1100 or return;
1219 1101
1220 my @paths; 1102 my @paths;
… …
1222 for (@$files) { 1104 for (@$files) {
1223 utf8::decode $_; 1105 utf8::decode $_;
1224 next if /\.(?:pl|pst)$/; 1106 next if /\.(?:pl|pst)$/;
1225 next unless /^$PATH_SEP/o; 1107 next unless /^$PATH_SEP/o;
1226 1108
1227 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1109 push @paths, cf::map::normalise "~$pl/$_";
1228 } 1110 }
1229 1111
1230 \@paths 1112 \@paths
1231} 1113}
1232 1114
… …
1258package cf::map; 1140package cf::map;
1259 1141
1260use Fcntl; 1142use Fcntl;
1261use Coro::AIO; 1143use Coro::AIO;
1262 1144
1145use overload
1146 '""' => \&as_string,
1147 fallback => 1;
1148
1263our $MAX_RESET = 3600; 1149our $MAX_RESET = 3600;
1264our $DEFAULT_RESET = 3000; 1150our $DEFAULT_RESET = 3000;
1265 1151
1266sub generate_random_map { 1152sub generate_random_map {
1267 my ($path, $rmp) = @_; 1153 my ($self, $rmp) = @_;
1268
1269 # mit "rum" bekleckern, nicht 1154 # mit "rum" bekleckern, nicht
1270 cf::map::_create_random_map 1155 $self->_create_random_map (
1271 $path,
1272 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1156 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1273 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1157 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1274 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1158 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1275 $rmp->{exit_on_final_map}, 1159 $rmp->{exit_on_final_map},
1276 $rmp->{xsize}, $rmp->{ysize}, 1160 $rmp->{xsize}, $rmp->{ysize},
1277 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1161 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1278 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1162 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1279 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1163 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1280 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1164 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1281 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1165 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1282 (cf::region::find $rmp->{region}) 1166 (cf::region::find $rmp->{region}), $rmp->{custom}
1167 )
1168}
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
1283} 1297}
1284 1298
1285# and all this just because we cannot iterate over 1299# and all this just because we cannot iterate over
1286# all maps in C++... 1300# all maps in C++...
1287sub change_all_map_light { 1301sub change_all_map_light {
… …
1289 1303
1290 $_->change_map_light ($change) 1304 $_->change_map_light ($change)
1291 for grep $_->outdoor, values %cf::MAP; 1305 for grep $_->outdoor, values %cf::MAP;
1292} 1306}
1293 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
1294sub load_map_header($) { 1321sub load_header_from($) {
1295 my ($path) = @_; 1322 my ($self, $path) = @_;
1296 1323
1297 utf8::encode $path; 1324 utf8::encode $path;
1298 aio_open $path, O_RDONLY, 0 1325 #aio_open $path, O_RDONLY, 0
1326 # or return;
1327
1328 $self->_load_header ($path)
1299 or return; 1329 or return;
1300 1330
1301 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
1302 or return; 1374 or return;
1375 $self->prepare_orig;
1376 }
1303 1377
1304 # for better error messages only, will be overwritten later 1378 1
1305 $map->path ($path);
1306
1307 $map->load_header ($path)
1308 or return;
1309
1310 $map->{load_path} = $path;
1311
1312 $map
1313} 1379}
1314 1380
1315sub find; 1381sub find;
1316sub find { 1382sub find {
1317 my ($path, $origin) = @_; 1383 my ($path, $origin) = @_;
1318 1384
1319 #warn "find<$path,$origin>\n";#d#
1320
1321 $path = new cf::path $path, $origin && $origin->path; 1385 $path = normalise $path, $origin && $origin->path;
1322 my $key = $path->as_string;
1323 1386
1324 cf::lock_wait "map_find:$key"; 1387 cf::lock_wait "map_find:$path";
1325 1388
1326 $cf::MAP{$key} || do { 1389 $cf::MAP{$path} || do {
1327 my $guard = cf::lock_acquire "map_find:$key"; 1390 my $guard = cf::lock_acquire "map_find:$path";
1328 1391 my $map = new_from_path cf::map $path
1329 # do it the slow way
1330 my $map = $path->load_temp;
1331
1332 Coro::cede;
1333
1334 if ($map) {
1335 $map->last_access ((delete $map->{last_access})
1336 || $cf::RUNTIME); #d#
1337 # safety
1338 $map->{instantiate_time} = $cf::RUNTIME
1339 if $map->{instantiate_time} > $cf::RUNTIME;
1340 } else {
1341 $map = $path->load_orig
1342 or return; 1392 or return;
1343 1393
1344 $map->{load_original} = 1;
1345 $map->{instantiate_time} = $cf::RUNTIME;
1346 $map->last_access ($cf::RUNTIME);
1347 $map->instantiate;
1348
1349 # per-player maps become, after loading, normal maps
1350 $map->per_player (0) if $path->{user_rel};
1351 }
1352
1353 $map->path ($key);
1354 $map->{path} = $path;
1355 $map->{last_save} = $cf::RUNTIME; 1394 $map->{last_save} = $cf::RUNTIME;
1356 1395
1357 Coro::cede; 1396 $map->load_header
1397 or return;
1358 1398
1359 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;
1360 $map->reset; 1402 $map->reset;
1361 undef $guard; 1403 undef $guard;
1362 $map = find $path 1404 return find $path;
1363 or return;
1364 } 1405 }
1365 1406
1366 $cf::MAP{$key} = $map 1407 $cf::MAP{$path} = $map
1367 } 1408 }
1368} 1409}
1410
1411sub pre_load { }
1412sub post_load { }
1369 1413
1370sub load { 1414sub load {
1371 my ($self) = @_; 1415 my ($self) = @_;
1372 1416
1417 local $self->{deny_reset} = 1; # loading can take a long time
1418
1373 my $path = $self->{path}; 1419 my $path = $self->{path};
1374 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1420 my $guard = cf::lock_acquire "map_load:$path";
1375 1421
1376 return if $self->in_memory != cf::MAP_SWAPPED; 1422 return if $self->in_memory != cf::MAP_SWAPPED;
1377 1423
1378 $self->in_memory (cf::MAP_LOADING); 1424 $self->in_memory (cf::MAP_LOADING);
1379 1425
1380 $self->alloc; 1426 $self->alloc;
1427
1428 $self->pre_load;
1429
1381 $self->load_objects ($self->{load_path}, 1) 1430 $self->_load_objects ($self->{load_path}, 1)
1382 or return; 1431 or return;
1383 1432
1384 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1433 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1385 if delete $self->{load_original}; 1434 if delete $self->{load_original};
1386 1435
1387 if (my $uniq = $path->uniq_path) { 1436 if (my $uniq = $self->uniq_path) {
1388 utf8::encode $uniq; 1437 utf8::encode $uniq;
1389 if (aio_open $uniq, O_RDONLY, 0) { 1438 if (aio_open $uniq, O_RDONLY, 0) {
1390 $self->clear_unique_items; 1439 $self->clear_unique_items;
1391 $self->load_objects ($uniq, 0); 1440 $self->_load_objects ($uniq, 0);
1392 } 1441 }
1393 } 1442 }
1394 1443
1395 Coro::cede; 1444 Coro::cede;
1396 1445
1397 # now do the right thing for maps 1446 # now do the right thing for maps
1398 $self->link_multipart_objects; 1447 $self->link_multipart_objects;
1399 1448
1400 if ($self->{path}->is_style_map) { 1449 unless ($self->{deny_activate}) {
1401 $self->{deny_save} = 1; 1450 $self->decay_objects;
1402 $self->{deny_reset} = 1;
1403 } else {
1404 $self->fix_auto_apply; 1451 $self->fix_auto_apply;
1405 $self->decay_objects;
1406 $self->update_buttons; 1452 $self->update_buttons;
1453 Coro::cede;
1407 $self->set_darkness_map; 1454 $self->set_darkness_map;
1408 $self->difficulty ($self->estimate_difficulty) 1455 $self->difficulty ($self->estimate_difficulty)
1409 unless $self->difficulty; 1456 unless $self->difficulty;
1457 Coro::cede;
1410 $self->activate; 1458 $self->activate;
1411 } 1459 }
1412 1460
1413 Coro::cede; 1461 $self->post_load;
1414 1462
1415 $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
1416} 1473}
1417 1474
1418# 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
1419sub load_diag { 1476sub load_diag {
1420 my ($map) = @_; 1477 my ($map) = @_;
… …
1450 1507
1451 cf::sync_job { $map->load }; 1508 cf::sync_job { $map->load };
1452} 1509}
1453 1510
1454our %MAP_PREFETCH; 1511our %MAP_PREFETCH;
1455our $MAP_PREFETCHER = Coro::async { 1512our $MAP_PREFETCHER = undef;
1456 while () {
1457 while (%MAP_PREFETCH) {
1458 my $key = each %MAP_PREFETCH
1459 or next;
1460 my $path = delete $MAP_PREFETCH{$key};
1461
1462 my $map = find $path
1463 or next;
1464 $map->load;
1465 }
1466 Coro::schedule;
1467 }
1468};
1469 1513
1470sub find_async { 1514sub find_async {
1471 my ($path, $origin) = @_; 1515 my ($path, $origin) = @_;
1472 1516
1473 $path = new cf::path $path, $origin && $origin->path; 1517 $path = normalise $path, $origin && $origin->{path};
1474 my $key = $path->as_string;
1475 1518
1476 if (my $map = $cf::MAP{$key}) { 1519 if (my $map = $cf::MAP{$path}) {
1477 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1520 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1478 } 1521 }
1479 1522
1480 $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 };
1481 $MAP_PREFETCHER->ready; 1536 $MAP_PREFETCHER->prio (6);
1482 1537
1483 () 1538 ()
1484} 1539}
1485 1540
1486sub save { 1541sub save {
… …
1490 1545
1491 $self->{last_save} = $cf::RUNTIME; 1546 $self->{last_save} = $cf::RUNTIME;
1492 1547
1493 return unless $self->dirty; 1548 return unless $self->dirty;
1494 1549
1495 my $save = $self->{path}->save_path; utf8::encode $save; 1550 my $save = $self->save_path; utf8::encode $save;
1496 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1551 my $uniq = $self->uniq_path; utf8::encode $uniq;
1497 1552
1498 $self->{load_path} = $save; 1553 $self->{load_path} = $save;
1499 1554
1500 return if $self->{deny_save}; 1555 return if $self->{deny_save};
1501 1556
… …
1504 cf::async { 1559 cf::async {
1505 $_->contr->save for $self->players; 1560 $_->contr->save for $self->players;
1506 }; 1561 };
1507 1562
1508 if ($uniq) { 1563 if ($uniq) {
1509 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1564 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1510 $self->save_objects ($uniq, cf::IO_UNIQUES); 1565 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1511 } else { 1566 } else {
1512 $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);
1513 } 1568 }
1514} 1569}
1515 1570
1516sub swap_out { 1571sub swap_out {
1517 my ($self) = @_; 1572 my ($self) = @_;
… …
1531 1586
1532sub reset_at { 1587sub reset_at {
1533 my ($self) = @_; 1588 my ($self) = @_;
1534 1589
1535 # TODO: safety, remove and allow resettable per-player maps 1590 # TODO: safety, remove and allow resettable per-player maps
1536 return 1e99 if $self->{path}{user_rel}; 1591 return 1e99 if $self->isa ("ext::map_per_player");#d#
1537 return 1e99 if $self->{deny_reset}; 1592 return 1e99 if $self->{deny_reset};
1538 1593
1539 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1594 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1540 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;
1541 1596
… …
1546 my ($self) = @_; 1601 my ($self) = @_;
1547 1602
1548 $self->reset_at <= $cf::RUNTIME 1603 $self->reset_at <= $cf::RUNTIME
1549} 1604}
1550 1605
1551sub unlink_save {
1552 my ($self) = @_;
1553
1554 utf8::encode (my $save = $self->{path}->save_path);
1555 aioreq_pri 3; IO::AIO::aio_unlink $save;
1556 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1557}
1558
1559sub rename {
1560 my ($self, $new_path) = @_;
1561
1562 $self->unlink_save;
1563
1564 delete $cf::MAP{$self->path};
1565 $self->{path} = new cf::path $new_path;
1566 $self->path ($self->{path}->as_string);
1567 $cf::MAP{$self->path} = $self;
1568
1569 $self->save;
1570}
1571
1572sub reset { 1606sub reset {
1573 my ($self) = @_; 1607 my ($self) = @_;
1574 1608
1575 my $lock = cf::lock_acquire "map_data:" . $self->path; 1609 my $lock = cf::lock_acquire "map_data:$self->{path}";
1576 1610
1577 return if $self->players; 1611 return if $self->players;
1578 return if $self->{path}{user_rel};#d# 1612 return if $self->isa ("ext::map_per_player");#d#
1579 1613
1580 warn "resetting map ", $self->path;#d# 1614 warn "resetting map ", $self->path;#d#
1581 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
1582 delete $cf::MAP{$self->path}; 1626 delete $cf::MAP{$self->path};
1627
1628 $self->clear;
1583 1629
1584 $_->clear_links_to ($self) for values %cf::MAP; 1630 $_->clear_links_to ($self) for values %cf::MAP;
1585 1631
1586 $self->unlink_save; 1632 $self->unlink_save;
1587 $self->destroy; 1633 $self->destroy;
… …
1590my $nuke_counter = "aaaa"; 1636my $nuke_counter = "aaaa";
1591 1637
1592sub nuke { 1638sub nuke {
1593 my ($self) = @_; 1639 my ($self) = @_;
1594 1640
1641 delete $cf::MAP{$self->path};
1642
1643 $self->unlink_save;
1644
1645 bless $self, "cf::map";
1646 delete $self->{deny_reset};
1595 $self->{deny_save} = 1; 1647 $self->{deny_save} = 1;
1596 $self->reset_timeout (1); 1648 $self->reset_timeout (1);
1597 $self->rename ("{nuke}/" . ($nuke_counter++)); 1649 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1650
1651 $cf::MAP{$self->path} = $self;
1652
1598 $self->reset; # polite request, might not happen 1653 $self->reset; # polite request, might not happen
1599} 1654}
1600 1655
1601sub customise_for {
1602 my ($map, $ob) = @_;
1603
1604 if ($map->per_player) {
1605 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1606 }
1607
1608 $map
1609}
1610
1611=item cf::map::unique_maps 1656=item cf::map::unique_maps
1612 1657
1613Returns an arrayref of cf::path's of all shared maps that have 1658Returns an arrayref of paths of all shared maps that have
1614instantiated unique items. May block. 1659instantiated unique items. May block.
1615 1660
1616=cut 1661=cut
1617 1662
1618sub unique_maps() { 1663sub unique_maps() {
… …
1624 for (@$files) { 1669 for (@$files) {
1625 utf8::decode $_; 1670 utf8::decode $_;
1626 next if /\.pst$/; 1671 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o; 1672 next unless /^$PATH_SEP/o;
1628 1673
1629 push @paths, new cf::path $_; 1674 push @paths, cf::map::normalise $_;
1630 } 1675 }
1631 1676
1632 \@paths 1677 \@paths
1633} 1678}
1634 1679
… …
1709 1754
1710=item $player_object->enter_link 1755=item $player_object->enter_link
1711 1756
1712Freezes 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}>).
1713 1758
1714The 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
1715I<MUST> call C<leave_link> as soon as possible, though. 1760I<MUST> call C<leave_link> as soon as possible, though.
1716 1761
1762Will never block.
1763
1717=item $player_object->leave_link ($map, $x, $y) 1764=item $player_object->leave_link ($map, $x, $y)
1718 1765
1719Moves 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
1720map 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
1721location 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
1722to the emergency map position. 1769fails, to the emergency map position.
1723 1770
1724Might block. 1771Might block.
1725 1772
1726=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}
1727 1784
1728sub cf::object::player::enter_link { 1785sub cf::object::player::enter_link {
1729 my ($self) = @_; 1786 my ($self) = @_;
1730 1787
1731 $self->deactivate_recursive; 1788 $self->deactivate_recursive;
1732 1789
1733 return if $self->map == $LINK_MAP; 1790 return if UNIVERSAL::isa $self->map, "ext::map_link";
1734 1791
1735 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1792 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1736 if $self->map; 1793 if $self->map;
1737 1794
1738 $self->enter_map ($LINK_MAP, 20, 20); 1795 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1739} 1796}
1740 1797
1741sub cf::object::player::leave_link { 1798sub cf::object::player::leave_link {
1742 my ($self, $map, $x, $y) = @_; 1799 my ($self, $map, $x, $y) = @_;
1743 1800
… …
1807=cut 1864=cut
1808 1865
1809sub cf::object::player::goto { 1866sub cf::object::player::goto {
1810 my ($self, $path, $x, $y) = @_; 1867 my ($self, $path, $x, $y) = @_;
1811 1868
1812 $path = new cf::path $path;
1813
1814 $self->enter_link; 1869 $self->enter_link;
1815 1870
1816 (async { 1871 (async {
1872 my $map = eval {
1817 my $map = cf::map::find $path->as_string; 1873 my $map = cf::map::find $path;
1818 $map = $map->customise_for ($self) if $map; 1874 $map = $map->customise_for ($self) if $map;
1819 1875 $map
1820# warn "entering ", $map->path, " at ($x, $y)\n" 1876 } or
1821# if $map;
1822
1823 $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);
1824 1878
1825 $self->leave_link ($map, $x, $y); 1879 $self->leave_link ($map, $x, $y);
1826 })->prio (1); 1880 })->prio (1);
1827} 1881}
1828 1882
… …
1832 1886
1833sub parse_random_map_params { 1887sub parse_random_map_params {
1834 my ($spec) = @_; 1888 my ($spec) = @_;
1835 1889
1836 my $rmp = { # defaults 1890 my $rmp = { # defaults
1837 xsize => 10, 1891 xsize => (cf::rndm 15, 40),
1838 ysize => 10, 1892 ysize => (cf::rndm 15, 40),
1893 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1894 #layout => string,
1839 }; 1895 };
1840 1896
1841 for (split /\n/, $spec) { 1897 for (split /\n/, $spec) {
1842 my ($k, $v) = split /\s+/, $_, 2; 1898 my ($k, $v) = split /\s+/, $_, 2;
1843 1899
… …
1847 $rmp 1903 $rmp
1848} 1904}
1849 1905
1850sub prepare_random_map { 1906sub prepare_random_map {
1851 my ($exit) = @_; 1907 my ($exit) = @_;
1908
1909 my $guard = cf::lock_acquire "exit_prepare:$exit";
1852 1910
1853 # all this does is basically replace the /! path by 1911 # all this does is basically replace the /! path by
1854 # a new random map path (?random/...) with a seed 1912 # a new random map path (?random/...) with a seed
1855 # that depends on the exit object 1913 # that depends on the exit object
1856 1914
1857 my $rmp = parse_random_map_params $exit->msg; 1915 my $rmp = parse_random_map_params $exit->msg;
1858 1916
1859 if ($exit->map) { 1917 if ($exit->map) {
1860 $rmp->{region} = $exit->map->region_name; 1918 $rmp->{region} = $exit->region->name;
1861 $rmp->{origin_map} = $exit->map->path; 1919 $rmp->{origin_map} = $exit->map->path;
1862 $rmp->{origin_x} = $exit->x; 1920 $rmp->{origin_x} = $exit->x;
1863 $rmp->{origin_y} = $exit->y; 1921 $rmp->{origin_y} = $exit->y;
1864 } 1922 }
1865 1923
1866 $rmp->{random_seed} ||= $exit->random_seed; 1924 $rmp->{random_seed} ||= $exit->random_seed;
1867 1925
1868 my $data = cf::to_json $rmp; 1926 my $data = cf::to_json $rmp;
1869 my $md5 = Digest::MD5::md5_hex $data; 1927 my $md5 = Digest::MD5::md5_hex $data;
1928 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1870 1929
1871 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) {
1872 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;
1873 1934
1874 $exit->slaying ("?random/$md5"); 1935 $exit->slaying ("?random/$md5");
1875 $exit->msg (undef); 1936 $exit->msg (undef);
1876 } 1937 }
1877} 1938}
1878 1939
1879sub cf::object::player::enter_exit { 1940sub cf::object::player::enter_exit {
1880 my ($self, $exit) = @_; 1941 my ($self, $exit) = @_;
1881 1942
1882 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;
1883 1953
1884 $self->enter_link; 1954 $self->enter_link;
1885 1955
1886 (async { 1956 (async {
1887 $self->deactivate_recursive; # just to be sure 1957 $self->deactivate_recursive; # just to be sure
1888 unless (eval { 1958 unless (eval {
1889 prepare_random_map $exit 1959 $self->goto ($slaying, $hp, $sp);
1890 if $exit->slaying eq "/!";
1891
1892 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1893 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1894 1960
1895 1; 1961 1;
1896 }) { 1962 }) {
1897 $self->message ("Something went wrong deep within the crossfire server. " 1963 $self->message ("Something went wrong deep within the crossfire server. "
1898 . "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. "
… …
1959 # get handled first 2025 # get handled first
1960 my $queue = delete $ns->{query_queue} 2026 my $queue = delete $ns->{query_queue}
1961 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
1962 2028
1963 (shift @$queue)->[1]->($msg); 2029 (shift @$queue)->[1]->($msg);
2030 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1964 2031
1965 push @{ $ns->{query_queue} }, @$queue; 2032 push @{ $ns->{query_queue} }, @$queue;
1966 2033
1967 if (@{ $ns->{query_queue} } == @$queue) { 2034 if (@{ $ns->{query_queue} } == @$queue) {
1968 if (@$queue) { 2035 if (@$queue) {
… …
2129The 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
2130using it, it should be unique. 2197using it, it should be unique.
2131 2198
2132=over 4 2199=over 4
2133 2200
2134=item $hashref = cf::db_get $family
2135
2136Return a hashref for use by the extension C<$family>, which can be
2137modified. After modifications, you have to call C<cf::db_dirty> or
2138C<cf::db_sync>.
2139
2140=item $value = cf::db_get $family => $key 2201=item $value = cf::db_get $family => $key
2141 2202
2142Returns a single value from the database 2203Returns a single value from the database.
2143
2144=item cf::db_put $family => $hashref
2145
2146Stores the given family hashref into the database. Updates are delayed, if
2147you want the data to be synced to disk immediately, use C<cf::db_sync>.
2148 2204
2149=item cf::db_put $family => $key => $value 2205=item cf::db_put $family => $key => $value
2150 2206
2151Stores the given C<$value> in the family hash. Updates are delayed, if you 2207Stores the given C<$value> in the family.
2152want the data to be synced to disk immediately, use C<cf::db_sync>.
2153
2154=item cf::db_dirty
2155
2156Marks the database as dirty, to be updated at a later time.
2157
2158=item cf::db_sync
2159
2160Immediately write the database to disk I<if it is dirty>.
2161 2208
2162=cut 2209=cut
2163 2210
2164our $DB; 2211our $DB;
2165 2212
2166{ 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
2167 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;
2168 2232
2169 sub db_load() { 2233 cf::db_put (board => data => $pst->{board});
2170 $DB = stat $path ? Storable::retrieve $path : { }; 2234 cf::db_put (guildrules => data => $pst->{guildrules});
2171 } 2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2172 2237
2173 my $pid; 2238 unlink $path;
2174
2175 sub db_save() {
2176 waitpid $pid, 0 if $pid;
2177 if (0 == ($pid = fork)) {
2178 $DB->{_meta}{version} = 1;
2179 Storable::nstore $DB, "$path~";
2180 rename "$path~", $path;
2181 cf::_exit 0 if defined $pid;
2182 } 2239 };
2183 }
2184
2185 my $dirty;
2186
2187 sub db_sync() {
2188 db_save if $dirty;
2189 undef $dirty;
2190 }
2191
2192 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2193 db_sync;
2194 });
2195
2196 sub db_dirty() {
2197 $dirty = 1;
2198 $idle->start;
2199 }
2200
2201 sub db_get($;$) {
2202 @_ >= 2
2203 ? $DB->{$_[0]}{$_[1]}
2204 : ($DB->{$_[0]} ||= { })
2205 }
2206
2207 sub db_put($$;$) {
2208 if (@_ >= 3) {
2209 $DB->{$_[0]}{$_[1]} = $_[2];
2210 } else {
2211 $DB->{$_[0]} = $_[1];
2212 }
2213 db_dirty;
2214 }
2215
2216 cf::global->attach (
2217 prio => 10000,
2218 on_cleanup => sub {
2219 db_sync;
2220 }, 2240 }
2221 ); 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 { };
2222} 2258}
2223 2259
2224############################################################################# 2260#############################################################################
2225# 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}
2226 2267
2227sub cfg_load { 2268sub cfg_load {
2228 open my $fh, "<:utf8", cf::confdir . "/config" 2269 open my $fh, "<:utf8", cf::confdir . "/config"
2229 or return; 2270 or return;
2230 2271
… …
2243 }; 2284 };
2244 warn $@ if $@; 2285 warn $@ if $@;
2245 } 2286 }
2246} 2287}
2247 2288
2289sub init {
2290 load_resources;
2291}
2292
2248sub main { 2293sub main {
2249 # we must not ever block the main coroutine 2294 # we must not ever block the main coroutine
2250 local $Coro::idle = sub { 2295 local $Coro::idle = sub {
2251 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 {
2252 async { Event::one_event }; 2298 Event::one_event;
2299 })->prio (Coro::PRIO_MAX);
2253 }; 2300 };
2254 2301
2255 cfg_load; 2302 cfg_load;
2256 db_load; 2303 db_init;
2257 load_extensions; 2304 load_extensions;
2305
2306 $TICK_WATCHER->start;
2258 Event::loop; 2307 Event::loop;
2259} 2308}
2260 2309
2261############################################################################# 2310#############################################################################
2262# initialisation and cleanup 2311# initialisation and cleanup
2263 2312
2264# install some emergency cleanup handlers 2313# install some emergency cleanup handlers
2265BEGIN { 2314BEGIN {
2266 for my $signal (qw(INT HUP TERM)) { 2315 for my $signal (qw(INT HUP TERM)) {
2267 Event->signal ( 2316 Event->signal (
2317 reentrant => 0,
2268 data => WF_AUTOCANCEL, 2318 data => WF_AUTOCANCEL,
2269 signal => $signal, 2319 signal => $signal,
2320 prio => 0,
2270 cb => sub { 2321 cb => sub {
2271 cf::cleanup "SIG$signal"; 2322 cf::cleanup "SIG$signal";
2272 }, 2323 },
2273 ); 2324 );
2274 } 2325 }
2275} 2326}
… …
2280 warn "enter emergency perl save\n"; 2331 warn "enter emergency perl save\n";
2281 2332
2282 cf::sync_job { 2333 cf::sync_job {
2283 # use a peculiar iteration method to avoid tripping on perl 2334 # use a peculiar iteration method to avoid tripping on perl
2284 # refcount bugs in for. also avoids problems with players 2335 # refcount bugs in for. also avoids problems with players
2285 # and maps saved/Destroyed asynchronously. 2336 # and maps saved/destroyed asynchronously.
2286 warn "begin emergency player save\n"; 2337 warn "begin emergency player save\n";
2287 for my $login (keys %cf::PLAYER) { 2338 for my $login (keys %cf::PLAYER) {
2288 my $pl = $cf::PLAYER{$login} or next; 2339 my $pl = $cf::PLAYER{$login} or next;
2289 $pl->valid or next; 2340 $pl->valid or next;
2290 $pl->save; 2341 $pl->save;
… …
2296 my $map = $cf::MAP{$path} or next; 2347 my $map = $cf::MAP{$path} or next;
2297 $map->valid or next; 2348 $map->valid or next;
2298 $map->save; 2349 $map->save;
2299 } 2350 }
2300 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";
2301 }; 2356 };
2302 2357
2303 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;
2304} 2366}
2305 2367
2306sub reload() { 2368sub reload() {
2307 # can/must only be called in main 2369 # can/must only be called in main
2308 if ($Coro::current != $Coro::main) { 2370 if ($Coro::current != $Coro::main) {
2309 warn "can only reload from main coroutine\n"; 2371 warn "can only reload from main coroutine";
2310 return; 2372 return;
2311 } 2373 }
2312 2374
2313 warn "reloading..."; 2375 warn "reloading...";
2314 2376
2315 warn "freezing server"; 2377 warn "cancelling server ticker";
2316 my $guard = freeze_mainloop; 2378 $TICK_WATCHER->cancel;
2379
2317 cf::emergency_save; 2380 cf::emergency_save;
2318
2319 warn "sync database to disk";
2320 cf::db_sync;
2321 IO::AIO::flush;
2322 2381
2323 eval { 2382 eval {
2324 # 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
2325 2384
2326 warn "cancel all watchers"; 2385 warn "cancelling all WF_AUTOCANCEL watchers";
2327 for (Event::all_watchers) { 2386 for (Event::all_watchers) {
2328 $_->cancel if $_->data & WF_AUTOCANCEL; 2387 $_->cancel if $_->data & WF_AUTOCANCEL;
2329 } 2388 }
2330 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
2331 warn "cancel all extension coros"; 2402 warn "cancelling all extension coros";
2332 $_->cancel for values %EXT_CORO; 2403 $_->cancel for values %EXT_CORO;
2333 %EXT_CORO = (); 2404 %EXT_CORO = ();
2334 2405
2335 warn "remove commands"; 2406 warn "removing commands";
2336 %COMMAND = (); 2407 %COMMAND = ();
2337 2408
2338 warn "remove ext commands"; 2409 warn "removing ext commands";
2339 %EXTCMD = (); 2410 %EXTCMD = ();
2340 2411
2341 warn "unload/nuke all extensions"; 2412 warn "unloading/nuking all extensions";
2342 for my $pkg (@EXTS) { 2413 for my $pkg (@EXTS) {
2343 warn "... unloading $pkg"; 2414 warn "... unloading $pkg";
2344 2415
2345 if (my $cb = $pkg->can ("unload")) { 2416 if (my $cb = $pkg->can ("unload")) {
2346 eval { 2417 eval {
… …
2351 2422
2352 warn "... nuking $pkg"; 2423 warn "... nuking $pkg";
2353 Symbol::delete_package $pkg; 2424 Symbol::delete_package $pkg;
2354 } 2425 }
2355 2426
2356 warn "unload all perl modules loaded from $LIBDIR"; 2427 warn "unloading all perl modules loaded from $LIBDIR";
2357 while (my ($k, $v) = each %INC) { 2428 while (my ($k, $v) = each %INC) {
2358 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2429 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2359 2430
2360 warn "removing <$k>"; 2431 warn "... unloading $k";
2361 delete $INC{$k}; 2432 delete $INC{$k};
2362 2433
2363 $k =~ s/\.pm$//; 2434 $k =~ s/\.pm$//;
2364 $k =~ s/\//::/g; 2435 $k =~ s/\//::/g;
2365 2436
… …
2368 } 2439 }
2369 2440
2370 Symbol::delete_package $k; 2441 Symbol::delete_package $k;
2371 } 2442 }
2372 2443
2373 warn "get rid of safe::, as good as possible"; 2444 warn "getting rid of safe::, as good as possible";
2374 Symbol::delete_package "safe::$_" 2445 Symbol::delete_package "safe::$_"
2375 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);
2376 2447
2377 warn "unload cf.pm \"a bit\""; 2448 warn "unloading cf.pm \"a bit\"";
2378 delete $INC{"cf.pm"}; 2449 delete $INC{"cf.pm"};
2379 2450
2380 # don't, removes xs symbols, too, 2451 # don't, removes xs symbols, too,
2381 # and global variables created in xs 2452 # and global variables created in xs
2382 #Symbol::delete_package __PACKAGE__; 2453 #Symbol::delete_package __PACKAGE__;
2383 2454
2455 warn "unload completed, starting to reload now";
2456
2384 warn "reloading cf.pm"; 2457 warn "reloading cf.pm";
2385 require cf; 2458 require cf;
2386 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2459 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2387 2460
2388 warn "load config and database again"; 2461 warn "loading config and database again";
2389 cf::cfg_load; 2462 cf::cfg_load;
2390 cf::db_load;
2391 2463
2392 warn "load extensions"; 2464 warn "loading extensions";
2393 cf::load_extensions; 2465 cf::load_extensions;
2394 2466
2395 warn "reattach attachments to objects/players"; 2467 warn "reattaching attachments to objects/players";
2396 _global_reattach; 2468 _global_reattach;
2397 warn "reattach attachments to maps"; 2469 warn "reattaching attachments to maps";
2398 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;
2399 }; 2478 };
2400 2479
2401 if ($@) { 2480 if ($@) {
2402 warn $@; 2481 warn $@;
2403 warn "error while reloading, exiting."; 2482 warn "error while reloading, exiting.";
… …
2405 } 2484 }
2406 2485
2407 warn "reloaded"; 2486 warn "reloaded";
2408}; 2487};
2409 2488
2410############################################################################# 2489our $RELOAD_WATCHER; # used only during reload
2411
2412unless ($LINK_MAP) {
2413 $LINK_MAP = cf::map::new;
2414
2415 $LINK_MAP->width (41);
2416 $LINK_MAP->height (41);
2417 $LINK_MAP->alloc;
2418 $LINK_MAP->path ("{link}");
2419 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2420 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2421
2422 # dirty hack because... archetypes are not yet loaded
2423 Event->timer (
2424 after => 10,
2425 cb => sub {
2426 $_[0]->w->cancel;
2427
2428 # provide some exits "home"
2429 my $exit = cf::object::new "exit";
2430
2431 $exit->slaying ($EMERGENCY_POSITION->[0]);
2432 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2433 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2434
2435 $LINK_MAP->insert ($exit->clone, 19, 19);
2436 $LINK_MAP->insert ($exit->clone, 19, 20);
2437 $LINK_MAP->insert ($exit->clone, 19, 21);
2438 $LINK_MAP->insert ($exit->clone, 20, 19);
2439 $LINK_MAP->insert ($exit->clone, 20, 21);
2440 $LINK_MAP->insert ($exit->clone, 21, 19);
2441 $LINK_MAP->insert ($exit->clone, 21, 20);
2442 $LINK_MAP->insert ($exit->clone, 21, 21);
2443
2444 $exit->destroy;
2445 });
2446
2447 $LINK_MAP->{deny_save} = 1;
2448 $LINK_MAP->{deny_reset} = 1;
2449
2450 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2451}
2452 2490
2453register_command "reload" => sub { 2491register_command "reload" => sub {
2454 my ($who, $arg) = @_; 2492 my ($who, $arg) = @_;
2455 2493
2456 if ($who->flag (FLAG_WIZ)) { 2494 if ($who->flag (FLAG_WIZ)) {
2457 $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 {
2458 reload; 2505 reload;
2459 $who->message ("end of reload."); 2506 undef $RELOAD_WATCHER;
2507 },
2508 );
2460 } 2509 }
2461}; 2510};
2462 2511
2463unshift @INC, $LIBDIR; 2512unshift @INC, $LIBDIR;
2513
2514my $bug_warning = 0;
2464 2515
2465$TICK_WATCHER = Event->timer ( 2516$TICK_WATCHER = Event->timer (
2466 reentrant => 0, 2517 reentrant => 0,
2518 parked => 1,
2467 prio => 0, 2519 prio => 0,
2468 at => $NEXT_TICK || $TICK, 2520 at => $NEXT_TICK || $TICK,
2469 data => WF_AUTOCANCEL, 2521 data => WF_AUTOCANCEL,
2470 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
2529 $NOW = Event::time;
2530
2471 cf::server_tick; # one server iteration 2531 cf::server_tick; # one server iteration
2472 $RUNTIME += $TICK; 2532 $RUNTIME += $TICK;
2473 $NEXT_TICK += $TICK; 2533 $NEXT_TICK += $TICK;
2474 2534
2475 $WAIT_FOR_TICK->broadcast; 2535 $WAIT_FOR_TICK->broadcast;
2476 $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#
2477 2543
2478 # 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
2479 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2545 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2480 2546
2481 $TICK_WATCHER->at ($NEXT_TICK); 2547 $TICK_WATCHER->at ($NEXT_TICK);
2482 $TICK_WATCHER->start; 2548 $TICK_WATCHER->start;
2483 }, 2549 },
2484); 2550);
2485 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;
2486IO::AIO::max_poll_time $TICK * 0.2; 2606 IO::AIO::max_poll_time $TICK * 0.1;
2487 2607 $AIO_POLL_WATCHER = Event->io (
2488Event->io ( 2608 reentrant => 0,
2489 fd => IO::AIO::poll_fileno, 2609 fd => IO::AIO::poll_fileno,
2490 poll => 'r', 2610 poll => 'r',
2491 prio => 5, 2611 prio => 6,
2492 data => WF_AUTOCANCEL, 2612 data => WF_AUTOCANCEL,
2493 cb => \&IO::AIO::poll_cb, 2613 cb => \&IO::AIO::poll_cb,
2494); 2614 );
2615}
2495 2616
2496Event->timer ( 2617$WRITE_RUNTIME_WATCHER = Event->timer (
2618 reentrant => 0,
2497 data => WF_AUTOCANCEL, 2619 data => WF_AUTOCANCEL,
2498 after => 0, 2620 after => 1,
2499 interval => 10, 2621 interval => 10,
2500 cb => sub { 2622 prio => 6, # keep it lowest so it acts like a watchdog
2501 (Coro::unblock_sub { 2623 cb => Coro::unblock_sub {
2502 write_runtime 2624 write_runtime
2503 or warn "ERROR: unable to write runtime file: $!"; 2625 or warn "ERROR: unable to write runtime file: $!";
2504 })->();
2505 }, 2626 },
2506); 2627);
2507 2628
2508END { cf::emergency_save } 2629END { cf::emergency_save }
2509 2630

Diff Legend

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