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.220 by root, Sat Feb 17 23:54:35 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;
1151} 1057}
1152 1058
1153=item cf::player::list_logins 1059=item cf::player::list_logins
1154 1060
… …
1175 \@logins 1081 \@logins
1176} 1082}
1177 1083
1178=item $player->maps 1084=item $player->maps
1179 1085
1180Returns an arrayref of cf::path's of all maps that are private for this 1086Returns an arrayref of map paths that are private for this
1181player. May block. 1087player. May block.
1182 1088
1183=cut 1089=cut
1184 1090
1185sub maps($) { 1091sub maps($) {
1186 my ($pl) = @_; 1092 my ($pl) = @_;
1093
1094 $pl = ref $pl ? $pl->ob->name : $pl;
1187 1095
1188 my $files = aio_readdir playerdir $pl 1096 my $files = aio_readdir playerdir $pl
1189 or return; 1097 or return;
1190 1098
1191 my @paths; 1099 my @paths;
… …
1193 for (@$files) { 1101 for (@$files) {
1194 utf8::decode $_; 1102 utf8::decode $_;
1195 next if /\.(?:pl|pst)$/; 1103 next if /\.(?:pl|pst)$/;
1196 next unless /^$PATH_SEP/o; 1104 next unless /^$PATH_SEP/o;
1197 1105
1198 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1106 push @paths, cf::map::normalise "~$pl/$_";
1199 } 1107 }
1200 1108
1201 \@paths 1109 \@paths
1202} 1110}
1203 1111
… …
1229package cf::map; 1137package cf::map;
1230 1138
1231use Fcntl; 1139use Fcntl;
1232use Coro::AIO; 1140use Coro::AIO;
1233 1141
1142use overload
1143 '""' => \&as_string,
1144 fallback => 1;
1145
1234our $MAX_RESET = 3600; 1146our $MAX_RESET = 3600;
1235our $DEFAULT_RESET = 3000; 1147our $DEFAULT_RESET = 3000;
1236 1148
1237sub generate_random_map { 1149sub generate_random_map {
1238 my ($path, $rmp) = @_; 1150 my ($self, $rmp) = @_;
1239
1240 # mit "rum" bekleckern, nicht 1151 # mit "rum" bekleckern, nicht
1241 cf::map::_create_random_map 1152 $self->_create_random_map (
1242 $path,
1243 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1153 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1244 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1154 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1245 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1155 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1246 $rmp->{exit_on_final_map}, 1156 $rmp->{exit_on_final_map},
1247 $rmp->{xsize}, $rmp->{ysize}, 1157 $rmp->{xsize}, $rmp->{ysize},
1248 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1158 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1249 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1159 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1250 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1160 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1251 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1161 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1252 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1162 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1253 (cf::region::find $rmp->{region}) 1163 (cf::region::find $rmp->{region}), $rmp->{custom}
1164 )
1165}
1166
1167=item cf::map->register ($regex, $prio)
1168
1169Register a handler for the map path matching the given regex at the
1170givne priority (higher is better, built-in handlers have priority 0, the
1171default).
1172
1173=cut
1174
1175sub register {
1176 my (undef, $regex, $prio) = @_;
1177 my $pkg = caller;
1178
1179 no strict;
1180 push @{"$pkg\::ISA"}, __PACKAGE__;
1181
1182 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1183}
1184
1185# also paths starting with '/'
1186$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1187
1188sub thawer_merge {
1189 my ($self, $merge) = @_;
1190
1191 # we have to keep some variables in memory intact
1192 local $self->{path};
1193 local $self->{load_path};
1194 local $self->{deny_save};
1195 local $self->{deny_reset};
1196
1197 $self->SUPER::thawer_merge ($merge);
1198}
1199
1200sub normalise {
1201 my ($path, $base) = @_;
1202
1203 $path = "$path"; # make sure its a string
1204
1205 $path =~ s/\.map$//;
1206
1207 # map plan:
1208 #
1209 # /! non-realised random map exit (special hack!)
1210 # {... are special paths that are not being touched
1211 # ?xxx/... are special absolute paths
1212 # ?random/... random maps
1213 # /... normal maps
1214 # ~user/... per-player map of a specific user
1215
1216 $path =~ s/$PATH_SEP/\//go;
1217
1218 # treat it as relative path if it starts with
1219 # something that looks reasonable
1220 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1221 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1222
1223 $base =~ s{[^/]+/?$}{};
1224 $path = "$base/$path";
1225 }
1226
1227 for ($path) {
1228 redo if s{//}{/};
1229 redo if s{/\.?/}{/};
1230 redo if s{/[^/]+/\.\./}{/};
1231 }
1232
1233 $path
1234}
1235
1236sub new_from_path {
1237 my (undef, $path, $base) = @_;
1238
1239 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1240
1241 $path = normalise $path, $base;
1242
1243 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1244 if ($path =~ $EXT_MAP{$pkg}[1]) {
1245 my $self = bless cf::map::new, $pkg;
1246 $self->{path} = $path; $self->path ($path);
1247 $self->init; # pass $1 etc.
1248 return $self;
1249 }
1250 }
1251
1252 Carp::carp "unable to resolve path '$path' (base '$base').";
1253 ()
1254}
1255
1256sub init {
1257 my ($self) = @_;
1258
1259 $self
1260}
1261
1262sub as_string {
1263 my ($self) = @_;
1264
1265 "$self->{path}"
1266}
1267
1268# the displayed name, this is a one way mapping
1269sub visible_name {
1270 &as_string
1271}
1272
1273# the original (read-only) location
1274sub load_path {
1275 my ($self) = @_;
1276
1277 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1278}
1279
1280# the temporary/swap location
1281sub save_path {
1282 my ($self) = @_;
1283
1284 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1285 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1286}
1287
1288# the unique path, undef == no special unique path
1289sub uniq_path {
1290 my ($self) = @_;
1291
1292 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1293 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1254} 1294}
1255 1295
1256# and all this just because we cannot iterate over 1296# and all this just because we cannot iterate over
1257# all maps in C++... 1297# all maps in C++...
1258sub change_all_map_light { 1298sub change_all_map_light {
… …
1260 1300
1261 $_->change_map_light ($change) 1301 $_->change_map_light ($change)
1262 for grep $_->outdoor, values %cf::MAP; 1302 for grep $_->outdoor, values %cf::MAP;
1263} 1303}
1264 1304
1305sub unlink_save {
1306 my ($self) = @_;
1307
1308 utf8::encode (my $save = $self->save_path);
1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1311}
1312
1265sub try_load_header($) { 1313sub load_header_from($) {
1266 my ($path) = @_; 1314 my ($self, $path) = @_;
1267 1315
1268 utf8::encode $path; 1316 utf8::encode $path;
1269 aio_open $path, O_RDONLY, 0 1317 #aio_open $path, O_RDONLY, 0
1318 # or return;
1319
1320 $self->_load_header ($path)
1270 or return; 1321 or return;
1271 1322
1272 my $map = cf::map::new 1323 $self->{load_path} = $path;
1324
1325 1
1326}
1327
1328sub load_header_orig {
1329 my ($self) = @_;
1330
1331 $self->load_header_from ($self->load_path)
1332}
1333
1334sub load_header_temp {
1335 my ($self) = @_;
1336
1337 $self->load_header_from ($self->save_path)
1338}
1339
1340sub prepare_temp {
1341 my ($self) = @_;
1342
1343 $self->last_access ((delete $self->{last_access})
1344 || $cf::RUNTIME); #d#
1345 # safety
1346 $self->{instantiate_time} = $cf::RUNTIME
1347 if $self->{instantiate_time} > $cf::RUNTIME;
1348}
1349
1350sub prepare_orig {
1351 my ($self) = @_;
1352
1353 $self->{load_original} = 1;
1354 $self->{instantiate_time} = $cf::RUNTIME;
1355 $self->last_access ($cf::RUNTIME);
1356 $self->instantiate;
1357}
1358
1359sub load_header {
1360 my ($self) = @_;
1361
1362 if ($self->load_header_temp) {
1363 $self->prepare_temp;
1364 } else {
1365 $self->load_header_orig
1273 or return; 1366 or return;
1367 $self->prepare_orig;
1368 }
1274 1369
1275 # for better error messages only, will be overwritten 1370 1
1276 $map->path ($path);
1277
1278 $map->load_header ($path)
1279 or return;
1280
1281 $map->{load_path} = $path;
1282
1283 $map
1284} 1371}
1285 1372
1286sub find; 1373sub find;
1287sub find { 1374sub find {
1288 my ($path, $origin) = @_; 1375 my ($path, $origin) = @_;
1289 1376
1290 #warn "find<$path,$origin>\n";#d#
1291
1292 $path = new cf::path $path, $origin && $origin->path; 1377 $path = normalise $path, $origin && $origin->path;
1293 my $key = $path->as_string;
1294 1378
1295 cf::lock_wait "map_find:$key"; 1379 cf::lock_wait "map_find:$path";
1296 1380
1297 $cf::MAP{$key} || do { 1381 $cf::MAP{$path} || do {
1298 my $guard = cf::lock_acquire "map_find:$key"; 1382 my $guard = cf::lock_acquire "map_find:$path";
1299 1383 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; 1384 or return;
1319 1385
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; 1386 $map->{last_save} = $cf::RUNTIME;
1332 1387
1333 Coro::cede; 1388 $map->load_header
1389 or return;
1334 1390
1335 if ($map->should_reset) { 1391 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1392 # doing this can freeze the server in a sync job, obviously
1393 #$cf::WAIT_FOR_TICK->wait;
1336 $map->reset; 1394 $map->reset;
1337 undef $guard; 1395 undef $guard;
1338 $map = find $path 1396 return find $path;
1339 or return;
1340 } 1397 }
1341 1398
1342 $cf::MAP{$key} = $map 1399 $cf::MAP{$path} = $map
1343 } 1400 }
1344} 1401}
1402
1403sub pre_load { }
1404sub post_load { }
1345 1405
1346sub load { 1406sub load {
1347 my ($self) = @_; 1407 my ($self) = @_;
1348 1408
1409 local $self->{deny_reset} = 1; # loading can take a long time
1410
1349 my $path = $self->{path}; 1411 my $path = $self->{path};
1350 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1412 my $guard = cf::lock_acquire "map_load:$path";
1351 1413
1352 return if $self->in_memory != cf::MAP_SWAPPED; 1414 return if $self->in_memory != cf::MAP_SWAPPED;
1353 1415
1354 $self->in_memory (cf::MAP_LOADING); 1416 $self->in_memory (cf::MAP_LOADING);
1355 1417
1356 $self->alloc; 1418 $self->alloc;
1419
1420 $self->pre_load;
1421
1357 $self->load_objects ($self->{load_path}, 1) 1422 $self->_load_objects ($self->{load_path}, 1)
1358 or return; 1423 or return;
1359 1424
1360 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1425 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1361 if delete $self->{load_original}; 1426 if delete $self->{load_original};
1362 1427
1363 if (my $uniq = $path->uniq_path) { 1428 if (my $uniq = $self->uniq_path) {
1364 utf8::encode $uniq; 1429 utf8::encode $uniq;
1365 if (aio_open $uniq, O_RDONLY, 0) { 1430 if (aio_open $uniq, O_RDONLY, 0) {
1366 $self->clear_unique_items; 1431 $self->clear_unique_items;
1367 $self->load_objects ($uniq, 0); 1432 $self->_load_objects ($uniq, 0);
1368 } 1433 }
1369 } 1434 }
1370 1435
1371 Coro::cede; 1436 Coro::cede;
1372 1437
1373 # now do the right thing for maps 1438 # now do the right thing for maps
1374 $self->link_multipart_objects; 1439 $self->link_multipart_objects;
1375 1440
1376 if ($self->{path}->is_style_map) { 1441 unless ($self->{deny_activate}) {
1377 $self->{deny_save} = 1; 1442 $self->decay_objects;
1378 $self->{deny_reset} = 1;
1379 } else {
1380 $self->fix_auto_apply; 1443 $self->fix_auto_apply;
1381 $self->decay_objects;
1382 $self->update_buttons; 1444 $self->update_buttons;
1445 Coro::cede;
1383 $self->set_darkness_map; 1446 $self->set_darkness_map;
1384 $self->difficulty ($self->estimate_difficulty) 1447 $self->difficulty ($self->estimate_difficulty)
1385 unless $self->difficulty; 1448 unless $self->difficulty;
1449 Coro::cede;
1386 $self->activate; 1450 $self->activate;
1387 } 1451 }
1388 1452
1389 Coro::cede; 1453 $self->post_load;
1390 1454
1391 $self->in_memory (cf::MAP_IN_MEMORY); 1455 $self->in_memory (cf::MAP_IN_MEMORY);
1456}
1457
1458sub customise_for {
1459 my ($self, $ob) = @_;
1460
1461 return find "~" . $ob->name . "/" . $self->{path}
1462 if $self->per_player;
1463
1464 $self
1392} 1465}
1393 1466
1394# find and load all maps in the 3x3 area around a map 1467# find and load all maps in the 3x3 area around a map
1395sub load_diag { 1468sub load_diag {
1396 my ($map) = @_; 1469 my ($map) = @_;
… …
1426 1499
1427 cf::sync_job { $map->load }; 1500 cf::sync_job { $map->load };
1428} 1501}
1429 1502
1430our %MAP_PREFETCH; 1503our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async { 1504our $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 1505
1446sub find_async { 1506sub find_async {
1447 my ($path, $origin) = @_; 1507 my ($path, $origin) = @_;
1448 1508
1449 $path = new cf::path $path, $origin && $origin->path; 1509 $path = normalise $path, $origin && $origin->{path};
1450 my $key = $path->as_string;
1451 1510
1452 if (my $map = $cf::MAP{$key}) { 1511 if (my $map = $cf::MAP{$path}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1512 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 } 1513 }
1455 1514
1456 $MAP_PREFETCH{$key} = $path; 1515 undef $MAP_PREFETCH{$path};
1516 $MAP_PREFETCHER ||= cf::async {
1517 while (%MAP_PREFETCH) {
1518 for my $path (keys %MAP_PREFETCH) {
1519 my $map = find $path
1520 or next;
1521 $map->load;
1522
1523 delete $MAP_PREFETCH{$path};
1524 }
1525 }
1526 undef $MAP_PREFETCHER;
1527 };
1457 $MAP_PREFETCHER->ready; 1528 $MAP_PREFETCHER->prio (6);
1458 1529
1459 () 1530 ()
1460} 1531}
1461 1532
1462sub save { 1533sub save {
… …
1466 1537
1467 $self->{last_save} = $cf::RUNTIME; 1538 $self->{last_save} = $cf::RUNTIME;
1468 1539
1469 return unless $self->dirty; 1540 return unless $self->dirty;
1470 1541
1471 my $save = $self->{path}->save_path; utf8::encode $save; 1542 my $save = $self->save_path; utf8::encode $save;
1472 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1543 my $uniq = $self->uniq_path; utf8::encode $uniq;
1473 1544
1474 $self->{load_path} = $save; 1545 $self->{load_path} = $save;
1475 1546
1476 return if $self->{deny_save}; 1547 return if $self->{deny_save};
1477 1548
… …
1480 cf::async { 1551 cf::async {
1481 $_->contr->save for $self->players; 1552 $_->contr->save for $self->players;
1482 }; 1553 };
1483 1554
1484 if ($uniq) { 1555 if ($uniq) {
1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1556 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1486 $self->save_objects ($uniq, cf::IO_UNIQUES); 1557 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1487 } else { 1558 } else {
1488 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1559 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1489 } 1560 }
1490} 1561}
1491 1562
1492sub swap_out { 1563sub swap_out {
1493 my ($self) = @_; 1564 my ($self) = @_;
… …
1507 1578
1508sub reset_at { 1579sub reset_at {
1509 my ($self) = @_; 1580 my ($self) = @_;
1510 1581
1511 # TODO: safety, remove and allow resettable per-player maps 1582 # TODO: safety, remove and allow resettable per-player maps
1512 return 1e99 if $self->{path}{user_rel}; 1583 return 1e99 if $self->isa ("ext::map_per_player");#d#
1513 return 1e99 if $self->{deny_reset}; 1584 return 1e99 if $self->{deny_reset};
1514 1585
1515 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1586 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1516 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1587 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1517 1588
… …
1522 my ($self) = @_; 1593 my ($self) = @_;
1523 1594
1524 $self->reset_at <= $cf::RUNTIME 1595 $self->reset_at <= $cf::RUNTIME
1525} 1596}
1526 1597
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 { 1598sub reset {
1549 my ($self) = @_; 1599 my ($self) = @_;
1550 1600
1551 my $lock = cf::lock_acquire "map_data:" . $self->path; 1601 my $lock = cf::lock_acquire "map_data:$self->{path}";
1552 1602
1553 return if $self->players; 1603 return if $self->players;
1554 return if $self->{path}{user_rel};#d# 1604 return if $self->isa ("ext::map_per_player");#d#
1555 1605
1556 warn "resetting map ", $self->path;#d# 1606 warn "resetting map ", $self->path;#d#
1557 1607
1608 $self->in_memory (cf::MAP_SWAPPED);
1609
1610 # need to save uniques path
1611 unless ($self->{deny_save}) {
1612 my $uniq = $self->uniq_path; utf8::encode $uniq;
1613
1614 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1615 if $uniq;
1616 }
1617
1558 delete $cf::MAP{$self->path}; 1618 delete $cf::MAP{$self->path};
1619
1620 $self->clear;
1559 1621
1560 $_->clear_links_to ($self) for values %cf::MAP; 1622 $_->clear_links_to ($self) for values %cf::MAP;
1561 1623
1562 $self->unlink_save; 1624 $self->unlink_save;
1563 $self->destroy; 1625 $self->destroy;
… …
1566my $nuke_counter = "aaaa"; 1628my $nuke_counter = "aaaa";
1567 1629
1568sub nuke { 1630sub nuke {
1569 my ($self) = @_; 1631 my ($self) = @_;
1570 1632
1633 delete $cf::MAP{$self->path};
1634
1635 $self->unlink_save;
1636
1637 bless $self, "cf::map";
1638 delete $self->{deny_reset};
1571 $self->{deny_save} = 1; 1639 $self->{deny_save} = 1;
1572 $self->reset_timeout (1); 1640 $self->reset_timeout (1);
1573 $self->rename ("{nuke}/" . ($nuke_counter++)); 1641 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1642
1643 $cf::MAP{$self->path} = $self;
1644
1574 $self->reset; # polite request, might not happen 1645 $self->reset; # polite request, might not happen
1575} 1646}
1576 1647
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 1648=item cf::map::unique_maps
1588 1649
1589Returns an arrayref of cf::path's of all shared maps that have 1650Returns an arrayref of paths of all shared maps that have
1590instantiated unique items. May block. 1651instantiated unique items. May block.
1591 1652
1592=cut 1653=cut
1593 1654
1594sub unique_maps() { 1655sub unique_maps() {
… …
1600 for (@$files) { 1661 for (@$files) {
1601 utf8::decode $_; 1662 utf8::decode $_;
1602 next if /\.pst$/; 1663 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o; 1664 next unless /^$PATH_SEP/o;
1604 1665
1605 push @paths, new cf::path $_; 1666 push @paths, cf::map::normalise $_;
1606 } 1667 }
1607 1668
1608 \@paths 1669 \@paths
1609} 1670}
1610 1671
… …
1685 1746
1686=item $player_object->enter_link 1747=item $player_object->enter_link
1687 1748
1688Freezes the player and moves him/her to a special map (C<{link}>). 1749Freezes the player and moves him/her to a special map (C<{link}>).
1689 1750
1690The player should be reaosnably safe there for short amounts of time. You 1751The player should be reasonably safe there for short amounts of time. You
1691I<MUST> call C<leave_link> as soon as possible, though. 1752I<MUST> call C<leave_link> as soon as possible, though.
1692 1753
1754Will never block.
1755
1693=item $player_object->leave_link ($map, $x, $y) 1756=item $player_object->leave_link ($map, $x, $y)
1694 1757
1695Moves the player out of the specila link map onto the given map. If the 1758Moves 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 1759map. 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, 1760to the location he/she was before the call to C<enter_link>, or, if that
1698to the emergency map position. 1761fails, to the emergency map position.
1699 1762
1700Might block. 1763Might block.
1701 1764
1702=cut 1765=cut
1766
1767sub link_map {
1768 unless ($LINK_MAP) {
1769 $LINK_MAP = cf::map::find "{link}"
1770 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1771 $LINK_MAP->load;
1772 }
1773
1774 $LINK_MAP
1775}
1703 1776
1704sub cf::object::player::enter_link { 1777sub cf::object::player::enter_link {
1705 my ($self) = @_; 1778 my ($self) = @_;
1706 1779
1707 $self->deactivate_recursive; 1780 $self->deactivate_recursive;
1708 1781
1709 return if $self->map == $LINK_MAP; 1782 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 1783
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1784 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 1785 if $self->map;
1713 1786
1714 $self->enter_map ($LINK_MAP, 20, 20); 1787 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1715} 1788}
1716 1789
1717sub cf::object::player::leave_link { 1790sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 1791 my ($self, $map, $x, $y) = @_;
1719 1792
… …
1741 $map->load; 1814 $map->load;
1742 $map->load_diag; 1815 $map->load_diag;
1743 1816
1744 return unless $self->contr->active; 1817 return unless $self->contr->active;
1745 $self->activate_recursive; 1818 $self->activate_recursive;
1819
1820 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1746 $self->enter_map ($map, $x, $y); 1821 $self->enter_map ($map, $x, $y);
1747} 1822}
1748 1823
1749cf::player->attach ( 1824cf::player->attach (
1750 on_logout => sub { 1825 on_logout => sub {
… …
1763 # try to abort aborted map switching on player login :) 1838 # try to abort aborted map switching on player login :)
1764 # should happen only on crashes 1839 # should happen only on crashes
1765 if ($pl->ob->{_link_pos}) { 1840 if ($pl->ob->{_link_pos}) {
1766 $pl->ob->enter_link; 1841 $pl->ob->enter_link;
1767 (async { 1842 (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, 1843 $pl->ob->reply (undef,
1771 "There was an internal problem at your last logout, " 1844 "There was an internal problem at your last logout, "
1772 . "the server will try to bring you to your intended destination in a second.", 1845 . "the server will try to bring you to your intended destination in a second.",
1773 cf::NDI_RED); 1846 cf::NDI_RED);
1847 # we need this sleep as the login has a concurrent enter_exit running
1848 # and this sleep increases chances of the player not ending up in scorn
1774 Coro::Timer::sleep 1; 1849 Coro::Timer::sleep 1;
1775 $pl->ob->leave_link; 1850 $pl->ob->leave_link;
1776 })->prio (2); 1851 })->prio (2);
1777 } 1852 }
1778 }, 1853 },
… …
1783=cut 1858=cut
1784 1859
1785sub cf::object::player::goto { 1860sub cf::object::player::goto {
1786 my ($self, $path, $x, $y) = @_; 1861 my ($self, $path, $x, $y) = @_;
1787 1862
1788 $path = new cf::path $path;
1789
1790 $self->enter_link; 1863 $self->enter_link;
1791 1864
1792 (async { 1865 (async {
1866 my $map = eval {
1793 my $map = cf::map::find $path->as_string; 1867 my $map = cf::map::find $path;
1794 $map = $map->customise_for ($self) if $map; 1868 $map = $map->customise_for ($self) if $map;
1795 1869 $map
1796# warn "entering ", $map->path, " at ($x, $y)\n" 1870 } or
1797# if $map;
1798
1799 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1871 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1800 1872
1801 $self->leave_link ($map, $x, $y); 1873 $self->leave_link ($map, $x, $y);
1802 })->prio (1); 1874 })->prio (1);
1803} 1875}
1804 1876
… …
1808 1880
1809sub parse_random_map_params { 1881sub parse_random_map_params {
1810 my ($spec) = @_; 1882 my ($spec) = @_;
1811 1883
1812 my $rmp = { # defaults 1884 my $rmp = { # defaults
1813 xsize => 10, 1885 xsize => (cf::rndm 15, 40),
1814 ysize => 10, 1886 ysize => (cf::rndm 15, 40),
1887 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1888 #layout => string,
1815 }; 1889 };
1816 1890
1817 for (split /\n/, $spec) { 1891 for (split /\n/, $spec) {
1818 my ($k, $v) = split /\s+/, $_, 2; 1892 my ($k, $v) = split /\s+/, $_, 2;
1819 1893
… …
1823 $rmp 1897 $rmp
1824} 1898}
1825 1899
1826sub prepare_random_map { 1900sub prepare_random_map {
1827 my ($exit) = @_; 1901 my ($exit) = @_;
1902
1903 my $guard = cf::lock_acquire "exit_prepare:$exit";
1828 1904
1829 # all this does is basically replace the /! path by 1905 # all this does is basically replace the /! path by
1830 # a new random map path (?random/...) with a seed 1906 # a new random map path (?random/...) with a seed
1831 # that depends on the exit object 1907 # that depends on the exit object
1832 1908
1833 my $rmp = parse_random_map_params $exit->msg; 1909 my $rmp = parse_random_map_params $exit->msg;
1834 1910
1835 if ($exit->map) { 1911 if ($exit->map) {
1836 $rmp->{region} = $exit->map->region_name; 1912 $rmp->{region} = $exit->region->name;
1837 $rmp->{origin_map} = $exit->map->path; 1913 $rmp->{origin_map} = $exit->map->path;
1838 $rmp->{origin_x} = $exit->x; 1914 $rmp->{origin_x} = $exit->x;
1839 $rmp->{origin_y} = $exit->y; 1915 $rmp->{origin_y} = $exit->y;
1840 } 1916 }
1841 1917
1842 $rmp->{random_seed} ||= $exit->random_seed; 1918 $rmp->{random_seed} ||= $exit->random_seed;
1843 1919
1844 my $data = cf::to_json $rmp; 1920 my $data = cf::to_json $rmp;
1845 my $md5 = Digest::MD5::md5_hex $data; 1921 my $md5 = Digest::MD5::md5_hex $data;
1922 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1846 1923
1847 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1924 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1848 aio_write $fh, 0, (length $data), $data, 0; 1925 aio_write $fh, 0, (length $data), $data, 0;
1926 undef $fh;
1927 aio_rename "$meta~", $meta;
1849 1928
1850 $exit->slaying ("?random/$md5"); 1929 $exit->slaying ("?random/$md5");
1851 $exit->msg (undef); 1930 $exit->msg (undef);
1852 } 1931 }
1853} 1932}
1854 1933
1855sub cf::object::player::enter_exit { 1934sub cf::object::player::enter_exit {
1856 my ($self, $exit) = @_; 1935 my ($self, $exit) = @_;
1857 1936
1858 return unless $self->type == cf::PLAYER; 1937 return unless $self->type == cf::PLAYER;
1938
1939 if ($exit->slaying eq "/!") {
1940 #TODO: this should de-fi-ni-te-ly not be a sync-job
1941 cf::sync_job { prepare_random_map $exit };
1942 }
1943
1944 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1945 my $hp = $exit->stats->hp;
1946 my $sp = $exit->stats->sp;
1859 1947
1860 $self->enter_link; 1948 $self->enter_link;
1861 1949
1862 (async { 1950 (async {
1863 $self->deactivate_recursive; # just to be sure 1951 $self->deactivate_recursive; # just to be sure
1864 unless (eval { 1952 unless (eval {
1865 prepare_random_map $exit 1953 $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 1954
1871 1; 1955 1;
1872 }) { 1956 }) {
1873 $self->message ("Something went wrong deep within the crossfire server. " 1957 $self->message ("Something went wrong deep within the crossfire server. "
1874 . "I'll try to bring you back to the map you were before. " 1958 . "I'll try to bring you back to the map you were before. "
… …
1935 # get handled first 2019 # get handled first
1936 my $queue = delete $ns->{query_queue} 2020 my $queue = delete $ns->{query_queue}
1937 or return; # be conservative, not sure how that can happen, but we saw a crash here 2021 or return; # be conservative, not sure how that can happen, but we saw a crash here
1938 2022
1939 (shift @$queue)->[1]->($msg); 2023 (shift @$queue)->[1]->($msg);
2024 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1940 2025
1941 push @{ $ns->{query_queue} }, @$queue; 2026 push @{ $ns->{query_queue} }, @$queue;
1942 2027
1943 if (@{ $ns->{query_queue} } == @$queue) { 2028 if (@{ $ns->{query_queue} } == @$queue) {
1944 if (@$queue) { 2029 if (@$queue) {
… …
2105The parameter C<$family> should best start with the name of the extension 2190The parameter C<$family> should best start with the name of the extension
2106using it, it should be unique. 2191using it, it should be unique.
2107 2192
2108=over 4 2193=over 4
2109 2194
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 2195=item $value = cf::db_get $family => $key
2117 2196
2118Returns a single value from the database 2197Returns 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 2198
2125=item cf::db_put $family => $key => $value 2199=item cf::db_put $family => $key => $value
2126 2200
2127Stores the given C<$value> in the family hash. Updates are delayed, if you 2201Stores 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 2202
2138=cut 2203=cut
2139 2204
2140our $DB; 2205our $DB;
2141 2206
2142{ 2207sub db_init {
2208 unless ($DB) {
2209 $DB = BDB::db_create $DB_ENV;
2210
2211 cf::sync_job {
2212 eval {
2213 $DB->set_flags (BDB::CHKSUM);
2214
2215 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2216 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2217 cf::cleanup "db_open(db): $!" if $!;
2218 };
2219 cf::cleanup "db_open(db): $@" if $@;
2220 };
2221
2143 my $path = cf::localdir . "/database.pst"; 2222 my $path = cf::localdir . "/database.pst";
2223 if (stat $path) {
2224 cf::sync_job {
2225 my $pst = Storable::retrieve $path;
2144 2226
2145 sub db_load() { 2227 cf::db_put (board => data => $pst->{board});
2146 $DB = stat $path ? Storable::retrieve $path : { }; 2228 cf::db_put (guildrules => data => $pst->{guildrules});
2147 } 2229 cf::db_put (rent => balance => $pst->{rent}{balance});
2230 BDB::db_env_txn_checkpoint $DB_ENV;
2148 2231
2149 my $pid; 2232 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 } 2233 };
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 }, 2234 }
2197 ); 2235 }
2236}
2237
2238sub db_get($$) {
2239 my $key = "$_[0]/$_[1]";
2240
2241 cf::sync_job {
2242 BDB::db_get $DB, undef, $key, my $data;
2243
2244 $! ? ()
2245 : Compress::LZF::sthaw $data
2246 }
2247}
2248
2249sub db_put($$$) {
2250 BDB::dbreq_pri 4;
2251 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2198} 2252}
2199 2253
2200############################################################################# 2254#############################################################################
2201# the server's main() 2255# the server's init and main functions
2256
2257sub init_resources {
2258 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2259 or die "unable to load regions file\n";#d#
2260}
2202 2261
2203sub cfg_load { 2262sub cfg_load {
2204 open my $fh, "<:utf8", cf::confdir . "/config" 2263 open my $fh, "<:utf8", cf::confdir . "/config"
2205 or return; 2264 or return;
2206 2265
… …
2219 }; 2278 };
2220 warn $@ if $@; 2279 warn $@ if $@;
2221 } 2280 }
2222} 2281}
2223 2282
2283sub init {
2284 init_resources;
2285}
2286
2224sub main { 2287sub main {
2225 # we must not ever block the main coroutine 2288 # we must not ever block the main coroutine
2226 local $Coro::idle = sub { 2289 local $Coro::idle = sub {
2227 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2290 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2291 (async {
2228 async { Event::one_event }; 2292 Event::one_event;
2293 })->prio (Coro::PRIO_MAX);
2229 }; 2294 };
2230 2295
2231 cfg_load; 2296 cfg_load;
2232 db_load; 2297 db_init;
2233 load_extensions; 2298 load_extensions;
2299
2300 $TICK_WATCHER->start;
2234 Event::loop; 2301 Event::loop;
2235} 2302}
2236 2303
2237############################################################################# 2304#############################################################################
2238# initialisation and cleanup 2305# initialisation and cleanup
2239 2306
2240# install some emergency cleanup handlers 2307# install some emergency cleanup handlers
2241BEGIN { 2308BEGIN {
2242 for my $signal (qw(INT HUP TERM)) { 2309 for my $signal (qw(INT HUP TERM)) {
2243 Event->signal ( 2310 Event->signal (
2311 reentrant => 0,
2244 data => WF_AUTOCANCEL, 2312 data => WF_AUTOCANCEL,
2245 signal => $signal, 2313 signal => $signal,
2314 prio => 0,
2246 cb => sub { 2315 cb => sub {
2247 cf::cleanup "SIG$signal"; 2316 cf::cleanup "SIG$signal";
2248 }, 2317 },
2249 ); 2318 );
2250 } 2319 }
2251} 2320}
… …
2256 warn "enter emergency perl save\n"; 2325 warn "enter emergency perl save\n";
2257 2326
2258 cf::sync_job { 2327 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl 2328 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players 2329 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously. 2330 # and maps saved/destroyed asynchronously.
2262 warn "begin emergency player save\n"; 2331 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) { 2332 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next; 2333 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next; 2334 $pl->valid or next;
2266 $pl->save; 2335 $pl->save;
… …
2272 my $map = $cf::MAP{$path} or next; 2341 my $map = $cf::MAP{$path} or next;
2273 $map->valid or next; 2342 $map->valid or next;
2274 $map->save; 2343 $map->save;
2275 } 2344 }
2276 warn "end emergency map save\n"; 2345 warn "end emergency map save\n";
2346
2347 warn "begin emergency database checkpoint\n";
2348 BDB::db_env_txn_checkpoint $DB_ENV;
2349 warn "end emergency database checkpoint\n";
2277 }; 2350 };
2278 2351
2279 warn "leave emergency perl save\n"; 2352 warn "leave emergency perl save\n";
2353}
2354
2355sub post_cleanup {
2356 my ($make_core) = @_;
2357
2358 warn Carp::longmess "post_cleanup backtrace"
2359 if $make_core;
2280} 2360}
2281 2361
2282sub reload() { 2362sub reload() {
2283 # can/must only be called in main 2363 # can/must only be called in main
2284 if ($Coro::current != $Coro::main) { 2364 if ($Coro::current != $Coro::main) {
2285 warn "can only reload from main coroutine\n"; 2365 warn "can only reload from main coroutine";
2286 return; 2366 return;
2287 } 2367 }
2288 2368
2289 warn "reloading..."; 2369 warn "reloading...";
2290 2370
2291 warn "freezing server"; 2371 warn "entering sync_job";
2292 my $guard = freeze_mainloop; 2372
2373 cf::sync_job {
2374 cf::write_runtime; # external watchdog should not bark
2293 cf::emergency_save; 2375 cf::emergency_save;
2376 cf::write_runtime; # external watchdog should not bark
2294 2377
2295 warn "sync database to disk"; 2378 warn "syncing database to disk";
2296 cf::db_sync; 2379 BDB::db_env_txn_checkpoint $DB_ENV;
2297 IO::AIO::flush;
2298 2380
2299 eval {
2300 # if anything goes wrong in here, we should simply crash as we already saved 2381 # if anything goes wrong in here, we should simply crash as we already saved
2301 2382
2302 warn "cancel all watchers"; 2383 warn "cancelling all WF_AUTOCANCEL watchers";
2303 for (Event::all_watchers) { 2384 for (Event::all_watchers) {
2304 $_->cancel if $_->data & WF_AUTOCANCEL; 2385 $_->cancel if $_->data & WF_AUTOCANCEL;
2305 } 2386 }
2306 2387
2388 warn "flushing outstanding aio requests";
2389 for (;;) {
2390 BDB::flush;
2391 IO::AIO::flush;
2392 Coro::cede;
2393 last unless IO::AIO::nreqs || BDB::nreqs;
2394 warn "iterate...";
2395 }
2396
2307 warn "cancel all extension coros"; 2397 warn "cancelling all extension coros";
2308 $_->cancel for values %EXT_CORO; 2398 $_->cancel for values %EXT_CORO;
2309 %EXT_CORO = (); 2399 %EXT_CORO = ();
2310 2400
2311 warn "remove commands"; 2401 warn "removing commands";
2312 %COMMAND = (); 2402 %COMMAND = ();
2313 2403
2314 warn "remove ext commands"; 2404 warn "removing ext commands";
2315 %EXTCMD = (); 2405 %EXTCMD = ();
2316 2406
2317 warn "unload/nuke all extensions"; 2407 warn "unloading/nuking all extensions";
2318 for my $pkg (@EXTS) { 2408 for my $pkg (@EXTS) {
2319 warn "unloading <$pkg>"; 2409 warn "... unloading $pkg";
2320 2410
2321 if (my $cb = $pkg->can ("unload")) { 2411 if (my $cb = $pkg->can ("unload")) {
2322 eval { 2412 eval {
2323 $cb->($pkg); 2413 $cb->($pkg);
2324 1 2414 1
2325 } or warn "$pkg unloaded, but with errors: $@"; 2415 } or warn "$pkg unloaded, but with errors: $@";
2326 } 2416 }
2327 2417
2418 warn "... nuking $pkg";
2328 Symbol::delete_package $pkg; 2419 Symbol::delete_package $pkg;
2329 } 2420 }
2330 2421
2331 warn "unload all perl modules loaded from $LIBDIR"; 2422 warn "unloading all perl modules loaded from $LIBDIR";
2332 while (my ($k, $v) = each %INC) { 2423 while (my ($k, $v) = each %INC) {
2333 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2424 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2334 2425
2335 warn "removing <$k>"; 2426 warn "... unloading $k";
2336 delete $INC{$k}; 2427 delete $INC{$k};
2337 2428
2338 $k =~ s/\.pm$//; 2429 $k =~ s/\.pm$//;
2339 $k =~ s/\//::/g; 2430 $k =~ s/\//::/g;
2340 2431
… …
2343 } 2434 }
2344 2435
2345 Symbol::delete_package $k; 2436 Symbol::delete_package $k;
2346 } 2437 }
2347 2438
2348 warn "get rid of safe::, as good as possible"; 2439 warn "getting rid of safe::, as good as possible";
2349 Symbol::delete_package "safe::$_" 2440 Symbol::delete_package "safe::$_"
2350 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2441 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2351 2442
2352 warn "unload cf.pm \"a bit\""; 2443 warn "unloading cf.pm \"a bit\"";
2353 delete $INC{"cf.pm"}; 2444 delete $INC{"cf.pm"};
2354 2445
2355 # don't, removes xs symbols, too, 2446 # don't, removes xs symbols, too,
2356 # and global variables created in xs 2447 # and global variables created in xs
2357 #Symbol::delete_package __PACKAGE__; 2448 #Symbol::delete_package __PACKAGE__;
2358 2449
2450 warn "unload completed, starting to reload now";
2451
2359 warn "reloading cf.pm"; 2452 warn "reloading cf.pm";
2360 require cf; 2453 require cf;
2361 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2454 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2362 2455
2363 warn "load config and database again"; 2456 warn "loading config and database again";
2364 cf::cfg_load; 2457 cf::cfg_load;
2365 cf::db_load;
2366 2458
2367 warn "load extensions"; 2459 warn "loading extensions";
2368 cf::load_extensions; 2460 cf::load_extensions;
2369 2461
2370 warn "reattach attachments to objects/players"; 2462 warn "reattaching attachments to objects/players";
2371 _global_reattach; 2463 _global_reattach;
2372 warn "reattach attachments to maps"; 2464 warn "reattaching attachments to maps";
2373 reattach $_ for values %MAP; 2465 reattach $_ for values %MAP;
2374 };
2375 2466
2376 if ($@) { 2467 warn "loading reloadable resources";
2468 init_resources;
2469
2470 warn "leaving sync_job";
2471
2472 1
2473 } or do {
2377 warn $@; 2474 warn $@;
2378 warn "error while reloading, exiting."; 2475 warn "error while reloading, exiting.";
2379 exit 1; 2476 exit 1;
2380 } 2477 };
2381 2478
2382 warn "reloaded"; 2479 warn "reloaded";
2383}; 2480};
2384 2481
2385############################################################################# 2482our $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 2483
2428register_command "reload" => sub { 2484register_command "reload" => sub {
2429 my ($who, $arg) = @_; 2485 my ($who, $arg) = @_;
2430 2486
2431 if ($who->flag (FLAG_WIZ)) { 2487 if ($who->flag (FLAG_WIZ)) {
2432 $who->message ("start of reload."); 2488 $who->message ("reloading server.");
2489
2490 # doing reload synchronously and two reloads happen back-to-back,
2491 # coro crashes during coro_state_free->destroy here.
2492
2493 $RELOAD_WATCHER ||= Event->timer (
2494 reentrant => 0,
2495 after => 0,
2496 data => WF_AUTOCANCEL,
2497 cb => sub {
2433 reload; 2498 reload;
2434 $who->message ("end of reload."); 2499 undef $RELOAD_WATCHER;
2500 },
2501 );
2435 } 2502 }
2436}; 2503};
2437 2504
2438unshift @INC, $LIBDIR; 2505unshift @INC, $LIBDIR;
2506
2507my $bug_warning = 0;
2439 2508
2440$TICK_WATCHER = Event->timer ( 2509$TICK_WATCHER = Event->timer (
2441 reentrant => 0, 2510 reentrant => 0,
2511 parked => 1,
2442 prio => 0, 2512 prio => 0,
2443 at => $NEXT_TICK || $TICK, 2513 at => $NEXT_TICK || $TICK,
2444 data => WF_AUTOCANCEL, 2514 data => WF_AUTOCANCEL,
2445 cb => sub { 2515 cb => sub {
2516 if ($Coro::current != $Coro::main) {
2517 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2518 unless ++$bug_warning > 10;
2519 return;
2520 }
2521
2522 $NOW = Event::time;
2523
2446 cf::server_tick; # one server iteration 2524 cf::server_tick; # one server iteration
2447 $RUNTIME += $TICK; 2525 $RUNTIME += $TICK;
2448 $NEXT_TICK += $TICK; 2526 $NEXT_TICK += $TICK;
2449 2527
2528 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2529 $NEXT_RUNTIME_WRITE = $NOW + 10;
2530 Coro::async_pool {
2531 write_runtime
2532 or warn "ERROR: unable to write runtime file: $!";
2533 };
2534 }
2535
2450 $WAIT_FOR_TICK->broadcast; 2536 $WAIT_FOR_TICK->broadcast;
2451 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2537 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2538
2539# my $AFTER = Event::time;
2540# warn $AFTER - $NOW;#d#
2452 2541
2453 # if we are delayed by four ticks or more, skip them all 2542 # if we are delayed by four ticks or more, skip them all
2454 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2543 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2455 2544
2456 $TICK_WATCHER->at ($NEXT_TICK); 2545 $TICK_WATCHER->at ($NEXT_TICK);
2457 $TICK_WATCHER->start; 2546 $TICK_WATCHER->start;
2458 }, 2547 },
2459); 2548);
2460 2549
2550{
2461IO::AIO::max_poll_time $TICK * 0.2; 2551 BDB::max_poll_time $TICK * 0.1;
2462 2552 $BDB_POLL_WATCHER = Event->io (
2463Event->io ( 2553 reentrant => 0,
2464 fd => IO::AIO::poll_fileno, 2554 fd => BDB::poll_fileno,
2465 poll => 'r', 2555 poll => 'r',
2466 prio => 5, 2556 prio => 0,
2467 data => WF_AUTOCANCEL,
2468 cb => \&IO::AIO::poll_cb,
2469);
2470
2471Event->timer (
2472 data => WF_AUTOCANCEL, 2557 data => WF_AUTOCANCEL,
2473 after => 0, 2558 cb => \&BDB::poll_cb,
2474 interval => 10, 2559 );
2475 cb => sub { 2560 BDB::min_parallel 8;
2476 (Coro::unblock_sub { 2561
2477 write_runtime 2562 BDB::set_sync_prepare {
2478 or warn "ERROR: unable to write runtime file: $!"; 2563 my $status;
2564 my $current = $Coro::current;
2565 (
2566 sub {
2567 $status = $!;
2568 $current->ready; undef $current;
2569 },
2570 sub {
2571 Coro::schedule while defined $current;
2572 $! = $status;
2573 },
2574 )
2575 };
2576
2577 unless ($DB_ENV) {
2578 $DB_ENV = BDB::db_env_create;
2579
2580 cf::sync_job {
2581 eval {
2582 BDB::db_env_open
2583 $DB_ENV,
2584 $BDB_ENV_DIR,
2585 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2586 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2587 0666;
2588
2589 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2590
2591 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2592 $DB_ENV->set_lk_detect;
2593 };
2594
2595 cf::cleanup "db_env_open(db): $@" if $@;
2479 })->(); 2596 };
2480 }, 2597 }
2481); 2598}
2599
2600{
2601 IO::AIO::min_parallel 8;
2602
2603 undef $Coro::AIO::WATCHER;
2604 IO::AIO::max_poll_time $TICK * 0.1;
2605 $AIO_POLL_WATCHER = Event->io (
2606 reentrant => 0,
2607 data => WF_AUTOCANCEL,
2608 fd => IO::AIO::poll_fileno,
2609 poll => 'r',
2610 prio => 6,
2611 cb => \&IO::AIO::poll_cb,
2612 );
2613}
2482 2614
2483END { cf::emergency_save } 2615END { cf::emergency_save }
2484 2616
24851 26171
2486 2618

Diff Legend

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