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.143 by root, Sun Jan 7 02:39:14 2007 UTC vs.
Revision 1.191 by root, Tue Jan 23 01:05:18 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.4 ();
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 Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 35
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
37our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
38 43
39our @EVENT; 44our @EVENT;
40our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
41 46
42our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
43our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
44our $NEXT_TICK; 51our $NEXT_TICK;
45our $NOW; 52our $NOW;
46 53
47our %CFG; 54our %CFG;
48 55
49our $UPTIME; $UPTIME ||= time; 56our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 57our $RUNTIME;
51 58
52our %PLAYER; # all users 59our %PLAYER; # all users
53our %MAP; # all maps 60our %MAP; # all maps
54our $LINK_MAP; # the special {link} map 61our $LINK_MAP; # the special {link} map, which is always available
55our $RANDOM_MAPS = cf::localdir . "/random"; 62our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; # coroutines bound to extensions 63
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66
67# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
57 69
58binmode STDOUT; 70binmode STDOUT;
59binmode STDERR; 71binmode STDERR;
60 72
61# read virtual server time, if available 73# read virtual server time, if available
69mkdir cf::localdir . "/" . cf::playerdir; 81mkdir cf::localdir . "/" . cf::playerdir;
70mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
71mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
73 85
74# a special map that is always available
75our $LINK_MAP;
76our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
77 87
78############################################################################# 88#############################################################################
79 89
80=head2 GLOBAL VARIABLES 90=head2 GLOBAL VARIABLES
105 115
106=item %cf::CFG 116=item %cf::CFG
107 117
108Configuration for the server, loaded from C</etc/crossfire/config>, or 118Configuration for the server, loaded from C</etc/crossfire/config>, or
109from wherever your confdir points to. 119from wherever your confdir points to.
120
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
122
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
125processing has been done. Call C<< ->wait >> on them to maximise the
126window of cpu time available, or simply to synchronise to the server tick.
110 127
111=back 128=back
112 129
113=cut 130=cut
114 131
118 utf8::encode $msg; 135 utf8::encode $msg;
119 136
120 $msg .= "\n" 137 $msg .= "\n"
121 unless $msg =~ /\n$/; 138 unless $msg =~ /\n$/;
122 139
123 LOG llevError, "cfperl: $msg"; 140 LOG llevError, $msg;
124 }; 141 };
125} 142}
126 143
127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 144@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 145@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
146 163
147$Event::DIED = sub { 164$Event::DIED = sub {
148 warn "error in event callback: @_"; 165 warn "error in event callback: @_";
149}; 166};
150 167
151my %ext_pkg;
152my @exts;
153my @hook;
154
155=head2 UTILITY FUNCTIONS 168=head2 UTILITY FUNCTIONS
156 169
157=over 4 170=over 4
158 171
172=item dumpval $ref
173
159=cut 174=cut
175
176sub dumpval {
177 eval {
178 local $SIG{__DIE__};
179 my $d;
180 if (1) {
181 $d = new Data::Dumper([$_[0]], ["*var"]);
182 $d->Terse(1);
183 $d->Indent(2);
184 $d->Quotekeys(0);
185 $d->Useqq(1);
186 #$d->Bless(...);
187 $d->Seen($_[1]) if @_ > 1;
188 $d = $d->Dump();
189 }
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d
192 } || "[unable to dump $_[0]: '$@']";
193}
160 194
161use JSON::Syck (); # TODO# replace by JSON::PC once working 195use JSON::Syck (); # TODO# replace by JSON::PC once working
162 196
163=item $ref = cf::from_json $json 197=item $ref = cf::from_json $json
164 198
225} 259}
226 260
227sub freeze_mainloop { 261sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
229 263
230 my $guard = Coro::guard { $TICK_WATCHER->start }; 264 my $guard = Coro::guard {
265 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 };
268 $WRITE_RUNTIME_WATCHER->stop;
231 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
232 $guard 270 $guard
233} 271}
234 272
235=item cf::async { BLOCK } 273=item cf::async { BLOCK }
287 } 325 }
288} 326}
289 327
290=item $coro = cf::async_ext { BLOCK } 328=item $coro = cf::async_ext { BLOCK }
291 329
292Like async, but this coro is automcatially being canceled when the 330Like async, but this coro is automatically being canceled when the
293extension calling this is being unloaded. 331extension calling this is being unloaded.
294 332
295=cut 333=cut
296 334
297sub async_ext(&) { 335sub async_ext(&) {
311 my $runtime = cf::localdir . "/runtime"; 349 my $runtime = cf::localdir . "/runtime";
312 350
313 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
314 or return; 352 or return;
315 353
354 my $value = $cf::RUNTIME + 90 + 10;
316 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 355 # 10 is the runtime save interval, for a monotonic clock
356 # 60 allows for the watchdog to kill the server.
357
317 (aio_write $fh, 0, (length $value), $value, 0) <= 0 358 (aio_write $fh, 0, (length $value), $value, 0) <= 0
318 and return; 359 and return;
319 360
320 aio_fsync $fh 361 aio_fsync $fh
321 and return; 362 and return;
330} 371}
331 372
332=back 373=back
333 374
334=cut 375=cut
335
336#############################################################################
337
338package cf::path;
339
340sub new {
341 my ($class, $path, $base) = @_;
342
343 $path = $path->as_string if ref $path;
344
345 my $self = bless { }, $class;
346
347 # {... are special paths that are not touched
348 # ?xxx/... are special absolute paths
349 # ?random/... random maps
350 # /! non-realised random map exit
351 # /... normal maps
352 # ~/... per-player maps without a specific player (DO NOT USE)
353 # ~user/... per-player map of a specific user
354
355 if ($path =~ /^{/) {
356 # fine as it is
357 } elsif ($path =~ s{^\?random/}{}) {
358 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
359 $self->{random} = cf::from_json $data;
360 } else {
361 if ($path =~ s{^~([^/]+)?}{}) {
362 $self->{user_rel} = 1;
363
364 if (defined $1) {
365 $self->{user} = $1;
366 } elsif ($base =~ m{^~([^/]+)/}) {
367 $self->{user} = $1;
368 } else {
369 warn "cannot resolve user-relative path without user <$path,$base>\n";
370 }
371 } elsif ($path =~ /^\//) {
372 # already absolute
373 } else {
374 $base =~ s{[^/]+/?$}{};
375 return $class->new ("$base/$path");
376 }
377
378 for ($path) {
379 redo if s{/\.?/}{/};
380 redo if s{/[^/]+/\.\./}{/};
381 }
382 }
383
384 $self->{path} = $path;
385
386 $self
387}
388
389# the name / primary key / in-game path
390sub as_string {
391 my ($self) = @_;
392
393 $self->{user_rel} ? "~$self->{user}$self->{path}"
394 : $self->{random} ? "?random/$self->{path}"
395 : $self->{path}
396}
397
398# the displayed name, this is a one way mapping
399sub visible_name {
400 my ($self) = @_;
401
402# if (my $rmp = $self->{random}) {
403# # todo: be more intelligent about this
404# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
405# } else {
406 $self->as_string
407# }
408}
409
410# escape the /'s in the path
411sub _escaped_path {
412 # ∕ is U+2215
413 (my $path = $_[0]{path}) =~ s/\//∕/g;
414 $path
415}
416
417# the original (read-only) location
418sub load_path {
419 my ($self) = @_;
420
421 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
422}
423
424# the temporary/swap location
425sub save_path {
426 my ($self) = @_;
427
428 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
429 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
430 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
431}
432
433# the unique path, might be eq to save_path
434sub uniq_path {
435 my ($self) = @_;
436
437 $self->{user_rel} || $self->{random}
438 ? undef
439 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
440}
441
442# return random map parameters, or undef
443sub random_map_params {
444 my ($self) = @_;
445
446 $self->{random}
447}
448
449# this is somewhat ugly, but style maps do need special treatment
450sub is_style_map {
451 $_[0]{path} =~ m{^/styles/}
452}
453
454package cf;
455 376
456############################################################################# 377#############################################################################
457 378
458=head2 ATTACHABLE OBJECTS 379=head2 ATTACHABLE OBJECTS
459 380
585our @CB_TYPE = (); # registry for type (cf-object class) based events 506our @CB_TYPE = (); # registry for type (cf-object class) based events
586our @CB_MAP = (); 507our @CB_MAP = ();
587 508
588my %attachment; 509my %attachment;
589 510
511sub cf::attachable::thawer_merge {
512 # simply override everything except _meta
513 local $_[0]{_meta};
514 %{$_[0]} = %{$_[1]};
515}
516
590sub _attach_cb($$$$) { 517sub _attach_cb($$$$) {
591 my ($registry, $event, $prio, $cb) = @_; 518 my ($registry, $event, $prio, $cb) = @_;
592 519
593 use sort 'stable'; 520 use sort 'stable';
594 521
765# object support 692# object support
766 693
767sub reattach { 694sub reattach {
768 # basically do the same as instantiate, without calling instantiate 695 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 696 my ($obj) = @_;
697
698 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
770 699
771 my $registry = $obj->registry; 700 my $registry = $obj->registry;
772 701
773 @$registry = (); 702 @$registry = ();
774 703
906=cut 835=cut
907 836
908sub register_extcmd { 837sub register_extcmd {
909 my ($name, $cb) = @_; 838 my ($name, $cb) = @_;
910 839
911 my $caller = caller;
912 #warn "registering extcmd '$name' to '$caller'";
913
914 $EXTCMD{$name} = [$cb, $caller]; 840 $EXTCMD{$name} = $cb;
915} 841}
916 842
917cf::player->attach ( 843cf::player->attach (
918 on_command => sub { 844 on_command => sub {
919 my ($pl, $name, $params) = @_; 845 my ($pl, $name, $params) = @_;
932 858
933 my $msg = eval { from_json $buf }; 859 my $msg = eval { from_json $buf };
934 860
935 if (ref $msg) { 861 if (ref $msg) {
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 862 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
937 if (my %reply = $cb->[0]->($pl, $msg)) { 863 if (my %reply = $cb->($pl, $msg)) {
938 $pl->ext_reply ($msg->{msgid}, %reply); 864 $pl->ext_reply ($msg->{msgid}, %reply);
939 } 865 }
940 } 866 }
941 } else { 867 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 868 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
944 870
945 cf::override; 871 cf::override;
946 }, 872 },
947); 873);
948 874
949sub register {
950 my ($base, $pkg) = @_;
951
952 #TODO
953}
954
955sub load_extension { 875sub load_extension {
956 my ($path) = @_; 876 my ($path) = @_;
957 877
958 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 878 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
959 my $base = $1; 879 my $base = $1;
960 my $pkg = $1; 880 my $pkg = $1;
961 $pkg =~ s/[^[:word:]]/_/g; 881 $pkg =~ s/[^[:word:]]/_/g;
962 $pkg = "ext::$pkg"; 882 $pkg = "ext::$pkg";
963 883
964 warn "loading '$path' into '$pkg'\n"; 884 warn "... loading '$path' into '$pkg'\n";
965 885
966 open my $fh, "<:utf8", $path 886 open my $fh, "<:utf8", $path
967 or die "$path: $!"; 887 or die "$path: $!";
968 888
969 my $source = 889 my $source =
970 "package $pkg; use strict; use utf8;\n" 890 "package $pkg; use strict; use utf8;\n"
971 . "#line 1 \"$path\"\n{\n" 891 . "#line 1 \"$path\"\n{\n"
972 . (do { local $/; <$fh> }) 892 . (do { local $/; <$fh> })
973 . "\n};\n1"; 893 . "\n};\n1";
974 894
975 eval $source 895 unless (eval $source) {
976 or die $@ ? "$path: $@\n" 896 my $msg = $@ ? "$path: $@\n"
977 : "extension disabled.\n"; 897 : "extension disabled.\n";
978 898 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
979 push @exts, $pkg; 899 warn $@;
980 $ext_pkg{$base} = $pkg; 900 warn "mandatory extension failed to load, exiting.\n";
981 901 exit 1;
982# no strict 'refs'; 902 }
983# @{"$pkg\::ISA"} = ext::; 903 die $@;
984
985 register $base, $pkg;
986}
987
988sub unload_extension {
989 my ($pkg) = @_;
990
991 warn "removing extension $pkg\n";
992
993 # remove hooks
994 #TODO
995# for my $idx (0 .. $#PLUGIN_EVENT) {
996# delete $hook[$idx]{$pkg};
997# } 904 }
998 905
999 # remove commands 906 push @EXTS, $pkg;
1000 for my $name (keys %COMMAND) {
1001 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1002
1003 if (@cb) {
1004 $COMMAND{$name} = \@cb;
1005 } else {
1006 delete $COMMAND{$name};
1007 }
1008 }
1009
1010 # remove extcmds
1011 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1012 delete $EXTCMD{$name};
1013 }
1014
1015 if (my $cb = $pkg->can ("unload")) {
1016 eval {
1017 $cb->($pkg);
1018 1
1019 } or warn "$pkg unloaded, but with errors: $@";
1020 }
1021
1022 Symbol::delete_package $pkg;
1023} 907}
1024 908
1025sub load_extensions { 909sub load_extensions {
1026 for my $ext (<$LIBDIR/*.ext>) { 910 for my $ext (<$LIBDIR/*.ext>) {
1027 next unless -r $ext; 911 next unless -r $ext;
1031 } or warn "$ext not loaded: $@"; 915 } or warn "$ext not loaded: $@";
1032 } 916 }
1033} 917}
1034 918
1035############################################################################# 919#############################################################################
1036# load/save/clean perl data associated with a map
1037
1038*cf::mapsupport::on_clean = sub {
1039 my ($map) = @_;
1040
1041 my $path = $map->tmpname;
1042 defined $path or return;
1043
1044 unlink "$path.pst";
1045};
1046
1047cf::map->attach (prio => -10000, package => cf::mapsupport::);
1048
1049#############################################################################
1050# load/save perl data associated with player->ob objects
1051
1052sub all_objects(@) {
1053 @_, map all_objects ($_->inv), @_
1054}
1055
1056# TODO: compatibility cruft, remove when no longer needed
1057cf::player->attach (
1058 on_load => sub {
1059 my ($pl, $path) = @_;
1060
1061 for my $o (all_objects $pl->ob) {
1062 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1063 $o->set_ob_key_value ("_perl_data");
1064
1065 %$o = %{ Storable::thaw pack "H*", $value };
1066 }
1067 }
1068 },
1069);
1070
1071#############################################################################
1072 920
1073=head2 CORE EXTENSIONS 921=head2 CORE EXTENSIONS
1074 922
1075Functions and methods that extend core crossfire objects. 923Functions and methods that extend core crossfire objects.
1076 924
1077=cut 925=cut
1078 926
1079package cf::player; 927package cf::player;
1080 928
929use Coro::AIO;
930
1081=head3 cf::player 931=head3 cf::player
1082 932
1083=over 4 933=over 4
1084 934
1085=item cf::player::find $login 935=item cf::player::find $login
1086 936
1087Returns the given player object, loading it if necessary (might block). 937Returns the given player object, loading it if necessary (might block).
1088 938
1089=cut 939=cut
1090 940
941sub playerdir($) {
942 cf::localdir
943 . "/"
944 . cf::playerdir
945 . "/"
946 . (ref $_[0] ? $_[0]->ob->name : $_[0])
947}
948
1091sub path($) { 949sub path($) {
1092 sprintf "%s/%s/%s/%s.pl", 950 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1093 cf::localdir, cf::playerdir, 951
1094 (ref $_[0] ? $_[0]->ob->name : $_[0]) x 2 952 (playerdir $login) . "/$login.pl"
1095} 953}
1096 954
1097sub find_active($) { 955sub find_active($) {
1098 $cf::PLAYER{$_[0]} 956 $cf::PLAYER{$_[0]}
1099 and $cf::PLAYER{$_[0]}->active 957 and $cf::PLAYER{$_[0]}->active
1102 960
1103sub exists($) { 961sub exists($) {
1104 my ($login) = @_; 962 my ($login) = @_;
1105 963
1106 $cf::PLAYER{$login} 964 $cf::PLAYER{$login}
1107 or cf::sync_job { !aio_stat $login } 965 or cf::sync_job { !aio_stat path $login }
1108} 966}
1109 967
1110sub find($) { 968sub find($) {
1111 return $cf::PLAYER{$_[0]} || do { 969 return $cf::PLAYER{$_[0]} || do {
1112 my $login = $_[0]; 970 my $login = $_[0];
1113 971
1114 my $guard = cf::lock_acquire "user_find:$login"; 972 my $guard = cf::lock_acquire "user_find:$login";
1115 973
1116 $cf::PLAYER{$login} ||= (load_pl path $login or return); 974 $cf::PLAYER{$_[0]} || do {
975 my $pl = load_pl path $login
976 or return;
977 $cf::PLAYER{$login} = $pl
978 }
1117 }; 979 }
1118} 980}
1119 981
1120sub save($) { 982sub save($) {
1121 my ($pl) = @_; 983 my ($pl) = @_;
1122 984
1124 986
1125 my $path = path $pl; 987 my $path = path $pl;
1126 my $guard = cf::lock_acquire "user_save:$path"; 988 my $guard = cf::lock_acquire "user_save:$path";
1127 989
1128 return if $pl->{deny_save}; 990 return if $pl->{deny_save};
991
992 aio_mkdir playerdir $pl, 0770;
1129 $pl->{last_save} = $cf::RUNTIME; 993 $pl->{last_save} = $cf::RUNTIME;
1130 994
1131 Coro::cede;
1132 $pl->save_pl ($path); 995 $pl->save_pl ($path);
1133 Coro::cede; 996 Coro::cede;
1134} 997}
1135 998
1136sub new($) { 999sub new($) {
1144 $cf::PLAYER{$login} = $self; 1007 $cf::PLAYER{$login} = $self;
1145 1008
1146 $self 1009 $self
1147} 1010}
1148 1011
1012=item $pl->quit_character
1013
1014Nukes the player without looking back. If logged in, the connection will
1015be destroyed. May block for a long time.
1016
1017=cut
1018
1019sub quit_character {
1020 my ($pl) = @_;
1021
1022 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir
1024
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1026 $pl->deactivate;
1027 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1028 $pl->ns->destroy if $pl->ns;
1029
1030 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy;
1035 IO::AIO::aio_rmtree $temp;
1036}
1037
1038=item cf::player::list_logins
1039
1040Returns am arrayref of all valid playernames in the system, can take a
1041while and may block, so not sync_job-capable, ever.
1042
1043=cut
1044
1045sub list_logins {
1046 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1047 or return [];
1048
1049 my @logins;
1050
1051 for my $login (@$dirs) {
1052 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1053 aio_read $fh, 0, 512, my $buf, 0 or next;
1054 $buf !~ /^password -------------$/m or next; # official not-valid tag
1055
1056 utf8::decode $login;
1057 push @logins, $login;
1058 }
1059
1060 \@logins
1061}
1062
1063=item $player->maps
1064
1065Returns an arrayref of map paths that are private for this
1066player. May block.
1067
1068=cut
1069
1070sub maps($) {
1071 my ($pl) = @_;
1072
1073 my $files = aio_readdir playerdir $pl
1074 or return;
1075
1076 my @paths;
1077
1078 for (@$files) {
1079 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o;
1082
1083 s/\.map$//;
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 }
1086
1087 \@paths
1088}
1089
1149=item $player->ext_reply ($msgid, $msgtype, %msg) 1090=item $player->ext_reply ($msgid, $msgtype, %msg)
1150 1091
1151Sends an ext reply to the player. 1092Sends an ext reply to the player.
1152 1093
1153=cut 1094=cut
1174package cf::map; 1115package cf::map;
1175 1116
1176use Fcntl; 1117use Fcntl;
1177use Coro::AIO; 1118use Coro::AIO;
1178 1119
1120use overload
1121 '""' => \&as_string,
1122 fallback => 1;
1123
1179our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1180our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1181 1126
1182sub generate_random_map { 1127sub generate_random_map {
1183 my ($path, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1184
1185 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1186 cf::map::_create_random_map 1130 $self->_create_random_map (
1187 $path,
1188 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1189 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1190 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1191 $rmp->{exit_on_final_map}, 1134 $rmp->{exit_on_final_map},
1192 $rmp->{xsize}, $rmp->{ysize}, 1135 $rmp->{xsize}, $rmp->{ysize},
1193 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1136 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1194 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1137 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1195 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1138 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1196 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1139 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1197 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1198 (cf::region::find $rmp->{region}) 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1142 )
1143}
1144
1145=item cf::map->register ($regex, $prio)
1146
1147Register a handler for the map path matching the given regex at the
1148givne priority (higher is better, built-in handlers have priority 0, the
1149default).
1150
1151=cut
1152
1153sub register {
1154 my (undef, $regex, $prio) = @_;
1155 my $pkg = caller;
1156
1157 no strict;
1158 push @{"$pkg\::ISA"}, __PACKAGE__;
1159
1160 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1161}
1162
1163# also paths starting with '/'
1164$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1165
1166sub thawer_merge {
1167 my ($self, $merge) = @_;
1168
1169 # we have to keep some variables in memory intact
1170 local $self->{path};
1171 local $self->{load_path};
1172 local $self->{deny_save};
1173 local $self->{deny_reset};
1174
1175 $self->SUPER::thawer_merge ($merge);
1176}
1177
1178sub normalise {
1179 my ($path, $base) = @_;
1180
1181 # map plan:
1182 #
1183 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths
1186 # ?random/... random maps
1187 # /... normal maps
1188 # ~user/... per-player map of a specific user
1189
1190 $path =~ s/$PATH_SEP/\//go;
1191
1192 # treat it as relative path if it starts with
1193 # something that looks reasonable
1194 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1195 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1196
1197 $base =~ s{[^/]+/?$}{};
1198 $path = "$base/$path";
1199 }
1200
1201 for ($path) {
1202 redo if s{//}{/};
1203 redo if s{/\.?/}{/};
1204 redo if s{/[^/]+/\.\./}{/};
1205 }
1206
1207 $path
1208}
1209
1210sub new_from_path {
1211 my (undef, $path, $base) = @_;
1212
1213 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1214
1215 $path = normalise $path, $base;
1216
1217 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1218 if ($path =~ $EXT_MAP{$pkg}[1]) {
1219 my $self = bless cf::map::new, $pkg;
1220 $self->{path} = $path; $self->path ($path);
1221 $self->init; # pass $1 etc.
1222 return $self;
1223 }
1224 }
1225
1226 Carp::carp "unable to resolve path '$path'.";
1227 ()
1228}
1229
1230sub init {
1231 my ($self) = @_;
1232
1233 $self
1234}
1235
1236sub as_string {
1237 my ($self) = @_;
1238
1239 "$self->{path}"
1240}
1241
1242# the displayed name, this is a one way mapping
1243sub visible_name {
1244 &as_string
1245}
1246
1247# the original (read-only) location
1248sub load_path {
1249 my ($self) = @_;
1250
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1252}
1253
1254# the temporary/swap location
1255sub save_path {
1256 my ($self) = @_;
1257
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1260}
1261
1262# the unique path, undef == no special unique path
1263sub uniq_path {
1264 my ($self) = @_;
1265
1266 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1267 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1199} 1268}
1200 1269
1201# and all this just because we cannot iterate over 1270# and all this just because we cannot iterate over
1202# all maps in C++... 1271# all maps in C++...
1203sub change_all_map_light { 1272sub change_all_map_light {
1205 1274
1206 $_->change_map_light ($change) 1275 $_->change_map_light ($change)
1207 for grep $_->outdoor, values %cf::MAP; 1276 for grep $_->outdoor, values %cf::MAP;
1208} 1277}
1209 1278
1279sub unlink_save {
1280 my ($self) = @_;
1281
1282 utf8::encode (my $save = $self->save_path);
1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1284 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1285}
1286
1210sub try_load_header($) { 1287sub load_header_from($) {
1211 my ($path) = @_; 1288 my ($self, $path) = @_;
1212 1289
1213 utf8::encode $path; 1290 utf8::encode $path;
1214 aio_open $path, O_RDONLY, 0 1291 aio_open $path, O_RDONLY, 0
1215 or return; 1292 or return;
1216 1293
1217 my $map = cf::map::new 1294 $self->_load_header ($path)
1218 or return; 1295 or return;
1219 1296
1220 # for better error messages only, will be overwritten 1297 $self->{load_path} = $path;
1221 $map->path ($path);
1222 1298
1223 $map->load_header ($path) 1299 1
1300}
1301
1302sub load_header_orig {
1303 my ($self) = @_;
1304
1305 $self->load_header_from ($self->load_path)
1306}
1307
1308sub load_header_temp {
1309 my ($self) = @_;
1310
1311 $self->load_header_from ($self->save_path)
1312}
1313
1314sub prepare_temp {
1315 my ($self) = @_;
1316
1317 $self->last_access ((delete $self->{last_access})
1318 || $cf::RUNTIME); #d#
1319 # safety
1320 $self->{instantiate_time} = $cf::RUNTIME
1321 if $self->{instantiate_time} > $cf::RUNTIME;
1322}
1323
1324sub prepare_orig {
1325 my ($self) = @_;
1326
1327 $self->{load_original} = 1;
1328 $self->{instantiate_time} = $cf::RUNTIME;
1329 $self->last_access ($cf::RUNTIME);
1330 $self->instantiate;
1331}
1332
1333sub load_header {
1334 my ($self) = @_;
1335
1336 if ($self->load_header_temp) {
1337 $self->prepare_temp;
1338 } else {
1339 $self->load_header_orig
1224 or return; 1340 or return;
1341 $self->prepare_orig;
1342 }
1225 1343
1226 $map->{load_path} = $path; 1344 1
1227
1228 $map
1229} 1345}
1230 1346
1231sub find; 1347sub find;
1232sub find { 1348sub find {
1233 my ($path, $origin) = @_; 1349 my ($path, $origin) = @_;
1234 1350
1235 #warn "find<$path,$origin>\n";#d#
1236
1237 $path = new cf::path $path, $origin && $origin->path; 1351 $path = normalise $path, $origin && $origin->path;
1238 my $key = $path->as_string;
1239 1352
1240 cf::lock_wait "map_find:$key"; 1353 cf::lock_wait "map_find:$path";
1241 1354
1242 $cf::MAP{$key} || do { 1355 $cf::MAP{$path} || do {
1243 my $guard = cf::lock_acquire "map_find:$key"; 1356 my $guard = cf::lock_acquire "map_find:$path";
1244 1357 my $map = new_from_path cf::map $path
1245 # do it the slow way
1246 my $map = try_load_header $path->save_path;
1247
1248 Coro::cede;
1249
1250 if ($map) {
1251 $map->last_access ((delete $map->{last_access})
1252 || $cf::RUNTIME); #d#
1253 # safety
1254 $map->{instantiate_time} = $cf::RUNTIME
1255 if $map->{instantiate_time} > $cf::RUNTIME;
1256 } else {
1257 if (my $rmp = $path->random_map_params) {
1258 $map = generate_random_map $key, $rmp;
1259 } else {
1260 $map = try_load_header $path->load_path;
1261 }
1262
1263 $map or return; 1358 or return;
1264 1359
1265 $map->{load_original} = 1;
1266 $map->{instantiate_time} = $cf::RUNTIME;
1267 $map->last_access ($cf::RUNTIME);
1268 $map->instantiate;
1269
1270 # per-player maps become, after loading, normal maps
1271 $map->per_player (0) if $path->{user_rel};
1272 }
1273
1274 $map->path ($key);
1275 $map->{path} = $path;
1276 $map->{last_save} = $cf::RUNTIME; 1360 $map->{last_save} = $cf::RUNTIME;
1277 1361
1278 Coro::cede; 1362 $map->load_header
1363 or return;
1279 1364
1280 if ($map->should_reset) { 1365 if ($map->should_reset) {
1366 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait;
1281 $map->reset; 1368 $map->reset;
1282 undef $guard; 1369 undef $guard;
1283 $map = find $path 1370 $map = find $path
1284 or return; 1371 or return;
1285 } 1372 }
1286 1373
1287 $cf::MAP{$key} = $map 1374 $cf::MAP{$path} = $map
1288 } 1375 }
1289} 1376}
1377
1378sub pre_load { }
1379sub post_load { }
1290 1380
1291sub load { 1381sub load {
1292 my ($self) = @_; 1382 my ($self) = @_;
1293 1383
1294 my $path = $self->{path}; 1384 my $path = $self->{path};
1295 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1385 my $guard = cf::lock_acquire "map_load:$path";
1296 1386
1297 return if $self->in_memory != cf::MAP_SWAPPED; 1387 return if $self->in_memory != cf::MAP_SWAPPED;
1298 1388
1299 $self->in_memory (cf::MAP_LOADING); 1389 $self->in_memory (cf::MAP_LOADING);
1300 1390
1301 $self->alloc; 1391 $self->alloc;
1392
1393 $self->pre_load;
1394
1302 $self->load_objects ($self->{load_path}, 1) 1395 $self->_load_objects ($self->{load_path}, 1)
1303 or return; 1396 or return;
1304 1397
1305 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1398 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1306 if delete $self->{load_original}; 1399 if delete $self->{load_original};
1307 1400
1308 if (my $uniq = $path->uniq_path) { 1401 if (my $uniq = $self->uniq_path) {
1309 utf8::encode $uniq; 1402 utf8::encode $uniq;
1310 if (aio_open $uniq, O_RDONLY, 0) { 1403 if (aio_open $uniq, O_RDONLY, 0) {
1311 $self->clear_unique_items; 1404 $self->clear_unique_items;
1312 $self->load_objects ($uniq, 0); 1405 $self->_load_objects ($uniq, 0);
1313 } 1406 }
1314 } 1407 }
1315 1408
1316 Coro::cede; 1409 Coro::cede;
1317 1410
1318 # now do the right thing for maps 1411 # now do the right thing for maps
1319 $self->link_multipart_objects; 1412 $self->link_multipart_objects;
1320 1413
1321 if ($self->{path}->is_style_map) { 1414 unless ($self->{deny_activate}) {
1322 $self->{deny_save} = 1; 1415 $self->decay_objects;
1323 $self->{deny_reset} = 1;
1324 } else {
1325 $self->fix_auto_apply; 1416 $self->fix_auto_apply;
1326 $self->decay_objects;
1327 $self->update_buttons; 1417 $self->update_buttons;
1418 Coro::cede;
1328 $self->set_darkness_map; 1419 $self->set_darkness_map;
1329 $self->difficulty ($self->estimate_difficulty) 1420 $self->difficulty ($self->estimate_difficulty)
1330 unless $self->difficulty; 1421 unless $self->difficulty;
1422 Coro::cede;
1331 $self->activate; 1423 $self->activate;
1332 } 1424 }
1333 1425
1334 Coro::cede; 1426 $self->post_load;
1335 1427
1336 $self->in_memory (cf::MAP_IN_MEMORY); 1428 $self->in_memory (cf::MAP_IN_MEMORY);
1429}
1430
1431sub customise_for {
1432 my ($self, $ob) = @_;
1433
1434 return find "~" . $ob->name . "/" . $self->{path}
1435 if $self->per_player;
1436
1437 $self
1438}
1439
1440# find and load all maps in the 3x3 area around a map
1441sub load_diag {
1442 my ($map) = @_;
1443
1444 my @diag; # diagonal neighbours
1445
1446 for (0 .. 3) {
1447 my $neigh = $map->tile_path ($_)
1448 or next;
1449 $neigh = find $neigh, $map
1450 or next;
1451 $neigh->load;
1452
1453 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1454 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1455 }
1456
1457 for (@diag) {
1458 my $neigh = find @$_
1459 or next;
1460 $neigh->load;
1461 }
1337} 1462}
1338 1463
1339sub find_sync { 1464sub find_sync {
1340 my ($path, $origin) = @_; 1465 my ($path, $origin) = @_;
1341 1466
1342 cf::sync_job { cf::map::find $path, $origin } 1467 cf::sync_job { find $path, $origin }
1343} 1468}
1344 1469
1345sub do_load_sync { 1470sub do_load_sync {
1346 my ($map) = @_; 1471 my ($map) = @_;
1347 1472
1348 cf::sync_job { $map->load }; 1473 cf::sync_job { $map->load };
1349} 1474}
1350 1475
1476our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = undef;
1478
1479sub find_async {
1480 my ($path, $origin) = @_;
1481
1482 $path = normalise $path, $origin && $origin->{path};
1483
1484 if (my $map = $cf::MAP{$path}) {
1485 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1486 }
1487
1488 undef $MAP_PREFETCH{$path};
1489 $MAP_PREFETCHER ||= cf::async {
1490 while (%MAP_PREFETCH) {
1491 for my $path (keys %MAP_PREFETCH) {
1492 my $map = find $path
1493 or next;
1494 $map->load;
1495
1496 delete $MAP_PREFETCH{$path};
1497 }
1498 }
1499 undef $MAP_PREFETCHER;
1500 };
1501 $MAP_PREFETCHER->prio (6);
1502
1503 ()
1504}
1505
1351sub save { 1506sub save {
1352 my ($self) = @_; 1507 my ($self) = @_;
1353 1508
1354 my $lock = cf::lock_acquire "map_data:" . $self->path; 1509 my $lock = cf::lock_acquire "map_data:" . $self->path;
1355 1510
1356 $self->{last_save} = $cf::RUNTIME; 1511 $self->{last_save} = $cf::RUNTIME;
1357 1512
1358 return unless $self->dirty; 1513 return unless $self->dirty;
1359 1514
1360 my $save = $self->{path}->save_path; utf8::encode $save; 1515 my $save = $self->save_path; utf8::encode $save;
1361 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1516 my $uniq = $self->uniq_path; utf8::encode $uniq;
1362 1517
1363 $self->{load_path} = $save; 1518 $self->{load_path} = $save;
1364 1519
1365 return if $self->{deny_save}; 1520 return if $self->{deny_save};
1366 1521
1369 cf::async { 1524 cf::async {
1370 $_->contr->save for $self->players; 1525 $_->contr->save for $self->players;
1371 }; 1526 };
1372 1527
1373 if ($uniq) { 1528 if ($uniq) {
1374 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1529 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1375 $self->save_objects ($uniq, cf::IO_UNIQUES); 1530 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1376 } else { 1531 } else {
1377 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1532 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1378 } 1533 }
1379} 1534}
1380 1535
1381sub swap_out { 1536sub swap_out {
1382 my ($self) = @_; 1537 my ($self) = @_;
1396 1551
1397sub reset_at { 1552sub reset_at {
1398 my ($self) = @_; 1553 my ($self) = @_;
1399 1554
1400 # TODO: safety, remove and allow resettable per-player maps 1555 # TODO: safety, remove and allow resettable per-player maps
1401 return 1e99 if $self->{path}{user_rel}; 1556 return 1e99 if $self->isa ("ext::map_per_player");#d#
1402 return 1e99 if $self->{deny_reset}; 1557 return 1e99 if $self->{deny_reset};
1403 1558
1404 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1559 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1405 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1560 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1406 1561
1411 my ($self) = @_; 1566 my ($self) = @_;
1412 1567
1413 $self->reset_at <= $cf::RUNTIME 1568 $self->reset_at <= $cf::RUNTIME
1414} 1569}
1415 1570
1416sub unlink_save {
1417 my ($self) = @_;
1418
1419 utf8::encode (my $save = $self->{path}->save_path);
1420 aioreq_pri 3; IO::AIO::aio_unlink $save;
1421 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1422}
1423
1424sub rename {
1425 my ($self, $new_path) = @_;
1426
1427 $self->unlink_save;
1428
1429 delete $cf::MAP{$self->path};
1430 $self->{path} = new cf::path $new_path;
1431 $self->path ($self->{path}->as_string);
1432 $cf::MAP{$self->path} = $self;
1433
1434 $self->save;
1435}
1436
1437sub reset { 1571sub reset {
1438 my ($self) = @_; 1572 my ($self) = @_;
1439 1573
1440 my $lock = cf::lock_acquire "map_data:" . $self->path; 1574 my $lock = cf::lock_acquire "map_data:$self->{path}";
1441 1575
1442 return if $self->players; 1576 return if $self->players;
1443 return if $self->{path}{user_rel};#d# 1577 return if $self->isa ("ext::map_per_player");#d#
1444 1578
1445 warn "resetting map ", $self->path;#d# 1579 warn "resetting map ", $self->path;#d#
1446 1580
1447 delete $cf::MAP{$self->path}; 1581 delete $cf::MAP{$self->path};
1582
1583 $self->in_memory (cf::MAP_SWAPPED);
1584 $self->clear;
1448 1585
1449 $_->clear_links_to ($self) for values %cf::MAP; 1586 $_->clear_links_to ($self) for values %cf::MAP;
1450 1587
1451 $self->unlink_save; 1588 $self->unlink_save;
1452 $self->destroy; 1589 $self->destroy;
1455my $nuke_counter = "aaaa"; 1592my $nuke_counter = "aaaa";
1456 1593
1457sub nuke { 1594sub nuke {
1458 my ($self) = @_; 1595 my ($self) = @_;
1459 1596
1597 delete $cf::MAP{$self->path};
1598
1599 $self->unlink_save;
1600
1601 bless $self, "cf::map";
1602 delete $self->{deny_reset};
1460 $self->{deny_save} = 1; 1603 $self->{deny_save} = 1;
1461 $self->reset_timeout (1); 1604 $self->reset_timeout (1);
1462 $self->rename ("{nuke}/" . ($nuke_counter++)); 1605 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1606
1607 $cf::MAP{$self->path} = $self;
1608
1463 $self->reset; # polite request, might not happen 1609 $self->reset; # polite request, might not happen
1464} 1610}
1465 1611
1466sub customise_for { 1612=item cf::map::unique_maps
1467 my ($map, $ob) = @_;
1468 1613
1469 if ($map->per_player) { 1614Returns an arrayref of paths of all shared maps that have
1470 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1615instantiated unique items. May block.
1471 }
1472 1616
1473 $map 1617=cut
1474}
1475 1618
1476sub emergency_save { 1619sub unique_maps() {
1477 my $freeze_guard = cf::freeze_mainloop; 1620 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1621 or return;
1478 1622
1479 warn "enter emergency map save\n"; 1623 my @paths;
1480 1624
1481 cf::sync_job { 1625 for (@$files) {
1482 warn "begin emergency map save\n"; 1626 utf8::decode $_;
1483 $_->save for values %cf::MAP; 1627 next if /\.pst$/;
1628 next unless /^$PATH_SEP/o;
1629
1630 s/\.map$//;
1631 push @paths, $_;
1484 }; 1632 }
1485 1633
1486 warn "end emergency map save\n"; 1634 \@paths
1487} 1635}
1488 1636
1489package cf; 1637package cf;
1490 1638
1491=back 1639=back
1492 1640
1641=head3 cf::object
1642
1643=cut
1644
1645package cf::object;
1646
1647=over 4
1648
1649=item $ob->inv_recursive
1650
1651Returns the inventory of the object _and_ their inventories, recursively.
1652
1653=cut
1654
1655sub inv_recursive_;
1656sub inv_recursive_ {
1657 map { $_, inv_recursive_ $_->inv } @_
1658}
1659
1660sub inv_recursive {
1661 inv_recursive_ inv $_[0]
1662}
1663
1664package cf;
1665
1666=back
1493 1667
1494=head3 cf::object::player 1668=head3 cf::object::player
1495 1669
1496=over 4 1670=over 4
1497 1671
1537 1711
1538=item $player_object->enter_link 1712=item $player_object->enter_link
1539 1713
1540Freezes the player and moves him/her to a special map (C<{link}>). 1714Freezes the player and moves him/her to a special map (C<{link}>).
1541 1715
1542The player should be reaosnably safe there for short amounts of time. You 1716The player should be reasonably safe there for short amounts of time. You
1543I<MUST> call C<leave_link> as soon as possible, though. 1717I<MUST> call C<leave_link> as soon as possible, though.
1544 1718
1719Will never block.
1720
1545=item $player_object->leave_link ($map, $x, $y) 1721=item $player_object->leave_link ($map, $x, $y)
1546 1722
1547Moves the player out of the specila link map onto the given map. If the 1723Moves the player out of the special C<{link}> map onto the specified
1548map is not valid (or omitted), the player will be moved back to the 1724map. If the map is not valid (or omitted), the player will be moved back
1549location he/she was before the call to C<enter_link>, or, if that fails, 1725to the location he/she was before the call to C<enter_link>, or, if that
1550to the emergency map position. 1726fails, to the emergency map position.
1551 1727
1552Might block. 1728Might block.
1553 1729
1554=cut 1730=cut
1731
1732sub link_map {
1733 unless ($LINK_MAP) {
1734 $LINK_MAP = cf::map::find "{link}"
1735 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1736 $LINK_MAP->load;
1737 }
1738
1739 $LINK_MAP
1740}
1555 1741
1556sub cf::object::player::enter_link { 1742sub cf::object::player::enter_link {
1557 my ($self) = @_; 1743 my ($self) = @_;
1558 1744
1559 $self->deactivate_recursive; 1745 $self->deactivate_recursive;
1560 1746
1561 return if $self->map == $LINK_MAP; 1747 return if UNIVERSAL::isa $self->map, "ext::map_link";
1562 1748
1563 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1749 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1564 if $self->map; 1750 if $self->map;
1565 1751
1566 $self->enter_map ($LINK_MAP, 20, 20); 1752 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1567} 1753}
1568 1754
1569sub cf::object::player::leave_link { 1755sub cf::object::player::leave_link {
1570 my ($self, $map, $x, $y) = @_; 1756 my ($self, $map, $x, $y) = @_;
1571 1757
1589 # use -1 or undef as default coordinates, not 0, 0 1775 # use -1 or undef as default coordinates, not 0, 0
1590 ($x, $y) = ($map->enter_x, $map->enter_y) 1776 ($x, $y) = ($map->enter_x, $map->enter_y)
1591 if $x <=0 && $y <= 0; 1777 if $x <=0 && $y <= 0;
1592 1778
1593 $map->load; 1779 $map->load;
1780 $map->load_diag;
1594 1781
1595 return unless $self->contr->active; 1782 return unless $self->contr->active;
1596 $self->activate_recursive; 1783 $self->activate_recursive;
1597 $self->enter_map ($map, $x, $y); 1784 $self->enter_map ($map, $x, $y);
1598} 1785}
1637 my ($self, $path, $x, $y) = @_; 1824 my ($self, $path, $x, $y) = @_;
1638 1825
1639 $self->enter_link; 1826 $self->enter_link;
1640 1827
1641 (async { 1828 (async {
1642 $path = new cf::path $path;
1643
1644 my $map = cf::map::find $path->as_string; 1829 my $map = cf::map::find $path;
1645 $map = $map->customise_for ($self) if $map; 1830 $map = $map->customise_for ($self) if $map;
1646 1831
1647# warn "entering ", $map->path, " at ($x, $y)\n" 1832# warn "entering ", $map->path, " at ($x, $y)\n"
1648# if $map; 1833# if $map;
1649 1834
1650 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1835 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1651 1836
1652 $self->leave_link ($map, $x, $y); 1837 $self->leave_link ($map, $x, $y);
1653 })->prio (1); 1838 })->prio (1);
1654} 1839}
1655 1840
1659 1844
1660sub parse_random_map_params { 1845sub parse_random_map_params {
1661 my ($spec) = @_; 1846 my ($spec) = @_;
1662 1847
1663 my $rmp = { # defaults 1848 my $rmp = { # defaults
1664 xsize => 10, 1849 xsize => (cf::rndm 15, 40),
1665 ysize => 10, 1850 ysize => (cf::rndm 15, 40),
1851 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1852 #layout => string,
1666 }; 1853 };
1667 1854
1668 for (split /\n/, $spec) { 1855 for (split /\n/, $spec) {
1669 my ($k, $v) = split /\s+/, $_, 2; 1856 my ($k, $v) = split /\s+/, $_, 2;
1670 1857
1674 $rmp 1861 $rmp
1675} 1862}
1676 1863
1677sub prepare_random_map { 1864sub prepare_random_map {
1678 my ($exit) = @_; 1865 my ($exit) = @_;
1866
1867 my $guard = cf::lock_acquire "exit_prepare:$exit";
1679 1868
1680 # all this does is basically replace the /! path by 1869 # all this does is basically replace the /! path by
1681 # a new random map path (?random/...) with a seed 1870 # a new random map path (?random/...) with a seed
1682 # that depends on the exit object 1871 # that depends on the exit object
1683 1872
1692 1881
1693 $rmp->{random_seed} ||= $exit->random_seed; 1882 $rmp->{random_seed} ||= $exit->random_seed;
1694 1883
1695 my $data = cf::to_json $rmp; 1884 my $data = cf::to_json $rmp;
1696 my $md5 = Digest::MD5::md5_hex $data; 1885 my $md5 = Digest::MD5::md5_hex $data;
1886 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1697 1887
1698 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1888 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1699 aio_write $fh, 0, (length $data), $data, 0; 1889 aio_write $fh, 0, (length $data), $data, 0;
1890 undef $fh;
1891 aio_rename "$meta~", $meta;
1700 1892
1701 $exit->slaying ("?random/$md5"); 1893 $exit->slaying ("?random/$md5");
1702 $exit->msg (undef); 1894 $exit->msg (undef);
1703 } 1895 }
1704} 1896}
1714 $self->deactivate_recursive; # just to be sure 1906 $self->deactivate_recursive; # just to be sure
1715 unless (eval { 1907 unless (eval {
1716 prepare_random_map $exit 1908 prepare_random_map $exit
1717 if $exit->slaying eq "/!"; 1909 if $exit->slaying eq "/!";
1718 1910
1719 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1911 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1720 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1912 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1721 1913
1722 1; 1914 1;
1723 }) { 1915 }) {
1724 $self->message ("Something went wrong deep within the crossfire server. " 1916 $self->message ("Something went wrong deep within the crossfire server. "
1725 . "I'll try to bring you back to the map you were before. " 1917 . "I'll try to bring you back to the map you were before. "
1726 . "Please report this to the dungeon master", 1918 . "Please report this to the dungeon master!",
1727 cf::NDI_UNIQUE | cf::NDI_RED); 1919 cf::NDI_UNIQUE | cf::NDI_RED);
1728 1920
1729 warn "ERROR in enter_exit: $@"; 1921 warn "ERROR in enter_exit: $@";
1730 $self->leave_link; 1922 $self->leave_link;
1731 } 1923 }
2014 sub db_sync() { 2206 sub db_sync() {
2015 db_save if $dirty; 2207 db_save if $dirty;
2016 undef $dirty; 2208 undef $dirty;
2017 } 2209 }
2018 2210
2019 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2211 my $idle = Event->idle (
2020 db_sync; 2212 reentrant => 0,
2213 min => 10,
2214 max => 20,
2215 repeat => 0,
2216 data => WF_AUTOCANCEL,
2217 cb => \&db_sync,
2021 }); 2218 );
2022 2219
2023 sub db_dirty() { 2220 sub db_dirty() {
2024 $dirty = 1; 2221 $dirty = 1;
2025 $idle->start; 2222 $idle->start;
2026 } 2223 }
2063 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2260 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2064 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 2261 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2065 2262
2066 if (exists $CFG{mlockall}) { 2263 if (exists $CFG{mlockall}) {
2067 eval { 2264 eval {
2068 $CFG{mlockall} ? &mlockall : &munlockall 2265 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2069 and die "WARNING: m(un)lockall failed: $!\n"; 2266 and die "WARNING: m(un)lockall failed: $!\n";
2070 }; 2267 };
2071 warn $@ if $@; 2268 warn $@ if $@;
2072 } 2269 }
2073} 2270}
2074 2271
2075sub main { 2272sub main {
2076 # we must not ever block the main coroutine 2273 # we must not ever block the main coroutine
2077 local $Coro::idle = sub { 2274 local $Coro::idle = sub {
2078 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2275 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2276 (async {
2079 async { Event::one_event }; 2277 Event::one_event;
2278 })->prio (Coro::PRIO_MAX);
2080 }; 2279 };
2081 2280
2082 cfg_load; 2281 cfg_load;
2083 db_load; 2282 db_load;
2084 load_extensions; 2283 load_extensions;
2284
2285 $TICK_WATCHER->start;
2085 Event::loop; 2286 Event::loop;
2086} 2287}
2087 2288
2088############################################################################# 2289#############################################################################
2089# initialisation 2290# initialisation and cleanup
2291
2292# install some emergency cleanup handlers
2293BEGIN {
2294 for my $signal (qw(INT HUP TERM)) {
2295 Event->signal (
2296 reentrant => 0,
2297 data => WF_AUTOCANCEL,
2298 signal => $signal,
2299 prio => 0,
2300 cb => sub {
2301 cf::cleanup "SIG$signal";
2302 },
2303 );
2304 }
2305}
2306
2307sub emergency_save() {
2308 my $freeze_guard = cf::freeze_mainloop;
2309
2310 warn "enter emergency perl save\n";
2311
2312 cf::sync_job {
2313 # use a peculiar iteration method to avoid tripping on perl
2314 # refcount bugs in for. also avoids problems with players
2315 # and maps saved/destroyed asynchronously.
2316 warn "begin emergency player save\n";
2317 for my $login (keys %cf::PLAYER) {
2318 my $pl = $cf::PLAYER{$login} or next;
2319 $pl->valid or next;
2320 $pl->save;
2321 }
2322 warn "end emergency player save\n";
2323
2324 warn "begin emergency map save\n";
2325 for my $path (keys %cf::MAP) {
2326 my $map = $cf::MAP{$path} or next;
2327 $map->valid or next;
2328 $map->save;
2329 }
2330 warn "end emergency map save\n";
2331 };
2332
2333 warn "leave emergency perl save\n";
2334}
2090 2335
2091sub reload() { 2336sub reload() {
2092 # can/must only be called in main 2337 # can/must only be called in main
2093 if ($Coro::current != $Coro::main) { 2338 if ($Coro::current != $Coro::main) {
2094 warn "can only reload from main coroutine\n"; 2339 warn "can only reload from main coroutine";
2095 return; 2340 return;
2096 } 2341 }
2097 2342
2098 warn "reloading..."; 2343 warn "reloading...";
2099 2344
2100 my $guard = freeze_mainloop; 2345 warn "cancelling server ticker";
2346 $TICK_WATCHER->cancel;
2347
2101 cf::emergency_save; 2348 cf::emergency_save;
2102 2349
2103 eval { 2350 eval {
2104 # if anything goes wrong in here, we should simply crash as we already saved 2351 # if anything goes wrong in here, we should simply crash as we already saved
2105 2352
2106 # cancel all watchers 2353 warn "syncing database to disk";
2354 cf::db_sync;
2355
2356 warn "cancelling all WF_AUTOCANCEL watchers";
2107 for (Event::all_watchers) { 2357 for (Event::all_watchers) {
2108 $_->cancel if $_->data & WF_AUTOCANCEL; 2358 $_->cancel if $_->data & WF_AUTOCANCEL;
2109 } 2359 }
2110 2360
2361 warn "flushing outstanding aio requests";
2362 for (;;) {
2363 IO::AIO::flush;
2364 Coro::cede;
2365 last unless IO::AIO::nreqs;
2366 warn "iterate...";
2367 }
2368
2111 # cancel all extension coros 2369 warn "cancelling all extension coros";
2112 $_->cancel for values %EXT_CORO; 2370 $_->cancel for values %EXT_CORO;
2113 %EXT_CORO = (); 2371 %EXT_CORO = ();
2114 2372
2115 # unload all extensions 2373 warn "removing commands";
2116 for (@exts) { 2374 %COMMAND = ();
2375
2376 warn "removing ext commands";
2377 %EXTCMD = ();
2378
2379 warn "unloading/nuking all extensions";
2380 for my $pkg (@EXTS) {
2117 warn "unloading <$_>"; 2381 warn "... unloading $pkg";
2118 unload_extension $_; 2382
2383 if (my $cb = $pkg->can ("unload")) {
2384 eval {
2385 $cb->($pkg);
2386 1
2387 } or warn "$pkg unloaded, but with errors: $@";
2119 } 2388 }
2120 2389
2390 warn "... nuking $pkg";
2391 Symbol::delete_package $pkg;
2392 }
2393
2121 # unload all modules loaded from $LIBDIR 2394 warn "unloading all perl modules loaded from $LIBDIR";
2122 while (my ($k, $v) = each %INC) { 2395 while (my ($k, $v) = each %INC) {
2123 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2396 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2124 2397
2125 warn "removing <$k>"; 2398 warn "... unloading $k";
2126 delete $INC{$k}; 2399 delete $INC{$k};
2127 2400
2128 $k =~ s/\.pm$//; 2401 $k =~ s/\.pm$//;
2129 $k =~ s/\//::/g; 2402 $k =~ s/\//::/g;
2130 2403
2133 } 2406 }
2134 2407
2135 Symbol::delete_package $k; 2408 Symbol::delete_package $k;
2136 } 2409 }
2137 2410
2138 # sync database to disk
2139 cf::db_sync;
2140 IO::AIO::flush;
2141
2142 # get rid of safe::, as good as possible 2411 warn "getting rid of safe::, as good as possible";
2143 Symbol::delete_package "safe::$_" 2412 Symbol::delete_package "safe::$_"
2144 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2413 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2145 2414
2146 # remove register_script_function callbacks
2147 # TODO
2148
2149 # unload cf.pm "a bit" 2415 warn "unloading cf.pm \"a bit\"";
2150 delete $INC{"cf.pm"}; 2416 delete $INC{"cf.pm"};
2151 2417
2152 # don't, removes xs symbols, too, 2418 # don't, removes xs symbols, too,
2153 # and global variables created in xs 2419 # and global variables created in xs
2154 #Symbol::delete_package __PACKAGE__; 2420 #Symbol::delete_package __PACKAGE__;
2155 2421
2156 # reload cf.pm 2422 warn "unload completed, starting to reload now";
2423
2157 warn "reloading cf.pm"; 2424 warn "reloading cf.pm";
2158 require cf; 2425 require cf;
2159 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2426 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2160 2427
2161 # load config and database again 2428 warn "loading config and database again";
2162 cf::cfg_load; 2429 cf::cfg_load;
2163 cf::db_load; 2430 cf::db_load;
2164 2431
2165 # load extensions
2166 warn "load extensions"; 2432 warn "loading extensions";
2167 cf::load_extensions; 2433 cf::load_extensions;
2168 2434
2169 # reattach attachments to objects 2435 warn "reattaching attachments to objects/players";
2170 warn "reattach";
2171 _global_reattach; 2436 _global_reattach;
2437 warn "reattaching attachments to maps";
2438 reattach $_ for values %MAP;
2439
2440 warn "restarting server ticker";
2441
2442 $TICK_WATCHER->start;
2172 }; 2443 };
2173 2444
2174 if ($@) { 2445 if ($@) {
2175 warn $@; 2446 warn $@;
2176 warn "error while reloading, exiting."; 2447 warn "error while reloading, exiting.";
2177 exit 1; 2448 exit 1;
2178 } 2449 }
2179 2450
2180 warn "reloaded successfully"; 2451 warn "reloaded";
2181}; 2452};
2182 2453
2183############################################################################# 2454our $RELOAD_WATCHER; # used only during reload
2184
2185unless ($LINK_MAP) {
2186 $LINK_MAP = cf::map::new;
2187
2188 $LINK_MAP->width (41);
2189 $LINK_MAP->height (41);
2190 $LINK_MAP->alloc;
2191 $LINK_MAP->path ("{link}");
2192 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2193 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2194
2195 # dirty hack because... archetypes are not yet loaded
2196 Event->timer (
2197 after => 10,
2198 cb => sub {
2199 $_[0]->w->cancel;
2200
2201 # provide some exits "home"
2202 my $exit = cf::object::new "exit";
2203
2204 $exit->slaying ($EMERGENCY_POSITION->[0]);
2205 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2206 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2207
2208 $LINK_MAP->insert ($exit->clone, 19, 19);
2209 $LINK_MAP->insert ($exit->clone, 19, 20);
2210 $LINK_MAP->insert ($exit->clone, 19, 21);
2211 $LINK_MAP->insert ($exit->clone, 20, 19);
2212 $LINK_MAP->insert ($exit->clone, 20, 21);
2213 $LINK_MAP->insert ($exit->clone, 21, 19);
2214 $LINK_MAP->insert ($exit->clone, 21, 20);
2215 $LINK_MAP->insert ($exit->clone, 21, 21);
2216
2217 $exit->destroy;
2218 });
2219
2220 $LINK_MAP->{deny_save} = 1;
2221 $LINK_MAP->{deny_reset} = 1;
2222
2223 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2224}
2225
2226register "<global>", __PACKAGE__;
2227 2455
2228register_command "reload" => sub { 2456register_command "reload" => sub {
2229 my ($who, $arg) = @_; 2457 my ($who, $arg) = @_;
2230 2458
2231 if ($who->flag (FLAG_WIZ)) { 2459 if ($who->flag (FLAG_WIZ)) {
2232 $who->message ("start of reload."); 2460 $who->message ("reloading server.");
2461
2462 # doing reload synchronously and two reloads happen back-to-back,
2463 # coro crashes during coro_state_free->destroy here.
2464
2465 $RELOAD_WATCHER ||= Event->timer (
2466 reentrant => 0,
2467 after => 0,
2468 data => WF_AUTOCANCEL,
2469 cb => sub {
2233 reload; 2470 reload;
2234 $who->message ("end of reload."); 2471 undef $RELOAD_WATCHER;
2472 },
2473 );
2235 } 2474 }
2236}; 2475};
2237 2476
2238unshift @INC, $LIBDIR; 2477unshift @INC, $LIBDIR;
2478
2479my $bug_warning = 0;
2239 2480
2240$TICK_WATCHER = Event->timer ( 2481$TICK_WATCHER = Event->timer (
2241 reentrant => 0, 2482 reentrant => 0,
2483 parked => 1,
2242 prio => 0, 2484 prio => 0,
2243 at => $NEXT_TICK || $TICK, 2485 at => $NEXT_TICK || $TICK,
2244 data => WF_AUTOCANCEL, 2486 data => WF_AUTOCANCEL,
2245 cb => sub { 2487 cb => sub {
2488 if ($Coro::current != $Coro::main) {
2489 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2490 unless ++$bug_warning > 10;
2491 return;
2492 }
2493
2494 $NOW = Event::time;
2495
2246 cf::server_tick; # one server iteration 2496 cf::server_tick; # one server iteration
2247 $RUNTIME += $TICK; 2497 $RUNTIME += $TICK;
2248 $NEXT_TICK += $TICK; 2498 $NEXT_TICK += $TICK;
2499
2500 $WAIT_FOR_TICK->broadcast;
2501 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2502
2503 Event::sweep;
2504 Coro::cede_notself;
2505
2506# my $AFTER = Event::time;
2507# warn $AFTER - $NOW;#d#
2249 2508
2250 # if we are delayed by four ticks or more, skip them all 2509 # if we are delayed by four ticks or more, skip them all
2251 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2510 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2252 2511
2253 $TICK_WATCHER->at ($NEXT_TICK); 2512 $TICK_WATCHER->at ($NEXT_TICK);
2254 $TICK_WATCHER->start; 2513 $TICK_WATCHER->start;
2255 }, 2514 },
2256); 2515);
2257 2516
2258IO::AIO::max_poll_time $TICK * 0.2; 2517IO::AIO::max_poll_time $TICK * 0.1;
2259 2518
2260Event->io ( 2519undef $Coro::AIO::WATCHER;
2520$AIO_POLL_WATCHER = Event->io (
2521 reentrant => 0,
2261 fd => IO::AIO::poll_fileno, 2522 fd => IO::AIO::poll_fileno,
2262 poll => 'r', 2523 poll => 'r',
2263 prio => 5, 2524 prio => 6,
2264 data => WF_AUTOCANCEL, 2525 data => WF_AUTOCANCEL,
2265 cb => \&IO::AIO::poll_cb, 2526 cb => \&IO::AIO::poll_cb,
2266); 2527);
2267 2528
2268Event->timer ( 2529$WRITE_RUNTIME_WATCHER = Event->timer (
2530 reentrant => 0,
2269 data => WF_AUTOCANCEL, 2531 data => WF_AUTOCANCEL,
2270 after => 0, 2532 after => 1,
2271 interval => 10, 2533 interval => 10,
2272 cb => sub { 2534 prio => 6, # keep it lowest so it acts like a watchdog
2273 (Coro::unblock_sub { 2535 cb => Coro::unblock_sub {
2274 write_runtime 2536 write_runtime
2275 or warn "ERROR: unable to write runtime file: $!"; 2537 or warn "ERROR: unable to write runtime file: $!";
2276 })->();
2277 }, 2538 },
2278); 2539);
2279 2540
2280END { cf::emergency_save } 2541END { cf::emergency_save }
2281 2542

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines