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

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

Diff Legend

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