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.199 by root, Mon Jan 29 14:46:01 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.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;
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
118 utf8::encode $msg; 137 utf8::encode $msg;
119 138
120 $msg .= "\n" 139 $msg .= "\n"
121 unless $msg =~ /\n$/; 140 unless $msg =~ /\n$/;
122 141
123 LOG llevError, "cfperl: $msg"; 142 LOG llevError, $msg;
124 }; 143 };
125} 144}
126 145
127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 146@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 147@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
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
906=cut 837=cut
907 838
908sub register_extcmd { 839sub register_extcmd {
909 my ($name, $cb) = @_; 840 my ($name, $cb) = @_;
910 841
911 my $caller = caller;
912 #warn "registering extcmd '$name' to '$caller'";
913
914 $EXTCMD{$name} = [$cb, $caller]; 842 $EXTCMD{$name} = $cb;
915} 843}
916 844
917cf::player->attach ( 845cf::player->attach (
918 on_command => sub { 846 on_command => sub {
919 my ($pl, $name, $params) = @_; 847 my ($pl, $name, $params) = @_;
932 860
933 my $msg = eval { from_json $buf }; 861 my $msg = eval { from_json $buf };
934 862
935 if (ref $msg) { 863 if (ref $msg) {
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 864 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
937 if (my %reply = $cb->[0]->($pl, $msg)) { 865 if (my %reply = $cb->($pl, $msg)) {
938 $pl->ext_reply ($msg->{msgid}, %reply); 866 $pl->ext_reply ($msg->{msgid}, %reply);
939 } 867 }
940 } 868 }
941 } else { 869 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 870 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
944 872
945 cf::override; 873 cf::override;
946 }, 874 },
947); 875);
948 876
949sub register {
950 my ($base, $pkg) = @_;
951
952 #TODO
953}
954
955sub load_extension { 877sub load_extension {
956 my ($path) = @_; 878 my ($path) = @_;
957 879
958 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 880 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
959 my $base = $1; 881 my $base = $1;
960 my $pkg = $1; 882 my $pkg = $1;
961 $pkg =~ s/[^[:word:]]/_/g; 883 $pkg =~ s/[^[:word:]]/_/g;
962 $pkg = "ext::$pkg"; 884 $pkg = "ext::$pkg";
963 885
964 warn "loading '$path' into '$pkg'\n"; 886 warn "... loading '$path' into '$pkg'\n";
965 887
966 open my $fh, "<:utf8", $path 888 open my $fh, "<:utf8", $path
967 or die "$path: $!"; 889 or die "$path: $!";
968 890
969 my $source = 891 my $source =
970 "package $pkg; use strict; use utf8;\n" 892 "package $pkg; use strict; use utf8;\n"
971 . "#line 1 \"$path\"\n{\n" 893 . "#line 1 \"$path\"\n{\n"
972 . (do { local $/; <$fh> }) 894 . (do { local $/; <$fh> })
973 . "\n};\n1"; 895 . "\n};\n1";
974 896
975 eval $source 897 unless (eval $source) {
976 or die $@ ? "$path: $@\n" 898 my $msg = $@ ? "$path: $@\n"
977 : "extension disabled.\n"; 899 : "extension disabled.\n";
978 900 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
979 push @exts, $pkg; 901 warn $@;
980 $ext_pkg{$base} = $pkg; 902 warn "mandatory extension failed to load, exiting.\n";
981 903 exit 1;
982# no strict 'refs'; 904 }
983# @{"$pkg\::ISA"} = ext::; 905 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# } 906 }
998 907
999 # remove commands 908 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} 909}
1024 910
1025sub load_extensions { 911sub load_extensions {
1026 for my $ext (<$LIBDIR/*.ext>) { 912 for my $ext (<$LIBDIR/*.ext>) {
1027 next unless -r $ext; 913 next unless -r $ext;
1031 } or warn "$ext not loaded: $@"; 917 } or warn "$ext not loaded: $@";
1032 } 918 }
1033} 919}
1034 920
1035############################################################################# 921#############################################################################
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 922
1073=head2 CORE EXTENSIONS 923=head2 CORE EXTENSIONS
1074 924
1075Functions and methods that extend core crossfire objects. 925Functions and methods that extend core crossfire objects.
1076 926
1077=cut 927=cut
1078 928
1079package cf::player; 929package cf::player;
1080 930
931use Coro::AIO;
932
1081=head3 cf::player 933=head3 cf::player
1082 934
1083=over 4 935=over 4
1084 936
1085=item cf::player::find $login 937=item cf::player::find $login
1086 938
1087Returns the given player object, loading it if necessary (might block). 939Returns the given player object, loading it if necessary (might block).
1088 940
1089=cut 941=cut
1090 942
943sub playerdir($) {
944 cf::localdir
945 . "/"
946 . cf::playerdir
947 . "/"
948 . (ref $_[0] ? $_[0]->ob->name : $_[0])
949}
950
1091sub path($) { 951sub path($) {
1092 sprintf "%s/%s/%s/%s.pl", 952 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1093 cf::localdir, cf::playerdir, 953
1094 (ref $_[0] ? $_[0]->ob->name : $_[0]) x 2 954 (playerdir $login) . "/$login.pl"
1095} 955}
1096 956
1097sub find_active($) { 957sub find_active($) {
1098 $cf::PLAYER{$_[0]} 958 $cf::PLAYER{$_[0]}
1099 and $cf::PLAYER{$_[0]}->active 959 and $cf::PLAYER{$_[0]}->active
1102 962
1103sub exists($) { 963sub exists($) {
1104 my ($login) = @_; 964 my ($login) = @_;
1105 965
1106 $cf::PLAYER{$login} 966 $cf::PLAYER{$login}
1107 or cf::sync_job { !aio_stat $login } 967 or cf::sync_job { !aio_stat path $login }
1108} 968}
1109 969
1110sub find($) { 970sub find($) {
1111 return $cf::PLAYER{$_[0]} || do { 971 return $cf::PLAYER{$_[0]} || do {
1112 my $login = $_[0]; 972 my $login = $_[0];
1113 973
1114 my $guard = cf::lock_acquire "user_find:$login"; 974 my $guard = cf::lock_acquire "user_find:$login";
1115 975
1116 $cf::PLAYER{$login} ||= (load_pl path $login or return); 976 $cf::PLAYER{$_[0]} || do {
977 my $pl = load_pl path $login
978 or return;
979 $cf::PLAYER{$login} = $pl
980 }
1117 }; 981 }
1118} 982}
1119 983
1120sub save($) { 984sub save($) {
1121 my ($pl) = @_; 985 my ($pl) = @_;
1122 986
1124 988
1125 my $path = path $pl; 989 my $path = path $pl;
1126 my $guard = cf::lock_acquire "user_save:$path"; 990 my $guard = cf::lock_acquire "user_save:$path";
1127 991
1128 return if $pl->{deny_save}; 992 return if $pl->{deny_save};
993
994 aio_mkdir playerdir $pl, 0770;
1129 $pl->{last_save} = $cf::RUNTIME; 995 $pl->{last_save} = $cf::RUNTIME;
1130 996
1131 Coro::cede;
1132 $pl->save_pl ($path); 997 $pl->save_pl ($path);
1133 Coro::cede; 998 Coro::cede;
1134} 999}
1135 1000
1136sub new($) { 1001sub new($) {
1144 $cf::PLAYER{$login} = $self; 1009 $cf::PLAYER{$login} = $self;
1145 1010
1146 $self 1011 $self
1147} 1012}
1148 1013
1014=item $pl->quit_character
1015
1016Nukes the player without looking back. If logged in, the connection will
1017be destroyed. May block for a long time.
1018
1019=cut
1020
1021sub quit_character {
1022 my ($pl) = @_;
1023
1024 $pl->{deny_save} = 1;
1025 $pl->password ("*"); # this should lock out the player until we nuked the dir
1026
1027 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1028 $pl->deactivate;
1029 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1030 $pl->ns->destroy if $pl->ns;
1031
1032 my $path = playerdir $pl;
1033 my $temp = "$path~$cf::RUNTIME~deleting~";
1034 aio_rename $path, $temp;
1035 delete $cf::PLAYER{$pl->ob->name};
1036 $pl->destroy;
1037 IO::AIO::aio_rmtree $temp;
1038}
1039
1040=item cf::player::list_logins
1041
1042Returns am arrayref of all valid playernames in the system, can take a
1043while and may block, so not sync_job-capable, ever.
1044
1045=cut
1046
1047sub list_logins {
1048 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1049 or return [];
1050
1051 my @logins;
1052
1053 for my $login (@$dirs) {
1054 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1055 aio_read $fh, 0, 512, my $buf, 0 or next;
1056 $buf !~ /^password -------------$/m or next; # official not-valid tag
1057
1058 utf8::decode $login;
1059 push @logins, $login;
1060 }
1061
1062 \@logins
1063}
1064
1065=item $player->maps
1066
1067Returns an arrayref of map paths that are private for this
1068player. May block.
1069
1070=cut
1071
1072sub maps($) {
1073 my ($pl) = @_;
1074
1075 my $files = aio_readdir playerdir $pl
1076 or return;
1077
1078 my @paths;
1079
1080 for (@$files) {
1081 utf8::decode $_;
1082 next if /\.(?:pl|pst)$/;
1083 next unless /^$PATH_SEP/o;
1084
1085 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1086 }
1087
1088 \@paths
1089}
1090
1149=item $player->ext_reply ($msgid, $msgtype, %msg) 1091=item $player->ext_reply ($msgid, $msgtype, %msg)
1150 1092
1151Sends an ext reply to the player. 1093Sends an ext reply to the player.
1152 1094
1153=cut 1095=cut
1174package cf::map; 1116package cf::map;
1175 1117
1176use Fcntl; 1118use Fcntl;
1177use Coro::AIO; 1119use Coro::AIO;
1178 1120
1121use overload
1122 '""' => \&as_string,
1123 fallback => 1;
1124
1179our $MAX_RESET = 3600; 1125our $MAX_RESET = 3600;
1180our $DEFAULT_RESET = 3000; 1126our $DEFAULT_RESET = 3000;
1181 1127
1182sub generate_random_map { 1128sub generate_random_map {
1183 my ($path, $rmp) = @_; 1129 my ($self, $rmp) = @_;
1184
1185 # mit "rum" bekleckern, nicht 1130 # mit "rum" bekleckern, nicht
1186 cf::map::_create_random_map 1131 $self->_create_random_map (
1187 $path,
1188 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1132 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1189 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1133 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1190 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1134 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1191 $rmp->{exit_on_final_map}, 1135 $rmp->{exit_on_final_map},
1192 $rmp->{xsize}, $rmp->{ysize}, 1136 $rmp->{xsize}, $rmp->{ysize},
1193 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1137 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1194 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1138 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1195 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1139 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1196 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1140 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1197 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1141 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1198 (cf::region::find $rmp->{region}) 1142 (cf::region::find $rmp->{region}), $rmp->{custom}
1143 )
1144}
1145
1146=item cf::map->register ($regex, $prio)
1147
1148Register a handler for the map path matching the given regex at the
1149givne priority (higher is better, built-in handlers have priority 0, the
1150default).
1151
1152=cut
1153
1154sub register {
1155 my (undef, $regex, $prio) = @_;
1156 my $pkg = caller;
1157
1158 no strict;
1159 push @{"$pkg\::ISA"}, __PACKAGE__;
1160
1161 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1162}
1163
1164# also paths starting with '/'
1165$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1166
1167sub thawer_merge {
1168 my ($self, $merge) = @_;
1169
1170 # we have to keep some variables in memory intact
1171 local $self->{path};
1172 local $self->{load_path};
1173 local $self->{deny_save};
1174 local $self->{deny_reset};
1175
1176 $self->SUPER::thawer_merge ($merge);
1177}
1178
1179sub normalise {
1180 my ($path, $base) = @_;
1181
1182 $path = "$path"; # make sure its a string
1183
1184 $path =~ s/\.map$//;
1185
1186 # map plan:
1187 #
1188 # /! non-realised random map exit (special hack!)
1189 # {... are special paths that are not being touched
1190 # ?xxx/... are special absolute paths
1191 # ?random/... random maps
1192 # /... normal maps
1193 # ~user/... per-player map of a specific user
1194
1195 $path =~ s/$PATH_SEP/\//go;
1196
1197 # treat it as relative path if it starts with
1198 # something that looks reasonable
1199 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1200 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1201
1202 $base =~ s{[^/]+/?$}{};
1203 $path = "$base/$path";
1204 }
1205
1206 for ($path) {
1207 redo if s{//}{/};
1208 redo if s{/\.?/}{/};
1209 redo if s{/[^/]+/\.\./}{/};
1210 }
1211
1212 $path
1213}
1214
1215sub new_from_path {
1216 my (undef, $path, $base) = @_;
1217
1218 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1219
1220 $path = normalise $path, $base;
1221
1222 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1223 if ($path =~ $EXT_MAP{$pkg}[1]) {
1224 my $self = bless cf::map::new, $pkg;
1225 $self->{path} = $path; $self->path ($path);
1226 $self->init; # pass $1 etc.
1227 return $self;
1228 }
1229 }
1230
1231 Carp::carp "unable to resolve path '$path' (base '$base').";
1232 ()
1233}
1234
1235sub init {
1236 my ($self) = @_;
1237
1238 $self
1239}
1240
1241sub as_string {
1242 my ($self) = @_;
1243
1244 "$self->{path}"
1245}
1246
1247# the displayed name, this is a one way mapping
1248sub visible_name {
1249 &as_string
1250}
1251
1252# the original (read-only) location
1253sub load_path {
1254 my ($self) = @_;
1255
1256 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1257}
1258
1259# the temporary/swap location
1260sub save_path {
1261 my ($self) = @_;
1262
1263 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1264 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1265}
1266
1267# the unique path, undef == no special unique path
1268sub uniq_path {
1269 my ($self) = @_;
1270
1271 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1272 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1199} 1273}
1200 1274
1201# and all this just because we cannot iterate over 1275# and all this just because we cannot iterate over
1202# all maps in C++... 1276# all maps in C++...
1203sub change_all_map_light { 1277sub change_all_map_light {
1205 1279
1206 $_->change_map_light ($change) 1280 $_->change_map_light ($change)
1207 for grep $_->outdoor, values %cf::MAP; 1281 for grep $_->outdoor, values %cf::MAP;
1208} 1282}
1209 1283
1284sub unlink_save {
1285 my ($self) = @_;
1286
1287 utf8::encode (my $save = $self->save_path);
1288 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1289 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1290}
1291
1210sub try_load_header($) { 1292sub load_header_from($) {
1211 my ($path) = @_; 1293 my ($self, $path) = @_;
1212 1294
1213 utf8::encode $path; 1295 utf8::encode $path;
1214 aio_open $path, O_RDONLY, 0 1296 aio_open $path, O_RDONLY, 0
1215 or return; 1297 or return;
1216 1298
1217 my $map = cf::map::new 1299 $self->_load_header ($path)
1218 or return; 1300 or return;
1219 1301
1220 # for better error messages only, will be overwritten 1302 $self->{load_path} = $path;
1221 $map->path ($path);
1222 1303
1223 $map->load_header ($path) 1304 1
1305}
1306
1307sub load_header_orig {
1308 my ($self) = @_;
1309
1310 $self->load_header_from ($self->load_path)
1311}
1312
1313sub load_header_temp {
1314 my ($self) = @_;
1315
1316 $self->load_header_from ($self->save_path)
1317}
1318
1319sub prepare_temp {
1320 my ($self) = @_;
1321
1322 $self->last_access ((delete $self->{last_access})
1323 || $cf::RUNTIME); #d#
1324 # safety
1325 $self->{instantiate_time} = $cf::RUNTIME
1326 if $self->{instantiate_time} > $cf::RUNTIME;
1327}
1328
1329sub prepare_orig {
1330 my ($self) = @_;
1331
1332 $self->{load_original} = 1;
1333 $self->{instantiate_time} = $cf::RUNTIME;
1334 $self->last_access ($cf::RUNTIME);
1335 $self->instantiate;
1336}
1337
1338sub load_header {
1339 my ($self) = @_;
1340
1341 if ($self->load_header_temp) {
1342 $self->prepare_temp;
1343 } else {
1344 $self->load_header_orig
1224 or return; 1345 or return;
1346 $self->prepare_orig;
1347 }
1225 1348
1226 $map->{load_path} = $path; 1349 1
1227
1228 $map
1229} 1350}
1230 1351
1231sub find; 1352sub find;
1232sub find { 1353sub find {
1233 my ($path, $origin) = @_; 1354 my ($path, $origin) = @_;
1234 1355
1235 #warn "find<$path,$origin>\n";#d#
1236
1237 $path = new cf::path $path, $origin && $origin->path; 1356 $path = normalise $path, $origin && $origin->path;
1238 my $key = $path->as_string;
1239 1357
1240 cf::lock_wait "map_find:$key"; 1358 cf::lock_wait "map_find:$path";
1241 1359
1242 $cf::MAP{$key} || do { 1360 $cf::MAP{$path} || do {
1243 my $guard = cf::lock_acquire "map_find:$key"; 1361 my $guard = cf::lock_acquire "map_find:$path";
1244 1362 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; 1363 or return;
1264 1364
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; 1365 $map->{last_save} = $cf::RUNTIME;
1277 1366
1278 Coro::cede; 1367 $map->load_header
1368 or return;
1279 1369
1280 if ($map->should_reset) { 1370 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1371 # doing this can freeze the server in a sync job, obviously
1372 #$cf::WAIT_FOR_TICK->wait;
1281 $map->reset; 1373 $map->reset;
1282 undef $guard; 1374 undef $guard;
1283 $map = find $path 1375 return find $path;
1284 or return;
1285 } 1376 }
1286 1377
1287 $cf::MAP{$key} = $map 1378 $cf::MAP{$path} = $map
1288 } 1379 }
1289} 1380}
1381
1382sub pre_load { }
1383sub post_load { }
1290 1384
1291sub load { 1385sub load {
1292 my ($self) = @_; 1386 my ($self) = @_;
1293 1387
1388 local $self->{deny_reset} = 1; # loading can take a long time
1389
1294 my $path = $self->{path}; 1390 my $path = $self->{path};
1295 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1391 my $guard = cf::lock_acquire "map_load:$path";
1296 1392
1297 return if $self->in_memory != cf::MAP_SWAPPED; 1393 return if $self->in_memory != cf::MAP_SWAPPED;
1298 1394
1299 $self->in_memory (cf::MAP_LOADING); 1395 $self->in_memory (cf::MAP_LOADING);
1300 1396
1301 $self->alloc; 1397 $self->alloc;
1398
1399 $self->pre_load;
1400
1302 $self->load_objects ($self->{load_path}, 1) 1401 $self->_load_objects ($self->{load_path}, 1)
1303 or return; 1402 or return;
1304 1403
1305 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1404 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1306 if delete $self->{load_original}; 1405 if delete $self->{load_original};
1307 1406
1308 if (my $uniq = $path->uniq_path) { 1407 if (my $uniq = $self->uniq_path) {
1309 utf8::encode $uniq; 1408 utf8::encode $uniq;
1310 if (aio_open $uniq, O_RDONLY, 0) { 1409 if (aio_open $uniq, O_RDONLY, 0) {
1311 $self->clear_unique_items; 1410 $self->clear_unique_items;
1312 $self->load_objects ($uniq, 0); 1411 $self->_load_objects ($uniq, 0);
1313 } 1412 }
1314 } 1413 }
1315 1414
1316 Coro::cede; 1415 Coro::cede;
1317 1416
1318 # now do the right thing for maps 1417 # now do the right thing for maps
1319 $self->link_multipart_objects; 1418 $self->link_multipart_objects;
1320 1419
1321 if ($self->{path}->is_style_map) { 1420 unless ($self->{deny_activate}) {
1322 $self->{deny_save} = 1; 1421 $self->decay_objects;
1323 $self->{deny_reset} = 1;
1324 } else {
1325 $self->fix_auto_apply; 1422 $self->fix_auto_apply;
1326 $self->decay_objects;
1327 $self->update_buttons; 1423 $self->update_buttons;
1424 Coro::cede;
1328 $self->set_darkness_map; 1425 $self->set_darkness_map;
1329 $self->difficulty ($self->estimate_difficulty) 1426 $self->difficulty ($self->estimate_difficulty)
1330 unless $self->difficulty; 1427 unless $self->difficulty;
1428 Coro::cede;
1331 $self->activate; 1429 $self->activate;
1332 } 1430 }
1333 1431
1334 Coro::cede; 1432 $self->post_load;
1335 1433
1336 $self->in_memory (cf::MAP_IN_MEMORY); 1434 $self->in_memory (cf::MAP_IN_MEMORY);
1435}
1436
1437sub customise_for {
1438 my ($self, $ob) = @_;
1439
1440 return find "~" . $ob->name . "/" . $self->{path}
1441 if $self->per_player;
1442
1443 $self
1444}
1445
1446# find and load all maps in the 3x3 area around a map
1447sub load_diag {
1448 my ($map) = @_;
1449
1450 my @diag; # diagonal neighbours
1451
1452 for (0 .. 3) {
1453 my $neigh = $map->tile_path ($_)
1454 or next;
1455 $neigh = find $neigh, $map
1456 or next;
1457 $neigh->load;
1458
1459 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1460 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1461 }
1462
1463 for (@diag) {
1464 my $neigh = find @$_
1465 or next;
1466 $neigh->load;
1467 }
1337} 1468}
1338 1469
1339sub find_sync { 1470sub find_sync {
1340 my ($path, $origin) = @_; 1471 my ($path, $origin) = @_;
1341 1472
1342 cf::sync_job { cf::map::find $path, $origin } 1473 cf::sync_job { find $path, $origin }
1343} 1474}
1344 1475
1345sub do_load_sync { 1476sub do_load_sync {
1346 my ($map) = @_; 1477 my ($map) = @_;
1347 1478
1348 cf::sync_job { $map->load }; 1479 cf::sync_job { $map->load };
1349} 1480}
1350 1481
1482our %MAP_PREFETCH;
1483our $MAP_PREFETCHER = undef;
1484
1485sub find_async {
1486 my ($path, $origin) = @_;
1487
1488 $path = normalise $path, $origin && $origin->{path};
1489
1490 if (my $map = $cf::MAP{$path}) {
1491 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1492 }
1493
1494 undef $MAP_PREFETCH{$path};
1495 $MAP_PREFETCHER ||= cf::async {
1496 while (%MAP_PREFETCH) {
1497 for my $path (keys %MAP_PREFETCH) {
1498 my $map = find $path
1499 or next;
1500 $map->load;
1501
1502 delete $MAP_PREFETCH{$path};
1503 }
1504 }
1505 undef $MAP_PREFETCHER;
1506 };
1507 $MAP_PREFETCHER->prio (6);
1508
1509 ()
1510}
1511
1351sub save { 1512sub save {
1352 my ($self) = @_; 1513 my ($self) = @_;
1353 1514
1354 my $lock = cf::lock_acquire "map_data:" . $self->path; 1515 my $lock = cf::lock_acquire "map_data:" . $self->path;
1355 1516
1356 $self->{last_save} = $cf::RUNTIME; 1517 $self->{last_save} = $cf::RUNTIME;
1357 1518
1358 return unless $self->dirty; 1519 return unless $self->dirty;
1359 1520
1360 my $save = $self->{path}->save_path; utf8::encode $save; 1521 my $save = $self->save_path; utf8::encode $save;
1361 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1522 my $uniq = $self->uniq_path; utf8::encode $uniq;
1362 1523
1363 $self->{load_path} = $save; 1524 $self->{load_path} = $save;
1364 1525
1365 return if $self->{deny_save}; 1526 return if $self->{deny_save};
1366 1527
1369 cf::async { 1530 cf::async {
1370 $_->contr->save for $self->players; 1531 $_->contr->save for $self->players;
1371 }; 1532 };
1372 1533
1373 if ($uniq) { 1534 if ($uniq) {
1374 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1535 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1375 $self->save_objects ($uniq, cf::IO_UNIQUES); 1536 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1376 } else { 1537 } else {
1377 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1538 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1378 } 1539 }
1379} 1540}
1380 1541
1381sub swap_out { 1542sub swap_out {
1382 my ($self) = @_; 1543 my ($self) = @_;
1396 1557
1397sub reset_at { 1558sub reset_at {
1398 my ($self) = @_; 1559 my ($self) = @_;
1399 1560
1400 # TODO: safety, remove and allow resettable per-player maps 1561 # TODO: safety, remove and allow resettable per-player maps
1401 return 1e99 if $self->{path}{user_rel}; 1562 return 1e99 if $self->isa ("ext::map_per_player");#d#
1402 return 1e99 if $self->{deny_reset}; 1563 return 1e99 if $self->{deny_reset};
1403 1564
1404 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1565 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1405 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1566 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1406 1567
1411 my ($self) = @_; 1572 my ($self) = @_;
1412 1573
1413 $self->reset_at <= $cf::RUNTIME 1574 $self->reset_at <= $cf::RUNTIME
1414} 1575}
1415 1576
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 { 1577sub reset {
1438 my ($self) = @_; 1578 my ($self) = @_;
1439 1579
1440 my $lock = cf::lock_acquire "map_data:" . $self->path; 1580 my $lock = cf::lock_acquire "map_data:$self->{path}";
1441 1581
1442 return if $self->players; 1582 return if $self->players;
1443 return if $self->{path}{user_rel};#d# 1583 return if $self->isa ("ext::map_per_player");#d#
1444 1584
1445 warn "resetting map ", $self->path;#d# 1585 warn "resetting map ", $self->path;#d#
1446 1586
1447 delete $cf::MAP{$self->path}; 1587 delete $cf::MAP{$self->path};
1588
1589 $self->in_memory (cf::MAP_SWAPPED);
1590 $self->clear;
1448 1591
1449 $_->clear_links_to ($self) for values %cf::MAP; 1592 $_->clear_links_to ($self) for values %cf::MAP;
1450 1593
1451 $self->unlink_save; 1594 $self->unlink_save;
1452 $self->destroy; 1595 $self->destroy;
1455my $nuke_counter = "aaaa"; 1598my $nuke_counter = "aaaa";
1456 1599
1457sub nuke { 1600sub nuke {
1458 my ($self) = @_; 1601 my ($self) = @_;
1459 1602
1603 delete $cf::MAP{$self->path};
1604
1605 $self->unlink_save;
1606
1607 bless $self, "cf::map";
1608 delete $self->{deny_reset};
1460 $self->{deny_save} = 1; 1609 $self->{deny_save} = 1;
1461 $self->reset_timeout (1); 1610 $self->reset_timeout (1);
1462 $self->rename ("{nuke}/" . ($nuke_counter++)); 1611 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1612
1613 $cf::MAP{$self->path} = $self;
1614
1463 $self->reset; # polite request, might not happen 1615 $self->reset; # polite request, might not happen
1464} 1616}
1465 1617
1466sub customise_for { 1618=item cf::map::unique_maps
1467 my ($map, $ob) = @_;
1468 1619
1469 if ($map->per_player) { 1620Returns an arrayref of paths of all shared maps that have
1470 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1621instantiated unique items. May block.
1471 }
1472 1622
1473 $map 1623=cut
1474}
1475 1624
1476sub emergency_save { 1625sub unique_maps() {
1477 my $freeze_guard = cf::freeze_mainloop; 1626 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1627 or return;
1478 1628
1479 warn "enter emergency perl save\n"; 1629 my @paths;
1480 1630
1481 cf::sync_job { 1631 for (@$files) {
1482 warn "begin emergency player save\n"; 1632 utf8::decode $_;
1483 $_->save for values %cf::PLAYER; 1633 next if /\.pst$/;
1484 warn "end emergency player save\n"; 1634 next unless /^$PATH_SEP/o;
1485 1635
1486 warn "begin emergency map save\n"; 1636 push @paths, cf::map::normalise $_;
1487 $_->save for values %cf::MAP;
1488 warn "end emergency map save\n";
1489 }; 1637 }
1490 1638
1491 warn "leave emergency perl save\n"; 1639 \@paths
1492} 1640}
1493 1641
1494package cf; 1642package cf;
1495 1643
1496=back 1644=back
1497 1645
1646=head3 cf::object
1647
1648=cut
1649
1650package cf::object;
1651
1652=over 4
1653
1654=item $ob->inv_recursive
1655
1656Returns the inventory of the object _and_ their inventories, recursively.
1657
1658=cut
1659
1660sub inv_recursive_;
1661sub inv_recursive_ {
1662 map { $_, inv_recursive_ $_->inv } @_
1663}
1664
1665sub inv_recursive {
1666 inv_recursive_ inv $_[0]
1667}
1668
1669package cf;
1670
1671=back
1498 1672
1499=head3 cf::object::player 1673=head3 cf::object::player
1500 1674
1501=over 4 1675=over 4
1502 1676
1542 1716
1543=item $player_object->enter_link 1717=item $player_object->enter_link
1544 1718
1545Freezes the player and moves him/her to a special map (C<{link}>). 1719Freezes the player and moves him/her to a special map (C<{link}>).
1546 1720
1547The player should be reaosnably safe there for short amounts of time. You 1721The player should be reasonably safe there for short amounts of time. You
1548I<MUST> call C<leave_link> as soon as possible, though. 1722I<MUST> call C<leave_link> as soon as possible, though.
1549 1723
1724Will never block.
1725
1550=item $player_object->leave_link ($map, $x, $y) 1726=item $player_object->leave_link ($map, $x, $y)
1551 1727
1552Moves the player out of the specila link map onto the given map. If the 1728Moves 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 1729map. 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, 1730to the location he/she was before the call to C<enter_link>, or, if that
1555to the emergency map position. 1731fails, to the emergency map position.
1556 1732
1557Might block. 1733Might block.
1558 1734
1559=cut 1735=cut
1736
1737sub link_map {
1738 unless ($LINK_MAP) {
1739 $LINK_MAP = cf::map::find "{link}"
1740 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1741 $LINK_MAP->load;
1742 }
1743
1744 $LINK_MAP
1745}
1560 1746
1561sub cf::object::player::enter_link { 1747sub cf::object::player::enter_link {
1562 my ($self) = @_; 1748 my ($self) = @_;
1563 1749
1564 $self->deactivate_recursive; 1750 $self->deactivate_recursive;
1565 1751
1566 return if $self->map == $LINK_MAP; 1752 return if UNIVERSAL::isa $self->map, "ext::map_link";
1567 1753
1568 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1754 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1569 if $self->map; 1755 if $self->map;
1570 1756
1571 $self->enter_map ($LINK_MAP, 20, 20); 1757 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1572} 1758}
1573 1759
1574sub cf::object::player::leave_link { 1760sub cf::object::player::leave_link {
1575 my ($self, $map, $x, $y) = @_; 1761 my ($self, $map, $x, $y) = @_;
1576 1762
1594 # use -1 or undef as default coordinates, not 0, 0 1780 # use -1 or undef as default coordinates, not 0, 0
1595 ($x, $y) = ($map->enter_x, $map->enter_y) 1781 ($x, $y) = ($map->enter_x, $map->enter_y)
1596 if $x <=0 && $y <= 0; 1782 if $x <=0 && $y <= 0;
1597 1783
1598 $map->load; 1784 $map->load;
1785 $map->load_diag;
1599 1786
1600 return unless $self->contr->active; 1787 return unless $self->contr->active;
1601 $self->activate_recursive; 1788 $self->activate_recursive;
1602 $self->enter_map ($map, $x, $y); 1789 $self->enter_map ($map, $x, $y);
1603} 1790}
1642 my ($self, $path, $x, $y) = @_; 1829 my ($self, $path, $x, $y) = @_;
1643 1830
1644 $self->enter_link; 1831 $self->enter_link;
1645 1832
1646 (async { 1833 (async {
1647 $path = new cf::path $path; 1834 my $map = eval {
1648
1649 my $map = cf::map::find $path->as_string; 1835 my $map = cf::map::find $path;
1650 $map = $map->customise_for ($self) if $map; 1836 $map = $map->customise_for ($self) if $map;
1651 1837 $map
1652# warn "entering ", $map->path, " at ($x, $y)\n" 1838 } or
1653# if $map;
1654
1655 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1839 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1656 1840
1657 $self->leave_link ($map, $x, $y); 1841 $self->leave_link ($map, $x, $y);
1658 })->prio (1); 1842 })->prio (1);
1659} 1843}
1660 1844
1664 1848
1665sub parse_random_map_params { 1849sub parse_random_map_params {
1666 my ($spec) = @_; 1850 my ($spec) = @_;
1667 1851
1668 my $rmp = { # defaults 1852 my $rmp = { # defaults
1669 xsize => 10, 1853 xsize => (cf::rndm 15, 40),
1670 ysize => 10, 1854 ysize => (cf::rndm 15, 40),
1855 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1856 #layout => string,
1671 }; 1857 };
1672 1858
1673 for (split /\n/, $spec) { 1859 for (split /\n/, $spec) {
1674 my ($k, $v) = split /\s+/, $_, 2; 1860 my ($k, $v) = split /\s+/, $_, 2;
1675 1861
1679 $rmp 1865 $rmp
1680} 1866}
1681 1867
1682sub prepare_random_map { 1868sub prepare_random_map {
1683 my ($exit) = @_; 1869 my ($exit) = @_;
1870
1871 my $guard = cf::lock_acquire "exit_prepare:$exit";
1684 1872
1685 # all this does is basically replace the /! path by 1873 # all this does is basically replace the /! path by
1686 # a new random map path (?random/...) with a seed 1874 # a new random map path (?random/...) with a seed
1687 # that depends on the exit object 1875 # that depends on the exit object
1688 1876
1689 my $rmp = parse_random_map_params $exit->msg; 1877 my $rmp = parse_random_map_params $exit->msg;
1690 1878
1691 if ($exit->map) { 1879 if ($exit->map) {
1692 $rmp->{region} = $exit->map->region_name; 1880 $rmp->{region} = $exit->region->name;
1693 $rmp->{origin_map} = $exit->map->path; 1881 $rmp->{origin_map} = $exit->map->path;
1694 $rmp->{origin_x} = $exit->x; 1882 $rmp->{origin_x} = $exit->x;
1695 $rmp->{origin_y} = $exit->y; 1883 $rmp->{origin_y} = $exit->y;
1696 } 1884 }
1697 1885
1698 $rmp->{random_seed} ||= $exit->random_seed; 1886 $rmp->{random_seed} ||= $exit->random_seed;
1699 1887
1700 my $data = cf::to_json $rmp; 1888 my $data = cf::to_json $rmp;
1701 my $md5 = Digest::MD5::md5_hex $data; 1889 my $md5 = Digest::MD5::md5_hex $data;
1890 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1702 1891
1703 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1892 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1704 aio_write $fh, 0, (length $data), $data, 0; 1893 aio_write $fh, 0, (length $data), $data, 0;
1894 undef $fh;
1895 aio_rename "$meta~", $meta;
1705 1896
1706 $exit->slaying ("?random/$md5"); 1897 $exit->slaying ("?random/$md5");
1707 $exit->msg (undef); 1898 $exit->msg (undef);
1708 } 1899 }
1709} 1900}
1710 1901
1711sub cf::object::player::enter_exit { 1902sub cf::object::player::enter_exit {
1712 my ($self, $exit) = @_; 1903 my ($self, $exit) = @_;
1713 1904
1714 return unless $self->type == cf::PLAYER; 1905 return unless $self->type == cf::PLAYER;
1906
1907 if ($exit->slaying eq "/!") {
1908 #TODO: this should de-fi-ni-te-ly not be a sync-job
1909 cf::sync_job { prepare_random_map $exit };
1910 }
1911
1912 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1913 my $hp = $exit->stats->hp;
1914 my $sp = $exit->stats->sp;
1715 1915
1716 $self->enter_link; 1916 $self->enter_link;
1717 1917
1718 (async { 1918 (async {
1719 $self->deactivate_recursive; # just to be sure 1919 $self->deactivate_recursive; # just to be sure
1720 unless (eval { 1920 unless (eval {
1721 prepare_random_map $exit 1921 $self->goto ($slaying, $hp, $sp);
1722 if $exit->slaying eq "/!";
1723
1724 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1725 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1726 1922
1727 1; 1923 1;
1728 }) { 1924 }) {
1729 $self->message ("Something went wrong deep within the crossfire server. " 1925 $self->message ("Something went wrong deep within the crossfire server. "
1730 . "I'll try to bring you back to the map you were before. " 1926 . "I'll try to bring you back to the map you were before. "
1731 . "Please report this to the dungeon master", 1927 . "Please report this to the dungeon master!",
1732 cf::NDI_UNIQUE | cf::NDI_RED); 1928 cf::NDI_UNIQUE | cf::NDI_RED);
1733 1929
1734 warn "ERROR in enter_exit: $@"; 1930 warn "ERROR in enter_exit: $@";
1735 $self->leave_link; 1931 $self->leave_link;
1736 } 1932 }
2019 sub db_sync() { 2215 sub db_sync() {
2020 db_save if $dirty; 2216 db_save if $dirty;
2021 undef $dirty; 2217 undef $dirty;
2022 } 2218 }
2023 2219
2024 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2220 my $idle = Event->idle (
2025 db_sync; 2221 reentrant => 0,
2222 min => 10,
2223 max => 20,
2224 repeat => 0,
2225 data => WF_AUTOCANCEL,
2226 cb => \&db_sync,
2026 }); 2227 );
2027 2228
2028 sub db_dirty() { 2229 sub db_dirty() {
2029 $dirty = 1; 2230 $dirty = 1;
2030 $idle->start; 2231 $idle->start;
2031 } 2232 }
2068 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2269 $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}; 2270 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2070 2271
2071 if (exists $CFG{mlockall}) { 2272 if (exists $CFG{mlockall}) {
2072 eval { 2273 eval {
2073 $CFG{mlockall} ? &mlockall : &munlockall 2274 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2074 and die "WARNING: m(un)lockall failed: $!\n"; 2275 and die "WARNING: m(un)lockall failed: $!\n";
2075 }; 2276 };
2076 warn $@ if $@; 2277 warn $@ if $@;
2077 } 2278 }
2078} 2279}
2079 2280
2080sub main { 2281sub main {
2081 # we must not ever block the main coroutine 2282 # we must not ever block the main coroutine
2082 local $Coro::idle = sub { 2283 local $Coro::idle = sub {
2083 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2284 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2285 (async {
2084 async { Event::one_event }; 2286 Event::one_event;
2287 })->prio (Coro::PRIO_MAX);
2085 }; 2288 };
2086 2289
2087 cfg_load; 2290 cfg_load;
2088 db_load; 2291 db_load;
2089 load_extensions; 2292 load_extensions;
2293
2294 $TICK_WATCHER->start;
2090 Event::loop; 2295 Event::loop;
2091} 2296}
2092 2297
2093############################################################################# 2298#############################################################################
2094# initialisation 2299# initialisation and cleanup
2300
2301# install some emergency cleanup handlers
2302BEGIN {
2303 for my $signal (qw(INT HUP TERM)) {
2304 Event->signal (
2305 reentrant => 0,
2306 data => WF_AUTOCANCEL,
2307 signal => $signal,
2308 prio => 0,
2309 cb => sub {
2310 cf::cleanup "SIG$signal";
2311 },
2312 );
2313 }
2314}
2315
2316sub emergency_save() {
2317 my $freeze_guard = cf::freeze_mainloop;
2318
2319 warn "enter emergency perl save\n";
2320
2321 cf::sync_job {
2322 # use a peculiar iteration method to avoid tripping on perl
2323 # refcount bugs in for. also avoids problems with players
2324 # and maps saved/destroyed asynchronously.
2325 warn "begin emergency player save\n";
2326 for my $login (keys %cf::PLAYER) {
2327 my $pl = $cf::PLAYER{$login} or next;
2328 $pl->valid or next;
2329 $pl->save;
2330 }
2331 warn "end emergency player save\n";
2332
2333 warn "begin emergency map save\n";
2334 for my $path (keys %cf::MAP) {
2335 my $map = $cf::MAP{$path} or next;
2336 $map->valid or next;
2337 $map->save;
2338 }
2339 warn "end emergency map save\n";
2340 };
2341
2342 warn "leave emergency perl save\n";
2343}
2095 2344
2096sub reload() { 2345sub reload() {
2097 # can/must only be called in main 2346 # can/must only be called in main
2098 if ($Coro::current != $Coro::main) { 2347 if ($Coro::current != $Coro::main) {
2099 warn "can only reload from main coroutine\n"; 2348 warn "can only reload from main coroutine";
2100 return; 2349 return;
2101 } 2350 }
2102 2351
2103 warn "reloading..."; 2352 warn "reloading...";
2104 2353
2105 my $guard = freeze_mainloop; 2354 warn "cancelling server ticker";
2355 $TICK_WATCHER->cancel;
2356
2106 cf::emergency_save; 2357 cf::emergency_save;
2107 2358
2108 eval { 2359 eval {
2109 # if anything goes wrong in here, we should simply crash as we already saved 2360 # if anything goes wrong in here, we should simply crash as we already saved
2110 2361
2111 # cancel all watchers 2362 warn "syncing database to disk";
2363 cf::db_sync;
2364
2365 warn "cancelling all WF_AUTOCANCEL watchers";
2112 for (Event::all_watchers) { 2366 for (Event::all_watchers) {
2113 $_->cancel if $_->data & WF_AUTOCANCEL; 2367 $_->cancel if $_->data & WF_AUTOCANCEL;
2114 } 2368 }
2115 2369
2370 warn "flushing outstanding aio requests";
2371 for (;;) {
2372 IO::AIO::flush;
2373 Coro::cede;
2374 last unless IO::AIO::nreqs;
2375 warn "iterate...";
2376 }
2377
2116 # cancel all extension coros 2378 warn "cancelling all extension coros";
2117 $_->cancel for values %EXT_CORO; 2379 $_->cancel for values %EXT_CORO;
2118 %EXT_CORO = (); 2380 %EXT_CORO = ();
2119 2381
2120 # unload all extensions 2382 warn "removing commands";
2121 for (@exts) { 2383 %COMMAND = ();
2384
2385 warn "removing ext commands";
2386 %EXTCMD = ();
2387
2388 warn "unloading/nuking all extensions";
2389 for my $pkg (@EXTS) {
2122 warn "unloading <$_>"; 2390 warn "... unloading $pkg";
2123 unload_extension $_; 2391
2392 if (my $cb = $pkg->can ("unload")) {
2393 eval {
2394 $cb->($pkg);
2395 1
2396 } or warn "$pkg unloaded, but with errors: $@";
2124 } 2397 }
2125 2398
2399 warn "... nuking $pkg";
2400 Symbol::delete_package $pkg;
2401 }
2402
2126 # unload all modules loaded from $LIBDIR 2403 warn "unloading all perl modules loaded from $LIBDIR";
2127 while (my ($k, $v) = each %INC) { 2404 while (my ($k, $v) = each %INC) {
2128 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2405 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2129 2406
2130 warn "removing <$k>"; 2407 warn "... unloading $k";
2131 delete $INC{$k}; 2408 delete $INC{$k};
2132 2409
2133 $k =~ s/\.pm$//; 2410 $k =~ s/\.pm$//;
2134 $k =~ s/\//::/g; 2411 $k =~ s/\//::/g;
2135 2412
2138 } 2415 }
2139 2416
2140 Symbol::delete_package $k; 2417 Symbol::delete_package $k;
2141 } 2418 }
2142 2419
2143 # sync database to disk
2144 cf::db_sync;
2145 IO::AIO::flush;
2146
2147 # get rid of safe::, as good as possible 2420 warn "getting rid of safe::, as good as possible";
2148 Symbol::delete_package "safe::$_" 2421 Symbol::delete_package "safe::$_"
2149 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2422 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2150 2423
2151 # remove register_script_function callbacks
2152 # TODO
2153
2154 # unload cf.pm "a bit" 2424 warn "unloading cf.pm \"a bit\"";
2155 delete $INC{"cf.pm"}; 2425 delete $INC{"cf.pm"};
2156 2426
2157 # don't, removes xs symbols, too, 2427 # don't, removes xs symbols, too,
2158 # and global variables created in xs 2428 # and global variables created in xs
2159 #Symbol::delete_package __PACKAGE__; 2429 #Symbol::delete_package __PACKAGE__;
2160 2430
2161 # reload cf.pm 2431 warn "unload completed, starting to reload now";
2432
2162 warn "reloading cf.pm"; 2433 warn "reloading cf.pm";
2163 require cf; 2434 require cf;
2164 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2435 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2165 2436
2166 # load config and database again 2437 warn "loading config and database again";
2167 cf::cfg_load; 2438 cf::cfg_load;
2168 cf::db_load; 2439 cf::db_load;
2169 2440
2170 # load extensions
2171 warn "load extensions"; 2441 warn "loading extensions";
2172 cf::load_extensions; 2442 cf::load_extensions;
2173 2443
2174 # reattach attachments to objects 2444 warn "reattaching attachments to objects/players";
2175 warn "reattach";
2176 _global_reattach; 2445 _global_reattach;
2446 warn "reattaching attachments to maps";
2177 reattach $_ for values %MAP; 2447 reattach $_ for values %MAP;
2448
2449 warn "restarting server ticker";
2450
2451 $TICK_WATCHER->start;
2178 }; 2452 };
2179 2453
2180 if ($@) { 2454 if ($@) {
2181 warn $@; 2455 warn $@;
2182 warn "error while reloading, exiting."; 2456 warn "error while reloading, exiting.";
2183 exit 1; 2457 exit 1;
2184 } 2458 }
2185 2459
2186 warn "reloaded successfully"; 2460 warn "reloaded";
2187}; 2461};
2188 2462
2189############################################################################# 2463our $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 2464
2234register_command "reload" => sub { 2465register_command "reload" => sub {
2235 my ($who, $arg) = @_; 2466 my ($who, $arg) = @_;
2236 2467
2237 if ($who->flag (FLAG_WIZ)) { 2468 if ($who->flag (FLAG_WIZ)) {
2238 $who->message ("start of reload."); 2469 $who->message ("reloading server.");
2470
2471 # doing reload synchronously and two reloads happen back-to-back,
2472 # coro crashes during coro_state_free->destroy here.
2473
2474 $RELOAD_WATCHER ||= Event->timer (
2475 reentrant => 0,
2476 after => 0,
2477 data => WF_AUTOCANCEL,
2478 cb => sub {
2239 reload; 2479 reload;
2240 $who->message ("end of reload."); 2480 undef $RELOAD_WATCHER;
2481 },
2482 );
2241 } 2483 }
2242}; 2484};
2243 2485
2244unshift @INC, $LIBDIR; 2486unshift @INC, $LIBDIR;
2487
2488my $bug_warning = 0;
2245 2489
2246$TICK_WATCHER = Event->timer ( 2490$TICK_WATCHER = Event->timer (
2247 reentrant => 0, 2491 reentrant => 0,
2492 parked => 1,
2248 prio => 0, 2493 prio => 0,
2249 at => $NEXT_TICK || $TICK, 2494 at => $NEXT_TICK || $TICK,
2250 data => WF_AUTOCANCEL, 2495 data => WF_AUTOCANCEL,
2251 cb => sub { 2496 cb => sub {
2497 if ($Coro::current != $Coro::main) {
2498 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2499 unless ++$bug_warning > 10;
2500 return;
2501 }
2502
2503 $NOW = Event::time;
2504
2252 cf::server_tick; # one server iteration 2505 cf::server_tick; # one server iteration
2253 $RUNTIME += $TICK; 2506 $RUNTIME += $TICK;
2254 $NEXT_TICK += $TICK; 2507 $NEXT_TICK += $TICK;
2508
2509 $WAIT_FOR_TICK->broadcast;
2510 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2511
2512 Event::sweep;
2513 Coro::cede_notself;
2514
2515# my $AFTER = Event::time;
2516# warn $AFTER - $NOW;#d#
2255 2517
2256 # if we are delayed by four ticks or more, skip them all 2518 # if we are delayed by four ticks or more, skip them all
2257 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2519 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2258 2520
2259 $TICK_WATCHER->at ($NEXT_TICK); 2521 $TICK_WATCHER->at ($NEXT_TICK);
2260 $TICK_WATCHER->start; 2522 $TICK_WATCHER->start;
2261 }, 2523 },
2262); 2524);
2263 2525
2264IO::AIO::max_poll_time $TICK * 0.2; 2526IO::AIO::max_poll_time $TICK * 0.1;
2265 2527
2266Event->io ( 2528undef $Coro::AIO::WATCHER;
2529$AIO_POLL_WATCHER = Event->io (
2530 reentrant => 0,
2267 fd => IO::AIO::poll_fileno, 2531 fd => IO::AIO::poll_fileno,
2268 poll => 'r', 2532 poll => 'r',
2269 prio => 5, 2533 prio => 6,
2270 data => WF_AUTOCANCEL, 2534 data => WF_AUTOCANCEL,
2271 cb => \&IO::AIO::poll_cb, 2535 cb => \&IO::AIO::poll_cb,
2272); 2536);
2273 2537
2274Event->timer ( 2538$WRITE_RUNTIME_WATCHER = Event->timer (
2539 reentrant => 0,
2275 data => WF_AUTOCANCEL, 2540 data => WF_AUTOCANCEL,
2276 after => 0, 2541 after => 1,
2277 interval => 10, 2542 interval => 10,
2278 cb => sub { 2543 prio => 6, # keep it lowest so it acts like a watchdog
2279 (Coro::unblock_sub { 2544 cb => Coro::unblock_sub {
2280 write_runtime 2545 write_runtime
2281 or warn "ERROR: unable to write runtime file: $!"; 2546 or warn "ERROR: unable to write runtime file: $!";
2282 })->();
2283 }, 2547 },
2284); 2548);
2285 2549
2286END { cf::emergency_save } 2550END { cf::emergency_save }
2287 2551

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines