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

Diff Legend

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