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.163 by root, Thu Jan 11 01:01:56 2007 UTC vs.
Revision 1.223 by root, Sun Mar 11 02:12:44 2007 UTC

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

Diff Legend

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