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

Diff Legend

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