ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.161 by root, Thu Jan 11 00:16:58 2007 UTC vs.
Revision 1.220 by root, Sat Feb 17 23:54:35 2007 UTC

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

Diff Legend

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