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.222 by root, Tue Mar 6 03:06:00 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;
1057}
1058
1059=item $pl->kick
1060
1061Kicks a player out of the game. This destroys the connection.
1062
1063=cut
1064
1065sub kick {
1066 my ($pl, $kicker) = @_;
1067
1068 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1069 $pl->killer ("kicked");
1070 $pl->ns->destroy;
1180} 1071}
1181 1072
1182=item cf::player::list_logins 1073=item cf::player::list_logins
1183 1074
1184Returns am arrayref of all valid playernames in the system, can take a 1075Returns am arrayref of all valid playernames in the system, can take a
… …
1204 \@logins 1095 \@logins
1205} 1096}
1206 1097
1207=item $player->maps 1098=item $player->maps
1208 1099
1209Returns an arrayref of cf::path's of all maps that are private for this 1100Returns an arrayref of map paths that are private for this
1210player. May block. 1101player. May block.
1211 1102
1212=cut 1103=cut
1213 1104
1214sub maps($) { 1105sub maps($) {
1215 my ($pl) = @_; 1106 my ($pl) = @_;
1107
1108 $pl = ref $pl ? $pl->ob->name : $pl;
1216 1109
1217 my $files = aio_readdir playerdir $pl 1110 my $files = aio_readdir playerdir $pl
1218 or return; 1111 or return;
1219 1112
1220 my @paths; 1113 my @paths;
… …
1222 for (@$files) { 1115 for (@$files) {
1223 utf8::decode $_; 1116 utf8::decode $_;
1224 next if /\.(?:pl|pst)$/; 1117 next if /\.(?:pl|pst)$/;
1225 next unless /^$PATH_SEP/o; 1118 next unless /^$PATH_SEP/o;
1226 1119
1227 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1120 push @paths, cf::map::normalise "~$pl/$_";
1228 } 1121 }
1229 1122
1230 \@paths 1123 \@paths
1231} 1124}
1232 1125
… …
1258package cf::map; 1151package cf::map;
1259 1152
1260use Fcntl; 1153use Fcntl;
1261use Coro::AIO; 1154use Coro::AIO;
1262 1155
1156use overload
1157 '""' => \&as_string,
1158 fallback => 1;
1159
1263our $MAX_RESET = 3600; 1160our $MAX_RESET = 3600;
1264our $DEFAULT_RESET = 3000; 1161our $DEFAULT_RESET = 3000;
1265 1162
1266sub generate_random_map { 1163sub generate_random_map {
1267 my ($path, $rmp) = @_; 1164 my ($self, $rmp) = @_;
1268
1269 # mit "rum" bekleckern, nicht 1165 # mit "rum" bekleckern, nicht
1270 cf::map::_create_random_map 1166 $self->_create_random_map (
1271 $path,
1272 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1167 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1273 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1168 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1274 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1169 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1275 $rmp->{exit_on_final_map}, 1170 $rmp->{exit_on_final_map},
1276 $rmp->{xsize}, $rmp->{ysize}, 1171 $rmp->{xsize}, $rmp->{ysize},
1277 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1172 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1278 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1173 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1279 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1174 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1280 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1175 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1281 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1176 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1282 (cf::region::find $rmp->{region}) 1177 (cf::region::find $rmp->{region}), $rmp->{custom}
1178 )
1179}
1180
1181=item cf::map->register ($regex, $prio)
1182
1183Register a handler for the map path matching the given regex at the
1184givne priority (higher is better, built-in handlers have priority 0, the
1185default).
1186
1187=cut
1188
1189sub register {
1190 my (undef, $regex, $prio) = @_;
1191 my $pkg = caller;
1192
1193 no strict;
1194 push @{"$pkg\::ISA"}, __PACKAGE__;
1195
1196 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1197}
1198
1199# also paths starting with '/'
1200$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1201
1202sub thawer_merge {
1203 my ($self, $merge) = @_;
1204
1205 # we have to keep some variables in memory intact
1206 local $self->{path};
1207 local $self->{load_path};
1208 local $self->{deny_save};
1209 local $self->{deny_reset};
1210
1211 $self->SUPER::thawer_merge ($merge);
1212}
1213
1214sub normalise {
1215 my ($path, $base) = @_;
1216
1217 $path = "$path"; # make sure its a string
1218
1219 $path =~ s/\.map$//;
1220
1221 # map plan:
1222 #
1223 # /! non-realised random map exit (special hack!)
1224 # {... are special paths that are not being touched
1225 # ?xxx/... are special absolute paths
1226 # ?random/... random maps
1227 # /... normal maps
1228 # ~user/... per-player map of a specific user
1229
1230 $path =~ s/$PATH_SEP/\//go;
1231
1232 # treat it as relative path if it starts with
1233 # something that looks reasonable
1234 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1235 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1236
1237 $base =~ s{[^/]+/?$}{};
1238 $path = "$base/$path";
1239 }
1240
1241 for ($path) {
1242 redo if s{//}{/};
1243 redo if s{/\.?/}{/};
1244 redo if s{/[^/]+/\.\./}{/};
1245 }
1246
1247 $path
1248}
1249
1250sub new_from_path {
1251 my (undef, $path, $base) = @_;
1252
1253 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1254
1255 $path = normalise $path, $base;
1256
1257 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1258 if ($path =~ $EXT_MAP{$pkg}[1]) {
1259 my $self = bless cf::map::new, $pkg;
1260 $self->{path} = $path; $self->path ($path);
1261 $self->init; # pass $1 etc.
1262 return $self;
1263 }
1264 }
1265
1266 Carp::carp "unable to resolve path '$path' (base '$base').";
1267 ()
1268}
1269
1270sub init {
1271 my ($self) = @_;
1272
1273 $self
1274}
1275
1276sub as_string {
1277 my ($self) = @_;
1278
1279 "$self->{path}"
1280}
1281
1282# the displayed name, this is a one way mapping
1283sub visible_name {
1284 &as_string
1285}
1286
1287# the original (read-only) location
1288sub load_path {
1289 my ($self) = @_;
1290
1291 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1292}
1293
1294# the temporary/swap location
1295sub save_path {
1296 my ($self) = @_;
1297
1298 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1299 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1300}
1301
1302# the unique path, undef == no special unique path
1303sub uniq_path {
1304 my ($self) = @_;
1305
1306 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1307 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1283} 1308}
1284 1309
1285# and all this just because we cannot iterate over 1310# and all this just because we cannot iterate over
1286# all maps in C++... 1311# all maps in C++...
1287sub change_all_map_light { 1312sub change_all_map_light {
… …
1289 1314
1290 $_->change_map_light ($change) 1315 $_->change_map_light ($change)
1291 for grep $_->outdoor, values %cf::MAP; 1316 for grep $_->outdoor, values %cf::MAP;
1292} 1317}
1293 1318
1319sub unlink_save {
1320 my ($self) = @_;
1321
1322 utf8::encode (my $save = $self->save_path);
1323 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1324 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1325}
1326
1294sub load_map_header($) { 1327sub load_header_from($) {
1295 my ($path) = @_; 1328 my ($self, $path) = @_;
1296 1329
1297 utf8::encode $path; 1330 utf8::encode $path;
1298 aio_open $path, O_RDONLY, 0 1331 #aio_open $path, O_RDONLY, 0
1332 # or return;
1333
1334 $self->_load_header ($path)
1299 or return; 1335 or return;
1300 1336
1301 my $map = cf::map::new 1337 $self->{load_path} = $path;
1338
1339 1
1340}
1341
1342sub load_header_orig {
1343 my ($self) = @_;
1344
1345 $self->load_header_from ($self->load_path)
1346}
1347
1348sub load_header_temp {
1349 my ($self) = @_;
1350
1351 $self->load_header_from ($self->save_path)
1352}
1353
1354sub prepare_temp {
1355 my ($self) = @_;
1356
1357 $self->last_access ((delete $self->{last_access})
1358 || $cf::RUNTIME); #d#
1359 # safety
1360 $self->{instantiate_time} = $cf::RUNTIME
1361 if $self->{instantiate_time} > $cf::RUNTIME;
1362}
1363
1364sub prepare_orig {
1365 my ($self) = @_;
1366
1367 $self->{load_original} = 1;
1368 $self->{instantiate_time} = $cf::RUNTIME;
1369 $self->last_access ($cf::RUNTIME);
1370 $self->instantiate;
1371}
1372
1373sub load_header {
1374 my ($self) = @_;
1375
1376 if ($self->load_header_temp) {
1377 $self->prepare_temp;
1378 } else {
1379 $self->load_header_orig
1302 or return; 1380 or return;
1381 $self->prepare_orig;
1382 }
1303 1383
1304 # for better error messages only, will be overwritten later 1384 1
1305 $map->path ($path);
1306
1307 $map->load_header ($path)
1308 or return;
1309
1310 $map->{load_path} = $path;
1311
1312 $map
1313} 1385}
1314 1386
1315sub find; 1387sub find;
1316sub find { 1388sub find {
1317 my ($path, $origin) = @_; 1389 my ($path, $origin) = @_;
1318 1390
1319 #warn "find<$path,$origin>\n";#d#
1320
1321 $path = new cf::path $path, $origin && $origin->path; 1391 $path = normalise $path, $origin && $origin->path;
1322 my $key = $path->as_string;
1323 1392
1324 cf::lock_wait "map_find:$key"; 1393 cf::lock_wait "map_find:$path";
1325 1394
1326 $cf::MAP{$key} || do { 1395 $cf::MAP{$path} || do {
1327 my $guard = cf::lock_acquire "map_find:$key"; 1396 my $guard = cf::lock_acquire "map_find:$path";
1328 1397 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; 1398 or return;
1343 1399
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; 1400 $map->{last_save} = $cf::RUNTIME;
1356 1401
1357 Coro::cede; 1402 $map->load_header
1403 or return;
1358 1404
1359 if ($map->should_reset) { 1405 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1406 # doing this can freeze the server in a sync job, obviously
1407 #$cf::WAIT_FOR_TICK->wait;
1360 $map->reset; 1408 $map->reset;
1361 undef $guard; 1409 undef $guard;
1362 $map = find $path 1410 return find $path;
1363 or return;
1364 } 1411 }
1365 1412
1366 $cf::MAP{$key} = $map 1413 $cf::MAP{$path} = $map
1367 } 1414 }
1368} 1415}
1416
1417sub pre_load { }
1418sub post_load { }
1369 1419
1370sub load { 1420sub load {
1371 my ($self) = @_; 1421 my ($self) = @_;
1372 1422
1423 local $self->{deny_reset} = 1; # loading can take a long time
1424
1373 my $path = $self->{path}; 1425 my $path = $self->{path};
1374 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1426 my $guard = cf::lock_acquire "map_load:$path";
1375 1427
1376 return if $self->in_memory != cf::MAP_SWAPPED; 1428 return if $self->in_memory != cf::MAP_SWAPPED;
1377 1429
1378 $self->in_memory (cf::MAP_LOADING); 1430 $self->in_memory (cf::MAP_LOADING);
1379 1431
1380 $self->alloc; 1432 $self->alloc;
1433
1434 $self->pre_load;
1435
1381 $self->load_objects ($self->{load_path}, 1) 1436 $self->_load_objects ($self->{load_path}, 1)
1382 or return; 1437 or return;
1383 1438
1384 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1439 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1385 if delete $self->{load_original}; 1440 if delete $self->{load_original};
1386 1441
1387 if (my $uniq = $path->uniq_path) { 1442 if (my $uniq = $self->uniq_path) {
1388 utf8::encode $uniq; 1443 utf8::encode $uniq;
1389 if (aio_open $uniq, O_RDONLY, 0) { 1444 if (aio_open $uniq, O_RDONLY, 0) {
1390 $self->clear_unique_items; 1445 $self->clear_unique_items;
1391 $self->load_objects ($uniq, 0); 1446 $self->_load_objects ($uniq, 0);
1392 } 1447 }
1393 } 1448 }
1394 1449
1395 Coro::cede; 1450 Coro::cede;
1396 1451
1397 # now do the right thing for maps 1452 # now do the right thing for maps
1398 $self->link_multipart_objects; 1453 $self->link_multipart_objects;
1399 1454
1400 if ($self->{path}->is_style_map) { 1455 unless ($self->{deny_activate}) {
1401 $self->{deny_save} = 1; 1456 $self->decay_objects;
1402 $self->{deny_reset} = 1;
1403 } else {
1404 $self->fix_auto_apply; 1457 $self->fix_auto_apply;
1405 $self->decay_objects;
1406 $self->update_buttons; 1458 $self->update_buttons;
1459 Coro::cede;
1407 $self->set_darkness_map; 1460 $self->set_darkness_map;
1408 $self->difficulty ($self->estimate_difficulty) 1461 $self->difficulty ($self->estimate_difficulty)
1409 unless $self->difficulty; 1462 unless $self->difficulty;
1463 Coro::cede;
1410 $self->activate; 1464 $self->activate;
1411 } 1465 }
1412 1466
1413 Coro::cede; 1467 $self->post_load;
1414 1468
1415 $self->in_memory (cf::MAP_IN_MEMORY); 1469 $self->in_memory (cf::MAP_IN_MEMORY);
1470}
1471
1472sub customise_for {
1473 my ($self, $ob) = @_;
1474
1475 return find "~" . $ob->name . "/" . $self->{path}
1476 if $self->per_player;
1477
1478 $self
1416} 1479}
1417 1480
1418# find and load all maps in the 3x3 area around a map 1481# find and load all maps in the 3x3 area around a map
1419sub load_diag { 1482sub load_diag {
1420 my ($map) = @_; 1483 my ($map) = @_;
… …
1450 1513
1451 cf::sync_job { $map->load }; 1514 cf::sync_job { $map->load };
1452} 1515}
1453 1516
1454our %MAP_PREFETCH; 1517our %MAP_PREFETCH;
1455our $MAP_PREFETCHER = Coro::async { 1518our $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 1519
1470sub find_async { 1520sub find_async {
1471 my ($path, $origin) = @_; 1521 my ($path, $origin) = @_;
1472 1522
1473 $path = new cf::path $path, $origin && $origin->path; 1523 $path = normalise $path, $origin && $origin->{path};
1474 my $key = $path->as_string;
1475 1524
1476 if (my $map = $cf::MAP{$key}) { 1525 if (my $map = $cf::MAP{$path}) {
1477 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1526 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1478 } 1527 }
1479 1528
1480 $MAP_PREFETCH{$key} = $path; 1529 undef $MAP_PREFETCH{$path};
1530 $MAP_PREFETCHER ||= cf::async {
1531 while (%MAP_PREFETCH) {
1532 for my $path (keys %MAP_PREFETCH) {
1533 my $map = find $path
1534 or next;
1535 $map->load;
1536
1537 delete $MAP_PREFETCH{$path};
1538 }
1539 }
1540 undef $MAP_PREFETCHER;
1541 };
1481 $MAP_PREFETCHER->ready; 1542 $MAP_PREFETCHER->prio (6);
1482 1543
1483 () 1544 ()
1484} 1545}
1485 1546
1486sub save { 1547sub save {
… …
1490 1551
1491 $self->{last_save} = $cf::RUNTIME; 1552 $self->{last_save} = $cf::RUNTIME;
1492 1553
1493 return unless $self->dirty; 1554 return unless $self->dirty;
1494 1555
1495 my $save = $self->{path}->save_path; utf8::encode $save; 1556 my $save = $self->save_path; utf8::encode $save;
1496 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1557 my $uniq = $self->uniq_path; utf8::encode $uniq;
1497 1558
1498 $self->{load_path} = $save; 1559 $self->{load_path} = $save;
1499 1560
1500 return if $self->{deny_save}; 1561 return if $self->{deny_save};
1501 1562
… …
1504 cf::async { 1565 cf::async {
1505 $_->contr->save for $self->players; 1566 $_->contr->save for $self->players;
1506 }; 1567 };
1507 1568
1508 if ($uniq) { 1569 if ($uniq) {
1509 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1570 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1510 $self->save_objects ($uniq, cf::IO_UNIQUES); 1571 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1511 } else { 1572 } else {
1512 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1573 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1513 } 1574 }
1514} 1575}
1515 1576
1516sub swap_out { 1577sub swap_out {
1517 my ($self) = @_; 1578 my ($self) = @_;
… …
1531 1592
1532sub reset_at { 1593sub reset_at {
1533 my ($self) = @_; 1594 my ($self) = @_;
1534 1595
1535 # TODO: safety, remove and allow resettable per-player maps 1596 # TODO: safety, remove and allow resettable per-player maps
1536 return 1e99 if $self->{path}{user_rel}; 1597 return 1e99 if $self->isa ("ext::map_per_player");#d#
1537 return 1e99 if $self->{deny_reset}; 1598 return 1e99 if $self->{deny_reset};
1538 1599
1539 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1600 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1540 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1601 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1541 1602
… …
1546 my ($self) = @_; 1607 my ($self) = @_;
1547 1608
1548 $self->reset_at <= $cf::RUNTIME 1609 $self->reset_at <= $cf::RUNTIME
1549} 1610}
1550 1611
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 { 1612sub reset {
1573 my ($self) = @_; 1613 my ($self) = @_;
1574 1614
1575 my $lock = cf::lock_acquire "map_data:" . $self->path; 1615 my $lock = cf::lock_acquire "map_data:$self->{path}";
1576 1616
1577 return if $self->players; 1617 return if $self->players;
1578 return if $self->{path}{user_rel};#d# 1618 return if $self->isa ("ext::map_per_player");#d#
1579 1619
1580 warn "resetting map ", $self->path;#d# 1620 warn "resetting map ", $self->path;#d#
1581 1621
1622 $self->in_memory (cf::MAP_SWAPPED);
1623
1624 # need to save uniques path
1625 unless ($self->{deny_save}) {
1626 my $uniq = $self->uniq_path; utf8::encode $uniq;
1627
1628 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1629 if $uniq;
1630 }
1631
1582 delete $cf::MAP{$self->path}; 1632 delete $cf::MAP{$self->path};
1633
1634 $self->clear;
1583 1635
1584 $_->clear_links_to ($self) for values %cf::MAP; 1636 $_->clear_links_to ($self) for values %cf::MAP;
1585 1637
1586 $self->unlink_save; 1638 $self->unlink_save;
1587 $self->destroy; 1639 $self->destroy;
… …
1590my $nuke_counter = "aaaa"; 1642my $nuke_counter = "aaaa";
1591 1643
1592sub nuke { 1644sub nuke {
1593 my ($self) = @_; 1645 my ($self) = @_;
1594 1646
1647 delete $cf::MAP{$self->path};
1648
1649 $self->unlink_save;
1650
1651 bless $self, "cf::map";
1652 delete $self->{deny_reset};
1595 $self->{deny_save} = 1; 1653 $self->{deny_save} = 1;
1596 $self->reset_timeout (1); 1654 $self->reset_timeout (1);
1597 $self->rename ("{nuke}/" . ($nuke_counter++)); 1655 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1656
1657 $cf::MAP{$self->path} = $self;
1658
1598 $self->reset; # polite request, might not happen 1659 $self->reset; # polite request, might not happen
1599} 1660}
1600 1661
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 1662=item cf::map::unique_maps
1612 1663
1613Returns an arrayref of cf::path's of all shared maps that have 1664Returns an arrayref of paths of all shared maps that have
1614instantiated unique items. May block. 1665instantiated unique items. May block.
1615 1666
1616=cut 1667=cut
1617 1668
1618sub unique_maps() { 1669sub unique_maps() {
… …
1624 for (@$files) { 1675 for (@$files) {
1625 utf8::decode $_; 1676 utf8::decode $_;
1626 next if /\.pst$/; 1677 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o; 1678 next unless /^$PATH_SEP/o;
1628 1679
1629 push @paths, new cf::path $_; 1680 push @paths, cf::map::normalise $_;
1630 } 1681 }
1631 1682
1632 \@paths 1683 \@paths
1633} 1684}
1634 1685
… …
1709 1760
1710=item $player_object->enter_link 1761=item $player_object->enter_link
1711 1762
1712Freezes the player and moves him/her to a special map (C<{link}>). 1763Freezes the player and moves him/her to a special map (C<{link}>).
1713 1764
1714The player should be reaosnably safe there for short amounts of time. You 1765The player should be reasonably safe there for short amounts of time. You
1715I<MUST> call C<leave_link> as soon as possible, though. 1766I<MUST> call C<leave_link> as soon as possible, though.
1716 1767
1768Will never block.
1769
1717=item $player_object->leave_link ($map, $x, $y) 1770=item $player_object->leave_link ($map, $x, $y)
1718 1771
1719Moves the player out of the specila link map onto the given map. If the 1772Moves 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 1773map. 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, 1774to the location he/she was before the call to C<enter_link>, or, if that
1722to the emergency map position. 1775fails, to the emergency map position.
1723 1776
1724Might block. 1777Might block.
1725 1778
1726=cut 1779=cut
1780
1781sub link_map {
1782 unless ($LINK_MAP) {
1783 $LINK_MAP = cf::map::find "{link}"
1784 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1785 $LINK_MAP->load;
1786 }
1787
1788 $LINK_MAP
1789}
1727 1790
1728sub cf::object::player::enter_link { 1791sub cf::object::player::enter_link {
1729 my ($self) = @_; 1792 my ($self) = @_;
1730 1793
1731 $self->deactivate_recursive; 1794 $self->deactivate_recursive;
1732 1795
1733 return if $self->map == $LINK_MAP; 1796 return if UNIVERSAL::isa $self->map, "ext::map_link";
1734 1797
1735 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1798 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1736 if $self->map; 1799 if $self->map;
1737 1800
1738 $self->enter_map ($LINK_MAP, 20, 20); 1801 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1739} 1802}
1740 1803
1741sub cf::object::player::leave_link { 1804sub cf::object::player::leave_link {
1742 my ($self, $map, $x, $y) = @_; 1805 my ($self, $map, $x, $y) = @_;
1743 1806
… …
1765 $map->load; 1828 $map->load;
1766 $map->load_diag; 1829 $map->load_diag;
1767 1830
1768 return unless $self->contr->active; 1831 return unless $self->contr->active;
1769 $self->activate_recursive; 1832 $self->activate_recursive;
1833
1834 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1770 $self->enter_map ($map, $x, $y); 1835 $self->enter_map ($map, $x, $y);
1771} 1836}
1772 1837
1773cf::player->attach ( 1838cf::player->attach (
1774 on_logout => sub { 1839 on_logout => sub {
… …
1787 # try to abort aborted map switching on player login :) 1852 # try to abort aborted map switching on player login :)
1788 # should happen only on crashes 1853 # should happen only on crashes
1789 if ($pl->ob->{_link_pos}) { 1854 if ($pl->ob->{_link_pos}) {
1790 $pl->ob->enter_link; 1855 $pl->ob->enter_link;
1791 (async { 1856 (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, 1857 $pl->ob->reply (undef,
1795 "There was an internal problem at your last logout, " 1858 "There was an internal problem at your last logout, "
1796 . "the server will try to bring you to your intended destination in a second.", 1859 . "the server will try to bring you to your intended destination in a second.",
1797 cf::NDI_RED); 1860 cf::NDI_RED);
1861 # we need this sleep as the login has a concurrent enter_exit running
1862 # and this sleep increases chances of the player not ending up in scorn
1798 Coro::Timer::sleep 1; 1863 Coro::Timer::sleep 1;
1799 $pl->ob->leave_link; 1864 $pl->ob->leave_link;
1800 })->prio (2); 1865 })->prio (2);
1801 } 1866 }
1802 }, 1867 },
… …
1807=cut 1872=cut
1808 1873
1809sub cf::object::player::goto { 1874sub cf::object::player::goto {
1810 my ($self, $path, $x, $y) = @_; 1875 my ($self, $path, $x, $y) = @_;
1811 1876
1812 $path = new cf::path $path;
1813
1814 $self->enter_link; 1877 $self->enter_link;
1815 1878
1816 (async { 1879 (async {
1880 my $map = eval {
1817 my $map = cf::map::find $path->as_string; 1881 my $map = cf::map::find $path;
1818 $map = $map->customise_for ($self) if $map; 1882 $map = $map->customise_for ($self) if $map;
1819 1883 $map
1820# warn "entering ", $map->path, " at ($x, $y)\n" 1884 } or
1821# if $map;
1822
1823 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1885 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1824 1886
1825 $self->leave_link ($map, $x, $y); 1887 $self->leave_link ($map, $x, $y);
1826 })->prio (1); 1888 })->prio (1);
1827} 1889}
1828 1890
… …
1832 1894
1833sub parse_random_map_params { 1895sub parse_random_map_params {
1834 my ($spec) = @_; 1896 my ($spec) = @_;
1835 1897
1836 my $rmp = { # defaults 1898 my $rmp = { # defaults
1837 xsize => 10, 1899 xsize => (cf::rndm 15, 40),
1838 ysize => 10, 1900 ysize => (cf::rndm 15, 40),
1901 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1902 #layout => string,
1839 }; 1903 };
1840 1904
1841 for (split /\n/, $spec) { 1905 for (split /\n/, $spec) {
1842 my ($k, $v) = split /\s+/, $_, 2; 1906 my ($k, $v) = split /\s+/, $_, 2;
1843 1907
… …
1847 $rmp 1911 $rmp
1848} 1912}
1849 1913
1850sub prepare_random_map { 1914sub prepare_random_map {
1851 my ($exit) = @_; 1915 my ($exit) = @_;
1916
1917 my $guard = cf::lock_acquire "exit_prepare:$exit";
1852 1918
1853 # all this does is basically replace the /! path by 1919 # all this does is basically replace the /! path by
1854 # a new random map path (?random/...) with a seed 1920 # a new random map path (?random/...) with a seed
1855 # that depends on the exit object 1921 # that depends on the exit object
1856 1922
1857 my $rmp = parse_random_map_params $exit->msg; 1923 my $rmp = parse_random_map_params $exit->msg;
1858 1924
1859 if ($exit->map) { 1925 if ($exit->map) {
1860 $rmp->{region} = $exit->map->region_name; 1926 $rmp->{region} = $exit->region->name;
1861 $rmp->{origin_map} = $exit->map->path; 1927 $rmp->{origin_map} = $exit->map->path;
1862 $rmp->{origin_x} = $exit->x; 1928 $rmp->{origin_x} = $exit->x;
1863 $rmp->{origin_y} = $exit->y; 1929 $rmp->{origin_y} = $exit->y;
1864 } 1930 }
1865 1931
1866 $rmp->{random_seed} ||= $exit->random_seed; 1932 $rmp->{random_seed} ||= $exit->random_seed;
1867 1933
1868 my $data = cf::to_json $rmp; 1934 my $data = cf::to_json $rmp;
1869 my $md5 = Digest::MD5::md5_hex $data; 1935 my $md5 = Digest::MD5::md5_hex $data;
1936 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1870 1937
1871 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1938 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1872 aio_write $fh, 0, (length $data), $data, 0; 1939 aio_write $fh, 0, (length $data), $data, 0;
1940 undef $fh;
1941 aio_rename "$meta~", $meta;
1873 1942
1874 $exit->slaying ("?random/$md5"); 1943 $exit->slaying ("?random/$md5");
1875 $exit->msg (undef); 1944 $exit->msg (undef);
1876 } 1945 }
1877} 1946}
1878 1947
1879sub cf::object::player::enter_exit { 1948sub cf::object::player::enter_exit {
1880 my ($self, $exit) = @_; 1949 my ($self, $exit) = @_;
1881 1950
1882 return unless $self->type == cf::PLAYER; 1951 return unless $self->type == cf::PLAYER;
1952
1953 if ($exit->slaying eq "/!") {
1954 #TODO: this should de-fi-ni-te-ly not be a sync-job
1955 cf::sync_job { prepare_random_map $exit };
1956 }
1957
1958 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1959 my $hp = $exit->stats->hp;
1960 my $sp = $exit->stats->sp;
1883 1961
1884 $self->enter_link; 1962 $self->enter_link;
1885 1963
1886 (async { 1964 (async {
1887 $self->deactivate_recursive; # just to be sure 1965 $self->deactivate_recursive; # just to be sure
1888 unless (eval { 1966 unless (eval {
1889 prepare_random_map $exit 1967 $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 1968
1895 1; 1969 1;
1896 }) { 1970 }) {
1897 $self->message ("Something went wrong deep within the crossfire server. " 1971 $self->message ("Something went wrong deep within the crossfire server. "
1898 . "I'll try to bring you back to the map you were before. " 1972 . "I'll try to bring you back to the map you were before. "
… …
1959 # get handled first 2033 # get handled first
1960 my $queue = delete $ns->{query_queue} 2034 my $queue = delete $ns->{query_queue}
1961 or return; # be conservative, not sure how that can happen, but we saw a crash here 2035 or return; # be conservative, not sure how that can happen, but we saw a crash here
1962 2036
1963 (shift @$queue)->[1]->($msg); 2037 (shift @$queue)->[1]->($msg);
2038 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1964 2039
1965 push @{ $ns->{query_queue} }, @$queue; 2040 push @{ $ns->{query_queue} }, @$queue;
1966 2041
1967 if (@{ $ns->{query_queue} } == @$queue) { 2042 if (@{ $ns->{query_queue} } == @$queue) {
1968 if (@$queue) { 2043 if (@$queue) {
… …
2129The parameter C<$family> should best start with the name of the extension 2204The parameter C<$family> should best start with the name of the extension
2130using it, it should be unique. 2205using it, it should be unique.
2131 2206
2132=over 4 2207=over 4
2133 2208
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 2209=item $value = cf::db_get $family => $key
2141 2210
2142Returns a single value from the database 2211Returns 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 2212
2149=item cf::db_put $family => $key => $value 2213=item cf::db_put $family => $key => $value
2150 2214
2151Stores the given C<$value> in the family hash. Updates are delayed, if you 2215Stores 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 2216
2162=cut 2217=cut
2163 2218
2164our $DB; 2219our $DB;
2165 2220
2166{ 2221sub db_init {
2222 unless ($DB) {
2223 $DB = BDB::db_create $DB_ENV;
2224
2225 cf::sync_job {
2226 eval {
2227 $DB->set_flags (BDB::CHKSUM);
2228
2229 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2230 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2231 cf::cleanup "db_open(db): $!" if $!;
2232 };
2233 cf::cleanup "db_open(db): $@" if $@;
2234 };
2235
2167 my $path = cf::localdir . "/database.pst"; 2236 my $path = cf::localdir . "/database.pst";
2237 if (stat $path) {
2238 cf::sync_job {
2239 my $pst = Storable::retrieve $path;
2168 2240
2169 sub db_load() { 2241 cf::db_put (board => data => $pst->{board});
2170 $DB = stat $path ? Storable::retrieve $path : { }; 2242 cf::db_put (guildrules => data => $pst->{guildrules});
2171 } 2243 cf::db_put (rent => balance => $pst->{rent}{balance});
2244 BDB::db_env_txn_checkpoint $DB_ENV;
2172 2245
2173 my $pid; 2246 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 } 2247 };
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 }, 2248 }
2221 ); 2249 }
2250}
2251
2252sub db_get($$) {
2253 my $key = "$_[0]/$_[1]";
2254
2255 cf::sync_job {
2256 BDB::db_get $DB, undef, $key, my $data;
2257
2258 $! ? ()
2259 : Compress::LZF::sthaw $data
2260 }
2261}
2262
2263sub db_put($$$) {
2264 BDB::dbreq_pri 4;
2265 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2222} 2266}
2223 2267
2224############################################################################# 2268#############################################################################
2225# the server's main() 2269# the server's init and main functions
2270
2271sub init_resources {
2272 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2273 or die "unable to load regions file\n";#d#
2274}
2226 2275
2227sub cfg_load { 2276sub cfg_load {
2228 open my $fh, "<:utf8", cf::confdir . "/config" 2277 open my $fh, "<:utf8", cf::confdir . "/config"
2229 or return; 2278 or return;
2230 2279
… …
2243 }; 2292 };
2244 warn $@ if $@; 2293 warn $@ if $@;
2245 } 2294 }
2246} 2295}
2247 2296
2297sub init {
2298 init_resources;
2299}
2300
2248sub main { 2301sub main {
2249 # we must not ever block the main coroutine 2302 # we must not ever block the main coroutine
2250 local $Coro::idle = sub { 2303 local $Coro::idle = sub {
2251 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2304 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2305 (async {
2252 async { Event::one_event }; 2306 Event::one_event;
2307 })->prio (Coro::PRIO_MAX);
2253 }; 2308 };
2254 2309
2255 cfg_load; 2310 cfg_load;
2256 db_load; 2311 db_init;
2257 load_extensions; 2312 load_extensions;
2313
2314 $TICK_WATCHER->start;
2258 Event::loop; 2315 Event::loop;
2259} 2316}
2260 2317
2261############################################################################# 2318#############################################################################
2262# initialisation and cleanup 2319# initialisation and cleanup
2263 2320
2264# install some emergency cleanup handlers 2321# install some emergency cleanup handlers
2265BEGIN { 2322BEGIN {
2266 for my $signal (qw(INT HUP TERM)) { 2323 for my $signal (qw(INT HUP TERM)) {
2267 Event->signal ( 2324 Event->signal (
2325 reentrant => 0,
2268 data => WF_AUTOCANCEL, 2326 data => WF_AUTOCANCEL,
2269 signal => $signal, 2327 signal => $signal,
2328 prio => 0,
2270 cb => sub { 2329 cb => sub {
2271 cf::cleanup "SIG$signal"; 2330 cf::cleanup "SIG$signal";
2272 }, 2331 },
2273 ); 2332 );
2274 } 2333 }
2275} 2334}
… …
2280 warn "enter emergency perl save\n"; 2339 warn "enter emergency perl save\n";
2281 2340
2282 cf::sync_job { 2341 cf::sync_job {
2283 # use a peculiar iteration method to avoid tripping on perl 2342 # use a peculiar iteration method to avoid tripping on perl
2284 # refcount bugs in for. also avoids problems with players 2343 # refcount bugs in for. also avoids problems with players
2285 # and maps saved/Destroyed asynchronously. 2344 # and maps saved/destroyed asynchronously.
2286 warn "begin emergency player save\n"; 2345 warn "begin emergency player save\n";
2287 for my $login (keys %cf::PLAYER) { 2346 for my $login (keys %cf::PLAYER) {
2288 my $pl = $cf::PLAYER{$login} or next; 2347 my $pl = $cf::PLAYER{$login} or next;
2289 $pl->valid or next; 2348 $pl->valid or next;
2290 $pl->save; 2349 $pl->save;
… …
2296 my $map = $cf::MAP{$path} or next; 2355 my $map = $cf::MAP{$path} or next;
2297 $map->valid or next; 2356 $map->valid or next;
2298 $map->save; 2357 $map->save;
2299 } 2358 }
2300 warn "end emergency map save\n"; 2359 warn "end emergency map save\n";
2360
2361 warn "begin emergency database checkpoint\n";
2362 BDB::db_env_txn_checkpoint $DB_ENV;
2363 warn "end emergency database checkpoint\n";
2301 }; 2364 };
2302 2365
2303 warn "leave emergency perl save\n"; 2366 warn "leave emergency perl save\n";
2367}
2368
2369sub post_cleanup {
2370 my ($make_core) = @_;
2371
2372 warn Carp::longmess "post_cleanup backtrace"
2373 if $make_core;
2304} 2374}
2305 2375
2306sub reload() { 2376sub reload() {
2307 # can/must only be called in main 2377 # can/must only be called in main
2308 if ($Coro::current != $Coro::main) { 2378 if ($Coro::current != $Coro::main) {
2309 warn "can only reload from main coroutine\n"; 2379 warn "can only reload from main coroutine";
2310 return; 2380 return;
2311 } 2381 }
2312 2382
2313 warn "reloading..."; 2383 warn "reloading...";
2314 2384
2315 warn "freezing server"; 2385 warn "entering sync_job";
2316 my $guard = freeze_mainloop; 2386
2387 cf::sync_job {
2388 cf::write_runtime; # external watchdog should not bark
2317 cf::emergency_save; 2389 cf::emergency_save;
2390 cf::write_runtime; # external watchdog should not bark
2318 2391
2319 warn "sync database to disk"; 2392 warn "syncing database to disk";
2320 cf::db_sync; 2393 BDB::db_env_txn_checkpoint $DB_ENV;
2321 IO::AIO::flush;
2322 2394
2323 eval {
2324 # if anything goes wrong in here, we should simply crash as we already saved 2395 # if anything goes wrong in here, we should simply crash as we already saved
2325 2396
2326 warn "cancel all watchers"; 2397 warn "cancelling all WF_AUTOCANCEL watchers";
2327 for (Event::all_watchers) { 2398 for (Event::all_watchers) {
2328 $_->cancel if $_->data & WF_AUTOCANCEL; 2399 $_->cancel if $_->data & WF_AUTOCANCEL;
2329 } 2400 }
2330 2401
2402 warn "flushing outstanding aio requests";
2403 for (;;) {
2404 BDB::flush;
2405 IO::AIO::flush;
2406 Coro::cede;
2407 last unless IO::AIO::nreqs || BDB::nreqs;
2408 warn "iterate...";
2409 }
2410
2331 warn "cancel all extension coros"; 2411 warn "cancelling all extension coros";
2332 $_->cancel for values %EXT_CORO; 2412 $_->cancel for values %EXT_CORO;
2333 %EXT_CORO = (); 2413 %EXT_CORO = ();
2334 2414
2335 warn "remove commands"; 2415 warn "removing commands";
2336 %COMMAND = (); 2416 %COMMAND = ();
2337 2417
2338 warn "remove ext commands"; 2418 warn "removing ext commands";
2339 %EXTCMD = (); 2419 %EXTCMD = ();
2340 2420
2341 warn "unload/nuke all extensions"; 2421 warn "unloading/nuking all extensions";
2342 for my $pkg (@EXTS) { 2422 for my $pkg (@EXTS) {
2343 warn "... unloading $pkg"; 2423 warn "... unloading $pkg";
2344 2424
2345 if (my $cb = $pkg->can ("unload")) { 2425 if (my $cb = $pkg->can ("unload")) {
2346 eval { 2426 eval {
… …
2351 2431
2352 warn "... nuking $pkg"; 2432 warn "... nuking $pkg";
2353 Symbol::delete_package $pkg; 2433 Symbol::delete_package $pkg;
2354 } 2434 }
2355 2435
2356 warn "unload all perl modules loaded from $LIBDIR"; 2436 warn "unloading all perl modules loaded from $LIBDIR";
2357 while (my ($k, $v) = each %INC) { 2437 while (my ($k, $v) = each %INC) {
2358 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2438 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2359 2439
2360 warn "removing <$k>"; 2440 warn "... unloading $k";
2361 delete $INC{$k}; 2441 delete $INC{$k};
2362 2442
2363 $k =~ s/\.pm$//; 2443 $k =~ s/\.pm$//;
2364 $k =~ s/\//::/g; 2444 $k =~ s/\//::/g;
2365 2445
… …
2368 } 2448 }
2369 2449
2370 Symbol::delete_package $k; 2450 Symbol::delete_package $k;
2371 } 2451 }
2372 2452
2373 warn "get rid of safe::, as good as possible"; 2453 warn "getting rid of safe::, as good as possible";
2374 Symbol::delete_package "safe::$_" 2454 Symbol::delete_package "safe::$_"
2375 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2455 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2376 2456
2377 warn "unload cf.pm \"a bit\""; 2457 warn "unloading cf.pm \"a bit\"";
2378 delete $INC{"cf.pm"}; 2458 delete $INC{"cf.pm"};
2379 2459
2380 # don't, removes xs symbols, too, 2460 # don't, removes xs symbols, too,
2381 # and global variables created in xs 2461 # and global variables created in xs
2382 #Symbol::delete_package __PACKAGE__; 2462 #Symbol::delete_package __PACKAGE__;
2383 2463
2464 warn "unload completed, starting to reload now";
2465
2384 warn "reloading cf.pm"; 2466 warn "reloading cf.pm";
2385 require cf; 2467 require cf;
2386 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2468 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2387 2469
2388 warn "load config and database again"; 2470 warn "loading config and database again";
2389 cf::cfg_load; 2471 cf::cfg_load;
2390 cf::db_load;
2391 2472
2392 warn "load extensions"; 2473 warn "loading extensions";
2393 cf::load_extensions; 2474 cf::load_extensions;
2394 2475
2395 warn "reattach attachments to objects/players"; 2476 warn "reattaching attachments to objects/players";
2396 _global_reattach; 2477 _global_reattach; # objects, sockets
2397 warn "reattach attachments to maps"; 2478 warn "reattaching attachments to maps";
2398 reattach $_ for values %MAP; 2479 reattach $_ for values %MAP;
2399 }; 2480 warn "reattaching attachments to players";
2481 reattach $_ for values %PLAYER;
2400 2482
2401 if ($@) { 2483 warn "loading reloadable resources";
2484 init_resources;
2485
2486 warn "leaving sync_job";
2487
2488 1
2489 } or do {
2402 warn $@; 2490 warn $@;
2403 warn "error while reloading, exiting."; 2491 warn "error while reloading, exiting.";
2404 exit 1; 2492 exit 1;
2405 } 2493 };
2406 2494
2407 warn "reloaded"; 2495 warn "reloaded";
2408}; 2496};
2409 2497
2410############################################################################# 2498our $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 2499
2453register_command "reload" => sub { 2500register_command "reload" => sub {
2454 my ($who, $arg) = @_; 2501 my ($who, $arg) = @_;
2455 2502
2456 if ($who->flag (FLAG_WIZ)) { 2503 if ($who->flag (FLAG_WIZ)) {
2457 $who->message ("start of reload."); 2504 $who->message ("reloading server.");
2505
2506 # doing reload synchronously and two reloads happen back-to-back,
2507 # coro crashes during coro_state_free->destroy here.
2508
2509 $RELOAD_WATCHER ||= Event->timer (
2510 reentrant => 0,
2511 after => 0,
2512 data => WF_AUTOCANCEL,
2513 cb => sub {
2458 reload; 2514 reload;
2459 $who->message ("end of reload."); 2515 undef $RELOAD_WATCHER;
2516 },
2517 );
2460 } 2518 }
2461}; 2519};
2462 2520
2463unshift @INC, $LIBDIR; 2521unshift @INC, $LIBDIR;
2522
2523my $bug_warning = 0;
2464 2524
2465$TICK_WATCHER = Event->timer ( 2525$TICK_WATCHER = Event->timer (
2466 reentrant => 0, 2526 reentrant => 0,
2527 parked => 1,
2467 prio => 0, 2528 prio => 0,
2468 at => $NEXT_TICK || $TICK, 2529 at => $NEXT_TICK || $TICK,
2469 data => WF_AUTOCANCEL, 2530 data => WF_AUTOCANCEL,
2470 cb => sub { 2531 cb => sub {
2532 if ($Coro::current != $Coro::main) {
2533 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2534 unless ++$bug_warning > 10;
2535 return;
2536 }
2537
2538 $NOW = Event::time;
2539
2471 cf::server_tick; # one server iteration 2540 cf::server_tick; # one server iteration
2472 $RUNTIME += $TICK; 2541 $RUNTIME += $TICK;
2473 $NEXT_TICK += $TICK; 2542 $NEXT_TICK += $TICK;
2474 2543
2544 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2545 $NEXT_RUNTIME_WRITE = $NOW + 10;
2546 Coro::async_pool {
2547 write_runtime
2548 or warn "ERROR: unable to write runtime file: $!";
2549 };
2550 }
2551
2475 $WAIT_FOR_TICK->broadcast; 2552 $WAIT_FOR_TICK->broadcast;
2476 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2553 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2554
2555# my $AFTER = Event::time;
2556# warn $AFTER - $NOW;#d#
2477 2557
2478 # if we are delayed by four ticks or more, skip them all 2558 # if we are delayed by four ticks or more, skip them all
2479 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2559 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2480 2560
2481 $TICK_WATCHER->at ($NEXT_TICK); 2561 $TICK_WATCHER->at ($NEXT_TICK);
2482 $TICK_WATCHER->start; 2562 $TICK_WATCHER->start;
2483 }, 2563 },
2484); 2564);
2485 2565
2566{
2486IO::AIO::max_poll_time $TICK * 0.2; 2567 BDB::max_poll_time $TICK * 0.1;
2487 2568 $BDB_POLL_WATCHER = Event->io (
2488Event->io ( 2569 reentrant => 0,
2489 fd => IO::AIO::poll_fileno, 2570 fd => BDB::poll_fileno,
2490 poll => 'r', 2571 poll => 'r',
2491 prio => 5, 2572 prio => 0,
2492 data => WF_AUTOCANCEL,
2493 cb => \&IO::AIO::poll_cb,
2494);
2495
2496Event->timer (
2497 data => WF_AUTOCANCEL, 2573 data => WF_AUTOCANCEL,
2498 after => 0, 2574 cb => \&BDB::poll_cb,
2499 interval => 10, 2575 );
2500 cb => sub { 2576 BDB::min_parallel 8;
2501 (Coro::unblock_sub { 2577
2502 write_runtime 2578 BDB::set_sync_prepare {
2503 or warn "ERROR: unable to write runtime file: $!"; 2579 my $status;
2580 my $current = $Coro::current;
2581 (
2582 sub {
2583 $status = $!;
2584 $current->ready; undef $current;
2585 },
2586 sub {
2587 Coro::schedule while defined $current;
2588 $! = $status;
2589 },
2590 )
2591 };
2592
2593 unless ($DB_ENV) {
2594 $DB_ENV = BDB::db_env_create;
2595
2596 cf::sync_job {
2597 eval {
2598 BDB::db_env_open
2599 $DB_ENV,
2600 $BDB_ENV_DIR,
2601 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2602 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2603 0666;
2604
2605 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2606
2607 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2608 $DB_ENV->set_lk_detect;
2609 };
2610
2611 cf::cleanup "db_env_open(db): $@" if $@;
2504 })->(); 2612 };
2505 }, 2613 }
2506); 2614}
2615
2616{
2617 IO::AIO::min_parallel 8;
2618
2619 undef $Coro::AIO::WATCHER;
2620 IO::AIO::max_poll_time $TICK * 0.1;
2621 $AIO_POLL_WATCHER = Event->io (
2622 reentrant => 0,
2623 data => WF_AUTOCANCEL,
2624 fd => IO::AIO::poll_fileno,
2625 poll => 'r',
2626 prio => 6,
2627 cb => \&IO::AIO::poll_cb,
2628 );
2629}
2507 2630
2508END { cf::emergency_save } 2631END { cf::emergency_save }
2509 2632
25101 26331
2511 2634

Diff Legend

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