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.158 by root, Wed Jan 10 19:52:43 2007 UTC vs.
Revision 1.206 by root, Sun Feb 11 22:27:05 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 ();
… …
33 34
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 35$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 36
36our %COMMAND = (); 37our %COMMAND = ();
37our %COMMAND_TIME = (); 38our %COMMAND_TIME = ();
39
40our @EXTS = (); # list of extension package names
38our %EXTCMD = (); 41our %EXTCMD = ();
42our %EXT_CORO = (); # coroutines bound to extensions
43our %EXT_MAP = (); # pluggable maps
39 44
40our @EVENT; 45our @EVENT;
41our $LIBDIR = datadir . "/ext"; 46our $LIBDIR = datadir . "/ext";
42 47
43our $TICK = MAX_TIME * 1e-6; 48our $TICK = MAX_TIME * 1e-6;
44our $TICK_WATCHER; 49our $TICK_WATCHER;
50our $AIO_POLL_WATCHER;
51our $WRITE_RUNTIME_WATCHER;
45our $NEXT_TICK; 52our $NEXT_TICK;
46our $NOW; 53our $NOW;
54our $USE_FSYNC = 1; # use fsync to write maps - default off
55
56our $BDB_POLL_WATCHER;
57our $DB_ENV;
47 58
48our %CFG; 59our %CFG;
49 60
50our $UPTIME; $UPTIME ||= time; 61our $UPTIME; $UPTIME ||= time;
51our $RUNTIME; 62our $RUNTIME;
52 63
53our %PLAYER; # all users 64our %PLAYER; # all users
54our %MAP; # all maps 65our %MAP; # all maps
55our $LINK_MAP; # the special {link} map 66our $LINK_MAP; # the special {link} map, which is always available
56our $RANDOM_MAPS = cf::localdir . "/random"; 67our $RANDOM_MAPS = cf::localdir . "/random";
57our %EXT_CORO; # coroutines bound to extensions 68our $BDB_ENV_DIR = cf::localdir . "/db";
58 69
59our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 70our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 71our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
72
73# used to convert map paths into valid unix filenames by replacing / by ∕
74our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
61 75
62binmode STDOUT; 76binmode STDOUT;
63binmode STDERR; 77binmode STDERR;
64 78
65# read virtual server time, if available 79# read virtual server time, if available
… …
72mkdir cf::localdir; 86mkdir cf::localdir;
73mkdir cf::localdir . "/" . cf::playerdir; 87mkdir cf::localdir . "/" . cf::playerdir;
74mkdir cf::localdir . "/" . cf::tmpdir; 88mkdir cf::localdir . "/" . cf::tmpdir;
75mkdir cf::localdir . "/" . cf::uniquedir; 89mkdir cf::localdir . "/" . cf::uniquedir;
76mkdir $RANDOM_MAPS; 90mkdir $RANDOM_MAPS;
91mkdir $BDB_ENV_DIR;
77 92
78# a special map that is always available
79our $LINK_MAP;
80our $EMERGENCY_POSITION; 93our $EMERGENCY_POSITION;
94
95sub cf::map::normalise;
81 96
82############################################################################# 97#############################################################################
83 98
84=head2 GLOBAL VARIABLES 99=head2 GLOBAL VARIABLES
85 100
… …
156} 171}
157 172
158$Event::DIED = sub { 173$Event::DIED = sub {
159 warn "error in event callback: @_"; 174 warn "error in event callback: @_";
160}; 175};
161
162my %ext_pkg;
163my @exts;
164my @hook;
165 176
166=head2 UTILITY FUNCTIONS 177=head2 UTILITY FUNCTIONS
167 178
168=over 4 179=over 4
169 180
… …
257} 268}
258 269
259sub freeze_mainloop { 270sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 271 return unless $TICK_WATCHER->is_active;
261 272
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 273 my $guard = Coro::guard {
274 $TICK_WATCHER->start;
275 $WRITE_RUNTIME_WATCHER->start;
276 };
277 $WRITE_RUNTIME_WATCHER->stop;
263 $TICK_WATCHER->stop; 278 $TICK_WATCHER->stop;
264 $guard 279 $guard
265} 280}
266 281
267=item cf::async { BLOCK } 282=item cf::async { BLOCK }
… …
319 } 334 }
320} 335}
321 336
322=item $coro = cf::async_ext { BLOCK } 337=item $coro = cf::async_ext { BLOCK }
323 338
324Like async, but this coro is automcatially being canceled when the 339Like async, but this coro is automatically being canceled when the
325extension calling this is being unloaded. 340extension calling this is being unloaded.
326 341
327=cut 342=cut
328 343
329sub async_ext(&) { 344sub async_ext(&) {
… …
343 my $runtime = cf::localdir . "/runtime"; 358 my $runtime = cf::localdir . "/runtime";
344 359
345 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
346 or return; 361 or return;
347 362
363 my $value = $cf::RUNTIME + 90 + 10;
348 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 364 # 10 is the runtime save interval, for a monotonic clock
365 # 60 allows for the watchdog to kill the server.
366
349 (aio_write $fh, 0, (length $value), $value, 0) <= 0 367 (aio_write $fh, 0, (length $value), $value, 0) <= 0
350 and return; 368 and return;
351 369
370 # always fsync - this file is important
352 aio_fsync $fh 371 aio_fsync $fh
353 and return; 372 and return;
354 373
355 close $fh 374 close $fh
356 or return; 375 or return;
… …
362} 381}
363 382
364=back 383=back
365 384
366=cut 385=cut
367
368#############################################################################
369
370package cf::path;
371
372use overload
373 '""' => \&as_string;
374
375# used to convert map paths into valid unix filenames by repalcing / by ∕
376our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
377
378sub new {
379 my ($class, $path, $base) = @_;
380
381 $path = $path->as_string if ref $path;
382
383 my $self = bless { }, $class;
384
385 # {... are special paths that are not touched
386 # ?xxx/... are special absolute paths
387 # ?random/... random maps
388 # /! non-realised random map exit
389 # /... normal maps
390 # ~/... per-player maps without a specific player (DO NOT USE)
391 # ~user/... per-player map of a specific user
392
393 $path =~ s/$PATH_SEP/\//go;
394
395 if ($path =~ /^{/) {
396 # fine as it is
397 } elsif ($path =~ s{^\?random/}{}) {
398 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
399 $self->{random} = cf::from_json $data;
400 } else {
401 if ($path =~ s{^~([^/]+)?}{}) {
402 $self->{user_rel} = 1;
403
404 if (defined $1) {
405 $self->{user} = $1;
406 } elsif ($base =~ m{^~([^/]+)/}) {
407 $self->{user} = $1;
408 } else {
409 warn "cannot resolve user-relative path without user <$path,$base>\n";
410 }
411 } elsif ($path =~ /^\//) {
412 # already absolute
413 } else {
414 $base =~ s{[^/]+/?$}{};
415 return $class->new ("$base/$path");
416 }
417
418 for ($path) {
419 redo if s{/\.?/}{/};
420 redo if s{/[^/]+/\.\./}{/};
421 }
422 }
423
424 $self->{path} = $path;
425
426 $self
427}
428
429# the name / primary key / in-game path
430sub as_string {
431 my ($self) = @_;
432
433 $self->{user_rel} ? "~$self->{user}$self->{path}"
434 : $self->{random} ? "?random/$self->{path}"
435 : $self->{path}
436}
437
438# the displayed name, this is a one way mapping
439sub visible_name {
440 my ($self) = @_;
441
442# if (my $rmp = $self->{random}) {
443# # todo: be more intelligent about this
444# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
445# } else {
446 $self->as_string
447# }
448}
449
450# escape the /'s in the path
451sub _escaped_path {
452 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
453 $path
454}
455
456# the original (read-only) location
457sub load_path {
458 my ($self) = @_;
459
460 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
461}
462
463# the temporary/swap location
464sub save_path {
465 my ($self) = @_;
466
467 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
468 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
469 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
470}
471
472# the unique path, might be eq to save_path
473sub uniq_path {
474 my ($self) = @_;
475
476 $self->{user_rel} || $self->{random}
477 ? undef
478 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
479}
480
481# return random map parameters, or undef
482sub random_map_params {
483 my ($self) = @_;
484
485 $self->{random}
486}
487
488# this is somewhat ugly, but style maps do need special treatment
489sub is_style_map {
490 $_[0]{path} =~ m{^/styles/}
491}
492
493package cf;
494 386
495############################################################################# 387#############################################################################
496 388
497=head2 ATTACHABLE OBJECTS 389=head2 ATTACHABLE OBJECTS
498 390
… …
624our @CB_TYPE = (); # registry for type (cf-object class) based events 516our @CB_TYPE = (); # registry for type (cf-object class) based events
625our @CB_MAP = (); 517our @CB_MAP = ();
626 518
627my %attachment; 519my %attachment;
628 520
521sub cf::attachable::thawer_merge {
522 # simply override everything except _meta
523 local $_[0]{_meta};
524 %{$_[0]} = %{$_[1]};
525}
526
629sub _attach_cb($$$$) { 527sub _attach_cb($$$$) {
630 my ($registry, $event, $prio, $cb) = @_; 528 my ($registry, $event, $prio, $cb) = @_;
631 529
632 use sort 'stable'; 530 use sort 'stable';
633 531
… …
804# object support 702# object support
805 703
806sub reattach { 704sub reattach {
807 # basically do the same as instantiate, without calling instantiate 705 # basically do the same as instantiate, without calling instantiate
808 my ($obj) = @_; 706 my ($obj) = @_;
707
708 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
809 709
810 my $registry = $obj->registry; 710 my $registry = $obj->registry;
811 711
812 @$registry = (); 712 @$registry = ();
813 713
… …
860 $filename, length $$rdata, scalar @$objs; 760 $filename, length $$rdata, scalar @$objs;
861 761
862 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 762 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
863 chmod SAVE_MODE, $fh; 763 chmod SAVE_MODE, $fh;
864 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 764 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
865 aio_fsync $fh; 765 aio_fsync $fh if $cf::USE_FSYNC;
866 close $fh; 766 close $fh;
867 767
868 if (@$objs) { 768 if (@$objs) {
869 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 769 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
870 chmod SAVE_MODE, $fh; 770 chmod SAVE_MODE, $fh;
871 my $data = Storable::nfreeze { version => 1, objs => $objs }; 771 my $data = Storable::nfreeze { version => 1, objs => $objs };
872 aio_write $fh, 0, (length $data), $data, 0; 772 aio_write $fh, 0, (length $data), $data, 0;
873 aio_fsync $fh; 773 aio_fsync $fh if $cf::USE_FSYNC;
874 close $fh; 774 close $fh;
875 aio_rename "$filename.pst~", "$filename.pst"; 775 aio_rename "$filename.pst~", "$filename.pst";
876 } 776 }
877 } else { 777 } else {
878 aio_unlink "$filename.pst"; 778 aio_unlink "$filename.pst";
… …
884 } 784 }
885 } else { 785 } else {
886 aio_unlink $filename; 786 aio_unlink $filename;
887 aio_unlink "$filename.pst"; 787 aio_unlink "$filename.pst";
888 } 788 }
789
790 #d##TODO# nuke non .map-files if exist
791 if ($filename =~ s/\.map$//) {
792 aio_unlink $filename;
793 aio_unlink "$filename.pst";
794 }
889 } 795 }
890} 796}
891 797
892sub object_freezer_as_string { 798sub object_freezer_as_string {
893 my ($rdata, $objs) = @_; 799 my ($rdata, $objs) = @_;
… …
899 805
900sub object_thawer_load { 806sub object_thawer_load {
901 my ($filename) = @_; 807 my ($filename) = @_;
902 808
903 my ($data, $av); 809 my ($data, $av);
810
811 #d#TODO remove .map if file does not exist
812 aio_stat $filename and $filename =~ s/\.map$//;
904 813
905 (aio_load $filename, $data) >= 0 814 (aio_load $filename, $data) >= 0
906 or return; 815 or return;
907 816
908 unless (aio_stat "$filename.pst") { 817 unless (aio_stat "$filename.pst") {
… …
945=cut 854=cut
946 855
947sub register_extcmd { 856sub register_extcmd {
948 my ($name, $cb) = @_; 857 my ($name, $cb) = @_;
949 858
950 my $caller = caller;
951 #warn "registering extcmd '$name' to '$caller'";
952
953 $EXTCMD{$name} = [$cb, $caller]; 859 $EXTCMD{$name} = $cb;
954} 860}
955 861
956cf::player->attach ( 862cf::player->attach (
957 on_command => sub { 863 on_command => sub {
958 my ($pl, $name, $params) = @_; 864 my ($pl, $name, $params) = @_;
… …
971 877
972 my $msg = eval { from_json $buf }; 878 my $msg = eval { from_json $buf };
973 879
974 if (ref $msg) { 880 if (ref $msg) {
975 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 881 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
976 if (my %reply = $cb->[0]->($pl, $msg)) { 882 if (my %reply = $cb->($pl, $msg)) {
977 $pl->ext_reply ($msg->{msgid}, %reply); 883 $pl->ext_reply ($msg->{msgid}, %reply);
978 } 884 }
979 } 885 }
980 } else { 886 } else {
981 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 887 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
983 889
984 cf::override; 890 cf::override;
985 }, 891 },
986); 892);
987 893
988sub register {
989 my ($base, $pkg) = @_;
990
991 #TODO
992}
993
994sub load_extension { 894sub load_extension {
995 my ($path) = @_; 895 my ($path) = @_;
996 896
997 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 897 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
998 my $base = $1; 898 my $base = $1;
999 my $pkg = $1; 899 my $pkg = $1;
1000 $pkg =~ s/[^[:word:]]/_/g; 900 $pkg =~ s/[^[:word:]]/_/g;
1001 $pkg = "ext::$pkg"; 901 $pkg = "ext::$pkg";
1002 902
1003 warn "loading '$path' into '$pkg'\n"; 903 warn "... loading '$path' into '$pkg'\n";
1004 904
1005 open my $fh, "<:utf8", $path 905 open my $fh, "<:utf8", $path
1006 or die "$path: $!"; 906 or die "$path: $!";
1007 907
1008 my $source = 908 my $source =
1009 "package $pkg; use strict; use utf8;\n" 909 "package $pkg; use strict; use utf8;\n"
1010 . "#line 1 \"$path\"\n{\n" 910 . "#line 1 \"$path\"\n{\n"
1011 . (do { local $/; <$fh> }) 911 . (do { local $/; <$fh> })
1012 . "\n};\n1"; 912 . "\n};\n1";
1013 913
1014 eval $source 914 unless (eval $source) {
1015 or die $@ ? "$path: $@\n" 915 my $msg = $@ ? "$path: $@\n"
1016 : "extension disabled.\n"; 916 : "extension disabled.\n";
1017 917 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1018 push @exts, $pkg; 918 warn $@;
1019 $ext_pkg{$base} = $pkg; 919 warn "mandatory extension failed to load, exiting.\n";
1020 920 exit 1;
1021# no strict 'refs'; 921 }
1022# @{"$pkg\::ISA"} = ext::; 922 die $@;
1023
1024 register $base, $pkg;
1025}
1026
1027sub unload_extension {
1028 my ($pkg) = @_;
1029
1030 warn "removing extension $pkg\n";
1031
1032 # remove hooks
1033 #TODO
1034# for my $idx (0 .. $#PLUGIN_EVENT) {
1035# delete $hook[$idx]{$pkg};
1036# } 923 }
1037 924
1038 # remove commands 925 push @EXTS, $pkg;
1039 for my $name (keys %COMMAND) {
1040 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1041
1042 if (@cb) {
1043 $COMMAND{$name} = \@cb;
1044 } else {
1045 delete $COMMAND{$name};
1046 }
1047 }
1048
1049 # remove extcmds
1050 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1051 delete $EXTCMD{$name};
1052 }
1053
1054 if (my $cb = $pkg->can ("unload")) {
1055 eval {
1056 $cb->($pkg);
1057 1
1058 } or warn "$pkg unloaded, but with errors: $@";
1059 }
1060
1061 Symbol::delete_package $pkg;
1062} 926}
1063 927
1064sub load_extensions { 928sub load_extensions {
1065 for my $ext (<$LIBDIR/*.ext>) { 929 for my $ext (<$LIBDIR/*.ext>) {
1066 next unless -r $ext; 930 next unless -r $ext;
… …
1070 } or warn "$ext not loaded: $@"; 934 } or warn "$ext not loaded: $@";
1071 } 935 }
1072} 936}
1073 937
1074############################################################################# 938#############################################################################
1075# load/save/clean perl data associated with a map
1076
1077*cf::mapsupport::on_clean = sub {
1078 my ($map) = @_;
1079
1080 my $path = $map->tmpname;
1081 defined $path or return;
1082
1083 unlink "$path.pst";
1084};
1085
1086cf::map->attach (prio => -10000, package => cf::mapsupport::);
1087
1088#############################################################################
1089 939
1090=head2 CORE EXTENSIONS 940=head2 CORE EXTENSIONS
1091 941
1092Functions and methods that extend core crossfire objects. 942Functions and methods that extend core crossfire objects.
1093 943
… …
1129 979
1130sub exists($) { 980sub exists($) {
1131 my ($login) = @_; 981 my ($login) = @_;
1132 982
1133 $cf::PLAYER{$login} 983 $cf::PLAYER{$login}
1134 or cf::sync_job { !aio_stat $login } 984 or cf::sync_job { !aio_stat path $login }
1135} 985}
1136 986
1137sub find($) { 987sub find($) {
1138 return $cf::PLAYER{$_[0]} || do { 988 return $cf::PLAYER{$_[0]} || do {
1139 my $login = $_[0]; 989 my $login = $_[0];
… …
1229 \@logins 1079 \@logins
1230} 1080}
1231 1081
1232=item $player->maps 1082=item $player->maps
1233 1083
1234Returns an arrayref of cf::path's of all maps that are private for this 1084Returns an arrayref of map paths that are private for this
1235player. May block. 1085player. May block.
1236 1086
1237=cut 1087=cut
1238 1088
1239sub maps($) { 1089sub maps($) {
1240 my ($pl) = @_; 1090 my ($pl) = @_;
1091
1092 $pl = ref $pl ? $pl->ob->name : $pl;
1241 1093
1242 my $files = aio_readdir playerdir $pl 1094 my $files = aio_readdir playerdir $pl
1243 or return; 1095 or return;
1244 1096
1245 my @paths; 1097 my @paths;
… …
1247 for (@$files) { 1099 for (@$files) {
1248 utf8::decode $_; 1100 utf8::decode $_;
1249 next if /\.(?:pl|pst)$/; 1101 next if /\.(?:pl|pst)$/;
1250 next unless /^$PATH_SEP/o; 1102 next unless /^$PATH_SEP/o;
1251 1103
1252 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1104 push @paths, cf::map::normalise "~$pl/$_";
1253 } 1105 }
1254 1106
1255 \@paths 1107 \@paths
1256} 1108}
1257 1109
… …
1283package cf::map; 1135package cf::map;
1284 1136
1285use Fcntl; 1137use Fcntl;
1286use Coro::AIO; 1138use Coro::AIO;
1287 1139
1140use overload
1141 '""' => \&as_string,
1142 fallback => 1;
1143
1288our $MAX_RESET = 3600; 1144our $MAX_RESET = 3600;
1289our $DEFAULT_RESET = 3000; 1145our $DEFAULT_RESET = 3000;
1290 1146
1291sub generate_random_map { 1147sub generate_random_map {
1292 my ($path, $rmp) = @_; 1148 my ($self, $rmp) = @_;
1293
1294 # mit "rum" bekleckern, nicht 1149 # mit "rum" bekleckern, nicht
1295 cf::map::_create_random_map 1150 $self->_create_random_map (
1296 $path,
1297 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1151 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1298 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1152 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1299 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1153 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1300 $rmp->{exit_on_final_map}, 1154 $rmp->{exit_on_final_map},
1301 $rmp->{xsize}, $rmp->{ysize}, 1155 $rmp->{xsize}, $rmp->{ysize},
1302 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1156 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1303 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1157 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1304 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1158 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1305 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1159 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1306 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1160 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1307 (cf::region::find $rmp->{region}) 1161 (cf::region::find $rmp->{region}), $rmp->{custom}
1162 )
1163}
1164
1165=item cf::map->register ($regex, $prio)
1166
1167Register a handler for the map path matching the given regex at the
1168givne priority (higher is better, built-in handlers have priority 0, the
1169default).
1170
1171=cut
1172
1173sub register {
1174 my (undef, $regex, $prio) = @_;
1175 my $pkg = caller;
1176
1177 no strict;
1178 push @{"$pkg\::ISA"}, __PACKAGE__;
1179
1180 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1181}
1182
1183# also paths starting with '/'
1184$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1185
1186sub thawer_merge {
1187 my ($self, $merge) = @_;
1188
1189 # we have to keep some variables in memory intact
1190 local $self->{path};
1191 local $self->{load_path};
1192 local $self->{deny_save};
1193 local $self->{deny_reset};
1194
1195 $self->SUPER::thawer_merge ($merge);
1196}
1197
1198sub normalise {
1199 my ($path, $base) = @_;
1200
1201 $path = "$path"; # make sure its a string
1202
1203 $path =~ s/\.map$//;
1204
1205 # map plan:
1206 #
1207 # /! non-realised random map exit (special hack!)
1208 # {... are special paths that are not being touched
1209 # ?xxx/... are special absolute paths
1210 # ?random/... random maps
1211 # /... normal maps
1212 # ~user/... per-player map of a specific user
1213
1214 $path =~ s/$PATH_SEP/\//go;
1215
1216 # treat it as relative path if it starts with
1217 # something that looks reasonable
1218 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1219 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1220
1221 $base =~ s{[^/]+/?$}{};
1222 $path = "$base/$path";
1223 }
1224
1225 for ($path) {
1226 redo if s{//}{/};
1227 redo if s{/\.?/}{/};
1228 redo if s{/[^/]+/\.\./}{/};
1229 }
1230
1231 $path
1232}
1233
1234sub new_from_path {
1235 my (undef, $path, $base) = @_;
1236
1237 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1238
1239 $path = normalise $path, $base;
1240
1241 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1242 if ($path =~ $EXT_MAP{$pkg}[1]) {
1243 my $self = bless cf::map::new, $pkg;
1244 $self->{path} = $path; $self->path ($path);
1245 $self->init; # pass $1 etc.
1246 return $self;
1247 }
1248 }
1249
1250 Carp::carp "unable to resolve path '$path' (base '$base').";
1251 ()
1252}
1253
1254sub init {
1255 my ($self) = @_;
1256
1257 $self
1258}
1259
1260sub as_string {
1261 my ($self) = @_;
1262
1263 "$self->{path}"
1264}
1265
1266# the displayed name, this is a one way mapping
1267sub visible_name {
1268 &as_string
1269}
1270
1271# the original (read-only) location
1272sub load_path {
1273 my ($self) = @_;
1274
1275 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1276}
1277
1278# the temporary/swap location
1279sub save_path {
1280 my ($self) = @_;
1281
1282 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1283 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1284}
1285
1286# the unique path, undef == no special unique path
1287sub uniq_path {
1288 my ($self) = @_;
1289
1290 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1291 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1308} 1292}
1309 1293
1310# and all this just because we cannot iterate over 1294# and all this just because we cannot iterate over
1311# all maps in C++... 1295# all maps in C++...
1312sub change_all_map_light { 1296sub change_all_map_light {
… …
1314 1298
1315 $_->change_map_light ($change) 1299 $_->change_map_light ($change)
1316 for grep $_->outdoor, values %cf::MAP; 1300 for grep $_->outdoor, values %cf::MAP;
1317} 1301}
1318 1302
1303sub unlink_save {
1304 my ($self) = @_;
1305
1306 utf8::encode (my $save = $self->save_path);
1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1309
1310 #d#TODO remove .map and also nuke
1311 $save =~ s/\.map// or return;#d#
1312 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1314}
1315
1319sub try_load_header($) { 1316sub load_header_from($) {
1320 my ($path) = @_; 1317 my ($self, $path) = @_;
1321 1318
1322 utf8::encode $path; 1319 utf8::encode $path;
1323 aio_open $path, O_RDONLY, 0 1320 #aio_open $path, O_RDONLY, 0
1321 # or return;
1322
1323 $self->_load_header ($path)
1324 or return; 1324 or return;
1325 1325
1326 my $map = cf::map::new 1326 $self->{load_path} = $path;
1327
1328 1
1329}
1330
1331sub load_header_orig {
1332 my ($self) = @_;
1333
1334 $self->load_header_from ($self->load_path)
1335}
1336
1337sub load_header_temp {
1338 my ($self) = @_;
1339
1340 $self->load_header_from ($self->save_path)
1341}
1342
1343sub prepare_temp {
1344 my ($self) = @_;
1345
1346 $self->last_access ((delete $self->{last_access})
1347 || $cf::RUNTIME); #d#
1348 # safety
1349 $self->{instantiate_time} = $cf::RUNTIME
1350 if $self->{instantiate_time} > $cf::RUNTIME;
1351}
1352
1353sub prepare_orig {
1354 my ($self) = @_;
1355
1356 $self->{load_original} = 1;
1357 $self->{instantiate_time} = $cf::RUNTIME;
1358 $self->last_access ($cf::RUNTIME);
1359 $self->instantiate;
1360}
1361
1362sub load_header {
1363 my ($self) = @_;
1364
1365 if ($self->load_header_temp) {
1366 $self->prepare_temp;
1367 } else {
1368 $self->load_header_orig
1327 or return; 1369 or return;
1370 $self->prepare_orig;
1371 }
1328 1372
1329 # for better error messages only, will be overwritten 1373 1
1330 $map->path ($path);
1331
1332 $map->load_header ($path)
1333 or return;
1334
1335 $map->{load_path} = $path;
1336
1337 $map
1338} 1374}
1339 1375
1340sub find; 1376sub find;
1341sub find { 1377sub find {
1342 my ($path, $origin) = @_; 1378 my ($path, $origin) = @_;
1343 1379
1344 #warn "find<$path,$origin>\n";#d#
1345
1346 $path = new cf::path $path, $origin && $origin->path; 1380 $path = normalise $path, $origin && $origin->path;
1347 my $key = $path->as_string;
1348 1381
1349 cf::lock_wait "map_find:$key"; 1382 cf::lock_wait "map_find:$path";
1350 1383
1351 $cf::MAP{$key} || do { 1384 $cf::MAP{$path} || do {
1352 my $guard = cf::lock_acquire "map_find:$key"; 1385 my $guard = cf::lock_acquire "map_find:$path";
1353 1386 my $map = new_from_path cf::map $path
1354 # do it the slow way
1355 my $map = try_load_header $path->save_path;
1356
1357 Coro::cede;
1358
1359 if ($map) {
1360 $map->last_access ((delete $map->{last_access})
1361 || $cf::RUNTIME); #d#
1362 # safety
1363 $map->{instantiate_time} = $cf::RUNTIME
1364 if $map->{instantiate_time} > $cf::RUNTIME;
1365 } else {
1366 if (my $rmp = $path->random_map_params) {
1367 $map = generate_random_map $key, $rmp;
1368 } else {
1369 $map = try_load_header $path->load_path;
1370 }
1371
1372 $map or return; 1387 or return;
1373 1388
1374 $map->{load_original} = 1;
1375 $map->{instantiate_time} = $cf::RUNTIME;
1376 $map->last_access ($cf::RUNTIME);
1377 $map->instantiate;
1378
1379 # per-player maps become, after loading, normal maps
1380 $map->per_player (0) if $path->{user_rel};
1381 }
1382
1383 $map->path ($key);
1384 $map->{path} = $path;
1385 $map->{last_save} = $cf::RUNTIME; 1389 $map->{last_save} = $cf::RUNTIME;
1386 1390
1387 Coro::cede; 1391 $map->load_header
1392 or return;
1388 1393
1389 if ($map->should_reset) { 1394 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1395 # doing this can freeze the server in a sync job, obviously
1396 #$cf::WAIT_FOR_TICK->wait;
1390 $map->reset; 1397 $map->reset;
1391 undef $guard; 1398 undef $guard;
1392 $map = find $path 1399 return find $path;
1393 or return;
1394 } 1400 }
1395 1401
1396 $cf::MAP{$key} = $map 1402 $cf::MAP{$path} = $map
1397 } 1403 }
1398} 1404}
1405
1406sub pre_load { }
1407sub post_load { }
1399 1408
1400sub load { 1409sub load {
1401 my ($self) = @_; 1410 my ($self) = @_;
1402 1411
1412 local $self->{deny_reset} = 1; # loading can take a long time
1413
1403 my $path = $self->{path}; 1414 my $path = $self->{path};
1404 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1415 my $guard = cf::lock_acquire "map_load:$path";
1405 1416
1406 return if $self->in_memory != cf::MAP_SWAPPED; 1417 return if $self->in_memory != cf::MAP_SWAPPED;
1407 1418
1408 $self->in_memory (cf::MAP_LOADING); 1419 $self->in_memory (cf::MAP_LOADING);
1409 1420
1410 $self->alloc; 1421 $self->alloc;
1422
1423 $self->pre_load;
1424
1411 $self->load_objects ($self->{load_path}, 1) 1425 $self->_load_objects ($self->{load_path}, 1)
1412 or return; 1426 or return;
1413 1427
1414 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1428 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1415 if delete $self->{load_original}; 1429 if delete $self->{load_original};
1416 1430
1417 if (my $uniq = $path->uniq_path) { 1431 if (my $uniq = $self->uniq_path) {
1418 utf8::encode $uniq; 1432 utf8::encode $uniq;
1419 if (aio_open $uniq, O_RDONLY, 0) { 1433 if (aio_open $uniq, O_RDONLY, 0) {
1420 $self->clear_unique_items; 1434 $self->clear_unique_items;
1421 $self->load_objects ($uniq, 0); 1435 $self->_load_objects ($uniq, 0);
1422 } 1436 }
1423 } 1437 }
1424 1438
1425 Coro::cede; 1439 Coro::cede;
1426 1440
1427 # now do the right thing for maps 1441 # now do the right thing for maps
1428 $self->link_multipart_objects; 1442 $self->link_multipart_objects;
1429 1443
1430 if ($self->{path}->is_style_map) { 1444 unless ($self->{deny_activate}) {
1431 $self->{deny_save} = 1; 1445 $self->decay_objects;
1432 $self->{deny_reset} = 1;
1433 } else {
1434 $self->fix_auto_apply; 1446 $self->fix_auto_apply;
1435 $self->decay_objects;
1436 $self->update_buttons; 1447 $self->update_buttons;
1448 Coro::cede;
1437 $self->set_darkness_map; 1449 $self->set_darkness_map;
1438 $self->difficulty ($self->estimate_difficulty) 1450 $self->difficulty ($self->estimate_difficulty)
1439 unless $self->difficulty; 1451 unless $self->difficulty;
1452 Coro::cede;
1440 $self->activate; 1453 $self->activate;
1441 } 1454 }
1442 1455
1443 Coro::cede; 1456 $self->post_load;
1444 1457
1445 $self->in_memory (cf::MAP_IN_MEMORY); 1458 $self->in_memory (cf::MAP_IN_MEMORY);
1459}
1460
1461sub customise_for {
1462 my ($self, $ob) = @_;
1463
1464 return find "~" . $ob->name . "/" . $self->{path}
1465 if $self->per_player;
1466
1467 $self
1446} 1468}
1447 1469
1448# find and load all maps in the 3x3 area around a map 1470# find and load all maps in the 3x3 area around a map
1449sub load_diag { 1471sub load_diag {
1450 my ($map) = @_; 1472 my ($map) = @_;
… …
1480 1502
1481 cf::sync_job { $map->load }; 1503 cf::sync_job { $map->load };
1482} 1504}
1483 1505
1484our %MAP_PREFETCH; 1506our %MAP_PREFETCH;
1485our $MAP_PREFETCHER = Coro::async { 1507our $MAP_PREFETCHER = undef;
1486 while () {
1487 while (%MAP_PREFETCH) {
1488 my $key = each %MAP_PREFETCH
1489 or next;
1490 my $path = delete $MAP_PREFETCH{$key};
1491
1492 my $map = find $path
1493 or next;
1494 $map->load;
1495 }
1496 Coro::schedule;
1497 }
1498};
1499 1508
1500sub find_async { 1509sub find_async {
1501 my ($path, $origin) = @_; 1510 my ($path, $origin) = @_;
1502 1511
1503 $path = new cf::path $path, $origin && $origin->path; 1512 $path = normalise $path, $origin && $origin->{path};
1504 my $key = $path->as_string;
1505 1513
1506 if (my $map = $cf::MAP{$key}) { 1514 if (my $map = $cf::MAP{$path}) {
1507 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1515 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1508 } 1516 }
1509 1517
1510 $MAP_PREFETCH{$key} = $path; 1518 undef $MAP_PREFETCH{$path};
1519 $MAP_PREFETCHER ||= cf::async {
1520 while (%MAP_PREFETCH) {
1521 for my $path (keys %MAP_PREFETCH) {
1522 my $map = find $path
1523 or next;
1524 $map->load;
1525
1526 delete $MAP_PREFETCH{$path};
1527 }
1528 }
1529 undef $MAP_PREFETCHER;
1530 };
1511 $MAP_PREFETCHER->ready; 1531 $MAP_PREFETCHER->prio (6);
1512 1532
1513 () 1533 ()
1514} 1534}
1515 1535
1516sub save { 1536sub save {
… …
1520 1540
1521 $self->{last_save} = $cf::RUNTIME; 1541 $self->{last_save} = $cf::RUNTIME;
1522 1542
1523 return unless $self->dirty; 1543 return unless $self->dirty;
1524 1544
1525 my $save = $self->{path}->save_path; utf8::encode $save; 1545 my $save = $self->save_path; utf8::encode $save;
1526 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1546 my $uniq = $self->uniq_path; utf8::encode $uniq;
1527 1547
1528 $self->{load_path} = $save; 1548 $self->{load_path} = $save;
1529 1549
1530 return if $self->{deny_save}; 1550 return if $self->{deny_save};
1531 1551
… …
1534 cf::async { 1554 cf::async {
1535 $_->contr->save for $self->players; 1555 $_->contr->save for $self->players;
1536 }; 1556 };
1537 1557
1538 if ($uniq) { 1558 if ($uniq) {
1539 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1559 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1540 $self->save_objects ($uniq, cf::IO_UNIQUES); 1560 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1541 } else { 1561 } else {
1542 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1562 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1543 } 1563 }
1544} 1564}
1545 1565
1546sub swap_out { 1566sub swap_out {
1547 my ($self) = @_; 1567 my ($self) = @_;
… …
1561 1581
1562sub reset_at { 1582sub reset_at {
1563 my ($self) = @_; 1583 my ($self) = @_;
1564 1584
1565 # TODO: safety, remove and allow resettable per-player maps 1585 # TODO: safety, remove and allow resettable per-player maps
1566 return 1e99 if $self->{path}{user_rel}; 1586 return 1e99 if $self->isa ("ext::map_per_player");#d#
1567 return 1e99 if $self->{deny_reset}; 1587 return 1e99 if $self->{deny_reset};
1568 1588
1569 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1589 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1570 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1590 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1571 1591
… …
1576 my ($self) = @_; 1596 my ($self) = @_;
1577 1597
1578 $self->reset_at <= $cf::RUNTIME 1598 $self->reset_at <= $cf::RUNTIME
1579} 1599}
1580 1600
1581sub unlink_save {
1582 my ($self) = @_;
1583
1584 utf8::encode (my $save = $self->{path}->save_path);
1585 aioreq_pri 3; IO::AIO::aio_unlink $save;
1586 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1587}
1588
1589sub rename {
1590 my ($self, $new_path) = @_;
1591
1592 $self->unlink_save;
1593
1594 delete $cf::MAP{$self->path};
1595 $self->{path} = new cf::path $new_path;
1596 $self->path ($self->{path}->as_string);
1597 $cf::MAP{$self->path} = $self;
1598
1599 $self->save;
1600}
1601
1602sub reset { 1601sub reset {
1603 my ($self) = @_; 1602 my ($self) = @_;
1604 1603
1605 my $lock = cf::lock_acquire "map_data:" . $self->path; 1604 my $lock = cf::lock_acquire "map_data:$self->{path}";
1606 1605
1607 return if $self->players; 1606 return if $self->players;
1608 return if $self->{path}{user_rel};#d# 1607 return if $self->isa ("ext::map_per_player");#d#
1609 1608
1610 warn "resetting map ", $self->path;#d# 1609 warn "resetting map ", $self->path;#d#
1611 1610
1612 delete $cf::MAP{$self->path}; 1611 delete $cf::MAP{$self->path};
1612
1613 $self->in_memory (cf::MAP_SWAPPED);
1614 $self->clear;
1613 1615
1614 $_->clear_links_to ($self) for values %cf::MAP; 1616 $_->clear_links_to ($self) for values %cf::MAP;
1615 1617
1616 $self->unlink_save; 1618 $self->unlink_save;
1617 $self->destroy; 1619 $self->destroy;
… …
1620my $nuke_counter = "aaaa"; 1622my $nuke_counter = "aaaa";
1621 1623
1622sub nuke { 1624sub nuke {
1623 my ($self) = @_; 1625 my ($self) = @_;
1624 1626
1627 delete $cf::MAP{$self->path};
1628
1629 $self->unlink_save;
1630
1631 bless $self, "cf::map";
1632 delete $self->{deny_reset};
1625 $self->{deny_save} = 1; 1633 $self->{deny_save} = 1;
1626 $self->reset_timeout (1); 1634 $self->reset_timeout (1);
1627 $self->rename ("{nuke}/" . ($nuke_counter++)); 1635 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1636
1637 $cf::MAP{$self->path} = $self;
1638
1628 $self->reset; # polite request, might not happen 1639 $self->reset; # polite request, might not happen
1629} 1640}
1630 1641
1631sub customise_for {
1632 my ($map, $ob) = @_;
1633
1634 if ($map->per_player) {
1635 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1636 }
1637
1638 $map
1639}
1640
1641=item cf::map::unique_maps 1642=item cf::map::unique_maps
1642 1643
1643Returns an arrayref of cf::path's of all shared maps that have 1644Returns an arrayref of paths of all shared maps that have
1644instantiated unique items. May block. 1645instantiated unique items. May block.
1645 1646
1646=cut 1647=cut
1647 1648
1648sub unique_maps() { 1649sub unique_maps() {
… …
1654 for (@$files) { 1655 for (@$files) {
1655 utf8::decode $_; 1656 utf8::decode $_;
1656 next if /\.pst$/; 1657 next if /\.pst$/;
1657 next unless /^$PATH_SEP/o; 1658 next unless /^$PATH_SEP/o;
1658 1659
1659 push @paths, new cf::path $_; 1660 push @paths, cf::map::normalise $_;
1660 } 1661 }
1661 1662
1662 \@paths 1663 \@paths
1663} 1664}
1664 1665
… …
1739 1740
1740=item $player_object->enter_link 1741=item $player_object->enter_link
1741 1742
1742Freezes the player and moves him/her to a special map (C<{link}>). 1743Freezes the player and moves him/her to a special map (C<{link}>).
1743 1744
1744The player should be reaosnably safe there for short amounts of time. You 1745The player should be reasonably safe there for short amounts of time. You
1745I<MUST> call C<leave_link> as soon as possible, though. 1746I<MUST> call C<leave_link> as soon as possible, though.
1746 1747
1748Will never block.
1749
1747=item $player_object->leave_link ($map, $x, $y) 1750=item $player_object->leave_link ($map, $x, $y)
1748 1751
1749Moves the player out of the specila link map onto the given map. If the 1752Moves the player out of the special C<{link}> map onto the specified
1750map is not valid (or omitted), the player will be moved back to the 1753map. If the map is not valid (or omitted), the player will be moved back
1751location he/she was before the call to C<enter_link>, or, if that fails, 1754to the location he/she was before the call to C<enter_link>, or, if that
1752to the emergency map position. 1755fails, to the emergency map position.
1753 1756
1754Might block. 1757Might block.
1755 1758
1756=cut 1759=cut
1760
1761sub link_map {
1762 unless ($LINK_MAP) {
1763 $LINK_MAP = cf::map::find "{link}"
1764 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1765 $LINK_MAP->load;
1766 }
1767
1768 $LINK_MAP
1769}
1757 1770
1758sub cf::object::player::enter_link { 1771sub cf::object::player::enter_link {
1759 my ($self) = @_; 1772 my ($self) = @_;
1760 1773
1761 $self->deactivate_recursive; 1774 $self->deactivate_recursive;
1762 1775
1763 return if $self->map == $LINK_MAP; 1776 return if UNIVERSAL::isa $self->map, "ext::map_link";
1764 1777
1765 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1766 if $self->map; 1779 if $self->map;
1767 1780
1768 $self->enter_map ($LINK_MAP, 20, 20); 1781 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1769} 1782}
1770 1783
1771sub cf::object::player::leave_link { 1784sub cf::object::player::leave_link {
1772 my ($self, $map, $x, $y) = @_; 1785 my ($self, $map, $x, $y) = @_;
1773 1786
… …
1837=cut 1850=cut
1838 1851
1839sub cf::object::player::goto { 1852sub cf::object::player::goto {
1840 my ($self, $path, $x, $y) = @_; 1853 my ($self, $path, $x, $y) = @_;
1841 1854
1842 $path = new cf::path $path;
1843
1844 $self->enter_link; 1855 $self->enter_link;
1845 1856
1846 (async { 1857 (async {
1858 my $map = eval {
1847 my $map = cf::map::find $path->as_string; 1859 my $map = cf::map::find $path;
1848 $map = $map->customise_for ($self) if $map; 1860 $map = $map->customise_for ($self) if $map;
1849 1861 $map
1850# warn "entering ", $map->path, " at ($x, $y)\n" 1862 } or
1851# if $map;
1852
1853 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1863 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1854 1864
1855 $self->leave_link ($map, $x, $y); 1865 $self->leave_link ($map, $x, $y);
1856 })->prio (1); 1866 })->prio (1);
1857} 1867}
1858 1868
… …
1862 1872
1863sub parse_random_map_params { 1873sub parse_random_map_params {
1864 my ($spec) = @_; 1874 my ($spec) = @_;
1865 1875
1866 my $rmp = { # defaults 1876 my $rmp = { # defaults
1867 xsize => 10, 1877 xsize => (cf::rndm 15, 40),
1868 ysize => 10, 1878 ysize => (cf::rndm 15, 40),
1879 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1880 #layout => string,
1869 }; 1881 };
1870 1882
1871 for (split /\n/, $spec) { 1883 for (split /\n/, $spec) {
1872 my ($k, $v) = split /\s+/, $_, 2; 1884 my ($k, $v) = split /\s+/, $_, 2;
1873 1885
… …
1877 $rmp 1889 $rmp
1878} 1890}
1879 1891
1880sub prepare_random_map { 1892sub prepare_random_map {
1881 my ($exit) = @_; 1893 my ($exit) = @_;
1894
1895 my $guard = cf::lock_acquire "exit_prepare:$exit";
1882 1896
1883 # all this does is basically replace the /! path by 1897 # all this does is basically replace the /! path by
1884 # a new random map path (?random/...) with a seed 1898 # a new random map path (?random/...) with a seed
1885 # that depends on the exit object 1899 # that depends on the exit object
1886 1900
1887 my $rmp = parse_random_map_params $exit->msg; 1901 my $rmp = parse_random_map_params $exit->msg;
1888 1902
1889 if ($exit->map) { 1903 if ($exit->map) {
1890 $rmp->{region} = $exit->map->region_name; 1904 $rmp->{region} = $exit->region->name;
1891 $rmp->{origin_map} = $exit->map->path; 1905 $rmp->{origin_map} = $exit->map->path;
1892 $rmp->{origin_x} = $exit->x; 1906 $rmp->{origin_x} = $exit->x;
1893 $rmp->{origin_y} = $exit->y; 1907 $rmp->{origin_y} = $exit->y;
1894 } 1908 }
1895 1909
1896 $rmp->{random_seed} ||= $exit->random_seed; 1910 $rmp->{random_seed} ||= $exit->random_seed;
1897 1911
1898 my $data = cf::to_json $rmp; 1912 my $data = cf::to_json $rmp;
1899 my $md5 = Digest::MD5::md5_hex $data; 1913 my $md5 = Digest::MD5::md5_hex $data;
1914 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1900 1915
1901 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1916 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1902 aio_write $fh, 0, (length $data), $data, 0; 1917 aio_write $fh, 0, (length $data), $data, 0;
1918 undef $fh;
1919 aio_rename "$meta~", $meta;
1903 1920
1904 $exit->slaying ("?random/$md5"); 1921 $exit->slaying ("?random/$md5");
1905 $exit->msg (undef); 1922 $exit->msg (undef);
1906 } 1923 }
1907} 1924}
1908 1925
1909sub cf::object::player::enter_exit { 1926sub cf::object::player::enter_exit {
1910 my ($self, $exit) = @_; 1927 my ($self, $exit) = @_;
1911 1928
1912 return unless $self->type == cf::PLAYER; 1929 return unless $self->type == cf::PLAYER;
1930
1931 if ($exit->slaying eq "/!") {
1932 #TODO: this should de-fi-ni-te-ly not be a sync-job
1933 cf::sync_job { prepare_random_map $exit };
1934 }
1935
1936 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1937 my $hp = $exit->stats->hp;
1938 my $sp = $exit->stats->sp;
1913 1939
1914 $self->enter_link; 1940 $self->enter_link;
1915 1941
1916 (async { 1942 (async {
1917 $self->deactivate_recursive; # just to be sure 1943 $self->deactivate_recursive; # just to be sure
1918 unless (eval { 1944 unless (eval {
1919 prepare_random_map $exit 1945 $self->goto ($slaying, $hp, $sp);
1920 if $exit->slaying eq "/!";
1921
1922 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1923 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1924 1946
1925 1; 1947 1;
1926 }) { 1948 }) {
1927 $self->message ("Something went wrong deep within the crossfire server. " 1949 $self->message ("Something went wrong deep within the crossfire server. "
1928 . "I'll try to bring you back to the map you were before. " 1950 . "I'll try to bring you back to the map you were before. "
… …
1989 # get handled first 2011 # get handled first
1990 my $queue = delete $ns->{query_queue} 2012 my $queue = delete $ns->{query_queue}
1991 or return; # be conservative, not sure how that can happen, but we saw a crash here 2013 or return; # be conservative, not sure how that can happen, but we saw a crash here
1992 2014
1993 (shift @$queue)->[1]->($msg); 2015 (shift @$queue)->[1]->($msg);
2016 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1994 2017
1995 push @{ $ns->{query_queue} }, @$queue; 2018 push @{ $ns->{query_queue} }, @$queue;
1996 2019
1997 if (@{ $ns->{query_queue} } == @$queue) { 2020 if (@{ $ns->{query_queue} } == @$queue) {
1998 if (@$queue) { 2021 if (@$queue) {
… …
2217 sub db_sync() { 2240 sub db_sync() {
2218 db_save if $dirty; 2241 db_save if $dirty;
2219 undef $dirty; 2242 undef $dirty;
2220 } 2243 }
2221 2244
2222 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2245 my $idle = Event->idle (
2223 db_sync; 2246 reentrant => 0,
2247 min => 10,
2248 max => 20,
2249 repeat => 0,
2250 data => WF_AUTOCANCEL,
2251 cb => \&db_sync,
2224 }); 2252 );
2225 2253
2226 sub db_dirty() { 2254 sub db_dirty() {
2227 $dirty = 1; 2255 $dirty = 1;
2228 $idle->start; 2256 $idle->start;
2229 } 2257 }
… …
2250 }, 2278 },
2251 ); 2279 );
2252} 2280}
2253 2281
2254############################################################################# 2282#############################################################################
2255# the server's main() 2283# the server's init and main functions
2284
2285sub load_resources {
2286 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2287 or die "unable to load regions file\n";#d#
2288}
2256 2289
2257sub cfg_load { 2290sub cfg_load {
2258 open my $fh, "<:utf8", cf::confdir . "/config" 2291 open my $fh, "<:utf8", cf::confdir . "/config"
2259 or return; 2292 or return;
2260 2293
… …
2273 }; 2306 };
2274 warn $@ if $@; 2307 warn $@ if $@;
2275 } 2308 }
2276} 2309}
2277 2310
2311sub init {
2312 load_resources;
2313}
2314
2278sub main { 2315sub main {
2279 # we must not ever block the main coroutine 2316 # we must not ever block the main coroutine
2280 local $Coro::idle = sub { 2317 local $Coro::idle = sub {
2281 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2318 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2319 (async {
2282 async { Event::one_event }; 2320 Event::one_event;
2321 })->prio (Coro::PRIO_MAX);
2283 }; 2322 };
2284 2323
2285 cfg_load; 2324 cfg_load;
2286 db_load; 2325 db_load;
2287 load_extensions; 2326 load_extensions;
2327
2328 $TICK_WATCHER->start;
2288 Event::loop; 2329 Event::loop;
2289} 2330}
2290 2331
2291############################################################################# 2332#############################################################################
2292# initialisation and cleanup 2333# initialisation and cleanup
2293 2334
2294# install some emergency cleanup handlers 2335# install some emergency cleanup handlers
2295BEGIN { 2336BEGIN {
2296 for my $signal (qw(INT HUP TERM)) { 2337 for my $signal (qw(INT HUP TERM)) {
2297 Event->signal ( 2338 Event->signal (
2339 reentrant => 0,
2298 data => WF_AUTOCANCEL, 2340 data => WF_AUTOCANCEL,
2299 signal => $signal, 2341 signal => $signal,
2342 prio => 0,
2300 cb => sub { 2343 cb => sub {
2301 cf::cleanup "SIG$signal"; 2344 cf::cleanup "SIG$signal";
2302 }, 2345 },
2303 ); 2346 );
2304 } 2347 }
2305} 2348}
… …
2310 warn "enter emergency perl save\n"; 2353 warn "enter emergency perl save\n";
2311 2354
2312 cf::sync_job { 2355 cf::sync_job {
2313 # use a peculiar iteration method to avoid tripping on perl 2356 # use a peculiar iteration method to avoid tripping on perl
2314 # refcount bugs in for. also avoids problems with players 2357 # refcount bugs in for. also avoids problems with players
2315 # and maps saved/Destroyed asynchronously. 2358 # and maps saved/destroyed asynchronously.
2316 warn "begin emergency player save\n"; 2359 warn "begin emergency player save\n";
2317 for my $login (keys %cf::PLAYER) { 2360 for my $login (keys %cf::PLAYER) {
2318 my $pl = $cf::PLAYER{$login} or next; 2361 my $pl = $cf::PLAYER{$login} or next;
2319 $pl->valid or next; 2362 $pl->valid or next;
2320 $pl->save; 2363 $pl->save;
… …
2334} 2377}
2335 2378
2336sub reload() { 2379sub reload() {
2337 # can/must only be called in main 2380 # can/must only be called in main
2338 if ($Coro::current != $Coro::main) { 2381 if ($Coro::current != $Coro::main) {
2339 warn "can only reload from main coroutine\n"; 2382 warn "can only reload from main coroutine";
2340 return; 2383 return;
2341 } 2384 }
2342 2385
2343 warn "reloading..."; 2386 warn "reloading...";
2344 2387
2345 my $guard = freeze_mainloop; 2388 warn "cancelling server ticker";
2389 $TICK_WATCHER->cancel;
2390
2346 cf::emergency_save; 2391 cf::emergency_save;
2347 2392
2348 eval { 2393 eval {
2349 # if anything goes wrong in here, we should simply crash as we already saved 2394 # if anything goes wrong in here, we should simply crash as we already saved
2350 2395
2351 # cancel all watchers 2396 warn "syncing database to disk";
2397 cf::db_sync;
2398
2399 warn "cancelling all WF_AUTOCANCEL watchers";
2352 for (Event::all_watchers) { 2400 for (Event::all_watchers) {
2353 $_->cancel if $_->data & WF_AUTOCANCEL; 2401 $_->cancel if $_->data & WF_AUTOCANCEL;
2354 } 2402 }
2355 2403
2404 warn "flushing outstanding aio requests";
2405 for (;;) {
2406 IO::AIO::flush;
2407 Coro::cede;
2408 last unless IO::AIO::nreqs;
2409 warn "iterate...";
2410 }
2411
2356 # cancel all extension coros 2412 warn "cancelling all extension coros";
2357 $_->cancel for values %EXT_CORO; 2413 $_->cancel for values %EXT_CORO;
2358 %EXT_CORO = (); 2414 %EXT_CORO = ();
2359 2415
2360 # unload all extensions 2416 warn "removing commands";
2361 for (@exts) { 2417 %COMMAND = ();
2418
2419 warn "removing ext commands";
2420 %EXTCMD = ();
2421
2422 warn "unloading/nuking all extensions";
2423 for my $pkg (@EXTS) {
2362 warn "unloading <$_>"; 2424 warn "... unloading $pkg";
2363 unload_extension $_; 2425
2426 if (my $cb = $pkg->can ("unload")) {
2427 eval {
2428 $cb->($pkg);
2429 1
2430 } or warn "$pkg unloaded, but with errors: $@";
2364 } 2431 }
2365 2432
2433 warn "... nuking $pkg";
2434 Symbol::delete_package $pkg;
2435 }
2436
2366 # unload all modules loaded from $LIBDIR 2437 warn "unloading all perl modules loaded from $LIBDIR";
2367 while (my ($k, $v) = each %INC) { 2438 while (my ($k, $v) = each %INC) {
2368 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2439 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2369 2440
2370 warn "removing <$k>"; 2441 warn "... unloading $k";
2371 delete $INC{$k}; 2442 delete $INC{$k};
2372 2443
2373 $k =~ s/\.pm$//; 2444 $k =~ s/\.pm$//;
2374 $k =~ s/\//::/g; 2445 $k =~ s/\//::/g;
2375 2446
… …
2378 } 2449 }
2379 2450
2380 Symbol::delete_package $k; 2451 Symbol::delete_package $k;
2381 } 2452 }
2382 2453
2383 # sync database to disk
2384 cf::db_sync;
2385 IO::AIO::flush;
2386
2387 # get rid of safe::, as good as possible 2454 warn "getting rid of safe::, as good as possible";
2388 Symbol::delete_package "safe::$_" 2455 Symbol::delete_package "safe::$_"
2389 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2456 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2390 2457
2391 # remove register_script_function callbacks
2392 # TODO
2393
2394 # unload cf.pm "a bit" 2458 warn "unloading cf.pm \"a bit\"";
2395 delete $INC{"cf.pm"}; 2459 delete $INC{"cf.pm"};
2396 2460
2397 # don't, removes xs symbols, too, 2461 # don't, removes xs symbols, too,
2398 # and global variables created in xs 2462 # and global variables created in xs
2399 #Symbol::delete_package __PACKAGE__; 2463 #Symbol::delete_package __PACKAGE__;
2400 2464
2401 # reload cf.pm 2465 warn "unload completed, starting to reload now";
2466
2402 warn "reloading cf.pm"; 2467 warn "reloading cf.pm";
2403 require cf; 2468 require cf;
2404 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2469 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2405 2470
2406 # load config and database again 2471 warn "loading config and database again";
2407 cf::cfg_load; 2472 cf::cfg_load;
2408 cf::db_load; 2473 cf::db_load;
2409 2474
2410 # load extensions
2411 warn "load extensions"; 2475 warn "loading extensions";
2412 cf::load_extensions; 2476 cf::load_extensions;
2413 2477
2414 # reattach attachments to objects 2478 warn "reattaching attachments to objects/players";
2415 warn "reattach";
2416 _global_reattach; 2479 _global_reattach;
2480 warn "reattaching attachments to maps";
2417 reattach $_ for values %MAP; 2481 reattach $_ for values %MAP;
2482
2483 warn "loading reloadable resources";
2484 load_resources;
2485
2486 warn "restarting server ticker";
2487
2488 $TICK_WATCHER->start;
2418 }; 2489 };
2419 2490
2420 if ($@) { 2491 if ($@) {
2421 warn $@; 2492 warn $@;
2422 warn "error while reloading, exiting."; 2493 warn "error while reloading, exiting.";
2423 exit 1; 2494 exit 1;
2424 } 2495 }
2425 2496
2426 warn "reloaded successfully"; 2497 warn "reloaded";
2427}; 2498};
2428 2499
2429############################################################################# 2500our $RELOAD_WATCHER; # used only during reload
2430
2431unless ($LINK_MAP) {
2432 $LINK_MAP = cf::map::new;
2433
2434 $LINK_MAP->width (41);
2435 $LINK_MAP->height (41);
2436 $LINK_MAP->alloc;
2437 $LINK_MAP->path ("{link}");
2438 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2439 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2440
2441 # dirty hack because... archetypes are not yet loaded
2442 Event->timer (
2443 after => 10,
2444 cb => sub {
2445 $_[0]->w->cancel;
2446
2447 # provide some exits "home"
2448 my $exit = cf::object::new "exit";
2449
2450 $exit->slaying ($EMERGENCY_POSITION->[0]);
2451 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2452 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2453
2454 $LINK_MAP->insert ($exit->clone, 19, 19);
2455 $LINK_MAP->insert ($exit->clone, 19, 20);
2456 $LINK_MAP->insert ($exit->clone, 19, 21);
2457 $LINK_MAP->insert ($exit->clone, 20, 19);
2458 $LINK_MAP->insert ($exit->clone, 20, 21);
2459 $LINK_MAP->insert ($exit->clone, 21, 19);
2460 $LINK_MAP->insert ($exit->clone, 21, 20);
2461 $LINK_MAP->insert ($exit->clone, 21, 21);
2462
2463 $exit->destroy;
2464 });
2465
2466 $LINK_MAP->{deny_save} = 1;
2467 $LINK_MAP->{deny_reset} = 1;
2468
2469 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2470}
2471
2472register "<global>", __PACKAGE__;
2473 2501
2474register_command "reload" => sub { 2502register_command "reload" => sub {
2475 my ($who, $arg) = @_; 2503 my ($who, $arg) = @_;
2476 2504
2477 if ($who->flag (FLAG_WIZ)) { 2505 if ($who->flag (FLAG_WIZ)) {
2478 $who->message ("start of reload."); 2506 $who->message ("reloading server.");
2507
2508 # doing reload synchronously and two reloads happen back-to-back,
2509 # coro crashes during coro_state_free->destroy here.
2510
2511 $RELOAD_WATCHER ||= Event->timer (
2512 reentrant => 0,
2513 after => 0,
2514 data => WF_AUTOCANCEL,
2515 cb => sub {
2479 reload; 2516 reload;
2480 $who->message ("end of reload."); 2517 undef $RELOAD_WATCHER;
2518 },
2519 );
2481 } 2520 }
2482}; 2521};
2483 2522
2484unshift @INC, $LIBDIR; 2523unshift @INC, $LIBDIR;
2524
2525my $bug_warning = 0;
2485 2526
2486$TICK_WATCHER = Event->timer ( 2527$TICK_WATCHER = Event->timer (
2487 reentrant => 0, 2528 reentrant => 0,
2529 parked => 1,
2488 prio => 0, 2530 prio => 0,
2489 at => $NEXT_TICK || $TICK, 2531 at => $NEXT_TICK || $TICK,
2490 data => WF_AUTOCANCEL, 2532 data => WF_AUTOCANCEL,
2491 cb => sub { 2533 cb => sub {
2534 if ($Coro::current != $Coro::main) {
2535 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2536 unless ++$bug_warning > 10;
2537 return;
2538 }
2539
2540 $NOW = Event::time;
2541
2492 cf::server_tick; # one server iteration 2542 cf::server_tick; # one server iteration
2493 $RUNTIME += $TICK; 2543 $RUNTIME += $TICK;
2494 $NEXT_TICK += $TICK; 2544 $NEXT_TICK += $TICK;
2495 2545
2496 $WAIT_FOR_TICK->broadcast; 2546 $WAIT_FOR_TICK->broadcast;
2497 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2547 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2548
2549 Event::sweep;
2550 Coro::cede_notself;
2551
2552# my $AFTER = Event::time;
2553# warn $AFTER - $NOW;#d#
2498 2554
2499 # if we are delayed by four ticks or more, skip them all 2555 # if we are delayed by four ticks or more, skip them all
2500 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2556 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2501 2557
2502 $TICK_WATCHER->at ($NEXT_TICK); 2558 $TICK_WATCHER->at ($NEXT_TICK);
2503 $TICK_WATCHER->start; 2559 $TICK_WATCHER->start;
2504 }, 2560 },
2505); 2561);
2506 2562
2563{
2564 BDB::max_poll_time $TICK * 0.1;
2565 $BDB_POLL_WATCHER = Event->io (
2566 reentrant => 0,
2567 fd => BDB::poll_fileno,
2568 poll => 'r',
2569 prio => 0,
2570 data => WF_AUTOCANCEL,
2571 cb => \&BDB::poll_cb,
2572 );
2573 BDB::min_parallel 8;
2574
2575 BDB::set_sync_prepare {
2576 my $status;
2577 my $current = $Coro::current;
2578 (
2579 sub {
2580 $status = $!;
2581 $current->ready; undef $current;
2582 },
2583 sub {
2584 Coro::schedule while defined $current;
2585 $! = $status;
2586 },
2587 )
2588 };
2589
2590 unless ($DB_ENV) {
2591 $DB_ENV = BDB::db_env_create;
2592
2593 cf::sync_job {
2594 BDB::db_env_open
2595 $DB_ENV,
2596 $BDB_ENV_DIR,
2597 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2598 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2599 0666;
2600
2601 cf::cleanup "$!" if $!;
2602
2603 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2604 };
2605 }
2606}
2607
2608{
2609 IO::AIO::min_parallel 8;
2610
2611 undef $Coro::AIO::WATCHER;
2507IO::AIO::max_poll_time $TICK * 0.2; 2612 IO::AIO::max_poll_time $TICK * 0.1;
2508 2613 $AIO_POLL_WATCHER = Event->io (
2509Event->io ( 2614 reentrant => 0,
2510 fd => IO::AIO::poll_fileno, 2615 fd => IO::AIO::poll_fileno,
2511 poll => 'r', 2616 poll => 'r',
2512 prio => 5, 2617 prio => 6,
2513 data => WF_AUTOCANCEL, 2618 data => WF_AUTOCANCEL,
2514 cb => \&IO::AIO::poll_cb, 2619 cb => \&IO::AIO::poll_cb,
2515); 2620 );
2621}
2516 2622
2517Event->timer ( 2623$WRITE_RUNTIME_WATCHER = Event->timer (
2624 reentrant => 0,
2518 data => WF_AUTOCANCEL, 2625 data => WF_AUTOCANCEL,
2519 after => 0, 2626 after => 1,
2520 interval => 10, 2627 interval => 10,
2521 cb => sub { 2628 prio => 6, # keep it lowest so it acts like a watchdog
2522 (Coro::unblock_sub { 2629 cb => Coro::unblock_sub {
2523 write_runtime 2630 write_runtime
2524 or warn "ERROR: unable to write runtime file: $!"; 2631 or warn "ERROR: unable to write runtime file: $!";
2525 })->();
2526 }, 2632 },
2527); 2633);
2528 2634
2529END { cf::emergency_save } 2635END { cf::emergency_save }
2530 2636

Diff Legend

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