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.157 by root, Wed Jan 10 01:16:54 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
372# used to convert map paths into valid unix filenames by repalcing / by ∕
373our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
374
375sub new {
376 my ($class, $path, $base) = @_;
377
378 $path = $path->as_string if ref $path;
379
380 my $self = bless { }, $class;
381
382 # {... are special paths that are not touched
383 # ?xxx/... are special absolute paths
384 # ?random/... random maps
385 # /! non-realised random map exit
386 # /... normal maps
387 # ~/... per-player maps without a specific player (DO NOT USE)
388 # ~user/... per-player map of a specific user
389
390 if ($path =~ /^{/) {
391 # fine as it is
392 } elsif ($path =~ s{^\?random/}{}) {
393 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
394 $self->{random} = cf::from_json $data;
395 } else {
396 if ($path =~ s{^~([^/]+)?}{}) {
397 $self->{user_rel} = 1;
398
399 if (defined $1) {
400 $self->{user} = $1;
401 } elsif ($base =~ m{^~([^/]+)/}) {
402 $self->{user} = $1;
403 } else {
404 warn "cannot resolve user-relative path without user <$path,$base>\n";
405 }
406 } elsif ($path =~ /^\//) {
407 # already absolute
408 } else {
409 $base =~ s{[^/]+/?$}{};
410 return $class->new ("$base/$path");
411 }
412
413 for ($path) {
414 redo if s{/\.?/}{/};
415 redo if s{/[^/]+/\.\./}{/};
416 }
417 }
418
419 $self->{path} = $path;
420
421 $self
422}
423
424# the name / primary key / in-game path
425sub as_string {
426 my ($self) = @_;
427
428 $self->{user_rel} ? "~$self->{user}$self->{path}"
429 : $self->{random} ? "?random/$self->{path}"
430 : $self->{path}
431}
432
433# the displayed name, this is a one way mapping
434sub visible_name {
435 my ($self) = @_;
436
437# if (my $rmp = $self->{random}) {
438# # todo: be more intelligent about this
439# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
440# } else {
441 $self->as_string
442# }
443}
444
445# escape the /'s in the path
446sub _escaped_path {
447 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
448 $path
449}
450
451# the original (read-only) location
452sub load_path {
453 my ($self) = @_;
454
455 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
456}
457
458# the temporary/swap location
459sub save_path {
460 my ($self) = @_;
461
462 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
463 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
464 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
465}
466
467# the unique path, might be eq to save_path
468sub uniq_path {
469 my ($self) = @_;
470
471 $self->{user_rel} || $self->{random}
472 ? undef
473 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
474}
475
476# return random map parameters, or undef
477sub random_map_params {
478 my ($self) = @_;
479
480 $self->{random}
481}
482
483# this is somewhat ugly, but style maps do need special treatment
484sub is_style_map {
485 $_[0]{path} =~ m{^/styles/}
486}
487
488package cf;
489 386
490############################################################################# 387#############################################################################
491 388
492=head2 ATTACHABLE OBJECTS 389=head2 ATTACHABLE OBJECTS
493 390
… …
619our @CB_TYPE = (); # registry for type (cf-object class) based events 516our @CB_TYPE = (); # registry for type (cf-object class) based events
620our @CB_MAP = (); 517our @CB_MAP = ();
621 518
622my %attachment; 519my %attachment;
623 520
521sub cf::attachable::thawer_merge {
522 # simply override everything except _meta
523 local $_[0]{_meta};
524 %{$_[0]} = %{$_[1]};
525}
526
624sub _attach_cb($$$$) { 527sub _attach_cb($$$$) {
625 my ($registry, $event, $prio, $cb) = @_; 528 my ($registry, $event, $prio, $cb) = @_;
626 529
627 use sort 'stable'; 530 use sort 'stable';
628 531
… …
799# object support 702# object support
800 703
801sub reattach { 704sub reattach {
802 # basically do the same as instantiate, without calling instantiate 705 # basically do the same as instantiate, without calling instantiate
803 my ($obj) = @_; 706 my ($obj) = @_;
707
708 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
804 709
805 my $registry = $obj->registry; 710 my $registry = $obj->registry;
806 711
807 @$registry = (); 712 @$registry = ();
808 713
… …
855 $filename, length $$rdata, scalar @$objs; 760 $filename, length $$rdata, scalar @$objs;
856 761
857 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 762 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
858 chmod SAVE_MODE, $fh; 763 chmod SAVE_MODE, $fh;
859 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 764 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
860 aio_fsync $fh; 765 aio_fsync $fh if $cf::USE_FSYNC;
861 close $fh; 766 close $fh;
862 767
863 if (@$objs) { 768 if (@$objs) {
864 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) {
865 chmod SAVE_MODE, $fh; 770 chmod SAVE_MODE, $fh;
866 my $data = Storable::nfreeze { version => 1, objs => $objs }; 771 my $data = Storable::nfreeze { version => 1, objs => $objs };
867 aio_write $fh, 0, (length $data), $data, 0; 772 aio_write $fh, 0, (length $data), $data, 0;
868 aio_fsync $fh; 773 aio_fsync $fh if $cf::USE_FSYNC;
869 close $fh; 774 close $fh;
870 aio_rename "$filename.pst~", "$filename.pst"; 775 aio_rename "$filename.pst~", "$filename.pst";
871 } 776 }
872 } else { 777 } else {
873 aio_unlink "$filename.pst"; 778 aio_unlink "$filename.pst";
… …
879 } 784 }
880 } else { 785 } else {
881 aio_unlink $filename; 786 aio_unlink $filename;
882 aio_unlink "$filename.pst"; 787 aio_unlink "$filename.pst";
883 } 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 }
884 } 795 }
885} 796}
886 797
887sub object_freezer_as_string { 798sub object_freezer_as_string {
888 my ($rdata, $objs) = @_; 799 my ($rdata, $objs) = @_;
… …
894 805
895sub object_thawer_load { 806sub object_thawer_load {
896 my ($filename) = @_; 807 my ($filename) = @_;
897 808
898 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$//;
899 813
900 (aio_load $filename, $data) >= 0 814 (aio_load $filename, $data) >= 0
901 or return; 815 or return;
902 816
903 unless (aio_stat "$filename.pst") { 817 unless (aio_stat "$filename.pst") {
… …
940=cut 854=cut
941 855
942sub register_extcmd { 856sub register_extcmd {
943 my ($name, $cb) = @_; 857 my ($name, $cb) = @_;
944 858
945 my $caller = caller;
946 #warn "registering extcmd '$name' to '$caller'";
947
948 $EXTCMD{$name} = [$cb, $caller]; 859 $EXTCMD{$name} = $cb;
949} 860}
950 861
951cf::player->attach ( 862cf::player->attach (
952 on_command => sub { 863 on_command => sub {
953 my ($pl, $name, $params) = @_; 864 my ($pl, $name, $params) = @_;
… …
966 877
967 my $msg = eval { from_json $buf }; 878 my $msg = eval { from_json $buf };
968 879
969 if (ref $msg) { 880 if (ref $msg) {
970 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 881 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
971 if (my %reply = $cb->[0]->($pl, $msg)) { 882 if (my %reply = $cb->($pl, $msg)) {
972 $pl->ext_reply ($msg->{msgid}, %reply); 883 $pl->ext_reply ($msg->{msgid}, %reply);
973 } 884 }
974 } 885 }
975 } else { 886 } else {
976 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 887 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
978 889
979 cf::override; 890 cf::override;
980 }, 891 },
981); 892);
982 893
983sub register {
984 my ($base, $pkg) = @_;
985
986 #TODO
987}
988
989sub load_extension { 894sub load_extension {
990 my ($path) = @_; 895 my ($path) = @_;
991 896
992 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 897 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
993 my $base = $1; 898 my $base = $1;
994 my $pkg = $1; 899 my $pkg = $1;
995 $pkg =~ s/[^[:word:]]/_/g; 900 $pkg =~ s/[^[:word:]]/_/g;
996 $pkg = "ext::$pkg"; 901 $pkg = "ext::$pkg";
997 902
998 warn "loading '$path' into '$pkg'\n"; 903 warn "... loading '$path' into '$pkg'\n";
999 904
1000 open my $fh, "<:utf8", $path 905 open my $fh, "<:utf8", $path
1001 or die "$path: $!"; 906 or die "$path: $!";
1002 907
1003 my $source = 908 my $source =
1004 "package $pkg; use strict; use utf8;\n" 909 "package $pkg; use strict; use utf8;\n"
1005 . "#line 1 \"$path\"\n{\n" 910 . "#line 1 \"$path\"\n{\n"
1006 . (do { local $/; <$fh> }) 911 . (do { local $/; <$fh> })
1007 . "\n};\n1"; 912 . "\n};\n1";
1008 913
1009 eval $source 914 unless (eval $source) {
1010 or die $@ ? "$path: $@\n" 915 my $msg = $@ ? "$path: $@\n"
1011 : "extension disabled.\n"; 916 : "extension disabled.\n";
1012 917 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1013 push @exts, $pkg; 918 warn $@;
1014 $ext_pkg{$base} = $pkg; 919 warn "mandatory extension failed to load, exiting.\n";
1015 920 exit 1;
1016# no strict 'refs'; 921 }
1017# @{"$pkg\::ISA"} = ext::; 922 die $@;
1018
1019 register $base, $pkg;
1020}
1021
1022sub unload_extension {
1023 my ($pkg) = @_;
1024
1025 warn "removing extension $pkg\n";
1026
1027 # remove hooks
1028 #TODO
1029# for my $idx (0 .. $#PLUGIN_EVENT) {
1030# delete $hook[$idx]{$pkg};
1031# } 923 }
1032 924
1033 # remove commands 925 push @EXTS, $pkg;
1034 for my $name (keys %COMMAND) {
1035 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1036
1037 if (@cb) {
1038 $COMMAND{$name} = \@cb;
1039 } else {
1040 delete $COMMAND{$name};
1041 }
1042 }
1043
1044 # remove extcmds
1045 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1046 delete $EXTCMD{$name};
1047 }
1048
1049 if (my $cb = $pkg->can ("unload")) {
1050 eval {
1051 $cb->($pkg);
1052 1
1053 } or warn "$pkg unloaded, but with errors: $@";
1054 }
1055
1056 Symbol::delete_package $pkg;
1057} 926}
1058 927
1059sub load_extensions { 928sub load_extensions {
1060 for my $ext (<$LIBDIR/*.ext>) { 929 for my $ext (<$LIBDIR/*.ext>) {
1061 next unless -r $ext; 930 next unless -r $ext;
… …
1065 } or warn "$ext not loaded: $@"; 934 } or warn "$ext not loaded: $@";
1066 } 935 }
1067} 936}
1068 937
1069############################################################################# 938#############################################################################
1070# load/save/clean perl data associated with a map
1071
1072*cf::mapsupport::on_clean = sub {
1073 my ($map) = @_;
1074
1075 my $path = $map->tmpname;
1076 defined $path or return;
1077
1078 unlink "$path.pst";
1079};
1080
1081cf::map->attach (prio => -10000, package => cf::mapsupport::);
1082
1083#############################################################################
1084 939
1085=head2 CORE EXTENSIONS 940=head2 CORE EXTENSIONS
1086 941
1087Functions and methods that extend core crossfire objects. 942Functions and methods that extend core crossfire objects.
1088 943
… …
1124 979
1125sub exists($) { 980sub exists($) {
1126 my ($login) = @_; 981 my ($login) = @_;
1127 982
1128 $cf::PLAYER{$login} 983 $cf::PLAYER{$login}
1129 or cf::sync_job { !aio_stat $login } 984 or cf::sync_job { !aio_stat path $login }
1130} 985}
1131 986
1132sub find($) { 987sub find($) {
1133 return $cf::PLAYER{$_[0]} || do { 988 return $cf::PLAYER{$_[0]} || do {
1134 my $login = $_[0]; 989 my $login = $_[0];
… …
1224 \@logins 1079 \@logins
1225} 1080}
1226 1081
1227=item $player->maps 1082=item $player->maps
1228 1083
1229Returns 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
1230player. May block. 1085player. May block.
1231 1086
1232=cut 1087=cut
1233 1088
1234sub maps($) { 1089sub maps($) {
1235 my ($pl) = @_; 1090 my ($pl) = @_;
1091
1092 $pl = ref $pl ? $pl->ob->name : $pl;
1236 1093
1237 my $files = aio_readdir playerdir $pl 1094 my $files = aio_readdir playerdir $pl
1238 or return; 1095 or return;
1239 1096
1240 my @paths; 1097 my @paths;
1241 1098
1242 for (@$files) { 1099 for (@$files) {
1243 utf8::decode $_; 1100 utf8::decode $_;
1244 next if /\.(?:pl|pst)$/; 1101 next if /\.(?:pl|pst)$/;
1245 next unless /^$PATH_SEP/; 1102 next unless /^$PATH_SEP/o;
1246 1103
1247 s/$PATH_SEP/\//g; 1104 push @paths, cf::map::normalise "~$pl/$_";
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1249 } 1105 }
1250 1106
1251 \@paths 1107 \@paths
1252} 1108}
1253 1109
… …
1279package cf::map; 1135package cf::map;
1280 1136
1281use Fcntl; 1137use Fcntl;
1282use Coro::AIO; 1138use Coro::AIO;
1283 1139
1140use overload
1141 '""' => \&as_string,
1142 fallback => 1;
1143
1284our $MAX_RESET = 3600; 1144our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1145our $DEFAULT_RESET = 3000;
1286 1146
1287sub generate_random_map { 1147sub generate_random_map {
1288 my ($path, $rmp) = @_; 1148 my ($self, $rmp) = @_;
1289
1290 # mit "rum" bekleckern, nicht 1149 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map 1150 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1151 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1152 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1153 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1154 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1155 $rmp->{xsize}, $rmp->{ysize},
1298 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1156 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1299 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1157 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1300 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1158 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1301 $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},
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1160 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (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
1304} 1292}
1305 1293
1306# and all this just because we cannot iterate over 1294# and all this just because we cannot iterate over
1307# all maps in C++... 1295# all maps in C++...
1308sub change_all_map_light { 1296sub change_all_map_light {
… …
1310 1298
1311 $_->change_map_light ($change) 1299 $_->change_map_light ($change)
1312 for grep $_->outdoor, values %cf::MAP; 1300 for grep $_->outdoor, values %cf::MAP;
1313} 1301}
1314 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
1315sub try_load_header($) { 1316sub load_header_from($) {
1316 my ($path) = @_; 1317 my ($self, $path) = @_;
1317 1318
1318 utf8::encode $path; 1319 utf8::encode $path;
1319 aio_open $path, O_RDONLY, 0 1320 #aio_open $path, O_RDONLY, 0
1321 # or return;
1322
1323 $self->_load_header ($path)
1320 or return; 1324 or return;
1321 1325
1322 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
1323 or return; 1369 or return;
1370 $self->prepare_orig;
1371 }
1324 1372
1325 # for better error messages only, will be overwritten 1373 1
1326 $map->path ($path);
1327
1328 $map->load_header ($path)
1329 or return;
1330
1331 $map->{load_path} = $path;
1332
1333 $map
1334} 1374}
1335 1375
1336sub find; 1376sub find;
1337sub find { 1377sub find {
1338 my ($path, $origin) = @_; 1378 my ($path, $origin) = @_;
1339 1379
1340 #warn "find<$path,$origin>\n";#d#
1341
1342 $path = new cf::path $path, $origin && $origin->path; 1380 $path = normalise $path, $origin && $origin->path;
1343 my $key = $path->as_string;
1344 1381
1345 cf::lock_wait "map_find:$key"; 1382 cf::lock_wait "map_find:$path";
1346 1383
1347 $cf::MAP{$key} || do { 1384 $cf::MAP{$path} || do {
1348 my $guard = cf::lock_acquire "map_find:$key"; 1385 my $guard = cf::lock_acquire "map_find:$path";
1349 1386 my $map = new_from_path cf::map $path
1350 # do it the slow way
1351 my $map = try_load_header $path->save_path;
1352
1353 Coro::cede;
1354
1355 if ($map) {
1356 $map->last_access ((delete $map->{last_access})
1357 || $cf::RUNTIME); #d#
1358 # safety
1359 $map->{instantiate_time} = $cf::RUNTIME
1360 if $map->{instantiate_time} > $cf::RUNTIME;
1361 } else {
1362 if (my $rmp = $path->random_map_params) {
1363 $map = generate_random_map $key, $rmp;
1364 } else {
1365 $map = try_load_header $path->load_path;
1366 }
1367
1368 $map or return; 1387 or return;
1369 1388
1370 $map->{load_original} = 1;
1371 $map->{instantiate_time} = $cf::RUNTIME;
1372 $map->last_access ($cf::RUNTIME);
1373 $map->instantiate;
1374
1375 # per-player maps become, after loading, normal maps
1376 $map->per_player (0) if $path->{user_rel};
1377 }
1378
1379 $map->path ($key);
1380 $map->{path} = $path;
1381 $map->{last_save} = $cf::RUNTIME; 1389 $map->{last_save} = $cf::RUNTIME;
1382 1390
1383 Coro::cede; 1391 $map->load_header
1392 or return;
1384 1393
1385 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;
1386 $map->reset; 1397 $map->reset;
1387 undef $guard; 1398 undef $guard;
1388 $map = find $path 1399 return find $path;
1389 or return;
1390 } 1400 }
1391 1401
1392 $cf::MAP{$key} = $map 1402 $cf::MAP{$path} = $map
1393 } 1403 }
1394} 1404}
1405
1406sub pre_load { }
1407sub post_load { }
1395 1408
1396sub load { 1409sub load {
1397 my ($self) = @_; 1410 my ($self) = @_;
1398 1411
1412 local $self->{deny_reset} = 1; # loading can take a long time
1413
1399 my $path = $self->{path}; 1414 my $path = $self->{path};
1400 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1415 my $guard = cf::lock_acquire "map_load:$path";
1401 1416
1402 return if $self->in_memory != cf::MAP_SWAPPED; 1417 return if $self->in_memory != cf::MAP_SWAPPED;
1403 1418
1404 $self->in_memory (cf::MAP_LOADING); 1419 $self->in_memory (cf::MAP_LOADING);
1405 1420
1406 $self->alloc; 1421 $self->alloc;
1422
1423 $self->pre_load;
1424
1407 $self->load_objects ($self->{load_path}, 1) 1425 $self->_load_objects ($self->{load_path}, 1)
1408 or return; 1426 or return;
1409 1427
1410 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1428 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1411 if delete $self->{load_original}; 1429 if delete $self->{load_original};
1412 1430
1413 if (my $uniq = $path->uniq_path) { 1431 if (my $uniq = $self->uniq_path) {
1414 utf8::encode $uniq; 1432 utf8::encode $uniq;
1415 if (aio_open $uniq, O_RDONLY, 0) { 1433 if (aio_open $uniq, O_RDONLY, 0) {
1416 $self->clear_unique_items; 1434 $self->clear_unique_items;
1417 $self->load_objects ($uniq, 0); 1435 $self->_load_objects ($uniq, 0);
1418 } 1436 }
1419 } 1437 }
1420 1438
1421 Coro::cede; 1439 Coro::cede;
1422 1440
1423 # now do the right thing for maps 1441 # now do the right thing for maps
1424 $self->link_multipart_objects; 1442 $self->link_multipart_objects;
1425 1443
1426 if ($self->{path}->is_style_map) { 1444 unless ($self->{deny_activate}) {
1427 $self->{deny_save} = 1; 1445 $self->decay_objects;
1428 $self->{deny_reset} = 1;
1429 } else {
1430 $self->fix_auto_apply; 1446 $self->fix_auto_apply;
1431 $self->decay_objects;
1432 $self->update_buttons; 1447 $self->update_buttons;
1448 Coro::cede;
1433 $self->set_darkness_map; 1449 $self->set_darkness_map;
1434 $self->difficulty ($self->estimate_difficulty) 1450 $self->difficulty ($self->estimate_difficulty)
1435 unless $self->difficulty; 1451 unless $self->difficulty;
1452 Coro::cede;
1436 $self->activate; 1453 $self->activate;
1437 } 1454 }
1438 1455
1439 Coro::cede; 1456 $self->post_load;
1440 1457
1441 $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
1442} 1468}
1443 1469
1444# 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
1445sub load_diag { 1471sub load_diag {
1446 my ($map) = @_; 1472 my ($map) = @_;
… …
1476 1502
1477 cf::sync_job { $map->load }; 1503 cf::sync_job { $map->load };
1478} 1504}
1479 1505
1480our %MAP_PREFETCH; 1506our %MAP_PREFETCH;
1481our $MAP_PREFETCHER = Coro::async { 1507our $MAP_PREFETCHER = undef;
1482 while () {
1483 while (%MAP_PREFETCH) {
1484 my $key = each %MAP_PREFETCH
1485 or next;
1486 my $path = delete $MAP_PREFETCH{$key};
1487
1488 my $map = find $path
1489 or next;
1490 $map->load;
1491 }
1492 Coro::schedule;
1493 }
1494};
1495 1508
1496sub find_async { 1509sub find_async {
1497 my ($path, $origin) = @_; 1510 my ($path, $origin) = @_;
1498 1511
1499 $path = new cf::path $path, $origin && $origin->path; 1512 $path = normalise $path, $origin && $origin->{path};
1500 my $key = $path->as_string;
1501 1513
1502 if (my $map = $cf::MAP{$key}) { 1514 if (my $map = $cf::MAP{$path}) {
1503 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1515 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1504 } 1516 }
1505 1517
1506 $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 };
1507 $MAP_PREFETCHER->ready; 1531 $MAP_PREFETCHER->prio (6);
1508 1532
1509 () 1533 ()
1510} 1534}
1511 1535
1512sub save { 1536sub save {
… …
1516 1540
1517 $self->{last_save} = $cf::RUNTIME; 1541 $self->{last_save} = $cf::RUNTIME;
1518 1542
1519 return unless $self->dirty; 1543 return unless $self->dirty;
1520 1544
1521 my $save = $self->{path}->save_path; utf8::encode $save; 1545 my $save = $self->save_path; utf8::encode $save;
1522 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1546 my $uniq = $self->uniq_path; utf8::encode $uniq;
1523 1547
1524 $self->{load_path} = $save; 1548 $self->{load_path} = $save;
1525 1549
1526 return if $self->{deny_save}; 1550 return if $self->{deny_save};
1527 1551
… …
1530 cf::async { 1554 cf::async {
1531 $_->contr->save for $self->players; 1555 $_->contr->save for $self->players;
1532 }; 1556 };
1533 1557
1534 if ($uniq) { 1558 if ($uniq) {
1535 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1559 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1536 $self->save_objects ($uniq, cf::IO_UNIQUES); 1560 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1537 } else { 1561 } else {
1538 $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);
1539 } 1563 }
1540} 1564}
1541 1565
1542sub swap_out { 1566sub swap_out {
1543 my ($self) = @_; 1567 my ($self) = @_;
… …
1557 1581
1558sub reset_at { 1582sub reset_at {
1559 my ($self) = @_; 1583 my ($self) = @_;
1560 1584
1561 # TODO: safety, remove and allow resettable per-player maps 1585 # TODO: safety, remove and allow resettable per-player maps
1562 return 1e99 if $self->{path}{user_rel}; 1586 return 1e99 if $self->isa ("ext::map_per_player");#d#
1563 return 1e99 if $self->{deny_reset}; 1587 return 1e99 if $self->{deny_reset};
1564 1588
1565 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1589 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1566 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;
1567 1591
… …
1572 my ($self) = @_; 1596 my ($self) = @_;
1573 1597
1574 $self->reset_at <= $cf::RUNTIME 1598 $self->reset_at <= $cf::RUNTIME
1575} 1599}
1576 1600
1577sub unlink_save {
1578 my ($self) = @_;
1579
1580 utf8::encode (my $save = $self->{path}->save_path);
1581 aioreq_pri 3; IO::AIO::aio_unlink $save;
1582 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1583}
1584
1585sub rename {
1586 my ($self, $new_path) = @_;
1587
1588 $self->unlink_save;
1589
1590 delete $cf::MAP{$self->path};
1591 $self->{path} = new cf::path $new_path;
1592 $self->path ($self->{path}->as_string);
1593 $cf::MAP{$self->path} = $self;
1594
1595 $self->save;
1596}
1597
1598sub reset { 1601sub reset {
1599 my ($self) = @_; 1602 my ($self) = @_;
1600 1603
1601 my $lock = cf::lock_acquire "map_data:" . $self->path; 1604 my $lock = cf::lock_acquire "map_data:$self->{path}";
1602 1605
1603 return if $self->players; 1606 return if $self->players;
1604 return if $self->{path}{user_rel};#d# 1607 return if $self->isa ("ext::map_per_player");#d#
1605 1608
1606 warn "resetting map ", $self->path;#d# 1609 warn "resetting map ", $self->path;#d#
1607 1610
1608 delete $cf::MAP{$self->path}; 1611 delete $cf::MAP{$self->path};
1612
1613 $self->in_memory (cf::MAP_SWAPPED);
1614 $self->clear;
1609 1615
1610 $_->clear_links_to ($self) for values %cf::MAP; 1616 $_->clear_links_to ($self) for values %cf::MAP;
1611 1617
1612 $self->unlink_save; 1618 $self->unlink_save;
1613 $self->destroy; 1619 $self->destroy;
… …
1616my $nuke_counter = "aaaa"; 1622my $nuke_counter = "aaaa";
1617 1623
1618sub nuke { 1624sub nuke {
1619 my ($self) = @_; 1625 my ($self) = @_;
1620 1626
1627 delete $cf::MAP{$self->path};
1628
1629 $self->unlink_save;
1630
1631 bless $self, "cf::map";
1632 delete $self->{deny_reset};
1621 $self->{deny_save} = 1; 1633 $self->{deny_save} = 1;
1622 $self->reset_timeout (1); 1634 $self->reset_timeout (1);
1623 $self->rename ("{nuke}/" . ($nuke_counter++)); 1635 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1636
1637 $cf::MAP{$self->path} = $self;
1638
1624 $self->reset; # polite request, might not happen 1639 $self->reset; # polite request, might not happen
1625} 1640}
1626 1641
1627sub customise_for { 1642=item cf::map::unique_maps
1628 my ($map, $ob) = @_;
1629 1643
1630 if ($map->per_player) { 1644Returns an arrayref of paths of all shared maps that have
1631 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1645instantiated unique items. May block.
1632 }
1633 1646
1634 $map 1647=cut
1648
1649sub unique_maps() {
1650 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1651 or return;
1652
1653 my @paths;
1654
1655 for (@$files) {
1656 utf8::decode $_;
1657 next if /\.pst$/;
1658 next unless /^$PATH_SEP/o;
1659
1660 push @paths, cf::map::normalise $_;
1661 }
1662
1663 \@paths
1635} 1664}
1636 1665
1637package cf; 1666package cf;
1638 1667
1639=back 1668=back
… …
1711 1740
1712=item $player_object->enter_link 1741=item $player_object->enter_link
1713 1742
1714Freezes 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}>).
1715 1744
1716The 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
1717I<MUST> call C<leave_link> as soon as possible, though. 1746I<MUST> call C<leave_link> as soon as possible, though.
1718 1747
1748Will never block.
1749
1719=item $player_object->leave_link ($map, $x, $y) 1750=item $player_object->leave_link ($map, $x, $y)
1720 1751
1721Moves 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
1722map 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
1723location 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
1724to the emergency map position. 1755fails, to the emergency map position.
1725 1756
1726Might block. 1757Might block.
1727 1758
1728=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}
1729 1770
1730sub cf::object::player::enter_link { 1771sub cf::object::player::enter_link {
1731 my ($self) = @_; 1772 my ($self) = @_;
1732 1773
1733 $self->deactivate_recursive; 1774 $self->deactivate_recursive;
1734 1775
1735 return if $self->map == $LINK_MAP; 1776 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1777
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1779 if $self->map;
1739 1780
1740 $self->enter_map ($LINK_MAP, 20, 20); 1781 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1741} 1782}
1742 1783
1743sub cf::object::player::leave_link { 1784sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1785 my ($self, $map, $x, $y) = @_;
1745 1786
… …
1809=cut 1850=cut
1810 1851
1811sub cf::object::player::goto { 1852sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1853 my ($self, $path, $x, $y) = @_;
1813 1854
1814 $path = new cf::path $path;
1815 $path ne "/" or Carp::cluck ("oy");#d#
1816
1817 $self->enter_link; 1855 $self->enter_link;
1818 1856
1819 (async { 1857 (async {
1858 my $map = eval {
1820 my $map = cf::map::find $path->as_string; 1859 my $map = cf::map::find $path;
1821 $map = $map->customise_for ($self) if $map; 1860 $map = $map->customise_for ($self) if $map;
1822 1861 $map
1823# warn "entering ", $map->path, " at ($x, $y)\n" 1862 } or
1824# if $map;
1825
1826 $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);
1827 1864
1828 $self->leave_link ($map, $x, $y); 1865 $self->leave_link ($map, $x, $y);
1829 })->prio (1); 1866 })->prio (1);
1830} 1867}
1831 1868
… …
1835 1872
1836sub parse_random_map_params { 1873sub parse_random_map_params {
1837 my ($spec) = @_; 1874 my ($spec) = @_;
1838 1875
1839 my $rmp = { # defaults 1876 my $rmp = { # defaults
1840 xsize => 10, 1877 xsize => (cf::rndm 15, 40),
1841 ysize => 10, 1878 ysize => (cf::rndm 15, 40),
1879 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1880 #layout => string,
1842 }; 1881 };
1843 1882
1844 for (split /\n/, $spec) { 1883 for (split /\n/, $spec) {
1845 my ($k, $v) = split /\s+/, $_, 2; 1884 my ($k, $v) = split /\s+/, $_, 2;
1846 1885
… …
1850 $rmp 1889 $rmp
1851} 1890}
1852 1891
1853sub prepare_random_map { 1892sub prepare_random_map {
1854 my ($exit) = @_; 1893 my ($exit) = @_;
1894
1895 my $guard = cf::lock_acquire "exit_prepare:$exit";
1855 1896
1856 # all this does is basically replace the /! path by 1897 # all this does is basically replace the /! path by
1857 # a new random map path (?random/...) with a seed 1898 # a new random map path (?random/...) with a seed
1858 # that depends on the exit object 1899 # that depends on the exit object
1859 1900
1860 my $rmp = parse_random_map_params $exit->msg; 1901 my $rmp = parse_random_map_params $exit->msg;
1861 1902
1862 if ($exit->map) { 1903 if ($exit->map) {
1863 $rmp->{region} = $exit->map->region_name; 1904 $rmp->{region} = $exit->region->name;
1864 $rmp->{origin_map} = $exit->map->path; 1905 $rmp->{origin_map} = $exit->map->path;
1865 $rmp->{origin_x} = $exit->x; 1906 $rmp->{origin_x} = $exit->x;
1866 $rmp->{origin_y} = $exit->y; 1907 $rmp->{origin_y} = $exit->y;
1867 } 1908 }
1868 1909
1869 $rmp->{random_seed} ||= $exit->random_seed; 1910 $rmp->{random_seed} ||= $exit->random_seed;
1870 1911
1871 my $data = cf::to_json $rmp; 1912 my $data = cf::to_json $rmp;
1872 my $md5 = Digest::MD5::md5_hex $data; 1913 my $md5 = Digest::MD5::md5_hex $data;
1914 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1873 1915
1874 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) {
1875 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;
1876 1920
1877 $exit->slaying ("?random/$md5"); 1921 $exit->slaying ("?random/$md5");
1878 $exit->msg (undef); 1922 $exit->msg (undef);
1879 } 1923 }
1880} 1924}
1881 1925
1882sub cf::object::player::enter_exit { 1926sub cf::object::player::enter_exit {
1883 my ($self, $exit) = @_; 1927 my ($self, $exit) = @_;
1884 1928
1885 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;
1886 1939
1887 $self->enter_link; 1940 $self->enter_link;
1888 1941
1889 (async { 1942 (async {
1890 $self->deactivate_recursive; # just to be sure 1943 $self->deactivate_recursive; # just to be sure
1891 unless (eval { 1944 unless (eval {
1892 prepare_random_map $exit 1945 $self->goto ($slaying, $hp, $sp);
1893 if $exit->slaying eq "/!";
1894
1895 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1896 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1897 1946
1898 1; 1947 1;
1899 }) { 1948 }) {
1900 $self->message ("Something went wrong deep within the crossfire server. " 1949 $self->message ("Something went wrong deep within the crossfire server. "
1901 . "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. "
1902 . "Please report this to the dungeon master", 1951 . "Please report this to the dungeon master!",
1903 cf::NDI_UNIQUE | cf::NDI_RED); 1952 cf::NDI_UNIQUE | cf::NDI_RED);
1904 1953
1905 warn "ERROR in enter_exit: $@"; 1954 warn "ERROR in enter_exit: $@";
1906 $self->leave_link; 1955 $self->leave_link;
1907 } 1956 }
… …
1962 # get handled first 2011 # get handled first
1963 my $queue = delete $ns->{query_queue} 2012 my $queue = delete $ns->{query_queue}
1964 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
1965 2014
1966 (shift @$queue)->[1]->($msg); 2015 (shift @$queue)->[1]->($msg);
2016 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1967 2017
1968 push @{ $ns->{query_queue} }, @$queue; 2018 push @{ $ns->{query_queue} }, @$queue;
1969 2019
1970 if (@{ $ns->{query_queue} } == @$queue) { 2020 if (@{ $ns->{query_queue} } == @$queue) {
1971 if (@$queue) { 2021 if (@$queue) {
… …
2190 sub db_sync() { 2240 sub db_sync() {
2191 db_save if $dirty; 2241 db_save if $dirty;
2192 undef $dirty; 2242 undef $dirty;
2193 } 2243 }
2194 2244
2195 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2245 my $idle = Event->idle (
2196 db_sync; 2246 reentrant => 0,
2247 min => 10,
2248 max => 20,
2249 repeat => 0,
2250 data => WF_AUTOCANCEL,
2251 cb => \&db_sync,
2197 }); 2252 );
2198 2253
2199 sub db_dirty() { 2254 sub db_dirty() {
2200 $dirty = 1; 2255 $dirty = 1;
2201 $idle->start; 2256 $idle->start;
2202 } 2257 }
… …
2223 }, 2278 },
2224 ); 2279 );
2225} 2280}
2226 2281
2227############################################################################# 2282#############################################################################
2228# 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}
2229 2289
2230sub cfg_load { 2290sub cfg_load {
2231 open my $fh, "<:utf8", cf::confdir . "/config" 2291 open my $fh, "<:utf8", cf::confdir . "/config"
2232 or return; 2292 or return;
2233 2293
… …
2246 }; 2306 };
2247 warn $@ if $@; 2307 warn $@ if $@;
2248 } 2308 }
2249} 2309}
2250 2310
2311sub init {
2312 load_resources;
2313}
2314
2251sub main { 2315sub main {
2252 # we must not ever block the main coroutine 2316 # we must not ever block the main coroutine
2253 local $Coro::idle = sub { 2317 local $Coro::idle = sub {
2254 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 {
2255 async { Event::one_event }; 2320 Event::one_event;
2321 })->prio (Coro::PRIO_MAX);
2256 }; 2322 };
2257 2323
2258 cfg_load; 2324 cfg_load;
2259 db_load; 2325 db_load;
2260 load_extensions; 2326 load_extensions;
2327
2328 $TICK_WATCHER->start;
2261 Event::loop; 2329 Event::loop;
2262} 2330}
2263 2331
2264############################################################################# 2332#############################################################################
2265# initialisation and cleanup 2333# initialisation and cleanup
2266 2334
2267# install some emergency cleanup handlers 2335# install some emergency cleanup handlers
2268BEGIN { 2336BEGIN {
2269 for my $signal (qw(INT HUP TERM)) { 2337 for my $signal (qw(INT HUP TERM)) {
2270 Event->signal ( 2338 Event->signal (
2339 reentrant => 0,
2271 data => WF_AUTOCANCEL, 2340 data => WF_AUTOCANCEL,
2272 signal => $signal, 2341 signal => $signal,
2342 prio => 0,
2273 cb => sub { 2343 cb => sub {
2274 cf::cleanup "SIG$signal"; 2344 cf::cleanup "SIG$signal";
2275 }, 2345 },
2276 ); 2346 );
2277 } 2347 }
2278} 2348}
… …
2283 warn "enter emergency perl save\n"; 2353 warn "enter emergency perl save\n";
2284 2354
2285 cf::sync_job { 2355 cf::sync_job {
2286 # use a peculiar iteration method to avoid tripping on perl 2356 # use a peculiar iteration method to avoid tripping on perl
2287 # refcount bugs in for. also avoids problems with players 2357 # refcount bugs in for. also avoids problems with players
2288 # and maps saved/Destroyed asynchronously. 2358 # and maps saved/destroyed asynchronously.
2289 warn "begin emergency player save\n"; 2359 warn "begin emergency player save\n";
2290 for my $login (keys %cf::PLAYER) { 2360 for my $login (keys %cf::PLAYER) {
2291 my $pl = $cf::PLAYER{$login} or next; 2361 my $pl = $cf::PLAYER{$login} or next;
2292 $pl->valid or next; 2362 $pl->valid or next;
2293 $pl->save; 2363 $pl->save;
… …
2307} 2377}
2308 2378
2309sub reload() { 2379sub reload() {
2310 # can/must only be called in main 2380 # can/must only be called in main
2311 if ($Coro::current != $Coro::main) { 2381 if ($Coro::current != $Coro::main) {
2312 warn "can only reload from main coroutine\n"; 2382 warn "can only reload from main coroutine";
2313 return; 2383 return;
2314 } 2384 }
2315 2385
2316 warn "reloading..."; 2386 warn "reloading...";
2317 2387
2318 my $guard = freeze_mainloop; 2388 warn "cancelling server ticker";
2389 $TICK_WATCHER->cancel;
2390
2319 cf::emergency_save; 2391 cf::emergency_save;
2320 2392
2321 eval { 2393 eval {
2322 # 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
2323 2395
2324 # cancel all watchers 2396 warn "syncing database to disk";
2397 cf::db_sync;
2398
2399 warn "cancelling all WF_AUTOCANCEL watchers";
2325 for (Event::all_watchers) { 2400 for (Event::all_watchers) {
2326 $_->cancel if $_->data & WF_AUTOCANCEL; 2401 $_->cancel if $_->data & WF_AUTOCANCEL;
2327 } 2402 }
2328 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
2329 # cancel all extension coros 2412 warn "cancelling all extension coros";
2330 $_->cancel for values %EXT_CORO; 2413 $_->cancel for values %EXT_CORO;
2331 %EXT_CORO = (); 2414 %EXT_CORO = ();
2332 2415
2333 # unload all extensions 2416 warn "removing commands";
2334 for (@exts) { 2417 %COMMAND = ();
2418
2419 warn "removing ext commands";
2420 %EXTCMD = ();
2421
2422 warn "unloading/nuking all extensions";
2423 for my $pkg (@EXTS) {
2335 warn "unloading <$_>"; 2424 warn "... unloading $pkg";
2336 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: $@";
2337 } 2431 }
2338 2432
2433 warn "... nuking $pkg";
2434 Symbol::delete_package $pkg;
2435 }
2436
2339 # unload all modules loaded from $LIBDIR 2437 warn "unloading all perl modules loaded from $LIBDIR";
2340 while (my ($k, $v) = each %INC) { 2438 while (my ($k, $v) = each %INC) {
2341 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2439 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2342 2440
2343 warn "removing <$k>"; 2441 warn "... unloading $k";
2344 delete $INC{$k}; 2442 delete $INC{$k};
2345 2443
2346 $k =~ s/\.pm$//; 2444 $k =~ s/\.pm$//;
2347 $k =~ s/\//::/g; 2445 $k =~ s/\//::/g;
2348 2446
… …
2351 } 2449 }
2352 2450
2353 Symbol::delete_package $k; 2451 Symbol::delete_package $k;
2354 } 2452 }
2355 2453
2356 # sync database to disk
2357 cf::db_sync;
2358 IO::AIO::flush;
2359
2360 # get rid of safe::, as good as possible 2454 warn "getting rid of safe::, as good as possible";
2361 Symbol::delete_package "safe::$_" 2455 Symbol::delete_package "safe::$_"
2362 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);
2363 2457
2364 # remove register_script_function callbacks
2365 # TODO
2366
2367 # unload cf.pm "a bit" 2458 warn "unloading cf.pm \"a bit\"";
2368 delete $INC{"cf.pm"}; 2459 delete $INC{"cf.pm"};
2369 2460
2370 # don't, removes xs symbols, too, 2461 # don't, removes xs symbols, too,
2371 # and global variables created in xs 2462 # and global variables created in xs
2372 #Symbol::delete_package __PACKAGE__; 2463 #Symbol::delete_package __PACKAGE__;
2373 2464
2374 # reload cf.pm 2465 warn "unload completed, starting to reload now";
2466
2375 warn "reloading cf.pm"; 2467 warn "reloading cf.pm";
2376 require cf; 2468 require cf;
2377 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2469 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2378 2470
2379 # load config and database again 2471 warn "loading config and database again";
2380 cf::cfg_load; 2472 cf::cfg_load;
2381 cf::db_load; 2473 cf::db_load;
2382 2474
2383 # load extensions
2384 warn "load extensions"; 2475 warn "loading extensions";
2385 cf::load_extensions; 2476 cf::load_extensions;
2386 2477
2387 # reattach attachments to objects 2478 warn "reattaching attachments to objects/players";
2388 warn "reattach";
2389 _global_reattach; 2479 _global_reattach;
2480 warn "reattaching attachments to maps";
2390 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;
2391 }; 2489 };
2392 2490
2393 if ($@) { 2491 if ($@) {
2394 warn $@; 2492 warn $@;
2395 warn "error while reloading, exiting."; 2493 warn "error while reloading, exiting.";
2396 exit 1; 2494 exit 1;
2397 } 2495 }
2398 2496
2399 warn "reloaded successfully"; 2497 warn "reloaded";
2400}; 2498};
2401 2499
2402############################################################################# 2500our $RELOAD_WATCHER; # used only during reload
2403
2404unless ($LINK_MAP) {
2405 $LINK_MAP = cf::map::new;
2406
2407 $LINK_MAP->width (41);
2408 $LINK_MAP->height (41);
2409 $LINK_MAP->alloc;
2410 $LINK_MAP->path ("{link}");
2411 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2412 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2413
2414 # dirty hack because... archetypes are not yet loaded
2415 Event->timer (
2416 after => 10,
2417 cb => sub {
2418 $_[0]->w->cancel;
2419
2420 # provide some exits "home"
2421 my $exit = cf::object::new "exit";
2422
2423 $exit->slaying ($EMERGENCY_POSITION->[0]);
2424 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2425 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2426
2427 $LINK_MAP->insert ($exit->clone, 19, 19);
2428 $LINK_MAP->insert ($exit->clone, 19, 20);
2429 $LINK_MAP->insert ($exit->clone, 19, 21);
2430 $LINK_MAP->insert ($exit->clone, 20, 19);
2431 $LINK_MAP->insert ($exit->clone, 20, 21);
2432 $LINK_MAP->insert ($exit->clone, 21, 19);
2433 $LINK_MAP->insert ($exit->clone, 21, 20);
2434 $LINK_MAP->insert ($exit->clone, 21, 21);
2435
2436 $exit->destroy;
2437 });
2438
2439 $LINK_MAP->{deny_save} = 1;
2440 $LINK_MAP->{deny_reset} = 1;
2441
2442 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2443}
2444
2445register "<global>", __PACKAGE__;
2446 2501
2447register_command "reload" => sub { 2502register_command "reload" => sub {
2448 my ($who, $arg) = @_; 2503 my ($who, $arg) = @_;
2449 2504
2450 if ($who->flag (FLAG_WIZ)) { 2505 if ($who->flag (FLAG_WIZ)) {
2451 $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 {
2452 reload; 2516 reload;
2453 $who->message ("end of reload."); 2517 undef $RELOAD_WATCHER;
2518 },
2519 );
2454 } 2520 }
2455}; 2521};
2456 2522
2457unshift @INC, $LIBDIR; 2523unshift @INC, $LIBDIR;
2524
2525my $bug_warning = 0;
2458 2526
2459$TICK_WATCHER = Event->timer ( 2527$TICK_WATCHER = Event->timer (
2460 reentrant => 0, 2528 reentrant => 0,
2529 parked => 1,
2461 prio => 0, 2530 prio => 0,
2462 at => $NEXT_TICK || $TICK, 2531 at => $NEXT_TICK || $TICK,
2463 data => WF_AUTOCANCEL, 2532 data => WF_AUTOCANCEL,
2464 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
2465 cf::server_tick; # one server iteration 2542 cf::server_tick; # one server iteration
2466 $RUNTIME += $TICK; 2543 $RUNTIME += $TICK;
2467 $NEXT_TICK += $TICK; 2544 $NEXT_TICK += $TICK;
2468 2545
2469 $WAIT_FOR_TICK->broadcast; 2546 $WAIT_FOR_TICK->broadcast;
2470 $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#
2471 2554
2472 # 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
2473 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2556 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2474 2557
2475 $TICK_WATCHER->at ($NEXT_TICK); 2558 $TICK_WATCHER->at ($NEXT_TICK);
2476 $TICK_WATCHER->start; 2559 $TICK_WATCHER->start;
2477 }, 2560 },
2478); 2561);
2479 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;
2480IO::AIO::max_poll_time $TICK * 0.2; 2612 IO::AIO::max_poll_time $TICK * 0.1;
2481 2613 $AIO_POLL_WATCHER = Event->io (
2482Event->io ( 2614 reentrant => 0,
2483 fd => IO::AIO::poll_fileno, 2615 fd => IO::AIO::poll_fileno,
2484 poll => 'r', 2616 poll => 'r',
2485 prio => 5, 2617 prio => 6,
2486 data => WF_AUTOCANCEL, 2618 data => WF_AUTOCANCEL,
2487 cb => \&IO::AIO::poll_cb, 2619 cb => \&IO::AIO::poll_cb,
2488); 2620 );
2621}
2489 2622
2490Event->timer ( 2623$WRITE_RUNTIME_WATCHER = Event->timer (
2624 reentrant => 0,
2491 data => WF_AUTOCANCEL, 2625 data => WF_AUTOCANCEL,
2492 after => 0, 2626 after => 1,
2493 interval => 10, 2627 interval => 10,
2494 cb => sub { 2628 prio => 6, # keep it lowest so it acts like a watchdog
2495 (Coro::unblock_sub { 2629 cb => Coro::unblock_sub {
2496 write_runtime 2630 write_runtime
2497 or warn "ERROR: unable to write runtime file: $!"; 2631 or warn "ERROR: unable to write runtime file: $!";
2498 })->();
2499 }, 2632 },
2500); 2633);
2501 2634
2502END { cf::emergency_save } 2635END { cf::emergency_save }
2503 2636

Diff Legend

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