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

Diff Legend

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