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.222 by root, Tue Mar 6 03:06:00 2007 UTC

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

Diff Legend

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