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.151 by root, Mon Jan 8 20:59:15 2007 UTC vs.
Revision 1.200 by root, Mon Jan 29 17:57:22 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3 (); 13use Coro 3.5 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.32 (); 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;
87
88sub cf::map::normalise;
77 89
78############################################################################# 90#############################################################################
79 91
80=head2 GLOBAL VARIABLES 92=head2 GLOBAL VARIABLES
81 93
105 117
106=item %cf::CFG 118=item %cf::CFG
107 119
108Configuration for the server, loaded from C</etc/crossfire/config>, or 120Configuration for the server, loaded from C</etc/crossfire/config>, or
109from wherever your confdir points to. 121from wherever your confdir points to.
122
123=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
124
125These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
126or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
127processing has been done. Call C<< ->wait >> on them to maximise the
128window of cpu time available, or simply to synchronise to the server tick.
110 129
111=back 130=back
112 131
113=cut 132=cut
114 133
146 165
147$Event::DIED = sub { 166$Event::DIED = sub {
148 warn "error in event callback: @_"; 167 warn "error in event callback: @_";
149}; 168};
150 169
151my %ext_pkg;
152my @exts;
153my @hook;
154
155=head2 UTILITY FUNCTIONS 170=head2 UTILITY FUNCTIONS
156 171
157=over 4 172=over 4
158 173
174=item dumpval $ref
175
159=cut 176=cut
177
178sub dumpval {
179 eval {
180 local $SIG{__DIE__};
181 my $d;
182 if (1) {
183 $d = new Data::Dumper([$_[0]], ["*var"]);
184 $d->Terse(1);
185 $d->Indent(2);
186 $d->Quotekeys(0);
187 $d->Useqq(1);
188 #$d->Bless(...);
189 $d->Seen($_[1]) if @_ > 1;
190 $d = $d->Dump();
191 }
192 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
193 $d
194 } || "[unable to dump $_[0]: '$@']";
195}
160 196
161use JSON::Syck (); # TODO# replace by JSON::PC once working 197use JSON::Syck (); # TODO# replace by JSON::PC once working
162 198
163=item $ref = cf::from_json $json 199=item $ref = cf::from_json $json
164 200
225} 261}
226 262
227sub freeze_mainloop { 263sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active; 264 return unless $TICK_WATCHER->is_active;
229 265
230 my $guard = Coro::guard { $TICK_WATCHER->start }; 266 my $guard = Coro::guard {
267 $TICK_WATCHER->start;
268 $WRITE_RUNTIME_WATCHER->start;
269 };
270 $WRITE_RUNTIME_WATCHER->stop;
231 $TICK_WATCHER->stop; 271 $TICK_WATCHER->stop;
232 $guard 272 $guard
233} 273}
234 274
235=item cf::async { BLOCK } 275=item cf::async { BLOCK }
287 } 327 }
288} 328}
289 329
290=item $coro = cf::async_ext { BLOCK } 330=item $coro = cf::async_ext { BLOCK }
291 331
292Like async, but this coro is automcatially being canceled when the 332Like async, but this coro is automatically being canceled when the
293extension calling this is being unloaded. 333extension calling this is being unloaded.
294 334
295=cut 335=cut
296 336
297sub async_ext(&) { 337sub async_ext(&) {
311 my $runtime = cf::localdir . "/runtime"; 351 my $runtime = cf::localdir . "/runtime";
312 352
313 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
314 or return; 354 or return;
315 355
356 my $value = $cf::RUNTIME + 90 + 10;
316 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 357 # 10 is the runtime save interval, for a monotonic clock
358 # 60 allows for the watchdog to kill the server.
359
317 (aio_write $fh, 0, (length $value), $value, 0) <= 0 360 (aio_write $fh, 0, (length $value), $value, 0) <= 0
318 and return; 361 and return;
319 362
320 aio_fsync $fh 363 aio_fsync $fh
321 and return; 364 and return;
330} 373}
331 374
332=back 375=back
333 376
334=cut 377=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 378
456############################################################################# 379#############################################################################
457 380
458=head2 ATTACHABLE OBJECTS 381=head2 ATTACHABLE OBJECTS
459 382
585our @CB_TYPE = (); # registry for type (cf-object class) based events 508our @CB_TYPE = (); # registry for type (cf-object class) based events
586our @CB_MAP = (); 509our @CB_MAP = ();
587 510
588my %attachment; 511my %attachment;
589 512
513sub cf::attachable::thawer_merge {
514 # simply override everything except _meta
515 local $_[0]{_meta};
516 %{$_[0]} = %{$_[1]};
517}
518
590sub _attach_cb($$$$) { 519sub _attach_cb($$$$) {
591 my ($registry, $event, $prio, $cb) = @_; 520 my ($registry, $event, $prio, $cb) = @_;
592 521
593 use sort 'stable'; 522 use sort 'stable';
594 523
765# object support 694# object support
766 695
767sub reattach { 696sub reattach {
768 # basically do the same as instantiate, without calling instantiate 697 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 698 my ($obj) = @_;
699
700 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
770 701
771 my $registry = $obj->registry; 702 my $registry = $obj->registry;
772 703
773 @$registry = (); 704 @$registry = ();
774 705
845 } 776 }
846 } else { 777 } else {
847 aio_unlink $filename; 778 aio_unlink $filename;
848 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
849 } 780 }
781
782 #d##TODO# nuke non .map-files if exist
783 if ($filename =~ s/\.map$//) {
784 aio_unlink $filename;
785 aio_unlink "$filename.pst";
786 }
850 } 787 }
851} 788}
852 789
853sub object_freezer_as_string { 790sub object_freezer_as_string {
854 my ($rdata, $objs) = @_; 791 my ($rdata, $objs) = @_;
860 797
861sub object_thawer_load { 798sub object_thawer_load {
862 my ($filename) = @_; 799 my ($filename) = @_;
863 800
864 my ($data, $av); 801 my ($data, $av);
802
803 #d#TODO remove .map if file does not exist
804 aio_stat $filename and $filename =~ s/\.map$//;
865 805
866 (aio_load $filename, $data) >= 0 806 (aio_load $filename, $data) >= 0
867 or return; 807 or return;
868 808
869 unless (aio_stat "$filename.pst") { 809 unless (aio_stat "$filename.pst") {
906=cut 846=cut
907 847
908sub register_extcmd { 848sub register_extcmd {
909 my ($name, $cb) = @_; 849 my ($name, $cb) = @_;
910 850
911 my $caller = caller;
912 #warn "registering extcmd '$name' to '$caller'";
913
914 $EXTCMD{$name} = [$cb, $caller]; 851 $EXTCMD{$name} = $cb;
915} 852}
916 853
917cf::player->attach ( 854cf::player->attach (
918 on_command => sub { 855 on_command => sub {
919 my ($pl, $name, $params) = @_; 856 my ($pl, $name, $params) = @_;
932 869
933 my $msg = eval { from_json $buf }; 870 my $msg = eval { from_json $buf };
934 871
935 if (ref $msg) { 872 if (ref $msg) {
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 873 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
937 if (my %reply = $cb->[0]->($pl, $msg)) { 874 if (my %reply = $cb->($pl, $msg)) {
938 $pl->ext_reply ($msg->{msgid}, %reply); 875 $pl->ext_reply ($msg->{msgid}, %reply);
939 } 876 }
940 } 877 }
941 } else { 878 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 879 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
944 881
945 cf::override; 882 cf::override;
946 }, 883 },
947); 884);
948 885
949sub register {
950 my ($base, $pkg) = @_;
951
952 #TODO
953}
954
955sub load_extension { 886sub load_extension {
956 my ($path) = @_; 887 my ($path) = @_;
957 888
958 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 889 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
959 my $base = $1; 890 my $base = $1;
960 my $pkg = $1; 891 my $pkg = $1;
961 $pkg =~ s/[^[:word:]]/_/g; 892 $pkg =~ s/[^[:word:]]/_/g;
962 $pkg = "ext::$pkg"; 893 $pkg = "ext::$pkg";
963 894
964 warn "loading '$path' into '$pkg'\n"; 895 warn "... loading '$path' into '$pkg'\n";
965 896
966 open my $fh, "<:utf8", $path 897 open my $fh, "<:utf8", $path
967 or die "$path: $!"; 898 or die "$path: $!";
968 899
969 my $source = 900 my $source =
970 "package $pkg; use strict; use utf8;\n" 901 "package $pkg; use strict; use utf8;\n"
971 . "#line 1 \"$path\"\n{\n" 902 . "#line 1 \"$path\"\n{\n"
972 . (do { local $/; <$fh> }) 903 . (do { local $/; <$fh> })
973 . "\n};\n1"; 904 . "\n};\n1";
974 905
975 eval $source 906 unless (eval $source) {
976 or die $@ ? "$path: $@\n" 907 my $msg = $@ ? "$path: $@\n"
977 : "extension disabled.\n"; 908 : "extension disabled.\n";
978 909 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
979 push @exts, $pkg; 910 warn $@;
980 $ext_pkg{$base} = $pkg; 911 warn "mandatory extension failed to load, exiting.\n";
981 912 exit 1;
982# no strict 'refs'; 913 }
983# @{"$pkg\::ISA"} = ext::; 914 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# } 915 }
998 916
999 # remove commands 917 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} 918}
1024 919
1025sub load_extensions { 920sub load_extensions {
1026 for my $ext (<$LIBDIR/*.ext>) { 921 for my $ext (<$LIBDIR/*.ext>) {
1027 next unless -r $ext; 922 next unless -r $ext;
1031 } or warn "$ext not loaded: $@"; 926 } or warn "$ext not loaded: $@";
1032 } 927 }
1033} 928}
1034 929
1035############################################################################# 930#############################################################################
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 931
1073=head2 CORE EXTENSIONS 932=head2 CORE EXTENSIONS
1074 933
1075Functions and methods that extend core crossfire objects. 934Functions and methods that extend core crossfire objects.
1076 935
1077=cut 936=cut
1078 937
1079package cf::player; 938package cf::player;
939
940use Coro::AIO;
1080 941
1081=head3 cf::player 942=head3 cf::player
1082 943
1083=over 4 944=over 4
1084 945
1110 971
1111sub exists($) { 972sub exists($) {
1112 my ($login) = @_; 973 my ($login) = @_;
1113 974
1114 $cf::PLAYER{$login} 975 $cf::PLAYER{$login}
1115 or cf::sync_job { !aio_stat $login } 976 or cf::sync_job { !aio_stat path $login }
1116} 977}
1117 978
1118sub find($) { 979sub find($) {
1119 return $cf::PLAYER{$_[0]} || do { 980 return $cf::PLAYER{$_[0]} || do {
1120 my $login = $_[0]; 981 my $login = $_[0];
1137 my $path = path $pl; 998 my $path = path $pl;
1138 my $guard = cf::lock_acquire "user_save:$path"; 999 my $guard = cf::lock_acquire "user_save:$path";
1139 1000
1140 return if $pl->{deny_save}; 1001 return if $pl->{deny_save};
1141 1002
1142 Coro::AIO::aio_mkdir playerdir $pl, 0770; 1003 aio_mkdir playerdir $pl, 0770;
1143 $pl->{last_save} = $cf::RUNTIME; 1004 $pl->{last_save} = $cf::RUNTIME;
1144 1005
1145 $pl->save_pl ($path); 1006 $pl->save_pl ($path);
1146 Coro::cede; 1007 Coro::cede;
1147} 1008}
1156 1017
1157 $cf::PLAYER{$login} = $self; 1018 $cf::PLAYER{$login} = $self;
1158 1019
1159 $self 1020 $self
1160} 1021}
1022
1023=item $pl->quit_character
1024
1025Nukes the player without looking back. If logged in, the connection will
1026be destroyed. May block for a long time.
1027
1028=cut
1161 1029
1162sub quit_character { 1030sub quit_character {
1163 my ($pl) = @_; 1031 my ($pl) = @_;
1164 1032
1165 $pl->{deny_save} = 1; 1033 $pl->{deny_save} = 1;
1170 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1038 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1171 $pl->ns->destroy if $pl->ns; 1039 $pl->ns->destroy if $pl->ns;
1172 1040
1173 my $path = playerdir $pl; 1041 my $path = playerdir $pl;
1174 my $temp = "$path~$cf::RUNTIME~deleting~"; 1042 my $temp = "$path~$cf::RUNTIME~deleting~";
1175 Coro::AIO::aio_rename $path, $temp; 1043 aio_rename $path, $temp;
1176 delete $cf::PLAYER{$pl->ob->name}; 1044 delete $cf::PLAYER{$pl->ob->name};
1177 $pl->destroy; 1045 $pl->destroy;
1178 IO::AIO::aio_rmtree $temp; 1046 IO::AIO::aio_rmtree $temp;
1179} 1047}
1180 1048
1049=item cf::player::list_logins
1050
1051Returns am arrayref of all valid playernames in the system, can take a
1052while and may block, so not sync_job-capable, ever.
1053
1054=cut
1055
1056sub list_logins {
1057 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1058 or return [];
1059
1060 my @logins;
1061
1062 for my $login (@$dirs) {
1063 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1064 aio_read $fh, 0, 512, my $buf, 0 or next;
1065 $buf !~ /^password -------------$/m or next; # official not-valid tag
1066
1067 utf8::decode $login;
1068 push @logins, $login;
1069 }
1070
1071 \@logins
1072}
1073
1074=item $player->maps
1075
1076Returns an arrayref of map paths that are private for this
1077player. May block.
1078
1079=cut
1080
1081sub maps($) {
1082 my ($pl) = @_;
1083
1084 my $files = aio_readdir playerdir $pl
1085 or return;
1086
1087 my @paths;
1088
1089 for (@$files) {
1090 utf8::decode $_;
1091 next if /\.(?:pl|pst)$/;
1092 next unless /^$PATH_SEP/o;
1093
1094 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1095 }
1096
1097 \@paths
1098}
1099
1181=item $player->ext_reply ($msgid, $msgtype, %msg) 1100=item $player->ext_reply ($msgid, $msgtype, %msg)
1182 1101
1183Sends an ext reply to the player. 1102Sends an ext reply to the player.
1184 1103
1185=cut 1104=cut
1206package cf::map; 1125package cf::map;
1207 1126
1208use Fcntl; 1127use Fcntl;
1209use Coro::AIO; 1128use Coro::AIO;
1210 1129
1130use overload
1131 '""' => \&as_string,
1132 fallback => 1;
1133
1211our $MAX_RESET = 3600; 1134our $MAX_RESET = 3600;
1212our $DEFAULT_RESET = 3000; 1135our $DEFAULT_RESET = 3000;
1213 1136
1214sub generate_random_map { 1137sub generate_random_map {
1215 my ($path, $rmp) = @_; 1138 my ($self, $rmp) = @_;
1216
1217 # mit "rum" bekleckern, nicht 1139 # mit "rum" bekleckern, nicht
1218 cf::map::_create_random_map 1140 $self->_create_random_map (
1219 $path,
1220 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1141 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1221 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1142 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1222 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1143 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1223 $rmp->{exit_on_final_map}, 1144 $rmp->{exit_on_final_map},
1224 $rmp->{xsize}, $rmp->{ysize}, 1145 $rmp->{xsize}, $rmp->{ysize},
1225 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1146 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1226 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1147 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1227 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1148 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1228 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1149 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1229 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1150 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1230 (cf::region::find $rmp->{region}) 1151 (cf::region::find $rmp->{region}), $rmp->{custom}
1152 )
1153}
1154
1155=item cf::map->register ($regex, $prio)
1156
1157Register a handler for the map path matching the given regex at the
1158givne priority (higher is better, built-in handlers have priority 0, the
1159default).
1160
1161=cut
1162
1163sub register {
1164 my (undef, $regex, $prio) = @_;
1165 my $pkg = caller;
1166
1167 no strict;
1168 push @{"$pkg\::ISA"}, __PACKAGE__;
1169
1170 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1171}
1172
1173# also paths starting with '/'
1174$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1175
1176sub thawer_merge {
1177 my ($self, $merge) = @_;
1178
1179 # we have to keep some variables in memory intact
1180 local $self->{path};
1181 local $self->{load_path};
1182 local $self->{deny_save};
1183 local $self->{deny_reset};
1184
1185 $self->SUPER::thawer_merge ($merge);
1186}
1187
1188sub normalise {
1189 my ($path, $base) = @_;
1190
1191 $path = "$path"; # make sure its a string
1192
1193 $path =~ s/\.map$//;
1194
1195 # map plan:
1196 #
1197 # /! non-realised random map exit (special hack!)
1198 # {... are special paths that are not being touched
1199 # ?xxx/... are special absolute paths
1200 # ?random/... random maps
1201 # /... normal maps
1202 # ~user/... per-player map of a specific user
1203
1204 $path =~ s/$PATH_SEP/\//go;
1205
1206 # treat it as relative path if it starts with
1207 # something that looks reasonable
1208 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1209 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1210
1211 $base =~ s{[^/]+/?$}{};
1212 $path = "$base/$path";
1213 }
1214
1215 for ($path) {
1216 redo if s{//}{/};
1217 redo if s{/\.?/}{/};
1218 redo if s{/[^/]+/\.\./}{/};
1219 }
1220
1221 $path
1222}
1223
1224sub new_from_path {
1225 my (undef, $path, $base) = @_;
1226
1227 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1228
1229 $path = normalise $path, $base;
1230
1231 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1232 if ($path =~ $EXT_MAP{$pkg}[1]) {
1233 my $self = bless cf::map::new, $pkg;
1234 $self->{path} = $path; $self->path ($path);
1235 $self->init; # pass $1 etc.
1236 return $self;
1237 }
1238 }
1239
1240 Carp::carp "unable to resolve path '$path' (base '$base').";
1241 ()
1242}
1243
1244sub init {
1245 my ($self) = @_;
1246
1247 $self
1248}
1249
1250sub as_string {
1251 my ($self) = @_;
1252
1253 "$self->{path}"
1254}
1255
1256# the displayed name, this is a one way mapping
1257sub visible_name {
1258 &as_string
1259}
1260
1261# the original (read-only) location
1262sub load_path {
1263 my ($self) = @_;
1264
1265 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1266}
1267
1268# the temporary/swap location
1269sub save_path {
1270 my ($self) = @_;
1271
1272 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1273 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1274}
1275
1276# the unique path, undef == no special unique path
1277sub uniq_path {
1278 my ($self) = @_;
1279
1280 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1281 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1231} 1282}
1232 1283
1233# and all this just because we cannot iterate over 1284# and all this just because we cannot iterate over
1234# all maps in C++... 1285# all maps in C++...
1235sub change_all_map_light { 1286sub change_all_map_light {
1237 1288
1238 $_->change_map_light ($change) 1289 $_->change_map_light ($change)
1239 for grep $_->outdoor, values %cf::MAP; 1290 for grep $_->outdoor, values %cf::MAP;
1240} 1291}
1241 1292
1293sub unlink_save {
1294 my ($self) = @_;
1295
1296 utf8::encode (my $save = $self->save_path);
1297 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1298 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1299
1300 #d#TODO remove .map and also nuke
1301 $save =~ s/\.map// or return;#d#
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1303 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1304}
1305
1242sub try_load_header($) { 1306sub load_header_from($) {
1243 my ($path) = @_; 1307 my ($self, $path) = @_;
1244 1308
1245 utf8::encode $path; 1309 utf8::encode $path;
1246 aio_open $path, O_RDONLY, 0 1310 #aio_open $path, O_RDONLY, 0
1311 # or return;
1312
1313 $self->_load_header ($path)
1247 or return; 1314 or return;
1248 1315
1249 my $map = cf::map::new 1316 $self->{load_path} = $path;
1317
1318 1
1319}
1320
1321sub load_header_orig {
1322 my ($self) = @_;
1323
1324 $self->load_header_from ($self->load_path)
1325}
1326
1327sub load_header_temp {
1328 my ($self) = @_;
1329
1330 $self->load_header_from ($self->save_path)
1331}
1332
1333sub prepare_temp {
1334 my ($self) = @_;
1335
1336 $self->last_access ((delete $self->{last_access})
1337 || $cf::RUNTIME); #d#
1338 # safety
1339 $self->{instantiate_time} = $cf::RUNTIME
1340 if $self->{instantiate_time} > $cf::RUNTIME;
1341}
1342
1343sub prepare_orig {
1344 my ($self) = @_;
1345
1346 $self->{load_original} = 1;
1347 $self->{instantiate_time} = $cf::RUNTIME;
1348 $self->last_access ($cf::RUNTIME);
1349 $self->instantiate;
1350}
1351
1352sub load_header {
1353 my ($self) = @_;
1354
1355 if ($self->load_header_temp) {
1356 $self->prepare_temp;
1357 } else {
1358 $self->load_header_orig
1250 or return; 1359 or return;
1360 $self->prepare_orig;
1361 }
1251 1362
1252 # for better error messages only, will be overwritten 1363 1
1253 $map->path ($path);
1254
1255 $map->load_header ($path)
1256 or return;
1257
1258 $map->{load_path} = $path;
1259
1260 $map
1261} 1364}
1262 1365
1263sub find; 1366sub find;
1264sub find { 1367sub find {
1265 my ($path, $origin) = @_; 1368 my ($path, $origin) = @_;
1266 1369
1267 #warn "find<$path,$origin>\n";#d#
1268
1269 $path = new cf::path $path, $origin && $origin->path; 1370 $path = normalise $path, $origin && $origin->path;
1270 my $key = $path->as_string;
1271 1371
1272 cf::lock_wait "map_find:$key"; 1372 cf::lock_wait "map_find:$path";
1273 1373
1274 $cf::MAP{$key} || do { 1374 $cf::MAP{$path} || do {
1275 my $guard = cf::lock_acquire "map_find:$key"; 1375 my $guard = cf::lock_acquire "map_find:$path";
1276 1376 my $map = new_from_path cf::map $path
1277 # do it the slow way
1278 my $map = try_load_header $path->save_path;
1279
1280 Coro::cede;
1281
1282 if ($map) {
1283 $map->last_access ((delete $map->{last_access})
1284 || $cf::RUNTIME); #d#
1285 # safety
1286 $map->{instantiate_time} = $cf::RUNTIME
1287 if $map->{instantiate_time} > $cf::RUNTIME;
1288 } else {
1289 if (my $rmp = $path->random_map_params) {
1290 $map = generate_random_map $key, $rmp;
1291 } else {
1292 $map = try_load_header $path->load_path;
1293 }
1294
1295 $map or return; 1377 or return;
1296 1378
1297 $map->{load_original} = 1;
1298 $map->{instantiate_time} = $cf::RUNTIME;
1299 $map->last_access ($cf::RUNTIME);
1300 $map->instantiate;
1301
1302 # per-player maps become, after loading, normal maps
1303 $map->per_player (0) if $path->{user_rel};
1304 }
1305
1306 $map->path ($key);
1307 $map->{path} = $path;
1308 $map->{last_save} = $cf::RUNTIME; 1379 $map->{last_save} = $cf::RUNTIME;
1309 1380
1310 Coro::cede; 1381 $map->load_header
1382 or return;
1311 1383
1312 if ($map->should_reset) { 1384 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1385 # doing this can freeze the server in a sync job, obviously
1386 #$cf::WAIT_FOR_TICK->wait;
1313 $map->reset; 1387 $map->reset;
1314 undef $guard; 1388 undef $guard;
1315 $map = find $path 1389 return find $path;
1316 or return;
1317 } 1390 }
1318 1391
1319 $cf::MAP{$key} = $map 1392 $cf::MAP{$path} = $map
1320 } 1393 }
1321} 1394}
1395
1396sub pre_load { }
1397sub post_load { }
1322 1398
1323sub load { 1399sub load {
1324 my ($self) = @_; 1400 my ($self) = @_;
1325 1401
1402 local $self->{deny_reset} = 1; # loading can take a long time
1403
1326 my $path = $self->{path}; 1404 my $path = $self->{path};
1327 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1405 my $guard = cf::lock_acquire "map_load:$path";
1328 1406
1329 return if $self->in_memory != cf::MAP_SWAPPED; 1407 return if $self->in_memory != cf::MAP_SWAPPED;
1330 1408
1331 $self->in_memory (cf::MAP_LOADING); 1409 $self->in_memory (cf::MAP_LOADING);
1332 1410
1333 $self->alloc; 1411 $self->alloc;
1412
1413 $self->pre_load;
1414
1334 $self->load_objects ($self->{load_path}, 1) 1415 $self->_load_objects ($self->{load_path}, 1)
1335 or return; 1416 or return;
1336 1417
1337 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1418 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1338 if delete $self->{load_original}; 1419 if delete $self->{load_original};
1339 1420
1340 if (my $uniq = $path->uniq_path) { 1421 if (my $uniq = $self->uniq_path) {
1341 utf8::encode $uniq; 1422 utf8::encode $uniq;
1342 if (aio_open $uniq, O_RDONLY, 0) { 1423 if (aio_open $uniq, O_RDONLY, 0) {
1343 $self->clear_unique_items; 1424 $self->clear_unique_items;
1344 $self->load_objects ($uniq, 0); 1425 $self->_load_objects ($uniq, 0);
1345 } 1426 }
1346 } 1427 }
1347 1428
1348 Coro::cede; 1429 Coro::cede;
1349 1430
1350 # now do the right thing for maps 1431 # now do the right thing for maps
1351 $self->link_multipart_objects; 1432 $self->link_multipart_objects;
1352 1433
1353 if ($self->{path}->is_style_map) { 1434 unless ($self->{deny_activate}) {
1354 $self->{deny_save} = 1; 1435 $self->decay_objects;
1355 $self->{deny_reset} = 1;
1356 } else {
1357 $self->fix_auto_apply; 1436 $self->fix_auto_apply;
1358 $self->decay_objects;
1359 $self->update_buttons; 1437 $self->update_buttons;
1438 Coro::cede;
1360 $self->set_darkness_map; 1439 $self->set_darkness_map;
1361 $self->difficulty ($self->estimate_difficulty) 1440 $self->difficulty ($self->estimate_difficulty)
1362 unless $self->difficulty; 1441 unless $self->difficulty;
1442 Coro::cede;
1363 $self->activate; 1443 $self->activate;
1364 } 1444 }
1365 1445
1366 Coro::cede; 1446 $self->post_load;
1367 1447
1368 $self->in_memory (cf::MAP_IN_MEMORY); 1448 $self->in_memory (cf::MAP_IN_MEMORY);
1449}
1450
1451sub customise_for {
1452 my ($self, $ob) = @_;
1453
1454 return find "~" . $ob->name . "/" . $self->{path}
1455 if $self->per_player;
1456
1457 $self
1458}
1459
1460# find and load all maps in the 3x3 area around a map
1461sub load_diag {
1462 my ($map) = @_;
1463
1464 my @diag; # diagonal neighbours
1465
1466 for (0 .. 3) {
1467 my $neigh = $map->tile_path ($_)
1468 or next;
1469 $neigh = find $neigh, $map
1470 or next;
1471 $neigh->load;
1472
1473 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1474 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1475 }
1476
1477 for (@diag) {
1478 my $neigh = find @$_
1479 or next;
1480 $neigh->load;
1481 }
1369} 1482}
1370 1483
1371sub find_sync { 1484sub find_sync {
1372 my ($path, $origin) = @_; 1485 my ($path, $origin) = @_;
1373 1486
1374 cf::sync_job { cf::map::find $path, $origin } 1487 cf::sync_job { find $path, $origin }
1375} 1488}
1376 1489
1377sub do_load_sync { 1490sub do_load_sync {
1378 my ($map) = @_; 1491 my ($map) = @_;
1379 1492
1380 cf::sync_job { $map->load }; 1493 cf::sync_job { $map->load };
1381} 1494}
1382 1495
1496our %MAP_PREFETCH;
1497our $MAP_PREFETCHER = undef;
1498
1499sub find_async {
1500 my ($path, $origin) = @_;
1501
1502 $path = normalise $path, $origin && $origin->{path};
1503
1504 if (my $map = $cf::MAP{$path}) {
1505 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1506 }
1507
1508 undef $MAP_PREFETCH{$path};
1509 $MAP_PREFETCHER ||= cf::async {
1510 while (%MAP_PREFETCH) {
1511 for my $path (keys %MAP_PREFETCH) {
1512 my $map = find $path
1513 or next;
1514 $map->load;
1515
1516 delete $MAP_PREFETCH{$path};
1517 }
1518 }
1519 undef $MAP_PREFETCHER;
1520 };
1521 $MAP_PREFETCHER->prio (6);
1522
1523 ()
1524}
1525
1383sub save { 1526sub save {
1384 my ($self) = @_; 1527 my ($self) = @_;
1385 1528
1386 my $lock = cf::lock_acquire "map_data:" . $self->path; 1529 my $lock = cf::lock_acquire "map_data:" . $self->path;
1387 1530
1388 $self->{last_save} = $cf::RUNTIME; 1531 $self->{last_save} = $cf::RUNTIME;
1389 1532
1390 return unless $self->dirty; 1533 return unless $self->dirty;
1391 1534
1392 my $save = $self->{path}->save_path; utf8::encode $save; 1535 my $save = $self->save_path; utf8::encode $save;
1393 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1536 my $uniq = $self->uniq_path; utf8::encode $uniq;
1394 1537
1395 $self->{load_path} = $save; 1538 $self->{load_path} = $save;
1396 1539
1397 return if $self->{deny_save}; 1540 return if $self->{deny_save};
1398 1541
1401 cf::async { 1544 cf::async {
1402 $_->contr->save for $self->players; 1545 $_->contr->save for $self->players;
1403 }; 1546 };
1404 1547
1405 if ($uniq) { 1548 if ($uniq) {
1406 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1549 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1407 $self->save_objects ($uniq, cf::IO_UNIQUES); 1550 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1408 } else { 1551 } else {
1409 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1552 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1410 } 1553 }
1411} 1554}
1412 1555
1413sub swap_out { 1556sub swap_out {
1414 my ($self) = @_; 1557 my ($self) = @_;
1428 1571
1429sub reset_at { 1572sub reset_at {
1430 my ($self) = @_; 1573 my ($self) = @_;
1431 1574
1432 # TODO: safety, remove and allow resettable per-player maps 1575 # TODO: safety, remove and allow resettable per-player maps
1433 return 1e99 if $self->{path}{user_rel}; 1576 return 1e99 if $self->isa ("ext::map_per_player");#d#
1434 return 1e99 if $self->{deny_reset}; 1577 return 1e99 if $self->{deny_reset};
1435 1578
1436 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1579 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1437 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1580 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1438 1581
1443 my ($self) = @_; 1586 my ($self) = @_;
1444 1587
1445 $self->reset_at <= $cf::RUNTIME 1588 $self->reset_at <= $cf::RUNTIME
1446} 1589}
1447 1590
1448sub unlink_save {
1449 my ($self) = @_;
1450
1451 utf8::encode (my $save = $self->{path}->save_path);
1452 aioreq_pri 3; IO::AIO::aio_unlink $save;
1453 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1454}
1455
1456sub rename {
1457 my ($self, $new_path) = @_;
1458
1459 $self->unlink_save;
1460
1461 delete $cf::MAP{$self->path};
1462 $self->{path} = new cf::path $new_path;
1463 $self->path ($self->{path}->as_string);
1464 $cf::MAP{$self->path} = $self;
1465
1466 $self->save;
1467}
1468
1469sub reset { 1591sub reset {
1470 my ($self) = @_; 1592 my ($self) = @_;
1471 1593
1472 my $lock = cf::lock_acquire "map_data:" . $self->path; 1594 my $lock = cf::lock_acquire "map_data:$self->{path}";
1473 1595
1474 return if $self->players; 1596 return if $self->players;
1475 return if $self->{path}{user_rel};#d# 1597 return if $self->isa ("ext::map_per_player");#d#
1476 1598
1477 warn "resetting map ", $self->path;#d# 1599 warn "resetting map ", $self->path;#d#
1478 1600
1479 delete $cf::MAP{$self->path}; 1601 delete $cf::MAP{$self->path};
1602
1603 $self->in_memory (cf::MAP_SWAPPED);
1604 $self->clear;
1480 1605
1481 $_->clear_links_to ($self) for values %cf::MAP; 1606 $_->clear_links_to ($self) for values %cf::MAP;
1482 1607
1483 $self->unlink_save; 1608 $self->unlink_save;
1484 $self->destroy; 1609 $self->destroy;
1487my $nuke_counter = "aaaa"; 1612my $nuke_counter = "aaaa";
1488 1613
1489sub nuke { 1614sub nuke {
1490 my ($self) = @_; 1615 my ($self) = @_;
1491 1616
1617 delete $cf::MAP{$self->path};
1618
1619 $self->unlink_save;
1620
1621 bless $self, "cf::map";
1622 delete $self->{deny_reset};
1492 $self->{deny_save} = 1; 1623 $self->{deny_save} = 1;
1493 $self->reset_timeout (1); 1624 $self->reset_timeout (1);
1494 $self->rename ("{nuke}/" . ($nuke_counter++)); 1625 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1626
1627 $cf::MAP{$self->path} = $self;
1628
1495 $self->reset; # polite request, might not happen 1629 $self->reset; # polite request, might not happen
1496} 1630}
1497 1631
1498sub customise_for { 1632=item cf::map::unique_maps
1499 my ($map, $ob) = @_;
1500 1633
1501 if ($map->per_player) { 1634Returns an arrayref of paths of all shared maps that have
1502 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1635instantiated unique items. May block.
1503 }
1504 1636
1505 $map 1637=cut
1506}
1507 1638
1508sub emergency_save { 1639sub unique_maps() {
1509 my $freeze_guard = cf::freeze_mainloop; 1640 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1641 or return;
1510 1642
1511 warn "enter emergency perl save\n"; 1643 my @paths;
1512 1644
1513 cf::sync_job { 1645 for (@$files) {
1514 warn "begin emergency player save\n"; 1646 utf8::decode $_;
1515 $_->save for values %cf::PLAYER; 1647 next if /\.pst$/;
1516 warn "end emergency player save\n"; 1648 next unless /^$PATH_SEP/o;
1517 1649
1518 warn "begin emergency map save\n"; 1650 push @paths, cf::map::normalise $_;
1519 $_->save for values %cf::MAP;
1520 warn "end emergency map save\n";
1521 }; 1651 }
1522 1652
1523 warn "leave emergency perl save\n"; 1653 \@paths
1524} 1654}
1525 1655
1526package cf; 1656package cf;
1527 1657
1528=back 1658=back
1529 1659
1660=head3 cf::object
1661
1662=cut
1663
1664package cf::object;
1665
1666=over 4
1667
1668=item $ob->inv_recursive
1669
1670Returns the inventory of the object _and_ their inventories, recursively.
1671
1672=cut
1673
1674sub inv_recursive_;
1675sub inv_recursive_ {
1676 map { $_, inv_recursive_ $_->inv } @_
1677}
1678
1679sub inv_recursive {
1680 inv_recursive_ inv $_[0]
1681}
1682
1683package cf;
1684
1685=back
1530 1686
1531=head3 cf::object::player 1687=head3 cf::object::player
1532 1688
1533=over 4 1689=over 4
1534 1690
1574 1730
1575=item $player_object->enter_link 1731=item $player_object->enter_link
1576 1732
1577Freezes the player and moves him/her to a special map (C<{link}>). 1733Freezes the player and moves him/her to a special map (C<{link}>).
1578 1734
1579The player should be reaosnably safe there for short amounts of time. You 1735The player should be reasonably safe there for short amounts of time. You
1580I<MUST> call C<leave_link> as soon as possible, though. 1736I<MUST> call C<leave_link> as soon as possible, though.
1581 1737
1738Will never block.
1739
1582=item $player_object->leave_link ($map, $x, $y) 1740=item $player_object->leave_link ($map, $x, $y)
1583 1741
1584Moves the player out of the specila link map onto the given map. If the 1742Moves the player out of the special C<{link}> map onto the specified
1585map is not valid (or omitted), the player will be moved back to the 1743map. If the map is not valid (or omitted), the player will be moved back
1586location he/she was before the call to C<enter_link>, or, if that fails, 1744to the location he/she was before the call to C<enter_link>, or, if that
1587to the emergency map position. 1745fails, to the emergency map position.
1588 1746
1589Might block. 1747Might block.
1590 1748
1591=cut 1749=cut
1750
1751sub link_map {
1752 unless ($LINK_MAP) {
1753 $LINK_MAP = cf::map::find "{link}"
1754 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1755 $LINK_MAP->load;
1756 }
1757
1758 $LINK_MAP
1759}
1592 1760
1593sub cf::object::player::enter_link { 1761sub cf::object::player::enter_link {
1594 my ($self) = @_; 1762 my ($self) = @_;
1595 1763
1596 $self->deactivate_recursive; 1764 $self->deactivate_recursive;
1597 1765
1598 return if $self->map == $LINK_MAP; 1766 return if UNIVERSAL::isa $self->map, "ext::map_link";
1599 1767
1600 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1768 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1601 if $self->map; 1769 if $self->map;
1602 1770
1603 $self->enter_map ($LINK_MAP, 20, 20); 1771 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1604} 1772}
1605 1773
1606sub cf::object::player::leave_link { 1774sub cf::object::player::leave_link {
1607 my ($self, $map, $x, $y) = @_; 1775 my ($self, $map, $x, $y) = @_;
1608 1776
1626 # use -1 or undef as default coordinates, not 0, 0 1794 # use -1 or undef as default coordinates, not 0, 0
1627 ($x, $y) = ($map->enter_x, $map->enter_y) 1795 ($x, $y) = ($map->enter_x, $map->enter_y)
1628 if $x <=0 && $y <= 0; 1796 if $x <=0 && $y <= 0;
1629 1797
1630 $map->load; 1798 $map->load;
1799 $map->load_diag;
1631 1800
1632 return unless $self->contr->active; 1801 return unless $self->contr->active;
1633 $self->activate_recursive; 1802 $self->activate_recursive;
1634 $self->enter_map ($map, $x, $y); 1803 $self->enter_map ($map, $x, $y);
1635} 1804}
1674 my ($self, $path, $x, $y) = @_; 1843 my ($self, $path, $x, $y) = @_;
1675 1844
1676 $self->enter_link; 1845 $self->enter_link;
1677 1846
1678 (async { 1847 (async {
1679 $path = new cf::path $path; 1848 my $map = eval {
1680
1681 my $map = cf::map::find $path->as_string; 1849 my $map = cf::map::find $path;
1682 $map = $map->customise_for ($self) if $map; 1850 $map = $map->customise_for ($self) if $map;
1683 1851 $map
1684# warn "entering ", $map->path, " at ($x, $y)\n" 1852 } or
1685# if $map;
1686
1687 $map or $map->cluck ("oy");#d#
1688 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1853 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1689 1854
1690 $self->leave_link ($map, $x, $y); 1855 $self->leave_link ($map, $x, $y);
1691 })->prio (1); 1856 })->prio (1);
1692} 1857}
1693 1858
1697 1862
1698sub parse_random_map_params { 1863sub parse_random_map_params {
1699 my ($spec) = @_; 1864 my ($spec) = @_;
1700 1865
1701 my $rmp = { # defaults 1866 my $rmp = { # defaults
1702 xsize => 10, 1867 xsize => (cf::rndm 15, 40),
1703 ysize => 10, 1868 ysize => (cf::rndm 15, 40),
1869 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1870 #layout => string,
1704 }; 1871 };
1705 1872
1706 for (split /\n/, $spec) { 1873 for (split /\n/, $spec) {
1707 my ($k, $v) = split /\s+/, $_, 2; 1874 my ($k, $v) = split /\s+/, $_, 2;
1708 1875
1712 $rmp 1879 $rmp
1713} 1880}
1714 1881
1715sub prepare_random_map { 1882sub prepare_random_map {
1716 my ($exit) = @_; 1883 my ($exit) = @_;
1884
1885 my $guard = cf::lock_acquire "exit_prepare:$exit";
1717 1886
1718 # all this does is basically replace the /! path by 1887 # all this does is basically replace the /! path by
1719 # a new random map path (?random/...) with a seed 1888 # a new random map path (?random/...) with a seed
1720 # that depends on the exit object 1889 # that depends on the exit object
1721 1890
1722 my $rmp = parse_random_map_params $exit->msg; 1891 my $rmp = parse_random_map_params $exit->msg;
1723 1892
1724 if ($exit->map) { 1893 if ($exit->map) {
1725 $rmp->{region} = $exit->map->region_name; 1894 $rmp->{region} = $exit->region->name;
1726 $rmp->{origin_map} = $exit->map->path; 1895 $rmp->{origin_map} = $exit->map->path;
1727 $rmp->{origin_x} = $exit->x; 1896 $rmp->{origin_x} = $exit->x;
1728 $rmp->{origin_y} = $exit->y; 1897 $rmp->{origin_y} = $exit->y;
1729 } 1898 }
1730 1899
1731 $rmp->{random_seed} ||= $exit->random_seed; 1900 $rmp->{random_seed} ||= $exit->random_seed;
1732 1901
1733 my $data = cf::to_json $rmp; 1902 my $data = cf::to_json $rmp;
1734 my $md5 = Digest::MD5::md5_hex $data; 1903 my $md5 = Digest::MD5::md5_hex $data;
1904 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1735 1905
1736 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1906 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1737 aio_write $fh, 0, (length $data), $data, 0; 1907 aio_write $fh, 0, (length $data), $data, 0;
1908 undef $fh;
1909 aio_rename "$meta~", $meta;
1738 1910
1739 $exit->slaying ("?random/$md5"); 1911 $exit->slaying ("?random/$md5");
1740 $exit->msg (undef); 1912 $exit->msg (undef);
1741 } 1913 }
1742} 1914}
1743 1915
1744sub cf::object::player::enter_exit { 1916sub cf::object::player::enter_exit {
1745 my ($self, $exit) = @_; 1917 my ($self, $exit) = @_;
1746 1918
1747 return unless $self->type == cf::PLAYER; 1919 return unless $self->type == cf::PLAYER;
1920
1921 if ($exit->slaying eq "/!") {
1922 #TODO: this should de-fi-ni-te-ly not be a sync-job
1923 cf::sync_job { prepare_random_map $exit };
1924 }
1925
1926 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1927 my $hp = $exit->stats->hp;
1928 my $sp = $exit->stats->sp;
1748 1929
1749 $self->enter_link; 1930 $self->enter_link;
1750 1931
1751 (async { 1932 (async {
1752 $self->deactivate_recursive; # just to be sure 1933 $self->deactivate_recursive; # just to be sure
1753 unless (eval { 1934 unless (eval {
1754 prepare_random_map $exit 1935 $self->goto ($slaying, $hp, $sp);
1755 if $exit->slaying eq "/!";
1756
1757 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1758 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1759 1936
1760 1; 1937 1;
1761 }) { 1938 }) {
1762 $self->message ("Something went wrong deep within the crossfire server. " 1939 $self->message ("Something went wrong deep within the crossfire server. "
1763 . "I'll try to bring you back to the map you were before. " 1940 . "I'll try to bring you back to the map you were before. "
1764 . "Please report this to the dungeon master", 1941 . "Please report this to the dungeon master!",
1765 cf::NDI_UNIQUE | cf::NDI_RED); 1942 cf::NDI_UNIQUE | cf::NDI_RED);
1766 1943
1767 warn "ERROR in enter_exit: $@"; 1944 warn "ERROR in enter_exit: $@";
1768 $self->leave_link; 1945 $self->leave_link;
1769 } 1946 }
2052 sub db_sync() { 2229 sub db_sync() {
2053 db_save if $dirty; 2230 db_save if $dirty;
2054 undef $dirty; 2231 undef $dirty;
2055 } 2232 }
2056 2233
2057 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2234 my $idle = Event->idle (
2058 db_sync; 2235 reentrant => 0,
2236 min => 10,
2237 max => 20,
2238 repeat => 0,
2239 data => WF_AUTOCANCEL,
2240 cb => \&db_sync,
2059 }); 2241 );
2060 2242
2061 sub db_dirty() { 2243 sub db_dirty() {
2062 $dirty = 1; 2244 $dirty = 1;
2063 $idle->start; 2245 $idle->start;
2064 } 2246 }
2112 2294
2113sub main { 2295sub main {
2114 # we must not ever block the main coroutine 2296 # we must not ever block the main coroutine
2115 local $Coro::idle = sub { 2297 local $Coro::idle = sub {
2116 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2298 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2299 (async {
2117 async { Event::one_event }; 2300 Event::one_event;
2301 })->prio (Coro::PRIO_MAX);
2118 }; 2302 };
2119 2303
2120 cfg_load; 2304 cfg_load;
2121 db_load; 2305 db_load;
2122 load_extensions; 2306 load_extensions;
2307
2308 $TICK_WATCHER->start;
2123 Event::loop; 2309 Event::loop;
2124} 2310}
2125 2311
2126############################################################################# 2312#############################################################################
2127# initialisation 2313# initialisation and cleanup
2314
2315# install some emergency cleanup handlers
2316BEGIN {
2317 for my $signal (qw(INT HUP TERM)) {
2318 Event->signal (
2319 reentrant => 0,
2320 data => WF_AUTOCANCEL,
2321 signal => $signal,
2322 prio => 0,
2323 cb => sub {
2324 cf::cleanup "SIG$signal";
2325 },
2326 );
2327 }
2328}
2329
2330sub emergency_save() {
2331 my $freeze_guard = cf::freeze_mainloop;
2332
2333 warn "enter emergency perl save\n";
2334
2335 cf::sync_job {
2336 # use a peculiar iteration method to avoid tripping on perl
2337 # refcount bugs in for. also avoids problems with players
2338 # and maps saved/destroyed asynchronously.
2339 warn "begin emergency player save\n";
2340 for my $login (keys %cf::PLAYER) {
2341 my $pl = $cf::PLAYER{$login} or next;
2342 $pl->valid or next;
2343 $pl->save;
2344 }
2345 warn "end emergency player save\n";
2346
2347 warn "begin emergency map save\n";
2348 for my $path (keys %cf::MAP) {
2349 my $map = $cf::MAP{$path} or next;
2350 $map->valid or next;
2351 $map->save;
2352 }
2353 warn "end emergency map save\n";
2354 };
2355
2356 warn "leave emergency perl save\n";
2357}
2128 2358
2129sub reload() { 2359sub reload() {
2130 # can/must only be called in main 2360 # can/must only be called in main
2131 if ($Coro::current != $Coro::main) { 2361 if ($Coro::current != $Coro::main) {
2132 warn "can only reload from main coroutine\n"; 2362 warn "can only reload from main coroutine";
2133 return; 2363 return;
2134 } 2364 }
2135 2365
2136 warn "reloading..."; 2366 warn "reloading...";
2137 2367
2138 my $guard = freeze_mainloop; 2368 warn "cancelling server ticker";
2369 $TICK_WATCHER->cancel;
2370
2139 cf::emergency_save; 2371 cf::emergency_save;
2140 2372
2141 eval { 2373 eval {
2142 # if anything goes wrong in here, we should simply crash as we already saved 2374 # if anything goes wrong in here, we should simply crash as we already saved
2143 2375
2144 # cancel all watchers 2376 warn "syncing database to disk";
2377 cf::db_sync;
2378
2379 warn "cancelling all WF_AUTOCANCEL watchers";
2145 for (Event::all_watchers) { 2380 for (Event::all_watchers) {
2146 $_->cancel if $_->data & WF_AUTOCANCEL; 2381 $_->cancel if $_->data & WF_AUTOCANCEL;
2147 } 2382 }
2148 2383
2384 warn "flushing outstanding aio requests";
2385 for (;;) {
2386 IO::AIO::flush;
2387 Coro::cede;
2388 last unless IO::AIO::nreqs;
2389 warn "iterate...";
2390 }
2391
2149 # cancel all extension coros 2392 warn "cancelling all extension coros";
2150 $_->cancel for values %EXT_CORO; 2393 $_->cancel for values %EXT_CORO;
2151 %EXT_CORO = (); 2394 %EXT_CORO = ();
2152 2395
2153 # unload all extensions 2396 warn "removing commands";
2154 for (@exts) { 2397 %COMMAND = ();
2398
2399 warn "removing ext commands";
2400 %EXTCMD = ();
2401
2402 warn "unloading/nuking all extensions";
2403 for my $pkg (@EXTS) {
2155 warn "unloading <$_>"; 2404 warn "... unloading $pkg";
2156 unload_extension $_; 2405
2406 if (my $cb = $pkg->can ("unload")) {
2407 eval {
2408 $cb->($pkg);
2409 1
2410 } or warn "$pkg unloaded, but with errors: $@";
2157 } 2411 }
2158 2412
2413 warn "... nuking $pkg";
2414 Symbol::delete_package $pkg;
2415 }
2416
2159 # unload all modules loaded from $LIBDIR 2417 warn "unloading all perl modules loaded from $LIBDIR";
2160 while (my ($k, $v) = each %INC) { 2418 while (my ($k, $v) = each %INC) {
2161 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2419 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2162 2420
2163 warn "removing <$k>"; 2421 warn "... unloading $k";
2164 delete $INC{$k}; 2422 delete $INC{$k};
2165 2423
2166 $k =~ s/\.pm$//; 2424 $k =~ s/\.pm$//;
2167 $k =~ s/\//::/g; 2425 $k =~ s/\//::/g;
2168 2426
2171 } 2429 }
2172 2430
2173 Symbol::delete_package $k; 2431 Symbol::delete_package $k;
2174 } 2432 }
2175 2433
2176 # sync database to disk
2177 cf::db_sync;
2178 IO::AIO::flush;
2179
2180 # get rid of safe::, as good as possible 2434 warn "getting rid of safe::, as good as possible";
2181 Symbol::delete_package "safe::$_" 2435 Symbol::delete_package "safe::$_"
2182 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2436 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2183 2437
2184 # remove register_script_function callbacks
2185 # TODO
2186
2187 # unload cf.pm "a bit" 2438 warn "unloading cf.pm \"a bit\"";
2188 delete $INC{"cf.pm"}; 2439 delete $INC{"cf.pm"};
2189 2440
2190 # don't, removes xs symbols, too, 2441 # don't, removes xs symbols, too,
2191 # and global variables created in xs 2442 # and global variables created in xs
2192 #Symbol::delete_package __PACKAGE__; 2443 #Symbol::delete_package __PACKAGE__;
2193 2444
2194 # reload cf.pm 2445 warn "unload completed, starting to reload now";
2446
2195 warn "reloading cf.pm"; 2447 warn "reloading cf.pm";
2196 require cf; 2448 require cf;
2197 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2198 2450
2199 # load config and database again 2451 warn "loading config and database again";
2200 cf::cfg_load; 2452 cf::cfg_load;
2201 cf::db_load; 2453 cf::db_load;
2202 2454
2203 # load extensions
2204 warn "load extensions"; 2455 warn "loading extensions";
2205 cf::load_extensions; 2456 cf::load_extensions;
2206 2457
2207 # reattach attachments to objects 2458 warn "reattaching attachments to objects/players";
2208 warn "reattach";
2209 _global_reattach; 2459 _global_reattach;
2460 warn "reattaching attachments to maps";
2210 reattach $_ for values %MAP; 2461 reattach $_ for values %MAP;
2462
2463 warn "restarting server ticker";
2464
2465 $TICK_WATCHER->start;
2211 }; 2466 };
2212 2467
2213 if ($@) { 2468 if ($@) {
2214 warn $@; 2469 warn $@;
2215 warn "error while reloading, exiting."; 2470 warn "error while reloading, exiting.";
2216 exit 1; 2471 exit 1;
2217 } 2472 }
2218 2473
2219 warn "reloaded successfully"; 2474 warn "reloaded";
2220}; 2475};
2221 2476
2222############################################################################# 2477our $RELOAD_WATCHER; # used only during reload
2223
2224unless ($LINK_MAP) {
2225 $LINK_MAP = cf::map::new;
2226
2227 $LINK_MAP->width (41);
2228 $LINK_MAP->height (41);
2229 $LINK_MAP->alloc;
2230 $LINK_MAP->path ("{link}");
2231 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2232 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2233
2234 # dirty hack because... archetypes are not yet loaded
2235 Event->timer (
2236 after => 10,
2237 cb => sub {
2238 $_[0]->w->cancel;
2239
2240 # provide some exits "home"
2241 my $exit = cf::object::new "exit";
2242
2243 $exit->slaying ($EMERGENCY_POSITION->[0]);
2244 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2245 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2246
2247 $LINK_MAP->insert ($exit->clone, 19, 19);
2248 $LINK_MAP->insert ($exit->clone, 19, 20);
2249 $LINK_MAP->insert ($exit->clone, 19, 21);
2250 $LINK_MAP->insert ($exit->clone, 20, 19);
2251 $LINK_MAP->insert ($exit->clone, 20, 21);
2252 $LINK_MAP->insert ($exit->clone, 21, 19);
2253 $LINK_MAP->insert ($exit->clone, 21, 20);
2254 $LINK_MAP->insert ($exit->clone, 21, 21);
2255
2256 $exit->destroy;
2257 });
2258
2259 $LINK_MAP->{deny_save} = 1;
2260 $LINK_MAP->{deny_reset} = 1;
2261
2262 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2263}
2264
2265register "<global>", __PACKAGE__;
2266 2478
2267register_command "reload" => sub { 2479register_command "reload" => sub {
2268 my ($who, $arg) = @_; 2480 my ($who, $arg) = @_;
2269 2481
2270 if ($who->flag (FLAG_WIZ)) { 2482 if ($who->flag (FLAG_WIZ)) {
2271 $who->message ("start of reload."); 2483 $who->message ("reloading server.");
2484
2485 # doing reload synchronously and two reloads happen back-to-back,
2486 # coro crashes during coro_state_free->destroy here.
2487
2488 $RELOAD_WATCHER ||= Event->timer (
2489 reentrant => 0,
2490 after => 0,
2491 data => WF_AUTOCANCEL,
2492 cb => sub {
2272 reload; 2493 reload;
2273 $who->message ("end of reload."); 2494 undef $RELOAD_WATCHER;
2495 },
2496 );
2274 } 2497 }
2275}; 2498};
2276 2499
2277unshift @INC, $LIBDIR; 2500unshift @INC, $LIBDIR;
2501
2502my $bug_warning = 0;
2278 2503
2279$TICK_WATCHER = Event->timer ( 2504$TICK_WATCHER = Event->timer (
2280 reentrant => 0, 2505 reentrant => 0,
2506 parked => 1,
2281 prio => 0, 2507 prio => 0,
2282 at => $NEXT_TICK || $TICK, 2508 at => $NEXT_TICK || $TICK,
2283 data => WF_AUTOCANCEL, 2509 data => WF_AUTOCANCEL,
2284 cb => sub { 2510 cb => sub {
2511 if ($Coro::current != $Coro::main) {
2512 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2513 unless ++$bug_warning > 10;
2514 return;
2515 }
2516
2517 $NOW = Event::time;
2518
2285 cf::server_tick; # one server iteration 2519 cf::server_tick; # one server iteration
2286 $RUNTIME += $TICK; 2520 $RUNTIME += $TICK;
2287 $NEXT_TICK += $TICK; 2521 $NEXT_TICK += $TICK;
2522
2523 $WAIT_FOR_TICK->broadcast;
2524 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2525
2526 Event::sweep;
2527 Coro::cede_notself;
2528
2529# my $AFTER = Event::time;
2530# warn $AFTER - $NOW;#d#
2288 2531
2289 # if we are delayed by four ticks or more, skip them all 2532 # if we are delayed by four ticks or more, skip them all
2290 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2533 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2291 2534
2292 $TICK_WATCHER->at ($NEXT_TICK); 2535 $TICK_WATCHER->at ($NEXT_TICK);
2293 $TICK_WATCHER->start; 2536 $TICK_WATCHER->start;
2294 }, 2537 },
2295); 2538);
2296 2539
2297IO::AIO::max_poll_time $TICK * 0.2; 2540IO::AIO::max_poll_time $TICK * 0.1;
2298 2541
2299Event->io ( 2542undef $Coro::AIO::WATCHER;
2543$AIO_POLL_WATCHER = Event->io (
2544 reentrant => 0,
2300 fd => IO::AIO::poll_fileno, 2545 fd => IO::AIO::poll_fileno,
2301 poll => 'r', 2546 poll => 'r',
2302 prio => 5, 2547 prio => 6,
2303 data => WF_AUTOCANCEL, 2548 data => WF_AUTOCANCEL,
2304 cb => \&IO::AIO::poll_cb, 2549 cb => \&IO::AIO::poll_cb,
2305); 2550);
2306 2551
2307Event->timer ( 2552$WRITE_RUNTIME_WATCHER = Event->timer (
2553 reentrant => 0,
2308 data => WF_AUTOCANCEL, 2554 data => WF_AUTOCANCEL,
2309 after => 0, 2555 after => 1,
2310 interval => 10, 2556 interval => 10,
2311 cb => sub { 2557 prio => 6, # keep it lowest so it acts like a watchdog
2312 (Coro::unblock_sub { 2558 cb => Coro::unblock_sub {
2313 write_runtime 2559 write_runtime
2314 or warn "ERROR: unable to write runtime file: $!"; 2560 or warn "ERROR: unable to write runtime file: $!";
2315 })->();
2316 }, 2561 },
2317); 2562);
2318 2563
2319END { cf::emergency_save } 2564END { cf::emergency_save }
2320 2565

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines