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.159 by root, Wed Jan 10 22:50:12 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
… …
37our %COMMAND_TIME = (); 41our %COMMAND_TIME = ();
38 42
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
46our %EXT_MAP = (); # pluggable maps
42 47
48our $RELOAD; # number of reloads so far
43our @EVENT; 49our @EVENT;
44our $LIBDIR = datadir . "/ext"; 50our $LIBDIR = datadir . "/ext";
45 51
46our $TICK = MAX_TIME * 1e-6; 52our $TICK = MAX_TIME * 1e-6;
47our $TICK_WATCHER; 53our $TICK_WATCHER;
54our $AIO_POLL_WATCHER;
55our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
48our $NEXT_TICK; 56our $NEXT_TICK;
49our $NOW; 57our $NOW;
58our $USE_FSYNC = 1; # use fsync to write maps - default off
59
60our $BDB_POLL_WATCHER;
61our $DB_ENV;
50 62
51our %CFG; 63our %CFG;
52 64
53our $UPTIME; $UPTIME ||= time; 65our $UPTIME; $UPTIME ||= time;
54our $RUNTIME; 66our $RUNTIME;
55 67
56our %PLAYER; # all users 68our %PLAYER; # all users
57our %MAP; # all maps 69our %MAP; # all maps
58our $LINK_MAP; # the special {link} map 70our $LINK_MAP; # the special {link} map, which is always available
59our $RANDOM_MAPS = cf::localdir . "/random"; 71our $RANDOM_MAPS = cf::localdir . "/random";
72our $BDB_ENV_DIR = cf::localdir . "/db";
60 73
61our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 74our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
62our $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
63 79
64binmode STDOUT; 80binmode STDOUT;
65binmode STDERR; 81binmode STDERR;
66 82
67# read virtual server time, if available 83# read virtual server time, if available
… …
74mkdir cf::localdir; 90mkdir cf::localdir;
75mkdir cf::localdir . "/" . cf::playerdir; 91mkdir cf::localdir . "/" . cf::playerdir;
76mkdir cf::localdir . "/" . cf::tmpdir; 92mkdir cf::localdir . "/" . cf::tmpdir;
77mkdir cf::localdir . "/" . cf::uniquedir; 93mkdir cf::localdir . "/" . cf::uniquedir;
78mkdir $RANDOM_MAPS; 94mkdir $RANDOM_MAPS;
95mkdir $BDB_ENV_DIR;
79 96
80# a special map that is always available
81our $LINK_MAP;
82our $EMERGENCY_POSITION; 97our $EMERGENCY_POSITION;
98
99sub cf::map::normalise;
83 100
84############################################################################# 101#############################################################################
85 102
86=head2 GLOBAL VARIABLES 103=head2 GLOBAL VARIABLES
87 104
… …
255} 272}
256 273
257sub freeze_mainloop { 274sub freeze_mainloop {
258 return unless $TICK_WATCHER->is_active; 275 return unless $TICK_WATCHER->is_active;
259 276
260 my $guard = Coro::guard { $TICK_WATCHER->start }; 277 my $guard = Coro::guard {
278 $TICK_WATCHER->start;
279 };
261 $TICK_WATCHER->stop; 280 $TICK_WATCHER->stop;
262 $guard 281 $guard
263} 282}
264 283
265=item cf::async { BLOCK } 284=item cf::async { BLOCK }
… …
336 355
337 $coro 356 $coro
338} 357}
339 358
340sub write_runtime { 359sub write_runtime {
360 my $guard = cf::lock_acquire "write_runtime";
361
341 my $runtime = cf::localdir . "/runtime"; 362 my $runtime = cf::localdir . "/runtime";
342 363
343 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 364 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
344 or return; 365 or return;
345 366
367 my $value = $cf::RUNTIME + 90 + 10;
346 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
347 (aio_write $fh, 0, (length $value), $value, 0) <= 0 371 (aio_write $fh, 0, (length $value), $value, 0) <= 0
348 and return; 372 and return;
349 373
374 # always fsync - this file is important
350 aio_fsync $fh 375 aio_fsync $fh
351 and return; 376 and return;
352 377
353 close $fh 378 close $fh
354 or return; 379 or return;
… …
360} 385}
361 386
362=back 387=back
363 388
364=cut 389=cut
365
366#############################################################################
367
368package cf::path;
369
370use overload
371 '""' => \&as_string;
372
373# used to convert map paths into valid unix filenames by repalcing / by ∕
374our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
375
376sub new {
377 my ($class, $path, $base) = @_;
378
379 $path = $path->as_string if ref $path;
380
381 my $self = bless { }, $class;
382
383 # {... are special paths that are not touched
384 # ?xxx/... are special absolute paths
385 # ?random/... random maps
386 # /! non-realised random map exit
387 # /... normal maps
388 # ~/... per-player maps without a specific player (DO NOT USE)
389 # ~user/... per-player map of a specific user
390
391 $path =~ s/$PATH_SEP/\//go;
392
393 if ($path =~ /^{/) {
394 # fine as it is
395 } elsif ($path =~ s{^\?random/}{}) {
396 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
397 $self->{random} = cf::from_json $data;
398 } else {
399 if ($path =~ s{^~([^/]+)?}{}) {
400 $self->{user_rel} = 1;
401
402 if (defined $1) {
403 $self->{user} = $1;
404 } elsif ($base =~ m{^~([^/]+)/}) {
405 $self->{user} = $1;
406 } else {
407 warn "cannot resolve user-relative path without user <$path,$base>\n";
408 }
409 } elsif ($path =~ /^\//) {
410 # already absolute
411 } else {
412 $base =~ s{[^/]+/?$}{};
413 return $class->new ("$base/$path");
414 }
415
416 for ($path) {
417 redo if s{/\.?/}{/};
418 redo if s{/[^/]+/\.\./}{/};
419 }
420 }
421
422 $self->{path} = $path;
423
424 $self
425}
426
427# the name / primary key / in-game path
428sub as_string {
429 my ($self) = @_;
430
431 $self->{user_rel} ? "~$self->{user}$self->{path}"
432 : $self->{random} ? "?random/$self->{path}"
433 : $self->{path}
434}
435
436# the displayed name, this is a one way mapping
437sub visible_name {
438 my ($self) = @_;
439
440# if (my $rmp = $self->{random}) {
441# # todo: be more intelligent about this
442# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
443# } else {
444 $self->as_string
445# }
446}
447
448# escape the /'s in the path
449sub _escaped_path {
450 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
451 $path
452}
453
454# the original (read-only) location
455sub load_path {
456 my ($self) = @_;
457
458 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
459}
460
461# the temporary/swap location
462sub save_path {
463 my ($self) = @_;
464
465 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
466 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
467 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
468}
469
470# the unique path, might be eq to save_path
471sub uniq_path {
472 my ($self) = @_;
473
474 $self->{user_rel} || $self->{random}
475 ? undef
476 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
477}
478
479# return random map parameters, or undef
480sub random_map_params {
481 my ($self) = @_;
482
483 $self->{random}
484}
485
486# this is somewhat ugly, but style maps do need special treatment
487sub is_style_map {
488 $_[0]{path} =~ m{^/styles/}
489}
490
491package cf;
492 390
493############################################################################# 391#############################################################################
494 392
495=head2 ATTACHABLE OBJECTS 393=head2 ATTACHABLE OBJECTS
496 394
… …
622our @CB_TYPE = (); # registry for type (cf-object class) based events 520our @CB_TYPE = (); # registry for type (cf-object class) based events
623our @CB_MAP = (); 521our @CB_MAP = ();
624 522
625my %attachment; 523my %attachment;
626 524
525sub cf::attachable::thawer_merge {
526 # simply override everything except _meta
527 local $_[0]{_meta};
528 %{$_[0]} = %{$_[1]};
529}
530
627sub _attach_cb($$$$) { 531sub _attach_cb($$$$) {
628 my ($registry, $event, $prio, $cb) = @_; 532 my ($registry, $event, $prio, $cb) = @_;
629 533
630 use sort 'stable'; 534 use sort 'stable';
631 535
… …
802# object support 706# object support
803 707
804sub reattach { 708sub reattach {
805 # basically do the same as instantiate, without calling instantiate 709 # basically do the same as instantiate, without calling instantiate
806 my ($obj) = @_; 710 my ($obj) = @_;
711
712 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
807 713
808 my $registry = $obj->registry; 714 my $registry = $obj->registry;
809 715
810 @$registry = (); 716 @$registry = ();
811 717
… …
858 $filename, length $$rdata, scalar @$objs; 764 $filename, length $$rdata, scalar @$objs;
859 765
860 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 766 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
861 chmod SAVE_MODE, $fh; 767 chmod SAVE_MODE, $fh;
862 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 768 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
863 aio_fsync $fh; 769 aio_fsync $fh if $cf::USE_FSYNC;
864 close $fh; 770 close $fh;
865 771
866 if (@$objs) { 772 if (@$objs) {
867 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) {
868 chmod SAVE_MODE, $fh; 774 chmod SAVE_MODE, $fh;
869 my $data = Storable::nfreeze { version => 1, objs => $objs }; 775 my $data = Storable::nfreeze { version => 1, objs => $objs };
870 aio_write $fh, 0, (length $data), $data, 0; 776 aio_write $fh, 0, (length $data), $data, 0;
871 aio_fsync $fh; 777 aio_fsync $fh if $cf::USE_FSYNC;
872 close $fh; 778 close $fh;
873 aio_rename "$filename.pst~", "$filename.pst"; 779 aio_rename "$filename.pst~", "$filename.pst";
874 } 780 }
875 } else { 781 } else {
876 aio_unlink "$filename.pst"; 782 aio_unlink "$filename.pst";
… …
987 my $base = $1; 893 my $base = $1;
988 my $pkg = $1; 894 my $pkg = $1;
989 $pkg =~ s/[^[:word:]]/_/g; 895 $pkg =~ s/[^[:word:]]/_/g;
990 $pkg = "ext::$pkg"; 896 $pkg = "ext::$pkg";
991 897
992 warn "loading '$path' into '$pkg'\n"; 898 warn "... loading '$path' into '$pkg'\n";
993 899
994 open my $fh, "<:utf8", $path 900 open my $fh, "<:utf8", $path
995 or die "$path: $!"; 901 or die "$path: $!";
996 902
997 my $source = 903 my $source =
998 "package $pkg; use strict; use utf8;\n" 904 "package $pkg; use strict; use utf8;\n"
999 . "#line 1 \"$path\"\n{\n" 905 . "#line 1 \"$path\"\n{\n"
1000 . (do { local $/; <$fh> }) 906 . (do { local $/; <$fh> })
1001 . "\n};\n1"; 907 . "\n};\n1";
1002 908
1003 eval $source 909 unless (eval $source) {
1004 or die $@ ? "$path: $@\n" 910 my $msg = $@ ? "$path: $@\n"
1005 : "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 }
1006 919
1007 push @EXTS, $pkg; 920 push @EXTS, $pkg;
1008} 921}
1009 922
1010sub load_extensions { 923sub load_extensions {
… …
1016 } or warn "$ext not loaded: $@"; 929 } or warn "$ext not loaded: $@";
1017 } 930 }
1018} 931}
1019 932
1020############################################################################# 933#############################################################################
1021# load/save/clean perl data associated with a map
1022
1023*cf::mapsupport::on_clean = sub {
1024 my ($map) = @_;
1025
1026 my $path = $map->tmpname;
1027 defined $path or return;
1028
1029 unlink "$path.pst";
1030};
1031
1032cf::map->attach (prio => -10000, package => cf::mapsupport::);
1033
1034#############################################################################
1035 934
1036=head2 CORE EXTENSIONS 935=head2 CORE EXTENSIONS
1037 936
1038Functions and methods that extend core crossfire objects. 937Functions and methods that extend core crossfire objects.
1039 938
… …
1075 974
1076sub exists($) { 975sub exists($) {
1077 my ($login) = @_; 976 my ($login) = @_;
1078 977
1079 $cf::PLAYER{$login} 978 $cf::PLAYER{$login}
1080 or cf::sync_job { !aio_stat $login } 979 or cf::sync_job { !aio_stat path $login }
1081} 980}
1082 981
1083sub find($) { 982sub find($) {
1084 return $cf::PLAYER{$_[0]} || do { 983 return $cf::PLAYER{$_[0]} || do {
1085 my $login = $_[0]; 984 my $login = $_[0];
… …
1131 1030
1132=cut 1031=cut
1133 1032
1134sub quit_character { 1033sub quit_character {
1135 my ($pl) = @_; 1034 my ($pl) = @_;
1035
1036 my $name = $pl->ob->name;
1136 1037
1137 $pl->{deny_save} = 1; 1038 $pl->{deny_save} = 1;
1138 $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
1139 1040
1140 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1041 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1145 my $path = playerdir $pl; 1046 my $path = playerdir $pl;
1146 my $temp = "$path~$cf::RUNTIME~deleting~"; 1047 my $temp = "$path~$cf::RUNTIME~deleting~";
1147 aio_rename $path, $temp; 1048 aio_rename $path, $temp;
1148 delete $cf::PLAYER{$pl->ob->name}; 1049 delete $cf::PLAYER{$pl->ob->name};
1149 $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
1150 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;
1151} 1072}
1152 1073
1153=item cf::player::list_logins 1074=item cf::player::list_logins
1154 1075
1155Returns 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
… …
1175 \@logins 1096 \@logins
1176} 1097}
1177 1098
1178=item $player->maps 1099=item $player->maps
1179 1100
1180Returns 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
1181player. May block. 1102player. May block.
1182 1103
1183=cut 1104=cut
1184 1105
1185sub maps($) { 1106sub maps($) {
1186 my ($pl) = @_; 1107 my ($pl) = @_;
1108
1109 $pl = ref $pl ? $pl->ob->name : $pl;
1187 1110
1188 my $files = aio_readdir playerdir $pl 1111 my $files = aio_readdir playerdir $pl
1189 or return; 1112 or return;
1190 1113
1191 my @paths; 1114 my @paths;
… …
1193 for (@$files) { 1116 for (@$files) {
1194 utf8::decode $_; 1117 utf8::decode $_;
1195 next if /\.(?:pl|pst)$/; 1118 next if /\.(?:pl|pst)$/;
1196 next unless /^$PATH_SEP/o; 1119 next unless /^$PATH_SEP/o;
1197 1120
1198 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1121 push @paths, cf::map::normalise "~$pl/$_";
1199 } 1122 }
1200 1123
1201 \@paths 1124 \@paths
1202} 1125}
1203 1126
… …
1229package cf::map; 1152package cf::map;
1230 1153
1231use Fcntl; 1154use Fcntl;
1232use Coro::AIO; 1155use Coro::AIO;
1233 1156
1157use overload
1158 '""' => \&as_string,
1159 fallback => 1;
1160
1234our $MAX_RESET = 3600; 1161our $MAX_RESET = 3600;
1235our $DEFAULT_RESET = 3000; 1162our $DEFAULT_RESET = 3000;
1236 1163
1237sub generate_random_map { 1164sub generate_random_map {
1238 my ($path, $rmp) = @_; 1165 my ($self, $rmp) = @_;
1239
1240 # mit "rum" bekleckern, nicht 1166 # mit "rum" bekleckern, nicht
1241 cf::map::_create_random_map 1167 $self->_create_random_map (
1242 $path,
1243 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1168 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1244 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1169 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1245 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1170 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1246 $rmp->{exit_on_final_map}, 1171 $rmp->{exit_on_final_map},
1247 $rmp->{xsize}, $rmp->{ysize}, 1172 $rmp->{xsize}, $rmp->{ysize},
1248 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1173 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1249 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1174 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1250 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1175 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1251 $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},
1252 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1177 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1253 (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
1254} 1309}
1255 1310
1256# and all this just because we cannot iterate over 1311# and all this just because we cannot iterate over
1257# all maps in C++... 1312# all maps in C++...
1258sub change_all_map_light { 1313sub change_all_map_light {
… …
1260 1315
1261 $_->change_map_light ($change) 1316 $_->change_map_light ($change)
1262 for grep $_->outdoor, values %cf::MAP; 1317 for grep $_->outdoor, values %cf::MAP;
1263} 1318}
1264 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
1265sub try_load_header($) { 1328sub load_header_from($) {
1266 my ($path) = @_; 1329 my ($self, $path) = @_;
1267 1330
1268 utf8::encode $path; 1331 utf8::encode $path;
1269 aio_open $path, O_RDONLY, 0 1332 #aio_open $path, O_RDONLY, 0
1333 # or return;
1334
1335 $self->_load_header ($path)
1270 or return; 1336 or return;
1271 1337
1272 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
1273 or return; 1381 or return;
1382 $self->prepare_orig;
1383 }
1274 1384
1275 # for better error messages only, will be overwritten 1385 1
1276 $map->path ($path);
1277
1278 $map->load_header ($path)
1279 or return;
1280
1281 $map->{load_path} = $path;
1282
1283 $map
1284} 1386}
1285 1387
1286sub find; 1388sub find;
1287sub find { 1389sub find {
1288 my ($path, $origin) = @_; 1390 my ($path, $origin) = @_;
1289 1391
1290 #warn "find<$path,$origin>\n";#d#
1291
1292 $path = new cf::path $path, $origin && $origin->path; 1392 $path = normalise $path, $origin && $origin->path;
1293 my $key = $path->as_string;
1294 1393
1295 cf::lock_wait "map_find:$key"; 1394 cf::lock_wait "map_find:$path";
1296 1395
1297 $cf::MAP{$key} || do { 1396 $cf::MAP{$path} || do {
1298 my $guard = cf::lock_acquire "map_find:$key"; 1397 my $guard = cf::lock_acquire "map_find:$path";
1299 1398 my $map = new_from_path cf::map $path
1300 # do it the slow way
1301 my $map = try_load_header $path->save_path;
1302
1303 Coro::cede;
1304
1305 if ($map) {
1306 $map->last_access ((delete $map->{last_access})
1307 || $cf::RUNTIME); #d#
1308 # safety
1309 $map->{instantiate_time} = $cf::RUNTIME
1310 if $map->{instantiate_time} > $cf::RUNTIME;
1311 } else {
1312 if (my $rmp = $path->random_map_params) {
1313 $map = generate_random_map $key, $rmp;
1314 } else {
1315 $map = try_load_header $path->load_path;
1316 }
1317
1318 $map or return; 1399 or return;
1319 1400
1320 $map->{load_original} = 1;
1321 $map->{instantiate_time} = $cf::RUNTIME;
1322 $map->last_access ($cf::RUNTIME);
1323 $map->instantiate;
1324
1325 # per-player maps become, after loading, normal maps
1326 $map->per_player (0) if $path->{user_rel};
1327 }
1328
1329 $map->path ($key);
1330 $map->{path} = $path;
1331 $map->{last_save} = $cf::RUNTIME; 1401 $map->{last_save} = $cf::RUNTIME;
1332 1402
1333 Coro::cede; 1403 $map->load_header
1404 or return;
1334 1405
1335 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;
1336 $map->reset; 1409 $map->reset;
1337 undef $guard; 1410 undef $guard;
1338 $map = find $path 1411 return find $path;
1339 or return;
1340 } 1412 }
1341 1413
1342 $cf::MAP{$key} = $map 1414 $cf::MAP{$path} = $map
1343 } 1415 }
1344} 1416}
1417
1418sub pre_load { }
1419sub post_load { }
1345 1420
1346sub load { 1421sub load {
1347 my ($self) = @_; 1422 my ($self) = @_;
1348 1423
1424 local $self->{deny_reset} = 1; # loading can take a long time
1425
1349 my $path = $self->{path}; 1426 my $path = $self->{path};
1350 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1427 my $guard = cf::lock_acquire "map_load:$path";
1351 1428
1352 return if $self->in_memory != cf::MAP_SWAPPED; 1429 return if $self->in_memory != cf::MAP_SWAPPED;
1353 1430
1354 $self->in_memory (cf::MAP_LOADING); 1431 $self->in_memory (cf::MAP_LOADING);
1355 1432
1356 $self->alloc; 1433 $self->alloc;
1434
1435 $self->pre_load;
1436
1357 $self->load_objects ($self->{load_path}, 1) 1437 $self->_load_objects ($self->{load_path}, 1)
1358 or return; 1438 or return;
1359 1439
1360 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1440 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1361 if delete $self->{load_original}; 1441 if delete $self->{load_original};
1362 1442
1363 if (my $uniq = $path->uniq_path) { 1443 if (my $uniq = $self->uniq_path) {
1364 utf8::encode $uniq; 1444 utf8::encode $uniq;
1365 if (aio_open $uniq, O_RDONLY, 0) { 1445 if (aio_open $uniq, O_RDONLY, 0) {
1366 $self->clear_unique_items; 1446 $self->clear_unique_items;
1367 $self->load_objects ($uniq, 0); 1447 $self->_load_objects ($uniq, 0);
1368 } 1448 }
1369 } 1449 }
1370 1450
1371 Coro::cede; 1451 Coro::cede;
1372 1452
1373 # now do the right thing for maps 1453 # now do the right thing for maps
1374 $self->link_multipart_objects; 1454 $self->link_multipart_objects;
1375 1455
1376 if ($self->{path}->is_style_map) { 1456 unless ($self->{deny_activate}) {
1377 $self->{deny_save} = 1; 1457 $self->decay_objects;
1378 $self->{deny_reset} = 1;
1379 } else {
1380 $self->fix_auto_apply; 1458 $self->fix_auto_apply;
1381 $self->decay_objects;
1382 $self->update_buttons; 1459 $self->update_buttons;
1460 Coro::cede;
1383 $self->set_darkness_map; 1461 $self->set_darkness_map;
1384 $self->difficulty ($self->estimate_difficulty) 1462 $self->difficulty ($self->estimate_difficulty)
1385 unless $self->difficulty; 1463 unless $self->difficulty;
1464 Coro::cede;
1386 $self->activate; 1465 $self->activate;
1387 } 1466 }
1388 1467
1389 Coro::cede; 1468 $self->post_load;
1390 1469
1391 $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
1392} 1480}
1393 1481
1394# 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
1395sub load_diag { 1483sub load_diag {
1396 my ($map) = @_; 1484 my ($map) = @_;
… …
1426 1514
1427 cf::sync_job { $map->load }; 1515 cf::sync_job { $map->load };
1428} 1516}
1429 1517
1430our %MAP_PREFETCH; 1518our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async { 1519our $MAP_PREFETCHER = undef;
1432 while () {
1433 while (%MAP_PREFETCH) {
1434 my $key = each %MAP_PREFETCH
1435 or next;
1436 my $path = delete $MAP_PREFETCH{$key};
1437
1438 my $map = find $path
1439 or next;
1440 $map->load;
1441 }
1442 Coro::schedule;
1443 }
1444};
1445 1520
1446sub find_async { 1521sub find_async {
1447 my ($path, $origin) = @_; 1522 my ($path, $origin) = @_;
1448 1523
1449 $path = new cf::path $path, $origin && $origin->path; 1524 $path = normalise $path, $origin && $origin->{path};
1450 my $key = $path->as_string;
1451 1525
1452 if (my $map = $cf::MAP{$key}) { 1526 if (my $map = $cf::MAP{$path}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1527 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 } 1528 }
1455 1529
1456 $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 };
1457 $MAP_PREFETCHER->ready; 1543 $MAP_PREFETCHER->prio (6);
1458 1544
1459 () 1545 ()
1460} 1546}
1461 1547
1462sub save { 1548sub save {
… …
1466 1552
1467 $self->{last_save} = $cf::RUNTIME; 1553 $self->{last_save} = $cf::RUNTIME;
1468 1554
1469 return unless $self->dirty; 1555 return unless $self->dirty;
1470 1556
1471 my $save = $self->{path}->save_path; utf8::encode $save; 1557 my $save = $self->save_path; utf8::encode $save;
1472 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1558 my $uniq = $self->uniq_path; utf8::encode $uniq;
1473 1559
1474 $self->{load_path} = $save; 1560 $self->{load_path} = $save;
1475 1561
1476 return if $self->{deny_save}; 1562 return if $self->{deny_save};
1477 1563
… …
1480 cf::async { 1566 cf::async {
1481 $_->contr->save for $self->players; 1567 $_->contr->save for $self->players;
1482 }; 1568 };
1483 1569
1484 if ($uniq) { 1570 if ($uniq) {
1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1571 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1486 $self->save_objects ($uniq, cf::IO_UNIQUES); 1572 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1487 } else { 1573 } else {
1488 $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);
1489 } 1575 }
1490} 1576}
1491 1577
1492sub swap_out { 1578sub swap_out {
1493 my ($self) = @_; 1579 my ($self) = @_;
… …
1507 1593
1508sub reset_at { 1594sub reset_at {
1509 my ($self) = @_; 1595 my ($self) = @_;
1510 1596
1511 # TODO: safety, remove and allow resettable per-player maps 1597 # TODO: safety, remove and allow resettable per-player maps
1512 return 1e99 if $self->{path}{user_rel}; 1598 return 1e99 if $self->isa ("ext::map_per_player");#d#
1513 return 1e99 if $self->{deny_reset}; 1599 return 1e99 if $self->{deny_reset};
1514 1600
1515 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1601 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1516 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;
1517 1603
… …
1522 my ($self) = @_; 1608 my ($self) = @_;
1523 1609
1524 $self->reset_at <= $cf::RUNTIME 1610 $self->reset_at <= $cf::RUNTIME
1525} 1611}
1526 1612
1527sub unlink_save {
1528 my ($self) = @_;
1529
1530 utf8::encode (my $save = $self->{path}->save_path);
1531 aioreq_pri 3; IO::AIO::aio_unlink $save;
1532 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1533}
1534
1535sub rename {
1536 my ($self, $new_path) = @_;
1537
1538 $self->unlink_save;
1539
1540 delete $cf::MAP{$self->path};
1541 $self->{path} = new cf::path $new_path;
1542 $self->path ($self->{path}->as_string);
1543 $cf::MAP{$self->path} = $self;
1544
1545 $self->save;
1546}
1547
1548sub reset { 1613sub reset {
1549 my ($self) = @_; 1614 my ($self) = @_;
1550 1615
1551 my $lock = cf::lock_acquire "map_data:" . $self->path; 1616 my $lock = cf::lock_acquire "map_data:$self->{path}";
1552 1617
1553 return if $self->players; 1618 return if $self->players;
1554 return if $self->{path}{user_rel};#d# 1619 return if $self->isa ("ext::map_per_player");#d#
1555 1620
1556 warn "resetting map ", $self->path;#d# 1621 warn "resetting map ", $self->path;#d#
1557 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
1558 delete $cf::MAP{$self->path}; 1633 delete $cf::MAP{$self->path};
1634
1635 $self->clear;
1559 1636
1560 $_->clear_links_to ($self) for values %cf::MAP; 1637 $_->clear_links_to ($self) for values %cf::MAP;
1561 1638
1562 $self->unlink_save; 1639 $self->unlink_save;
1563 $self->destroy; 1640 $self->destroy;
… …
1566my $nuke_counter = "aaaa"; 1643my $nuke_counter = "aaaa";
1567 1644
1568sub nuke { 1645sub nuke {
1569 my ($self) = @_; 1646 my ($self) = @_;
1570 1647
1648 delete $cf::MAP{$self->path};
1649
1650 $self->unlink_save;
1651
1652 bless $self, "cf::map";
1653 delete $self->{deny_reset};
1571 $self->{deny_save} = 1; 1654 $self->{deny_save} = 1;
1572 $self->reset_timeout (1); 1655 $self->reset_timeout (1);
1573 $self->rename ("{nuke}/" . ($nuke_counter++)); 1656 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1657
1658 $cf::MAP{$self->path} = $self;
1659
1574 $self->reset; # polite request, might not happen 1660 $self->reset; # polite request, might not happen
1575} 1661}
1576 1662
1577sub customise_for {
1578 my ($map, $ob) = @_;
1579
1580 if ($map->per_player) {
1581 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1582 }
1583
1584 $map
1585}
1586
1587=item cf::map::unique_maps 1663=item cf::map::unique_maps
1588 1664
1589Returns an arrayref of cf::path's of all shared maps that have 1665Returns an arrayref of paths of all shared maps that have
1590instantiated unique items. May block. 1666instantiated unique items. May block.
1591 1667
1592=cut 1668=cut
1593 1669
1594sub unique_maps() { 1670sub unique_maps() {
… …
1600 for (@$files) { 1676 for (@$files) {
1601 utf8::decode $_; 1677 utf8::decode $_;
1602 next if /\.pst$/; 1678 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o; 1679 next unless /^$PATH_SEP/o;
1604 1680
1605 push @paths, new cf::path $_; 1681 push @paths, cf::map::normalise $_;
1606 } 1682 }
1607 1683
1608 \@paths 1684 \@paths
1609} 1685}
1610 1686
… …
1685 1761
1686=item $player_object->enter_link 1762=item $player_object->enter_link
1687 1763
1688Freezes 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}>).
1689 1765
1690The 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
1691I<MUST> call C<leave_link> as soon as possible, though. 1767I<MUST> call C<leave_link> as soon as possible, though.
1692 1768
1769Will never block.
1770
1693=item $player_object->leave_link ($map, $x, $y) 1771=item $player_object->leave_link ($map, $x, $y)
1694 1772
1695Moves 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
1696map 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
1697location 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
1698to the emergency map position. 1776fails, to the emergency map position.
1699 1777
1700Might block. 1778Might block.
1701 1779
1702=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}
1703 1791
1704sub cf::object::player::enter_link { 1792sub cf::object::player::enter_link {
1705 my ($self) = @_; 1793 my ($self) = @_;
1706 1794
1707 $self->deactivate_recursive; 1795 $self->deactivate_recursive;
1708 1796
1709 return if $self->map == $LINK_MAP; 1797 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1798
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1799 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1800 if $self->map;
1713 1801
1714 $self->enter_map ($LINK_MAP, 20, 20); 1802 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1715} 1803}
1716 1804
1717sub cf::object::player::leave_link { 1805sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1806 my ($self, $map, $x, $y) = @_;
1719 1807
… …
1741 $map->load; 1829 $map->load;
1742 $map->load_diag; 1830 $map->load_diag;
1743 1831
1744 return unless $self->contr->active; 1832 return unless $self->contr->active;
1745 $self->activate_recursive; 1833 $self->activate_recursive;
1834
1835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1746 $self->enter_map ($map, $x, $y); 1836 $self->enter_map ($map, $x, $y);
1747} 1837}
1748 1838
1749cf::player->attach ( 1839cf::player->attach (
1750 on_logout => sub { 1840 on_logout => sub {
… …
1763 # try to abort aborted map switching on player login :) 1853 # try to abort aborted map switching on player login :)
1764 # should happen only on crashes 1854 # should happen only on crashes
1765 if ($pl->ob->{_link_pos}) { 1855 if ($pl->ob->{_link_pos}) {
1766 $pl->ob->enter_link; 1856 $pl->ob->enter_link;
1767 (async { 1857 (async {
1768 # we need this sleep as the login has a concurrent enter_exit running
1769 # and this sleep increases chances of the player not ending up in scorn
1770 $pl->ob->reply (undef, 1858 $pl->ob->reply (undef,
1771 "There was an internal problem at your last logout, " 1859 "There was an internal problem at your last logout, "
1772 . "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.",
1773 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
1774 Coro::Timer::sleep 1; 1864 Coro::Timer::sleep 1;
1775 $pl->ob->leave_link; 1865 $pl->ob->leave_link;
1776 })->prio (2); 1866 })->prio (2);
1777 } 1867 }
1778 }, 1868 },
… …
1783=cut 1873=cut
1784 1874
1785sub cf::object::player::goto { 1875sub cf::object::player::goto {
1786 my ($self, $path, $x, $y) = @_; 1876 my ($self, $path, $x, $y) = @_;
1787 1877
1788 $path = new cf::path $path;
1789
1790 $self->enter_link; 1878 $self->enter_link;
1791 1879
1792 (async { 1880 (async {
1881 my $map = eval {
1793 my $map = cf::map::find $path->as_string; 1882 my $map = cf::map::find $path;
1794 $map = $map->customise_for ($self) if $map; 1883 $map = $map->customise_for ($self) if $map;
1795 1884 $map
1796# warn "entering ", $map->path, " at ($x, $y)\n" 1885 } or
1797# if $map;
1798
1799 $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);
1800 1887
1801 $self->leave_link ($map, $x, $y); 1888 $self->leave_link ($map, $x, $y);
1802 })->prio (1); 1889 })->prio (1);
1803} 1890}
1804 1891
… …
1808 1895
1809sub parse_random_map_params { 1896sub parse_random_map_params {
1810 my ($spec) = @_; 1897 my ($spec) = @_;
1811 1898
1812 my $rmp = { # defaults 1899 my $rmp = { # defaults
1813 xsize => 10, 1900 xsize => (cf::rndm 15, 40),
1814 ysize => 10, 1901 ysize => (cf::rndm 15, 40),
1902 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1903 #layout => string,
1815 }; 1904 };
1816 1905
1817 for (split /\n/, $spec) { 1906 for (split /\n/, $spec) {
1818 my ($k, $v) = split /\s+/, $_, 2; 1907 my ($k, $v) = split /\s+/, $_, 2;
1819 1908
… …
1823 $rmp 1912 $rmp
1824} 1913}
1825 1914
1826sub prepare_random_map { 1915sub prepare_random_map {
1827 my ($exit) = @_; 1916 my ($exit) = @_;
1917
1918 my $guard = cf::lock_acquire "exit_prepare:$exit";
1828 1919
1829 # all this does is basically replace the /! path by 1920 # all this does is basically replace the /! path by
1830 # a new random map path (?random/...) with a seed 1921 # a new random map path (?random/...) with a seed
1831 # that depends on the exit object 1922 # that depends on the exit object
1832 1923
1833 my $rmp = parse_random_map_params $exit->msg; 1924 my $rmp = parse_random_map_params $exit->msg;
1834 1925
1835 if ($exit->map) { 1926 if ($exit->map) {
1836 $rmp->{region} = $exit->map->region_name; 1927 $rmp->{region} = $exit->region->name;
1837 $rmp->{origin_map} = $exit->map->path; 1928 $rmp->{origin_map} = $exit->map->path;
1838 $rmp->{origin_x} = $exit->x; 1929 $rmp->{origin_x} = $exit->x;
1839 $rmp->{origin_y} = $exit->y; 1930 $rmp->{origin_y} = $exit->y;
1840 } 1931 }
1841 1932
1842 $rmp->{random_seed} ||= $exit->random_seed; 1933 $rmp->{random_seed} ||= $exit->random_seed;
1843 1934
1844 my $data = cf::to_json $rmp; 1935 my $data = cf::to_json $rmp;
1845 my $md5 = Digest::MD5::md5_hex $data; 1936 my $md5 = Digest::MD5::md5_hex $data;
1937 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1846 1938
1847 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) {
1848 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;
1849 1943
1850 $exit->slaying ("?random/$md5"); 1944 $exit->slaying ("?random/$md5");
1851 $exit->msg (undef); 1945 $exit->msg (undef);
1852 } 1946 }
1853} 1947}
1854 1948
1855sub cf::object::player::enter_exit { 1949sub cf::object::player::enter_exit {
1856 my ($self, $exit) = @_; 1950 my ($self, $exit) = @_;
1857 1951
1858 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;
1859 1962
1860 $self->enter_link; 1963 $self->enter_link;
1861 1964
1862 (async { 1965 (async {
1863 $self->deactivate_recursive; # just to be sure 1966 $self->deactivate_recursive; # just to be sure
1864 unless (eval { 1967 unless (eval {
1865 prepare_random_map $exit 1968 $self->goto ($slaying, $hp, $sp);
1866 if $exit->slaying eq "/!";
1867
1868 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1869 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1870 1969
1871 1; 1970 1;
1872 }) { 1971 }) {
1873 $self->message ("Something went wrong deep within the crossfire server. " 1972 $self->message ("Something went wrong deep within the crossfire server. "
1874 . "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. "
… …
1935 # get handled first 2034 # get handled first
1936 my $queue = delete $ns->{query_queue} 2035 my $queue = delete $ns->{query_queue}
1937 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
1938 2037
1939 (shift @$queue)->[1]->($msg); 2038 (shift @$queue)->[1]->($msg);
2039 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1940 2040
1941 push @{ $ns->{query_queue} }, @$queue; 2041 push @{ $ns->{query_queue} }, @$queue;
1942 2042
1943 if (@{ $ns->{query_queue} } == @$queue) { 2043 if (@{ $ns->{query_queue} } == @$queue) {
1944 if (@$queue) { 2044 if (@$queue) {
… …
2105The 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
2106using it, it should be unique. 2206using it, it should be unique.
2107 2207
2108=over 4 2208=over 4
2109 2209
2110=item $hashref = cf::db_get $family
2111
2112Return a hashref for use by the extension C<$family>, which can be
2113modified. After modifications, you have to call C<cf::db_dirty> or
2114C<cf::db_sync>.
2115
2116=item $value = cf::db_get $family => $key 2210=item $value = cf::db_get $family => $key
2117 2211
2118Returns a single value from the database 2212Returns a single value from the database.
2119
2120=item cf::db_put $family => $hashref
2121
2122Stores the given family hashref into the database. Updates are delayed, if
2123you want the data to be synced to disk immediately, use C<cf::db_sync>.
2124 2213
2125=item cf::db_put $family => $key => $value 2214=item cf::db_put $family => $key => $value
2126 2215
2127Stores the given C<$value> in the family hash. Updates are delayed, if you 2216Stores the given C<$value> in the family.
2128want the data to be synced to disk immediately, use C<cf::db_sync>.
2129
2130=item cf::db_dirty
2131
2132Marks the database as dirty, to be updated at a later time.
2133
2134=item cf::db_sync
2135
2136Immediately write the database to disk I<if it is dirty>.
2137 2217
2138=cut 2218=cut
2139 2219
2140our $DB; 2220our $DB;
2141 2221
2142{ 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
2143 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;
2144 2241
2145 sub db_load() { 2242 cf::db_put (board => data => $pst->{board});
2146 $DB = stat $path ? Storable::retrieve $path : { }; 2243 cf::db_put (guildrules => data => $pst->{guildrules});
2147 } 2244 cf::db_put (rent => balance => $pst->{rent}{balance});
2245 BDB::db_env_txn_checkpoint $DB_ENV;
2148 2246
2149 my $pid; 2247 unlink $path;
2150
2151 sub db_save() {
2152 waitpid $pid, 0 if $pid;
2153 if (0 == ($pid = fork)) {
2154 $DB->{_meta}{version} = 1;
2155 Storable::nstore $DB, "$path~";
2156 rename "$path~", $path;
2157 cf::_exit 0 if defined $pid;
2158 } 2248 };
2159 }
2160
2161 my $dirty;
2162
2163 sub db_sync() {
2164 db_save if $dirty;
2165 undef $dirty;
2166 }
2167
2168 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2169 db_sync;
2170 });
2171
2172 sub db_dirty() {
2173 $dirty = 1;
2174 $idle->start;
2175 }
2176
2177 sub db_get($;$) {
2178 @_ >= 2
2179 ? $DB->{$_[0]}{$_[1]}
2180 : ($DB->{$_[0]} ||= { })
2181 }
2182
2183 sub db_put($$;$) {
2184 if (@_ >= 3) {
2185 $DB->{$_[0]}{$_[1]} = $_[2];
2186 } else {
2187 $DB->{$_[0]} = $_[1];
2188 }
2189 db_dirty;
2190 }
2191
2192 cf::global->attach (
2193 prio => 10000,
2194 on_cleanup => sub {
2195 db_sync;
2196 }, 2249 }
2197 ); 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 { };
2198} 2267}
2199 2268
2200############################################################################# 2269#############################################################################
2201# 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}
2202 2305
2203sub cfg_load { 2306sub cfg_load {
2204 open my $fh, "<:utf8", cf::confdir . "/config" 2307 open my $fh, "<:utf8", cf::confdir . "/config"
2205 or return; 2308 or return;
2206 2309
… …
2223 2326
2224sub main { 2327sub main {
2225 # we must not ever block the main coroutine 2328 # we must not ever block the main coroutine
2226 local $Coro::idle = sub { 2329 local $Coro::idle = sub {
2227 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 {
2228 async { Event::one_event }; 2332 Event::one_event;
2333 })->prio (Coro::PRIO_MAX);
2229 }; 2334 };
2230 2335
2231 cfg_load; 2336 cfg_load;
2232 db_load; 2337 db_init;
2233 load_extensions; 2338 load_extensions;
2339
2340 $TICK_WATCHER->start;
2234 Event::loop; 2341 Event::loop;
2235} 2342}
2236 2343
2237############################################################################# 2344#############################################################################
2238# initialisation and cleanup 2345# initialisation and cleanup
2239 2346
2240# install some emergency cleanup handlers 2347# install some emergency cleanup handlers
2241BEGIN { 2348BEGIN {
2242 for my $signal (qw(INT HUP TERM)) { 2349 for my $signal (qw(INT HUP TERM)) {
2243 Event->signal ( 2350 Event->signal (
2351 reentrant => 0,
2244 data => WF_AUTOCANCEL, 2352 data => WF_AUTOCANCEL,
2245 signal => $signal, 2353 signal => $signal,
2354 prio => 0,
2246 cb => sub { 2355 cb => sub {
2247 cf::cleanup "SIG$signal"; 2356 cf::cleanup "SIG$signal";
2248 }, 2357 },
2249 ); 2358 );
2250 } 2359 }
2251} 2360}
… …
2256 warn "enter emergency perl save\n"; 2365 warn "enter emergency perl save\n";
2257 2366
2258 cf::sync_job { 2367 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl 2368 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players 2369 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously. 2370 # and maps saved/destroyed asynchronously.
2262 warn "begin emergency player save\n"; 2371 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) { 2372 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next; 2373 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next; 2374 $pl->valid or next;
2266 $pl->save; 2375 $pl->save;
… …
2272 my $map = $cf::MAP{$path} or next; 2381 my $map = $cf::MAP{$path} or next;
2273 $map->valid or next; 2382 $map->valid or next;
2274 $map->save; 2383 $map->save;
2275 } 2384 }
2276 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";
2277 }; 2390 };
2278 2391
2279 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;
2280} 2400}
2281 2401
2282sub reload() { 2402sub reload() {
2283 # can/must only be called in main 2403 # can/must only be called in main
2284 if ($Coro::current != $Coro::main) { 2404 if ($Coro::current != $Coro::main) {
2285 warn "can only reload from main coroutine\n"; 2405 warn "can only reload from main coroutine";
2286 return; 2406 return;
2287 } 2407 }
2288 2408
2289 warn "reloading..."; 2409 warn "reloading...";
2290 2410
2291 warn "freezing server"; 2411 warn "entering sync_job";
2292 my $guard = freeze_mainloop; 2412
2413 cf::sync_job {
2414 cf::write_runtime; # external watchdog should not bark
2293 cf::emergency_save; 2415 cf::emergency_save;
2416 cf::write_runtime; # external watchdog should not bark
2294 2417
2295 warn "sync database to disk"; 2418 warn "syncing database to disk";
2296 cf::db_sync; 2419 BDB::db_env_txn_checkpoint $DB_ENV;
2297 IO::AIO::flush;
2298 2420
2299 eval {
2300 # 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
2301 2422
2302 warn "cancel all watchers"; 2423 warn "cancelling all WF_AUTOCANCEL watchers";
2303 for (Event::all_watchers) { 2424 for (Event::all_watchers) {
2304 $_->cancel if $_->data & WF_AUTOCANCEL; 2425 $_->cancel if $_->data & WF_AUTOCANCEL;
2305 } 2426 }
2306 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
2307 warn "cancel all extension coros"; 2439 warn "cancelling all extension coros";
2308 $_->cancel for values %EXT_CORO; 2440 $_->cancel for values %EXT_CORO;
2309 %EXT_CORO = (); 2441 %EXT_CORO = ();
2310 2442
2311 warn "remove commands"; 2443 warn "removing commands";
2312 %COMMAND = (); 2444 %COMMAND = ();
2313 2445
2314 warn "remove ext commands"; 2446 warn "removing ext commands";
2315 %EXTCMD = (); 2447 %EXTCMD = ();
2316 2448
2317 warn "unload/nuke all extensions"; 2449 warn "unloading/nuking all extensions";
2318 for my $pkg (@EXTS) { 2450 for my $pkg (@EXTS) {
2319 warn "unloading <$pkg>"; 2451 warn "... unloading $pkg";
2320 2452
2321 if (my $cb = $pkg->can ("unload")) { 2453 if (my $cb = $pkg->can ("unload")) {
2322 eval { 2454 eval {
2323 $cb->($pkg); 2455 $cb->($pkg);
2324 1 2456 1
2325 } or warn "$pkg unloaded, but with errors: $@"; 2457 } or warn "$pkg unloaded, but with errors: $@";
2326 } 2458 }
2327 2459
2460 warn "... nuking $pkg";
2328 Symbol::delete_package $pkg; 2461 Symbol::delete_package $pkg;
2329 } 2462 }
2330 2463
2331 warn "unload all perl modules loaded from $LIBDIR"; 2464 warn "unloading all perl modules loaded from $LIBDIR";
2332 while (my ($k, $v) = each %INC) { 2465 while (my ($k, $v) = each %INC) {
2333 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2466 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2334 2467
2335 warn "removing <$k>"; 2468 warn "... unloading $k";
2336 delete $INC{$k}; 2469 delete $INC{$k};
2337 2470
2338 $k =~ s/\.pm$//; 2471 $k =~ s/\.pm$//;
2339 $k =~ s/\//::/g; 2472 $k =~ s/\//::/g;
2340 2473
… …
2343 } 2476 }
2344 2477
2345 Symbol::delete_package $k; 2478 Symbol::delete_package $k;
2346 } 2479 }
2347 2480
2348 warn "get rid of safe::, as good as possible"; 2481 warn "getting rid of safe::, as good as possible";
2349 Symbol::delete_package "safe::$_" 2482 Symbol::delete_package "safe::$_"
2350 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);
2351 2484
2352 warn "unload cf.pm \"a bit\""; 2485 warn "unloading cf.pm \"a bit\"";
2353 delete $INC{"cf.pm"}; 2486 delete $INC{"cf.pm"};
2354 2487
2355 # don't, removes xs symbols, too, 2488 # don't, removes xs symbols, too,
2356 # and global variables created in xs 2489 # and global variables created in xs
2357 #Symbol::delete_package __PACKAGE__; 2490 #Symbol::delete_package __PACKAGE__;
2358 2491
2492 warn "unload completed, starting to reload now";
2493
2359 warn "reloading cf.pm"; 2494 warn "reloading cf.pm";
2360 require cf; 2495 require cf;
2361 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2496 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2362 2497
2363 warn "load config and database again"; 2498 warn "loading config and database again";
2364 cf::cfg_load; 2499 cf::cfg_load;
2365 cf::db_load;
2366 2500
2367 warn "load extensions"; 2501 warn "loading extensions";
2368 cf::load_extensions; 2502 cf::load_extensions;
2369 2503
2370 warn "reattach attachments to objects/players"; 2504 warn "reattaching attachments to objects/players";
2371 _global_reattach; 2505 _global_reattach; # objects, sockets
2372 warn "reattach attachments to maps"; 2506 warn "reattaching attachments to maps";
2373 reattach $_ for values %MAP; 2507 reattach $_ for values %MAP;
2374 }; 2508 warn "reattaching attachments to players";
2509 reattach $_ for values %PLAYER;
2375 2510
2376 if ($@) { 2511 warn "loading reloadable resources";
2512 reload_resources;
2513
2514 warn "leaving sync_job";
2515
2516 1
2517 } or do {
2377 warn $@; 2518 warn $@;
2378 warn "error while reloading, exiting."; 2519 warn "error while reloading, exiting.";
2379 exit 1; 2520 exit 1;
2380 } 2521 };
2381 2522
2382 warn "reloaded"; 2523 warn "reloaded";
2383}; 2524};
2384 2525
2385############################################################################# 2526our $RELOAD_WATCHER; # used only during reload
2386
2387unless ($LINK_MAP) {
2388 $LINK_MAP = cf::map::new;
2389
2390 $LINK_MAP->width (41);
2391 $LINK_MAP->height (41);
2392 $LINK_MAP->alloc;
2393 $LINK_MAP->path ("{link}");
2394 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2395 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2396
2397 # dirty hack because... archetypes are not yet loaded
2398 Event->timer (
2399 after => 10,
2400 cb => sub {
2401 $_[0]->w->cancel;
2402
2403 # provide some exits "home"
2404 my $exit = cf::object::new "exit";
2405
2406 $exit->slaying ($EMERGENCY_POSITION->[0]);
2407 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2408 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2409
2410 $LINK_MAP->insert ($exit->clone, 19, 19);
2411 $LINK_MAP->insert ($exit->clone, 19, 20);
2412 $LINK_MAP->insert ($exit->clone, 19, 21);
2413 $LINK_MAP->insert ($exit->clone, 20, 19);
2414 $LINK_MAP->insert ($exit->clone, 20, 21);
2415 $LINK_MAP->insert ($exit->clone, 21, 19);
2416 $LINK_MAP->insert ($exit->clone, 21, 20);
2417 $LINK_MAP->insert ($exit->clone, 21, 21);
2418
2419 $exit->destroy;
2420 });
2421
2422 $LINK_MAP->{deny_save} = 1;
2423 $LINK_MAP->{deny_reset} = 1;
2424
2425 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2426}
2427 2527
2428register_command "reload" => sub { 2528register_command "reload" => sub {
2429 my ($who, $arg) = @_; 2529 my ($who, $arg) = @_;
2430 2530
2431 if ($who->flag (FLAG_WIZ)) { 2531 if ($who->flag (FLAG_WIZ)) {
2432 $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 {
2433 reload; 2542 reload;
2434 $who->message ("end of reload."); 2543 undef $RELOAD_WATCHER;
2544 },
2545 );
2435 } 2546 }
2436}; 2547};
2437 2548
2438unshift @INC, $LIBDIR; 2549unshift @INC, $LIBDIR;
2550
2551my $bug_warning = 0;
2439 2552
2440$TICK_WATCHER = Event->timer ( 2553$TICK_WATCHER = Event->timer (
2441 reentrant => 0, 2554 reentrant => 0,
2555 parked => 1,
2442 prio => 0, 2556 prio => 0,
2443 at => $NEXT_TICK || $TICK, 2557 at => $NEXT_TICK || $TICK,
2444 data => WF_AUTOCANCEL, 2558 data => WF_AUTOCANCEL,
2445 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
2446 cf::server_tick; # one server iteration 2568 cf::server_tick; # one server iteration
2447 $RUNTIME += $TICK; 2569 $RUNTIME += $TICK;
2448 $NEXT_TICK += $TICK; 2570 $NEXT_TICK += $TICK;
2449 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
2450 $WAIT_FOR_TICK->broadcast; 2580 $WAIT_FOR_TICK->broadcast;
2451 $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#
2452 2585
2453 # 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
2454 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2587 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2455 2588
2456 $TICK_WATCHER->at ($NEXT_TICK); 2589 $TICK_WATCHER->at ($NEXT_TICK);
2457 $TICK_WATCHER->start; 2590 $TICK_WATCHER->start;
2458 }, 2591 },
2459); 2592);
2460 2593
2594{
2461IO::AIO::max_poll_time $TICK * 0.2; 2595 BDB::max_poll_time $TICK * 0.1;
2462 2596 $BDB_POLL_WATCHER = Event->io (
2463Event->io ( 2597 reentrant => 0,
2464 fd => IO::AIO::poll_fileno, 2598 fd => BDB::poll_fileno,
2465 poll => 'r', 2599 poll => 'r',
2466 prio => 5, 2600 prio => 0,
2467 data => WF_AUTOCANCEL,
2468 cb => \&IO::AIO::poll_cb,
2469);
2470
2471Event->timer (
2472 data => WF_AUTOCANCEL, 2601 data => WF_AUTOCANCEL,
2473 after => 0, 2602 cb => \&BDB::poll_cb,
2474 interval => 10, 2603 );
2475 cb => sub { 2604 BDB::min_parallel 8;
2476 (Coro::unblock_sub { 2605
2477 write_runtime 2606 BDB::set_sync_prepare {
2478 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 $@;
2479 })->(); 2640 };
2480 }, 2641 }
2481); 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}
2482 2658
2483END { cf::emergency_save } 2659END { cf::emergency_save }
2484 2660
24851 26611
2486 2662

Diff Legend

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