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.165 by root, Fri Jan 12 22:09:22 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 $self->{user_rel} || $self->{ext}
502 ? undef
503 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
504}
505
506sub customise_for {
507 my ($self, $map, $ob) = @_;
508
509 if ($map->per_player) {
510 return cf::map::find ("~" . $ob->name . "/" . $map->{path}{path});
511 }
512
513 $map
514}
515
516# this is somewhat ugly, but style maps do need special treatment
517sub is_style_map {
518 $_[0]{path} =~ m{^/styles/}
519}
520
521sub load_orig {
522 my ($self) = @_;
523
524 &cf::map::load_map_header ($self->load_path)
525}
526
527sub load_temp {
528 my ($self) = @_;
529
530 &cf::map::load_map_header ($self->save_path)
531}
532
533sub unlink_save {
534 my ($self) = @_;
535
536 utf8::encode (my $save = $self->save_path);
537 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
538 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
539}
540
541package cf;
542 390
543############################################################################# 391#############################################################################
544 392
545=head2 ATTACHABLE OBJECTS 393=head2 ATTACHABLE OBJECTS
546 394
… …
672our @CB_TYPE = (); # registry for type (cf-object class) based events 520our @CB_TYPE = (); # registry for type (cf-object class) based events
673our @CB_MAP = (); 521our @CB_MAP = ();
674 522
675my %attachment; 523my %attachment;
676 524
525sub cf::attachable::thawer_merge {
526 # simply override everything except _meta
527 local $_[0]{_meta};
528 %{$_[0]} = %{$_[1]};
529}
530
677sub _attach_cb($$$$) { 531sub _attach_cb($$$$) {
678 my ($registry, $event, $prio, $cb) = @_; 532 my ($registry, $event, $prio, $cb) = @_;
679 533
680 use sort 'stable'; 534 use sort 'stable';
681 535
… …
852# object support 706# object support
853 707
854sub reattach { 708sub reattach {
855 # basically do the same as instantiate, without calling instantiate 709 # basically do the same as instantiate, without calling instantiate
856 my ($obj) = @_; 710 my ($obj) = @_;
711
712 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
857 713
858 my $registry = $obj->registry; 714 my $registry = $obj->registry;
859 715
860 @$registry = (); 716 @$registry = ();
861 717
… …
908 $filename, length $$rdata, scalar @$objs; 764 $filename, length $$rdata, scalar @$objs;
909 765
910 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 766 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
911 chmod SAVE_MODE, $fh; 767 chmod SAVE_MODE, $fh;
912 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 768 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
913 aio_fsync $fh; 769 aio_fsync $fh if $cf::USE_FSYNC;
914 close $fh; 770 close $fh;
915 771
916 if (@$objs) { 772 if (@$objs) {
917 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) {
918 chmod SAVE_MODE, $fh; 774 chmod SAVE_MODE, $fh;
919 my $data = Storable::nfreeze { version => 1, objs => $objs }; 775 my $data = Storable::nfreeze { version => 1, objs => $objs };
920 aio_write $fh, 0, (length $data), $data, 0; 776 aio_write $fh, 0, (length $data), $data, 0;
921 aio_fsync $fh; 777 aio_fsync $fh if $cf::USE_FSYNC;
922 close $fh; 778 close $fh;
923 aio_rename "$filename.pst~", "$filename.pst"; 779 aio_rename "$filename.pst~", "$filename.pst";
924 } 780 }
925 } else { 781 } else {
926 aio_unlink "$filename.pst"; 782 aio_unlink "$filename.pst";
… …
1048 "package $pkg; use strict; use utf8;\n" 904 "package $pkg; use strict; use utf8;\n"
1049 . "#line 1 \"$path\"\n{\n" 905 . "#line 1 \"$path\"\n{\n"
1050 . (do { local $/; <$fh> }) 906 . (do { local $/; <$fh> })
1051 . "\n};\n1"; 907 . "\n};\n1";
1052 908
1053 eval $source 909 unless (eval $source) {
1054 or die $@ ? "$path: $@\n" 910 my $msg = $@ ? "$path: $@\n"
1055 : "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 }
1056 919
1057 push @EXTS, $pkg; 920 push @EXTS, $pkg;
1058} 921}
1059 922
1060sub load_extensions { 923sub load_extensions {
… …
1066 } or warn "$ext not loaded: $@"; 929 } or warn "$ext not loaded: $@";
1067 } 930 }
1068} 931}
1069 932
1070############################################################################# 933#############################################################################
1071# load/save/clean perl data associated with a map
1072
1073*cf::mapsupport::on_clean = sub {
1074 my ($map) = @_;
1075
1076 my $path = $map->tmpname;
1077 defined $path or return;
1078
1079 unlink "$path.pst";
1080};
1081
1082cf::map->attach (prio => -10000, package => cf::mapsupport::);
1083
1084#############################################################################
1085 934
1086=head2 CORE EXTENSIONS 935=head2 CORE EXTENSIONS
1087 936
1088Functions and methods that extend core crossfire objects. 937Functions and methods that extend core crossfire objects.
1089 938
… …
1125 974
1126sub exists($) { 975sub exists($) {
1127 my ($login) = @_; 976 my ($login) = @_;
1128 977
1129 $cf::PLAYER{$login} 978 $cf::PLAYER{$login}
1130 or cf::sync_job { !aio_stat $login } 979 or cf::sync_job { !aio_stat path $login }
1131} 980}
1132 981
1133sub find($) { 982sub find($) {
1134 return $cf::PLAYER{$_[0]} || do { 983 return $cf::PLAYER{$_[0]} || do {
1135 my $login = $_[0]; 984 my $login = $_[0];
… …
1181 1030
1182=cut 1031=cut
1183 1032
1184sub quit_character { 1033sub quit_character {
1185 my ($pl) = @_; 1034 my ($pl) = @_;
1035
1036 my $name = $pl->ob->name;
1186 1037
1187 $pl->{deny_save} = 1; 1038 $pl->{deny_save} = 1;
1188 $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
1189 1040
1190 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1041 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1195 my $path = playerdir $pl; 1046 my $path = playerdir $pl;
1196 my $temp = "$path~$cf::RUNTIME~deleting~"; 1047 my $temp = "$path~$cf::RUNTIME~deleting~";
1197 aio_rename $path, $temp; 1048 aio_rename $path, $temp;
1198 delete $cf::PLAYER{$pl->ob->name}; 1049 delete $cf::PLAYER{$pl->ob->name};
1199 $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
1200 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;
1201} 1072}
1202 1073
1203=item cf::player::list_logins 1074=item cf::player::list_logins
1204 1075
1205Returns 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
… …
1225 \@logins 1096 \@logins
1226} 1097}
1227 1098
1228=item $player->maps 1099=item $player->maps
1229 1100
1230Returns 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
1231player. May block. 1102player. May block.
1232 1103
1233=cut 1104=cut
1234 1105
1235sub maps($) { 1106sub maps($) {
1236 my ($pl) = @_; 1107 my ($pl) = @_;
1108
1109 $pl = ref $pl ? $pl->ob->name : $pl;
1237 1110
1238 my $files = aio_readdir playerdir $pl 1111 my $files = aio_readdir playerdir $pl
1239 or return; 1112 or return;
1240 1113
1241 my @paths; 1114 my @paths;
… …
1243 for (@$files) { 1116 for (@$files) {
1244 utf8::decode $_; 1117 utf8::decode $_;
1245 next if /\.(?:pl|pst)$/; 1118 next if /\.(?:pl|pst)$/;
1246 next unless /^$PATH_SEP/o; 1119 next unless /^$PATH_SEP/o;
1247 1120
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1121 push @paths, cf::map::normalise "~$pl/$_";
1249 } 1122 }
1250 1123
1251 \@paths 1124 \@paths
1252} 1125}
1253 1126
… …
1279package cf::map; 1152package cf::map;
1280 1153
1281use Fcntl; 1154use Fcntl;
1282use Coro::AIO; 1155use Coro::AIO;
1283 1156
1157use overload
1158 '""' => \&as_string,
1159 fallback => 1;
1160
1284our $MAX_RESET = 3600; 1161our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1162our $DEFAULT_RESET = 3000;
1286 1163
1287sub generate_random_map { 1164sub generate_random_map {
1288 my ($path, $rmp) = @_; 1165 my ($self, $rmp) = @_;
1289
1290 # mit "rum" bekleckern, nicht 1166 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map ( 1167 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1168 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1169 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1170 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1171 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1172 $rmp->{xsize}, $rmp->{ysize},
… …
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1177 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region}), $rmp->{custom} 1178 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 ) 1179 )
1305} 1180}
1306 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
1307# and all this just because we cannot iterate over 1311# and all this just because we cannot iterate over
1308# all maps in C++... 1312# all maps in C++...
1309sub change_all_map_light { 1313sub change_all_map_light {
1310 my ($change) = @_; 1314 my ($change) = @_;
1311 1315
1312 $_->change_map_light ($change) 1316 $_->change_map_light ($change)
1313 for grep $_->outdoor, values %cf::MAP; 1317 for grep $_->outdoor, values %cf::MAP;
1314} 1318}
1315 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
1316sub load_map_header($) { 1328sub load_header_from($) {
1317 my ($path) = @_; 1329 my ($self, $path) = @_;
1318 1330
1319 utf8::encode $path; 1331 utf8::encode $path;
1320 aio_open $path, O_RDONLY, 0 1332 #aio_open $path, O_RDONLY, 0
1333 # or return;
1334
1335 $self->_load_header ($path)
1321 or return; 1336 or return;
1322 1337
1323 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
1324 or return; 1381 or return;
1382 $self->prepare_orig;
1383 }
1325 1384
1326 # for better error messages only, will be overwritten later 1385 1
1327 $map->path ($path);
1328
1329 $map->load_header ($path)
1330 or return;
1331
1332 $map->{load_path} = $path;
1333
1334 $map
1335} 1386}
1336 1387
1337sub find; 1388sub find;
1338sub find { 1389sub find {
1339 my ($path, $origin) = @_; 1390 my ($path, $origin) = @_;
1340 1391
1341 #warn "find<$path,$origin>\n";#d#
1342
1343 $path = new cf::path $path, $origin && $origin->path; 1392 $path = normalise $path, $origin && $origin->path;
1344 my $key = $path->as_string;
1345 1393
1346 cf::lock_wait "map_find:$key"; 1394 cf::lock_wait "map_find:$path";
1347 1395
1348 $cf::MAP{$key} || do { 1396 $cf::MAP{$path} || do {
1349 my $guard = cf::lock_acquire "map_find:$key"; 1397 my $guard = cf::lock_acquire "map_find:$path";
1350 1398 my $map = new_from_path cf::map $path
1351 # do it the slow way
1352 my $map = $path->load_temp;
1353
1354 Coro::cede;
1355
1356 if ($map) {
1357 $map->last_access ((delete $map->{last_access})
1358 || $cf::RUNTIME); #d#
1359 # safety
1360 $map->{instantiate_time} = $cf::RUNTIME
1361 if $map->{instantiate_time} > $cf::RUNTIME;
1362 } else {
1363 $map = $path->load_orig
1364 or return; 1399 or return;
1365 1400
1366 $map->{load_original} = 1;
1367 $map->{instantiate_time} = $cf::RUNTIME;
1368 $map->last_access ($cf::RUNTIME);
1369 $map->instantiate;
1370
1371 # per-player maps become, after loading, normal maps
1372 $map->per_player (0) if $path->{user_rel};
1373 }
1374
1375 $map->path ($key);
1376 $map->{path} = $path;
1377 $map->{last_save} = $cf::RUNTIME; 1401 $map->{last_save} = $cf::RUNTIME;
1378 1402
1379 Coro::cede; 1403 $map->load_header
1404 or return;
1380 1405
1381 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;
1382 $map->reset; 1409 $map->reset;
1383 undef $guard; 1410 undef $guard;
1384 $map = find $path 1411 return find $path;
1385 or return;
1386 } 1412 }
1387 1413
1388 $cf::MAP{$key} = $map 1414 $cf::MAP{$path} = $map
1389 } 1415 }
1390} 1416}
1417
1418sub pre_load { }
1419sub post_load { }
1391 1420
1392sub load { 1421sub load {
1393 my ($self) = @_; 1422 my ($self) = @_;
1394 1423
1424 local $self->{deny_reset} = 1; # loading can take a long time
1425
1395 my $path = $self->{path}; 1426 my $path = $self->{path};
1396 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1427 my $guard = cf::lock_acquire "map_load:$path";
1397 1428
1398 return if $self->in_memory != cf::MAP_SWAPPED; 1429 return if $self->in_memory != cf::MAP_SWAPPED;
1399 1430
1400 $self->in_memory (cf::MAP_LOADING); 1431 $self->in_memory (cf::MAP_LOADING);
1401 1432
1402 $self->alloc; 1433 $self->alloc;
1434
1435 $self->pre_load;
1436
1403 $self->load_objects ($self->{load_path}, 1) 1437 $self->_load_objects ($self->{load_path}, 1)
1404 or return; 1438 or return;
1405 1439
1406 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1440 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1407 if delete $self->{load_original}; 1441 if delete $self->{load_original};
1408 1442
1409 if (my $uniq = $path->uniq_path) { 1443 if (my $uniq = $self->uniq_path) {
1410 utf8::encode $uniq; 1444 utf8::encode $uniq;
1411 if (aio_open $uniq, O_RDONLY, 0) { 1445 if (aio_open $uniq, O_RDONLY, 0) {
1412 $self->clear_unique_items; 1446 $self->clear_unique_items;
1413 $self->load_objects ($uniq, 0); 1447 $self->_load_objects ($uniq, 0);
1414 } 1448 }
1415 } 1449 }
1416 1450
1417 Coro::cede; 1451 Coro::cede;
1418 1452
1419 # now do the right thing for maps 1453 # now do the right thing for maps
1420 $self->link_multipart_objects; 1454 $self->link_multipart_objects;
1421 1455
1422 if ($self->{path}->is_style_map) { 1456 unless ($self->{deny_activate}) {
1423 $self->{deny_save} = 1;
1424 $self->{deny_reset} = 1;
1425 } else {
1426 $self->decay_objects; 1457 $self->decay_objects;
1427 $self->fix_auto_apply; 1458 $self->fix_auto_apply;
1428 $self->update_buttons; 1459 $self->update_buttons;
1460 Coro::cede;
1429 $self->set_darkness_map; 1461 $self->set_darkness_map;
1430 $self->difficulty ($self->estimate_difficulty) 1462 $self->difficulty ($self->estimate_difficulty)
1431 unless $self->difficulty; 1463 unless $self->difficulty;
1464 Coro::cede;
1432 $self->activate; 1465 $self->activate;
1433 } 1466 }
1434 1467
1435 Coro::cede; 1468 $self->post_load;
1436 1469
1437 $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
1438} 1480}
1439 1481
1440# 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
1441sub load_diag { 1483sub load_diag {
1442 my ($map) = @_; 1484 my ($map) = @_;
… …
1472 1514
1473 cf::sync_job { $map->load }; 1515 cf::sync_job { $map->load };
1474} 1516}
1475 1517
1476our %MAP_PREFETCH; 1518our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = Coro::async { 1519our $MAP_PREFETCHER = undef;
1478 while () {
1479 while (%MAP_PREFETCH) {
1480 my $key = each %MAP_PREFETCH
1481 or next;
1482 my $path = delete $MAP_PREFETCH{$key};
1483
1484 my $map = find $path
1485 or next;
1486 $map->load;
1487 }
1488 Coro::schedule;
1489 }
1490};
1491 1520
1492sub find_async { 1521sub find_async {
1493 my ($path, $origin) = @_; 1522 my ($path, $origin) = @_;
1494 1523
1495 $path = new cf::path $path, $origin && $origin->path; 1524 $path = normalise $path, $origin && $origin->{path};
1496 my $key = $path->as_string;
1497 1525
1498 if (my $map = $cf::MAP{$key}) { 1526 if (my $map = $cf::MAP{$path}) {
1499 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1527 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1500 } 1528 }
1501 1529
1502 $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 };
1503 $MAP_PREFETCHER->ready; 1543 $MAP_PREFETCHER->prio (6);
1504 1544
1505 () 1545 ()
1506} 1546}
1507 1547
1508sub save { 1548sub save {
… …
1512 1552
1513 $self->{last_save} = $cf::RUNTIME; 1553 $self->{last_save} = $cf::RUNTIME;
1514 1554
1515 return unless $self->dirty; 1555 return unless $self->dirty;
1516 1556
1517 my $save = $self->{path}->save_path; utf8::encode $save; 1557 my $save = $self->save_path; utf8::encode $save;
1518 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1558 my $uniq = $self->uniq_path; utf8::encode $uniq;
1519 1559
1520 $self->{load_path} = $save; 1560 $self->{load_path} = $save;
1521 1561
1522 return if $self->{deny_save}; 1562 return if $self->{deny_save};
1523 1563
… …
1526 cf::async { 1566 cf::async {
1527 $_->contr->save for $self->players; 1567 $_->contr->save for $self->players;
1528 }; 1568 };
1529 1569
1530 if ($uniq) { 1570 if ($uniq) {
1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1571 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1532 $self->save_objects ($uniq, cf::IO_UNIQUES); 1572 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1533 } else { 1573 } else {
1534 $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);
1535 } 1575 }
1536} 1576}
1537 1577
1538sub swap_out { 1578sub swap_out {
1539 my ($self) = @_; 1579 my ($self) = @_;
… …
1553 1593
1554sub reset_at { 1594sub reset_at {
1555 my ($self) = @_; 1595 my ($self) = @_;
1556 1596
1557 # TODO: safety, remove and allow resettable per-player maps 1597 # TODO: safety, remove and allow resettable per-player maps
1558 return 1e99 if $self->{path}{user_rel}; 1598 return 1e99 if $self->isa ("ext::map_per_player");#d#
1559 return 1e99 if $self->{deny_reset}; 1599 return 1e99 if $self->{deny_reset};
1560 1600
1561 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1601 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1562 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;
1563 1603
… …
1568 my ($self) = @_; 1608 my ($self) = @_;
1569 1609
1570 $self->reset_at <= $cf::RUNTIME 1610 $self->reset_at <= $cf::RUNTIME
1571} 1611}
1572 1612
1573sub rename {
1574 my ($self, $new_path) = @_;
1575
1576 $self->{path}->unlink_save;
1577
1578 delete $cf::MAP{$self->path};
1579 $self->{path} = new cf::path $new_path;
1580 $self->path ($self->{path}->as_string);
1581 $cf::MAP{$self->path} = $self;
1582
1583 $self->save;
1584}
1585
1586sub reset { 1613sub reset {
1587 my ($self) = @_; 1614 my ($self) = @_;
1588 1615
1589 my $lock = cf::lock_acquire "map_data:" . $self->path; 1616 my $lock = cf::lock_acquire "map_data:$self->{path}";
1590 1617
1591 return if $self->players; 1618 return if $self->players;
1592 return if $self->{path}{user_rel};#d# 1619 return if $self->isa ("ext::map_per_player");#d#
1593 1620
1594 warn "resetting map ", $self->path;#d# 1621 warn "resetting map ", $self->path;#d#
1595 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
1596 delete $cf::MAP{$self->path}; 1633 delete $cf::MAP{$self->path};
1597 1634
1635 $self->clear;
1636
1598 $_->clear_links_to ($self) for values %cf::MAP; 1637 $_->clear_links_to ($self) for values %cf::MAP;
1599 1638
1600 $self->{path}->unlink_save; 1639 $self->unlink_save;
1601 $self->destroy; 1640 $self->destroy;
1602} 1641}
1603 1642
1604my $nuke_counter = "aaaa"; 1643my $nuke_counter = "aaaa";
1605 1644
1606sub nuke { 1645sub nuke {
1607 my ($self) = @_; 1646 my ($self) = @_;
1608 1647
1648 delete $cf::MAP{$self->path};
1649
1650 $self->unlink_save;
1651
1652 bless $self, "cf::map";
1653 delete $self->{deny_reset};
1609 $self->{deny_save} = 1; 1654 $self->{deny_save} = 1;
1610 $self->reset_timeout (1); 1655 $self->reset_timeout (1);
1611 $self->rename ("{nuke}/" . ($nuke_counter++)); 1656 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1657
1658 $cf::MAP{$self->path} = $self;
1659
1612 $self->reset; # polite request, might not happen 1660 $self->reset; # polite request, might not happen
1613} 1661}
1614 1662
1615=item cf::map::unique_maps 1663=item cf::map::unique_maps
1616 1664
1617Returns an arrayref of cf::path's of all shared maps that have 1665Returns an arrayref of paths of all shared maps that have
1618instantiated unique items. May block. 1666instantiated unique items. May block.
1619 1667
1620=cut 1668=cut
1621 1669
1622sub unique_maps() { 1670sub unique_maps() {
… …
1628 for (@$files) { 1676 for (@$files) {
1629 utf8::decode $_; 1677 utf8::decode $_;
1630 next if /\.pst$/; 1678 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1679 next unless /^$PATH_SEP/o;
1632 1680
1633 push @paths, new cf::path $_; 1681 push @paths, cf::map::normalise $_;
1634 } 1682 }
1635 1683
1636 \@paths 1684 \@paths
1637} 1685}
1638 1686
… …
1713 1761
1714=item $player_object->enter_link 1762=item $player_object->enter_link
1715 1763
1716Freezes 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}>).
1717 1765
1718The 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
1719I<MUST> call C<leave_link> as soon as possible, though. 1767I<MUST> call C<leave_link> as soon as possible, though.
1720 1768
1769Will never block.
1770
1721=item $player_object->leave_link ($map, $x, $y) 1771=item $player_object->leave_link ($map, $x, $y)
1722 1772
1723Moves 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
1724map 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
1725location 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
1726to the emergency map position. 1776fails, to the emergency map position.
1727 1777
1728Might block. 1778Might block.
1729 1779
1730=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}
1731 1791
1732sub cf::object::player::enter_link { 1792sub cf::object::player::enter_link {
1733 my ($self) = @_; 1793 my ($self) = @_;
1734 1794
1735 $self->deactivate_recursive; 1795 $self->deactivate_recursive;
1736 1796
1737 return if $self->map == $LINK_MAP; 1797 return if UNIVERSAL::isa $self->map, "ext::map_link";
1738 1798
1739 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1799 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1740 if $self->map; 1800 if $self->map;
1741 1801
1742 $self->enter_map ($LINK_MAP, 20, 20); 1802 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1743} 1803}
1744 1804
1745sub cf::object::player::leave_link { 1805sub cf::object::player::leave_link {
1746 my ($self, $map, $x, $y) = @_; 1806 my ($self, $map, $x, $y) = @_;
1747 1807
… …
1769 $map->load; 1829 $map->load;
1770 $map->load_diag; 1830 $map->load_diag;
1771 1831
1772 return unless $self->contr->active; 1832 return unless $self->contr->active;
1773 $self->activate_recursive; 1833 $self->activate_recursive;
1834
1835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1774 $self->enter_map ($map, $x, $y); 1836 $self->enter_map ($map, $x, $y);
1775} 1837}
1776 1838
1777cf::player->attach ( 1839cf::player->attach (
1778 on_logout => sub { 1840 on_logout => sub {
… …
1791 # try to abort aborted map switching on player login :) 1853 # try to abort aborted map switching on player login :)
1792 # should happen only on crashes 1854 # should happen only on crashes
1793 if ($pl->ob->{_link_pos}) { 1855 if ($pl->ob->{_link_pos}) {
1794 $pl->ob->enter_link; 1856 $pl->ob->enter_link;
1795 (async { 1857 (async {
1796 # we need this sleep as the login has a concurrent enter_exit running
1797 # and this sleep increases chances of the player not ending up in scorn
1798 $pl->ob->reply (undef, 1858 $pl->ob->reply (undef,
1799 "There was an internal problem at your last logout, " 1859 "There was an internal problem at your last logout, "
1800 . "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.",
1801 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
1802 Coro::Timer::sleep 1; 1864 Coro::Timer::sleep 1;
1803 $pl->ob->leave_link; 1865 $pl->ob->leave_link;
1804 })->prio (2); 1866 })->prio (2);
1805 } 1867 }
1806 }, 1868 },
… …
1811=cut 1873=cut
1812 1874
1813sub cf::object::player::goto { 1875sub cf::object::player::goto {
1814 my ($self, $path, $x, $y) = @_; 1876 my ($self, $path, $x, $y) = @_;
1815 1877
1816 $path = new cf::path $path;
1817
1818 $self->enter_link; 1878 $self->enter_link;
1819 1879
1820 (async { 1880 (async {
1881 my $map = eval {
1821 my $map = cf::map::find $path->as_string; 1882 my $map = cf::map::find $path;
1822 $map = $map->{path}->customise_for ($map, $self) if $map; 1883 $map = $map->customise_for ($self) if $map;
1823 1884 $map
1824# warn "entering ", $map->path, " at ($x, $y)\n" 1885 } or
1825# if $map;
1826
1827 $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);
1828 1887
1829 $self->leave_link ($map, $x, $y); 1888 $self->leave_link ($map, $x, $y);
1830 })->prio (1); 1889 })->prio (1);
1831} 1890}
1832 1891
… …
1836 1895
1837sub parse_random_map_params { 1896sub parse_random_map_params {
1838 my ($spec) = @_; 1897 my ($spec) = @_;
1839 1898
1840 my $rmp = { # defaults 1899 my $rmp = { # defaults
1841 xsize => 10, 1900 xsize => (cf::rndm 15, 40),
1842 ysize => 10, 1901 ysize => (cf::rndm 15, 40),
1902 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1903 #layout => string,
1843 }; 1904 };
1844 1905
1845 for (split /\n/, $spec) { 1906 for (split /\n/, $spec) {
1846 my ($k, $v) = split /\s+/, $_, 2; 1907 my ($k, $v) = split /\s+/, $_, 2;
1847 1908
… …
1851 $rmp 1912 $rmp
1852} 1913}
1853 1914
1854sub prepare_random_map { 1915sub prepare_random_map {
1855 my ($exit) = @_; 1916 my ($exit) = @_;
1917
1918 my $guard = cf::lock_acquire "exit_prepare:$exit";
1856 1919
1857 # all this does is basically replace the /! path by 1920 # all this does is basically replace the /! path by
1858 # a new random map path (?random/...) with a seed 1921 # a new random map path (?random/...) with a seed
1859 # that depends on the exit object 1922 # that depends on the exit object
1860 1923
1861 my $rmp = parse_random_map_params $exit->msg; 1924 my $rmp = parse_random_map_params $exit->msg;
1862 1925
1863 if ($exit->map) { 1926 if ($exit->map) {
1864 $rmp->{region} = $exit->map->region_name; 1927 $rmp->{region} = $exit->region->name;
1865 $rmp->{origin_map} = $exit->map->path; 1928 $rmp->{origin_map} = $exit->map->path;
1866 $rmp->{origin_x} = $exit->x; 1929 $rmp->{origin_x} = $exit->x;
1867 $rmp->{origin_y} = $exit->y; 1930 $rmp->{origin_y} = $exit->y;
1868 } 1931 }
1869 1932
1870 $rmp->{random_seed} ||= $exit->random_seed; 1933 $rmp->{random_seed} ||= $exit->random_seed;
1871 1934
1872 my $data = cf::to_json $rmp; 1935 my $data = cf::to_json $rmp;
1873 my $md5 = Digest::MD5::md5_hex $data; 1936 my $md5 = Digest::MD5::md5_hex $data;
1937 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1874 1938
1875 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) {
1876 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;
1877 1943
1878 $exit->slaying ("?random/$md5"); 1944 $exit->slaying ("?random/$md5");
1879 $exit->msg (undef); 1945 $exit->msg (undef);
1880 } 1946 }
1881} 1947}
1882 1948
1883sub cf::object::player::enter_exit { 1949sub cf::object::player::enter_exit {
1884 my ($self, $exit) = @_; 1950 my ($self, $exit) = @_;
1885 1951
1886 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;
1887 1962
1888 $self->enter_link; 1963 $self->enter_link;
1889 1964
1890 (async { 1965 (async {
1891 $self->deactivate_recursive; # just to be sure 1966 $self->deactivate_recursive; # just to be sure
1892 unless (eval { 1967 unless (eval {
1893 prepare_random_map $exit 1968 $self->goto ($slaying, $hp, $sp);
1894 if $exit->slaying eq "/!";
1895
1896 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1897 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1898 1969
1899 1; 1970 1;
1900 }) { 1971 }) {
1901 $self->message ("Something went wrong deep within the crossfire server. " 1972 $self->message ("Something went wrong deep within the crossfire server. "
1902 . "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. "
… …
1963 # get handled first 2034 # get handled first
1964 my $queue = delete $ns->{query_queue} 2035 my $queue = delete $ns->{query_queue}
1965 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
1966 2037
1967 (shift @$queue)->[1]->($msg); 2038 (shift @$queue)->[1]->($msg);
2039 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1968 2040
1969 push @{ $ns->{query_queue} }, @$queue; 2041 push @{ $ns->{query_queue} }, @$queue;
1970 2042
1971 if (@{ $ns->{query_queue} } == @$queue) { 2043 if (@{ $ns->{query_queue} } == @$queue) {
1972 if (@$queue) { 2044 if (@$queue) {
… …
2133The 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
2134using it, it should be unique. 2206using it, it should be unique.
2135 2207
2136=over 4 2208=over 4
2137 2209
2138=item $hashref = cf::db_get $family
2139
2140Return a hashref for use by the extension C<$family>, which can be
2141modified. After modifications, you have to call C<cf::db_dirty> or
2142C<cf::db_sync>.
2143
2144=item $value = cf::db_get $family => $key 2210=item $value = cf::db_get $family => $key
2145 2211
2146Returns a single value from the database 2212Returns a single value from the database.
2147
2148=item cf::db_put $family => $hashref
2149
2150Stores the given family hashref into the database. Updates are delayed, if
2151you want the data to be synced to disk immediately, use C<cf::db_sync>.
2152 2213
2153=item cf::db_put $family => $key => $value 2214=item cf::db_put $family => $key => $value
2154 2215
2155Stores the given C<$value> in the family hash. Updates are delayed, if you 2216Stores the given C<$value> in the family.
2156want the data to be synced to disk immediately, use C<cf::db_sync>.
2157
2158=item cf::db_dirty
2159
2160Marks the database as dirty, to be updated at a later time.
2161
2162=item cf::db_sync
2163
2164Immediately write the database to disk I<if it is dirty>.
2165 2217
2166=cut 2218=cut
2167 2219
2168our $DB; 2220our $DB;
2169 2221
2170{ 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
2171 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;
2172 2241
2173 sub db_load() { 2242 cf::db_put (board => data => $pst->{board});
2174 $DB = stat $path ? Storable::retrieve $path : { }; 2243 cf::db_put (guildrules => data => $pst->{guildrules});
2175 } 2244 cf::db_put (rent => balance => $pst->{rent}{balance});
2245 BDB::db_env_txn_checkpoint $DB_ENV;
2176 2246
2177 my $pid; 2247 unlink $path;
2178
2179 sub db_save() {
2180 waitpid $pid, 0 if $pid;
2181 if (0 == ($pid = fork)) {
2182 $DB->{_meta}{version} = 1;
2183 Storable::nstore $DB, "$path~";
2184 rename "$path~", $path;
2185 cf::_exit 0 if defined $pid;
2186 } 2248 };
2187 }
2188
2189 my $dirty;
2190
2191 sub db_sync() {
2192 db_save if $dirty;
2193 undef $dirty;
2194 }
2195
2196 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2197 db_sync;
2198 });
2199
2200 sub db_dirty() {
2201 $dirty = 1;
2202 $idle->start;
2203 }
2204
2205 sub db_get($;$) {
2206 @_ >= 2
2207 ? $DB->{$_[0]}{$_[1]}
2208 : ($DB->{$_[0]} ||= { })
2209 }
2210
2211 sub db_put($$;$) {
2212 if (@_ >= 3) {
2213 $DB->{$_[0]}{$_[1]} = $_[2];
2214 } else {
2215 $DB->{$_[0]} = $_[1];
2216 }
2217 db_dirty;
2218 }
2219
2220 cf::global->attach (
2221 prio => 10000,
2222 on_cleanup => sub {
2223 db_sync;
2224 }, 2249 }
2225 ); 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 { };
2226} 2267}
2227 2268
2228############################################################################# 2269#############################################################################
2229# 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}
2230 2305
2231sub cfg_load { 2306sub cfg_load {
2232 open my $fh, "<:utf8", cf::confdir . "/config" 2307 open my $fh, "<:utf8", cf::confdir . "/config"
2233 or return; 2308 or return;
2234 2309
… …
2251 2326
2252sub main { 2327sub main {
2253 # we must not ever block the main coroutine 2328 # we must not ever block the main coroutine
2254 local $Coro::idle = sub { 2329 local $Coro::idle = sub {
2255 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 {
2256 async { Event::one_event }; 2332 Event::one_event;
2333 })->prio (Coro::PRIO_MAX);
2257 }; 2334 };
2258 2335
2259 cfg_load; 2336 cfg_load;
2260 db_load; 2337 db_init;
2261 load_extensions; 2338 load_extensions;
2339
2340 $TICK_WATCHER->start;
2262 Event::loop; 2341 Event::loop;
2263} 2342}
2264 2343
2265############################################################################# 2344#############################################################################
2266# initialisation and cleanup 2345# initialisation and cleanup
2267 2346
2268# install some emergency cleanup handlers 2347# install some emergency cleanup handlers
2269BEGIN { 2348BEGIN {
2270 for my $signal (qw(INT HUP TERM)) { 2349 for my $signal (qw(INT HUP TERM)) {
2271 Event->signal ( 2350 Event->signal (
2351 reentrant => 0,
2272 data => WF_AUTOCANCEL, 2352 data => WF_AUTOCANCEL,
2273 signal => $signal, 2353 signal => $signal,
2354 prio => 0,
2274 cb => sub { 2355 cb => sub {
2275 cf::cleanup "SIG$signal"; 2356 cf::cleanup "SIG$signal";
2276 }, 2357 },
2277 ); 2358 );
2278 } 2359 }
2279} 2360}
… …
2284 warn "enter emergency perl save\n"; 2365 warn "enter emergency perl save\n";
2285 2366
2286 cf::sync_job { 2367 cf::sync_job {
2287 # use a peculiar iteration method to avoid tripping on perl 2368 # use a peculiar iteration method to avoid tripping on perl
2288 # refcount bugs in for. also avoids problems with players 2369 # refcount bugs in for. also avoids problems with players
2289 # and maps saved/Destroyed asynchronously. 2370 # and maps saved/destroyed asynchronously.
2290 warn "begin emergency player save\n"; 2371 warn "begin emergency player save\n";
2291 for my $login (keys %cf::PLAYER) { 2372 for my $login (keys %cf::PLAYER) {
2292 my $pl = $cf::PLAYER{$login} or next; 2373 my $pl = $cf::PLAYER{$login} or next;
2293 $pl->valid or next; 2374 $pl->valid or next;
2294 $pl->save; 2375 $pl->save;
… …
2300 my $map = $cf::MAP{$path} or next; 2381 my $map = $cf::MAP{$path} or next;
2301 $map->valid or next; 2382 $map->valid or next;
2302 $map->save; 2383 $map->save;
2303 } 2384 }
2304 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";
2305 }; 2390 };
2306 2391
2307 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;
2308} 2400}
2309 2401
2310sub reload() { 2402sub reload() {
2311 # can/must only be called in main 2403 # can/must only be called in main
2312 if ($Coro::current != $Coro::main) { 2404 if ($Coro::current != $Coro::main) {
2313 warn "can only reload from main coroutine\n"; 2405 warn "can only reload from main coroutine";
2314 return; 2406 return;
2315 } 2407 }
2316 2408
2317 warn "reloading..."; 2409 warn "reloading...";
2318 2410
2319 warn "freezing server"; 2411 warn "entering sync_job";
2320 my $guard = freeze_mainloop; 2412
2413 cf::sync_job {
2414 cf::write_runtime; # external watchdog should not bark
2321 cf::emergency_save; 2415 cf::emergency_save;
2416 cf::write_runtime; # external watchdog should not bark
2322 2417
2323 warn "sync database to disk"; 2418 warn "syncing database to disk";
2324 cf::db_sync; 2419 BDB::db_env_txn_checkpoint $DB_ENV;
2325 IO::AIO::flush;
2326 2420
2327 eval {
2328 # 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
2329 2422
2330 warn "cancel all watchers"; 2423 warn "cancelling all WF_AUTOCANCEL watchers";
2331 for (Event::all_watchers) { 2424 for (Event::all_watchers) {
2332 $_->cancel if $_->data & WF_AUTOCANCEL; 2425 $_->cancel if $_->data & WF_AUTOCANCEL;
2333 } 2426 }
2334 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
2335 warn "cancel all extension coros"; 2439 warn "cancelling all extension coros";
2336 $_->cancel for values %EXT_CORO; 2440 $_->cancel for values %EXT_CORO;
2337 %EXT_CORO = (); 2441 %EXT_CORO = ();
2338 2442
2339 warn "remove commands"; 2443 warn "removing commands";
2340 %COMMAND = (); 2444 %COMMAND = ();
2341 2445
2342 warn "remove ext commands"; 2446 warn "removing ext commands";
2343 %EXTCMD = (); 2447 %EXTCMD = ();
2344 2448
2345 warn "unload/nuke all extensions"; 2449 warn "unloading/nuking all extensions";
2346 for my $pkg (@EXTS) { 2450 for my $pkg (@EXTS) {
2347 warn "... unloading $pkg"; 2451 warn "... unloading $pkg";
2348 2452
2349 if (my $cb = $pkg->can ("unload")) { 2453 if (my $cb = $pkg->can ("unload")) {
2350 eval { 2454 eval {
… …
2355 2459
2356 warn "... nuking $pkg"; 2460 warn "... nuking $pkg";
2357 Symbol::delete_package $pkg; 2461 Symbol::delete_package $pkg;
2358 } 2462 }
2359 2463
2360 warn "unload all perl modules loaded from $LIBDIR"; 2464 warn "unloading all perl modules loaded from $LIBDIR";
2361 while (my ($k, $v) = each %INC) { 2465 while (my ($k, $v) = each %INC) {
2362 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2466 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2363 2467
2364 warn "removing <$k>"; 2468 warn "... unloading $k";
2365 delete $INC{$k}; 2469 delete $INC{$k};
2366 2470
2367 $k =~ s/\.pm$//; 2471 $k =~ s/\.pm$//;
2368 $k =~ s/\//::/g; 2472 $k =~ s/\//::/g;
2369 2473
… …
2372 } 2476 }
2373 2477
2374 Symbol::delete_package $k; 2478 Symbol::delete_package $k;
2375 } 2479 }
2376 2480
2377 warn "get rid of safe::, as good as possible"; 2481 warn "getting rid of safe::, as good as possible";
2378 Symbol::delete_package "safe::$_" 2482 Symbol::delete_package "safe::$_"
2379 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);
2380 2484
2381 warn "unload cf.pm \"a bit\""; 2485 warn "unloading cf.pm \"a bit\"";
2382 delete $INC{"cf.pm"}; 2486 delete $INC{"cf.pm"};
2383 2487
2384 # don't, removes xs symbols, too, 2488 # don't, removes xs symbols, too,
2385 # and global variables created in xs 2489 # and global variables created in xs
2386 #Symbol::delete_package __PACKAGE__; 2490 #Symbol::delete_package __PACKAGE__;
2387 2491
2492 warn "unload completed, starting to reload now";
2493
2388 warn "reloading cf.pm"; 2494 warn "reloading cf.pm";
2389 require cf; 2495 require cf;
2390 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2496 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2391 2497
2392 warn "load config and database again"; 2498 warn "loading config and database again";
2393 cf::cfg_load; 2499 cf::cfg_load;
2394 cf::db_load;
2395 2500
2396 warn "load extensions"; 2501 warn "loading extensions";
2397 cf::load_extensions; 2502 cf::load_extensions;
2398 2503
2399 warn "reattach attachments to objects/players"; 2504 warn "reattaching attachments to objects/players";
2400 _global_reattach; 2505 _global_reattach; # objects, sockets
2401 warn "reattach attachments to maps"; 2506 warn "reattaching attachments to maps";
2402 reattach $_ for values %MAP; 2507 reattach $_ for values %MAP;
2403 }; 2508 warn "reattaching attachments to players";
2509 reattach $_ for values %PLAYER;
2404 2510
2405 if ($@) { 2511 warn "loading reloadable resources";
2512 reload_resources;
2513
2514 warn "leaving sync_job";
2515
2516 1
2517 } or do {
2406 warn $@; 2518 warn $@;
2407 warn "error while reloading, exiting."; 2519 warn "error while reloading, exiting.";
2408 exit 1; 2520 exit 1;
2409 } 2521 };
2410 2522
2411 warn "reloaded"; 2523 warn "reloaded";
2412}; 2524};
2413 2525
2414############################################################################# 2526our $RELOAD_WATCHER; # used only during reload
2415
2416unless ($LINK_MAP) {
2417 $LINK_MAP = cf::map::new;
2418
2419 $LINK_MAP->width (41);
2420 $LINK_MAP->height (41);
2421 $LINK_MAP->alloc;
2422 $LINK_MAP->path ("{link}");
2423 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2424 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2425
2426 # dirty hack because... archetypes are not yet loaded
2427 Event->timer (
2428 after => 10,
2429 cb => sub {
2430 $_[0]->w->cancel;
2431
2432 # provide some exits "home"
2433 my $exit = cf::object::new "exit";
2434
2435 $exit->slaying ($EMERGENCY_POSITION->[0]);
2436 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2437 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2438
2439 $LINK_MAP->insert ($exit->clone, 19, 19);
2440 $LINK_MAP->insert ($exit->clone, 19, 20);
2441 $LINK_MAP->insert ($exit->clone, 19, 21);
2442 $LINK_MAP->insert ($exit->clone, 20, 19);
2443 $LINK_MAP->insert ($exit->clone, 20, 21);
2444 $LINK_MAP->insert ($exit->clone, 21, 19);
2445 $LINK_MAP->insert ($exit->clone, 21, 20);
2446 $LINK_MAP->insert ($exit->clone, 21, 21);
2447
2448 $exit->destroy;
2449 });
2450
2451 $LINK_MAP->{deny_save} = 1;
2452 $LINK_MAP->{deny_reset} = 1;
2453
2454 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2455}
2456 2527
2457register_command "reload" => sub { 2528register_command "reload" => sub {
2458 my ($who, $arg) = @_; 2529 my ($who, $arg) = @_;
2459 2530
2460 if ($who->flag (FLAG_WIZ)) { 2531 if ($who->flag (FLAG_WIZ)) {
2461 $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 {
2462 reload; 2542 reload;
2463 $who->message ("end of reload."); 2543 undef $RELOAD_WATCHER;
2544 },
2545 );
2464 } 2546 }
2465}; 2547};
2466 2548
2467unshift @INC, $LIBDIR; 2549unshift @INC, $LIBDIR;
2550
2551my $bug_warning = 0;
2468 2552
2469$TICK_WATCHER = Event->timer ( 2553$TICK_WATCHER = Event->timer (
2470 reentrant => 0, 2554 reentrant => 0,
2555 parked => 1,
2471 prio => 0, 2556 prio => 0,
2472 at => $NEXT_TICK || $TICK, 2557 at => $NEXT_TICK || $TICK,
2473 data => WF_AUTOCANCEL, 2558 data => WF_AUTOCANCEL,
2474 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
2475 $NOW = Event::time; 2566 $NOW = Event::time;
2476 2567
2477 cf::server_tick; # one server iteration 2568 cf::server_tick; # one server iteration
2478 $RUNTIME += $TICK; 2569 $RUNTIME += $TICK;
2479 $NEXT_TICK += $TICK; 2570 $NEXT_TICK += $TICK;
2480 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
2481 $WAIT_FOR_TICK->broadcast; 2580 $WAIT_FOR_TICK->broadcast;
2482 $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#
2483 2585
2484 # 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
2485 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2587 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2486 2588
2487 $TICK_WATCHER->at ($NEXT_TICK); 2589 $TICK_WATCHER->at ($NEXT_TICK);
2488 $TICK_WATCHER->start; 2590 $TICK_WATCHER->start;
2489 }, 2591 },
2490); 2592);
2491 2593
2594{
2492IO::AIO::max_poll_time $TICK * 0.2; 2595 BDB::max_poll_time $TICK * 0.1;
2493 2596 $BDB_POLL_WATCHER = Event->io (
2494Event->io ( 2597 reentrant => 0,
2495 fd => IO::AIO::poll_fileno, 2598 fd => BDB::poll_fileno,
2496 poll => 'r', 2599 poll => 'r',
2497 prio => 5, 2600 prio => 0,
2498 data => WF_AUTOCANCEL,
2499 cb => \&IO::AIO::poll_cb,
2500);
2501
2502Event->timer (
2503 data => WF_AUTOCANCEL, 2601 data => WF_AUTOCANCEL,
2504 after => 0, 2602 cb => \&BDB::poll_cb,
2505 interval => 10, 2603 );
2506 cb => sub { 2604 BDB::min_parallel 8;
2507 (Coro::unblock_sub { 2605
2508 write_runtime 2606 BDB::set_sync_prepare {
2509 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 $@;
2510 })->(); 2640 };
2511 }, 2641 }
2512); 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}
2513 2658
2514END { cf::emergency_save } 2659END { cf::emergency_save }
2515 2660
25161 26611
2517 2662

Diff Legend

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