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.144 by root, Sun Jan 7 18:01:10 2007 UTC vs.
Revision 1.188 by root, Sat Jan 20 23:30:16 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
1502 ()
1503}
1504
1351sub save { 1505sub save {
1352 my ($self) = @_; 1506 my ($self) = @_;
1353 1507
1354 my $lock = cf::lock_acquire "map_data:" . $self->path; 1508 my $lock = cf::lock_acquire "map_data:" . $self->path;
1355 1509
1356 $self->{last_save} = $cf::RUNTIME; 1510 $self->{last_save} = $cf::RUNTIME;
1357 1511
1358 return unless $self->dirty; 1512 return unless $self->dirty;
1359 1513
1360 my $save = $self->{path}->save_path; utf8::encode $save; 1514 my $save = $self->save_path; utf8::encode $save;
1361 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1515 my $uniq = $self->uniq_path; utf8::encode $uniq;
1362 1516
1363 $self->{load_path} = $save; 1517 $self->{load_path} = $save;
1364 1518
1365 return if $self->{deny_save}; 1519 return if $self->{deny_save};
1366 1520
… …
1369 cf::async { 1523 cf::async {
1370 $_->contr->save for $self->players; 1524 $_->contr->save for $self->players;
1371 }; 1525 };
1372 1526
1373 if ($uniq) { 1527 if ($uniq) {
1374 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1528 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1375 $self->save_objects ($uniq, cf::IO_UNIQUES); 1529 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1376 } else { 1530 } else {
1377 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1531 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1378 } 1532 }
1379} 1533}
1380 1534
1381sub swap_out { 1535sub swap_out {
1382 my ($self) = @_; 1536 my ($self) = @_;
… …
1396 1550
1397sub reset_at { 1551sub reset_at {
1398 my ($self) = @_; 1552 my ($self) = @_;
1399 1553
1400 # TODO: safety, remove and allow resettable per-player maps 1554 # TODO: safety, remove and allow resettable per-player maps
1401 return 1e99 if $self->{path}{user_rel}; 1555 return 1e99 if $self->isa ("ext::map_per_player");#d#
1402 return 1e99 if $self->{deny_reset}; 1556 return 1e99 if $self->{deny_reset};
1403 1557
1404 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1558 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1405 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1559 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1406 1560
… …
1411 my ($self) = @_; 1565 my ($self) = @_;
1412 1566
1413 $self->reset_at <= $cf::RUNTIME 1567 $self->reset_at <= $cf::RUNTIME
1414} 1568}
1415 1569
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 { 1570sub reset {
1438 my ($self) = @_; 1571 my ($self) = @_;
1439 1572
1440 my $lock = cf::lock_acquire "map_data:" . $self->path; 1573 my $lock = cf::lock_acquire "map_data:$self->{path}";
1441 1574
1442 return if $self->players; 1575 return if $self->players;
1443 return if $self->{path}{user_rel};#d# 1576 return if $self->isa ("ext::map_per_player");#d#
1444 1577
1445 warn "resetting map ", $self->path;#d# 1578 warn "resetting map ", $self->path;#d#
1446 1579
1447 delete $cf::MAP{$self->path}; 1580 delete $cf::MAP{$self->path};
1581
1582 $self->in_memory (cf::MAP_SWAPPED);
1583 $self->clear;
1448 1584
1449 $_->clear_links_to ($self) for values %cf::MAP; 1585 $_->clear_links_to ($self) for values %cf::MAP;
1450 1586
1451 $self->unlink_save; 1587 $self->unlink_save;
1452 $self->destroy; 1588 $self->destroy;
… …
1455my $nuke_counter = "aaaa"; 1591my $nuke_counter = "aaaa";
1456 1592
1457sub nuke { 1593sub nuke {
1458 my ($self) = @_; 1594 my ($self) = @_;
1459 1595
1596 delete $cf::MAP{$self->path};
1597
1598 $self->unlink_save;
1599
1600 bless $self, "cf::map";
1601 delete $self->{deny_reset};
1460 $self->{deny_save} = 1; 1602 $self->{deny_save} = 1;
1461 $self->reset_timeout (1); 1603 $self->reset_timeout (1);
1462 $self->rename ("{nuke}/" . ($nuke_counter++)); 1604 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1605
1606 $cf::MAP{$self->path} = $self;
1607
1463 $self->reset; # polite request, might not happen 1608 $self->reset; # polite request, might not happen
1464} 1609}
1465 1610
1466sub customise_for { 1611=item cf::map::unique_maps
1467 my ($map, $ob) = @_;
1468 1612
1469 if ($map->per_player) { 1613Returns an arrayref of paths of all shared maps that have
1470 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1614instantiated unique items. May block.
1471 }
1472 1615
1473 $map 1616=cut
1474}
1475 1617
1476sub emergency_save { 1618sub unique_maps() {
1477 my $freeze_guard = cf::freeze_mainloop; 1619 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1620 or return;
1478 1621
1479 warn "enter emergency perl save\n"; 1622 my @paths;
1480 1623
1481 cf::sync_job { 1624 for (@$files) {
1482 warn "begin emergency player save\n"; 1625 utf8::decode $_;
1483 $_->save for values %cf::PLAYER; 1626 next if /\.pst$/;
1484 warn "end emergency player save\n"; 1627 next unless /^$PATH_SEP/o;
1485 1628
1486 warn "begin emergency map save\n"; 1629 s/\.map$//;
1487 $_->save for values %cf::MAP; 1630 push @paths, $_;
1488 warn "end emergency map save\n";
1489 }; 1631 }
1490 1632
1491 warn "leave emergency perl save\n"; 1633 \@paths
1492} 1634}
1493 1635
1494package cf; 1636package cf;
1495 1637
1496=back 1638=back
1497 1639
1640=head3 cf::object
1641
1642=cut
1643
1644package cf::object;
1645
1646=over 4
1647
1648=item $ob->inv_recursive
1649
1650Returns the inventory of the object _and_ their inventories, recursively.
1651
1652=cut
1653
1654sub inv_recursive_;
1655sub inv_recursive_ {
1656 map { $_, inv_recursive_ $_->inv } @_
1657}
1658
1659sub inv_recursive {
1660 inv_recursive_ inv $_[0]
1661}
1662
1663package cf;
1664
1665=back
1498 1666
1499=head3 cf::object::player 1667=head3 cf::object::player
1500 1668
1501=over 4 1669=over 4
1502 1670
… …
1542 1710
1543=item $player_object->enter_link 1711=item $player_object->enter_link
1544 1712
1545Freezes the player and moves him/her to a special map (C<{link}>). 1713Freezes the player and moves him/her to a special map (C<{link}>).
1546 1714
1547The player should be reaosnably safe there for short amounts of time. You 1715The player should be reasonably safe there for short amounts of time. You
1548I<MUST> call C<leave_link> as soon as possible, though. 1716I<MUST> call C<leave_link> as soon as possible, though.
1549 1717
1718Will never block.
1719
1550=item $player_object->leave_link ($map, $x, $y) 1720=item $player_object->leave_link ($map, $x, $y)
1551 1721
1552Moves the player out of the specila link map onto the given map. If the 1722Moves the player out of the special C<{link}> map onto the specified
1553map is not valid (or omitted), the player will be moved back to the 1723map. If the map is not valid (or omitted), the player will be moved back
1554location he/she was before the call to C<enter_link>, or, if that fails, 1724to the location he/she was before the call to C<enter_link>, or, if that
1555to the emergency map position. 1725fails, to the emergency map position.
1556 1726
1557Might block. 1727Might block.
1558 1728
1559=cut 1729=cut
1730
1731sub link_map {
1732 unless ($LINK_MAP) {
1733 $LINK_MAP = cf::map::find "{link}"
1734 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1735 $LINK_MAP->load;
1736 }
1737
1738 $LINK_MAP
1739}
1560 1740
1561sub cf::object::player::enter_link { 1741sub cf::object::player::enter_link {
1562 my ($self) = @_; 1742 my ($self) = @_;
1563 1743
1564 $self->deactivate_recursive; 1744 $self->deactivate_recursive;
1565 1745
1566 return if $self->map == $LINK_MAP; 1746 return if UNIVERSAL::isa $self->map, "ext::map_link";
1567 1747
1568 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1748 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1569 if $self->map; 1749 if $self->map;
1570 1750
1571 $self->enter_map ($LINK_MAP, 20, 20); 1751 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1572} 1752}
1573 1753
1574sub cf::object::player::leave_link { 1754sub cf::object::player::leave_link {
1575 my ($self, $map, $x, $y) = @_; 1755 my ($self, $map, $x, $y) = @_;
1576 1756
… …
1594 # use -1 or undef as default coordinates, not 0, 0 1774 # use -1 or undef as default coordinates, not 0, 0
1595 ($x, $y) = ($map->enter_x, $map->enter_y) 1775 ($x, $y) = ($map->enter_x, $map->enter_y)
1596 if $x <=0 && $y <= 0; 1776 if $x <=0 && $y <= 0;
1597 1777
1598 $map->load; 1778 $map->load;
1779 $map->load_diag;
1599 1780
1600 return unless $self->contr->active; 1781 return unless $self->contr->active;
1601 $self->activate_recursive; 1782 $self->activate_recursive;
1602 $self->enter_map ($map, $x, $y); 1783 $self->enter_map ($map, $x, $y);
1603} 1784}
… …
1642 my ($self, $path, $x, $y) = @_; 1823 my ($self, $path, $x, $y) = @_;
1643 1824
1644 $self->enter_link; 1825 $self->enter_link;
1645 1826
1646 (async { 1827 (async {
1647 $path = new cf::path $path;
1648
1649 my $map = cf::map::find $path->as_string; 1828 my $map = cf::map::find $path;
1650 $map = $map->customise_for ($self) if $map; 1829 $map = $map->customise_for ($self) if $map;
1651 1830
1652# warn "entering ", $map->path, " at ($x, $y)\n" 1831# warn "entering ", $map->path, " at ($x, $y)\n"
1653# if $map; 1832# if $map;
1654 1833
1655 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1834 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1656 1835
1657 $self->leave_link ($map, $x, $y); 1836 $self->leave_link ($map, $x, $y);
1658 })->prio (1); 1837 })->prio (1);
1659} 1838}
1660 1839
… …
1664 1843
1665sub parse_random_map_params { 1844sub parse_random_map_params {
1666 my ($spec) = @_; 1845 my ($spec) = @_;
1667 1846
1668 my $rmp = { # defaults 1847 my $rmp = { # defaults
1669 xsize => 10, 1848 xsize => (cf::rndm 15, 40),
1670 ysize => 10, 1849 ysize => (cf::rndm 15, 40),
1850 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1851 #layout => string,
1671 }; 1852 };
1672 1853
1673 for (split /\n/, $spec) { 1854 for (split /\n/, $spec) {
1674 my ($k, $v) = split /\s+/, $_, 2; 1855 my ($k, $v) = split /\s+/, $_, 2;
1675 1856
… …
1679 $rmp 1860 $rmp
1680} 1861}
1681 1862
1682sub prepare_random_map { 1863sub prepare_random_map {
1683 my ($exit) = @_; 1864 my ($exit) = @_;
1865
1866 my $guard = cf::lock_acquire "exit_prepare:$exit";
1684 1867
1685 # all this does is basically replace the /! path by 1868 # all this does is basically replace the /! path by
1686 # a new random map path (?random/...) with a seed 1869 # a new random map path (?random/...) with a seed
1687 # that depends on the exit object 1870 # that depends on the exit object
1688 1871
… …
1697 1880
1698 $rmp->{random_seed} ||= $exit->random_seed; 1881 $rmp->{random_seed} ||= $exit->random_seed;
1699 1882
1700 my $data = cf::to_json $rmp; 1883 my $data = cf::to_json $rmp;
1701 my $md5 = Digest::MD5::md5_hex $data; 1884 my $md5 = Digest::MD5::md5_hex $data;
1885 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1702 1886
1703 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1887 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1704 aio_write $fh, 0, (length $data), $data, 0; 1888 aio_write $fh, 0, (length $data), $data, 0;
1889 undef $fh;
1890 aio_rename "$meta~", $meta;
1705 1891
1706 $exit->slaying ("?random/$md5"); 1892 $exit->slaying ("?random/$md5");
1707 $exit->msg (undef); 1893 $exit->msg (undef);
1708 } 1894 }
1709} 1895}
… …
1719 $self->deactivate_recursive; # just to be sure 1905 $self->deactivate_recursive; # just to be sure
1720 unless (eval { 1906 unless (eval {
1721 prepare_random_map $exit 1907 prepare_random_map $exit
1722 if $exit->slaying eq "/!"; 1908 if $exit->slaying eq "/!";
1723 1909
1724 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1910 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1725 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1911 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1726 1912
1727 1; 1913 1;
1728 }) { 1914 }) {
1729 $self->message ("Something went wrong deep within the crossfire server. " 1915 $self->message ("Something went wrong deep within the crossfire server. "
1730 . "I'll try to bring you back to the map you were before. " 1916 . "I'll try to bring you back to the map you were before. "
1731 . "Please report this to the dungeon master", 1917 . "Please report this to the dungeon master!",
1732 cf::NDI_UNIQUE | cf::NDI_RED); 1918 cf::NDI_UNIQUE | cf::NDI_RED);
1733 1919
1734 warn "ERROR in enter_exit: $@"; 1920 warn "ERROR in enter_exit: $@";
1735 $self->leave_link; 1921 $self->leave_link;
1736 } 1922 }
… …
2019 sub db_sync() { 2205 sub db_sync() {
2020 db_save if $dirty; 2206 db_save if $dirty;
2021 undef $dirty; 2207 undef $dirty;
2022 } 2208 }
2023 2209
2024 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2210 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2025 db_sync; 2211 db_sync;
2026 }); 2212 });
2027 2213
2028 sub db_dirty() { 2214 sub db_dirty() {
2029 $dirty = 1; 2215 $dirty = 1;
… …
2068 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2254 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2069 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 2255 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2070 2256
2071 if (exists $CFG{mlockall}) { 2257 if (exists $CFG{mlockall}) {
2072 eval { 2258 eval {
2073 $CFG{mlockall} ? &mlockall : &munlockall 2259 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2074 and die "WARNING: m(un)lockall failed: $!\n"; 2260 and die "WARNING: m(un)lockall failed: $!\n";
2075 }; 2261 };
2076 warn $@ if $@; 2262 warn $@ if $@;
2077 } 2263 }
2078} 2264}
2079 2265
2080sub main { 2266sub main {
2081 # we must not ever block the main coroutine 2267 # we must not ever block the main coroutine
2082 local $Coro::idle = sub { 2268 local $Coro::idle = sub {
2083 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2269 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2270 (async {
2084 async { Event::one_event }; 2271 Event::one_event;
2272 })->prio (Coro::PRIO_MAX);
2085 }; 2273 };
2086 2274
2087 cfg_load; 2275 cfg_load;
2088 db_load; 2276 db_load;
2089 load_extensions; 2277 load_extensions;
2278
2279 $TICK_WATCHER->start;
2090 Event::loop; 2280 Event::loop;
2091} 2281}
2092 2282
2093############################################################################# 2283#############################################################################
2094# initialisation 2284# initialisation and cleanup
2285
2286# install some emergency cleanup handlers
2287BEGIN {
2288 for my $signal (qw(INT HUP TERM)) {
2289 Event->signal (
2290 data => WF_AUTOCANCEL,
2291 signal => $signal,
2292 cb => sub {
2293 cf::cleanup "SIG$signal";
2294 },
2295 );
2296 }
2297}
2298
2299sub emergency_save() {
2300 my $freeze_guard = cf::freeze_mainloop;
2301
2302 warn "enter emergency perl save\n";
2303
2304 cf::sync_job {
2305 # use a peculiar iteration method to avoid tripping on perl
2306 # refcount bugs in for. also avoids problems with players
2307 # and maps saved/destroyed asynchronously.
2308 warn "begin emergency player save\n";
2309 for my $login (keys %cf::PLAYER) {
2310 my $pl = $cf::PLAYER{$login} or next;
2311 $pl->valid or next;
2312 $pl->save;
2313 }
2314 warn "end emergency player save\n";
2315
2316 warn "begin emergency map save\n";
2317 for my $path (keys %cf::MAP) {
2318 my $map = $cf::MAP{$path} or next;
2319 $map->valid or next;
2320 $map->save;
2321 }
2322 warn "end emergency map save\n";
2323 };
2324
2325 warn "leave emergency perl save\n";
2326}
2095 2327
2096sub reload() { 2328sub reload() {
2097 # can/must only be called in main 2329 # can/must only be called in main
2098 if ($Coro::current != $Coro::main) { 2330 if ($Coro::current != $Coro::main) {
2099 warn "can only reload from main coroutine\n"; 2331 warn "can only reload from main coroutine";
2100 return; 2332 return;
2101 } 2333 }
2102 2334
2103 warn "reloading..."; 2335 warn "reloading...";
2104 2336
2105 my $guard = freeze_mainloop; 2337 warn "cancelling server ticker";
2338 $TICK_WATCHER->cancel;
2339
2106 cf::emergency_save; 2340 cf::emergency_save;
2107 2341
2108 eval { 2342 eval {
2109 # if anything goes wrong in here, we should simply crash as we already saved 2343 # if anything goes wrong in here, we should simply crash as we already saved
2110 2344
2111 # cancel all watchers 2345 warn "syncing database to disk";
2346 cf::db_sync;
2347
2348 warn "cancelling all WF_AUTOCANCEL watchers";
2112 for (Event::all_watchers) { 2349 for (Event::all_watchers) {
2113 $_->cancel if $_->data & WF_AUTOCANCEL; 2350 $_->cancel if $_->data & WF_AUTOCANCEL;
2114 } 2351 }
2115 2352
2353 warn "flushing outstanding aio requests";
2354 for (;;) {
2355 IO::AIO::flush;
2356 Coro::cede;
2357 last unless IO::AIO::nreqs;
2358 warn "iterate...";
2359 }
2360
2116 # cancel all extension coros 2361 warn "cancelling all extension coros";
2117 $_->cancel for values %EXT_CORO; 2362 $_->cancel for values %EXT_CORO;
2118 %EXT_CORO = (); 2363 %EXT_CORO = ();
2119 2364
2120 # unload all extensions 2365 warn "removing commands";
2121 for (@exts) { 2366 %COMMAND = ();
2367
2368 warn "removing ext commands";
2369 %EXTCMD = ();
2370
2371 warn "unloading/nuking all extensions";
2372 for my $pkg (@EXTS) {
2122 warn "unloading <$_>"; 2373 warn "... unloading $pkg";
2123 unload_extension $_; 2374
2375 if (my $cb = $pkg->can ("unload")) {
2376 eval {
2377 $cb->($pkg);
2378 1
2379 } or warn "$pkg unloaded, but with errors: $@";
2124 } 2380 }
2125 2381
2382 warn "... nuking $pkg";
2383 Symbol::delete_package $pkg;
2384 }
2385
2126 # unload all modules loaded from $LIBDIR 2386 warn "unloading all perl modules loaded from $LIBDIR";
2127 while (my ($k, $v) = each %INC) { 2387 while (my ($k, $v) = each %INC) {
2128 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2388 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2129 2389
2130 warn "removing <$k>"; 2390 warn "... unloading $k";
2131 delete $INC{$k}; 2391 delete $INC{$k};
2132 2392
2133 $k =~ s/\.pm$//; 2393 $k =~ s/\.pm$//;
2134 $k =~ s/\//::/g; 2394 $k =~ s/\//::/g;
2135 2395
… …
2138 } 2398 }
2139 2399
2140 Symbol::delete_package $k; 2400 Symbol::delete_package $k;
2141 } 2401 }
2142 2402
2143 # sync database to disk
2144 cf::db_sync;
2145 IO::AIO::flush;
2146
2147 # get rid of safe::, as good as possible 2403 warn "getting rid of safe::, as good as possible";
2148 Symbol::delete_package "safe::$_" 2404 Symbol::delete_package "safe::$_"
2149 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2405 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2150 2406
2151 # remove register_script_function callbacks
2152 # TODO
2153
2154 # unload cf.pm "a bit" 2407 warn "unloading cf.pm \"a bit\"";
2155 delete $INC{"cf.pm"}; 2408 delete $INC{"cf.pm"};
2156 2409
2157 # don't, removes xs symbols, too, 2410 # don't, removes xs symbols, too,
2158 # and global variables created in xs 2411 # and global variables created in xs
2159 #Symbol::delete_package __PACKAGE__; 2412 #Symbol::delete_package __PACKAGE__;
2160 2413
2161 # reload cf.pm 2414 warn "unload completed, starting to reload now";
2415
2162 warn "reloading cf.pm"; 2416 warn "reloading cf.pm";
2163 require cf; 2417 require cf;
2164 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2418 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2165 2419
2166 # load config and database again 2420 warn "loading config and database again";
2167 cf::cfg_load; 2421 cf::cfg_load;
2168 cf::db_load; 2422 cf::db_load;
2169 2423
2170 # load extensions
2171 warn "load extensions"; 2424 warn "loading extensions";
2172 cf::load_extensions; 2425 cf::load_extensions;
2173 2426
2174 # reattach attachments to objects 2427 warn "reattaching attachments to objects/players";
2175 warn "reattach";
2176 _global_reattach; 2428 _global_reattach;
2429 warn "reattaching attachments to maps";
2177 reattach $_ for values %MAP; 2430 reattach $_ for values %MAP;
2431
2432 warn "restarting server ticker";
2433
2434 $TICK_WATCHER->start;
2178 }; 2435 };
2179 2436
2180 if ($@) { 2437 if ($@) {
2181 warn $@; 2438 warn $@;
2182 warn "error while reloading, exiting."; 2439 warn "error while reloading, exiting.";
2183 exit 1; 2440 exit 1;
2184 } 2441 }
2185 2442
2186 warn "reloaded successfully"; 2443 warn "reloaded";
2187}; 2444};
2188 2445
2189############################################################################# 2446our $RELOAD_WATCHER; # used only during reload
2190
2191unless ($LINK_MAP) {
2192 $LINK_MAP = cf::map::new;
2193
2194 $LINK_MAP->width (41);
2195 $LINK_MAP->height (41);
2196 $LINK_MAP->alloc;
2197 $LINK_MAP->path ("{link}");
2198 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2199 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2200
2201 # dirty hack because... archetypes are not yet loaded
2202 Event->timer (
2203 after => 10,
2204 cb => sub {
2205 $_[0]->w->cancel;
2206
2207 # provide some exits "home"
2208 my $exit = cf::object::new "exit";
2209
2210 $exit->slaying ($EMERGENCY_POSITION->[0]);
2211 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2212 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2213
2214 $LINK_MAP->insert ($exit->clone, 19, 19);
2215 $LINK_MAP->insert ($exit->clone, 19, 20);
2216 $LINK_MAP->insert ($exit->clone, 19, 21);
2217 $LINK_MAP->insert ($exit->clone, 20, 19);
2218 $LINK_MAP->insert ($exit->clone, 20, 21);
2219 $LINK_MAP->insert ($exit->clone, 21, 19);
2220 $LINK_MAP->insert ($exit->clone, 21, 20);
2221 $LINK_MAP->insert ($exit->clone, 21, 21);
2222
2223 $exit->destroy;
2224 });
2225
2226 $LINK_MAP->{deny_save} = 1;
2227 $LINK_MAP->{deny_reset} = 1;
2228
2229 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2230}
2231
2232register "<global>", __PACKAGE__;
2233 2447
2234register_command "reload" => sub { 2448register_command "reload" => sub {
2235 my ($who, $arg) = @_; 2449 my ($who, $arg) = @_;
2236 2450
2237 if ($who->flag (FLAG_WIZ)) { 2451 if ($who->flag (FLAG_WIZ)) {
2238 $who->message ("start of reload."); 2452 $who->message ("reloading server.");
2453
2454 # doing reload synchronously and two reloads happen back-to-back,
2455 # coro crashes during coro_state_free->destroy here.
2456
2457 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2239 reload; 2458 reload;
2240 $who->message ("end of reload."); 2459 undef $RELOAD_WATCHER;
2460 });
2241 } 2461 }
2242}; 2462};
2243 2463
2244unshift @INC, $LIBDIR; 2464unshift @INC, $LIBDIR;
2465
2466my $bug_warning = 0;
2245 2467
2246$TICK_WATCHER = Event->timer ( 2468$TICK_WATCHER = Event->timer (
2247 reentrant => 0, 2469 reentrant => 0,
2470 parked => 1,
2248 prio => 0, 2471 prio => 0,
2249 at => $NEXT_TICK || $TICK, 2472 at => $NEXT_TICK || $TICK,
2250 data => WF_AUTOCANCEL, 2473 data => WF_AUTOCANCEL,
2251 cb => sub { 2474 cb => sub {
2475 if ($Coro::current != $Coro::main) {
2476 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2477 unless ++$bug_warning > 10;
2478 return;
2479 }
2480
2481 $NOW = Event::time;
2482
2252 cf::server_tick; # one server iteration 2483 cf::server_tick; # one server iteration
2253 $RUNTIME += $TICK; 2484 $RUNTIME += $TICK;
2254 $NEXT_TICK += $TICK; 2485 $NEXT_TICK += $TICK;
2486
2487 $WAIT_FOR_TICK->broadcast;
2488 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2255 2489
2256 # if we are delayed by four ticks or more, skip them all 2490 # if we are delayed by four ticks or more, skip them all
2257 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2491 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2258 2492
2259 $TICK_WATCHER->at ($NEXT_TICK); 2493 $TICK_WATCHER->at ($NEXT_TICK);
… …
2261 }, 2495 },
2262); 2496);
2263 2497
2264IO::AIO::max_poll_time $TICK * 0.2; 2498IO::AIO::max_poll_time $TICK * 0.2;
2265 2499
2266Event->io ( 2500$AIO_POLL_WATCHER = Event->io (
2267 fd => IO::AIO::poll_fileno, 2501 fd => IO::AIO::poll_fileno,
2268 poll => 'r', 2502 poll => 'r',
2269 prio => 5, 2503 prio => 5,
2270 data => WF_AUTOCANCEL, 2504 data => WF_AUTOCANCEL,
2271 cb => \&IO::AIO::poll_cb, 2505 cb => \&IO::AIO::poll_cb,
2272); 2506);
2273 2507
2274Event->timer ( 2508$WRITE_RUNTIME_WATCHER = Event->timer (
2275 data => WF_AUTOCANCEL, 2509 data => WF_AUTOCANCEL,
2276 after => 0, 2510 after => 1,
2277 interval => 10, 2511 interval => 10,
2278 cb => sub { 2512 prio => 6, # keep it lowest so it acts like a watchdog
2279 (Coro::unblock_sub { 2513 cb => Coro::unblock_sub {
2280 write_runtime 2514 write_runtime
2281 or warn "ERROR: unable to write runtime file: $!"; 2515 or warn "ERROR: unable to write runtime file: $!";
2282 })->();
2283 }, 2516 },
2284); 2517);
2285 2518
2286END { cf::emergency_save } 2519END { cf::emergency_save }
2287 2520

Diff Legend

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