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

Diff Legend

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