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.127 by root, Wed Jan 3 00:05:26 2007 UTC vs.
Revision 1.169 by root, Sun Jan 14 01:09:46 2007 UTC

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 (2); # 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
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
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
59our %PLAYER; # all users
52our %MAP; # all maps 60our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 61our $LINK_MAP; # the special {link} map, which is always available
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 62our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 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 86our $EMERGENCY_POSITION;
75our $LINK_MAP;
76
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 87
79############################################################################# 88#############################################################################
80 89
81=head2 GLOBAL VARIABLES 90=head2 GLOBAL VARIABLES
82 91
106 115
107=item %cf::CFG 116=item %cf::CFG
108 117
109Configuration for the server, loaded from C</etc/crossfire/config>, or 118Configuration for the server, loaded from C</etc/crossfire/config>, or
110from wherever your confdir points to. 119from wherever your confdir points to.
120
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
122
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
125processing has been done. Call C<< ->wait >> on them to maximise the
126window of cpu time available, or simply to synchronise to the server tick.
111 127
112=back 128=back
113 129
114=cut 130=cut
115 131
119 utf8::encode $msg; 135 utf8::encode $msg;
120 136
121 $msg .= "\n" 137 $msg .= "\n"
122 unless $msg =~ /\n$/; 138 unless $msg =~ /\n$/;
123 139
124 LOG llevError, "cfperl: $msg"; 140 LOG llevError, $msg;
125 }; 141 };
126} 142}
127 143
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 144@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 145@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
147 163
148$Event::DIED = sub { 164$Event::DIED = sub {
149 warn "error in event callback: @_"; 165 warn "error in event callback: @_";
150}; 166};
151 167
152my %ext_pkg;
153my @exts;
154my @hook;
155
156=head2 UTILITY FUNCTIONS 168=head2 UTILITY FUNCTIONS
157 169
158=over 4 170=over 4
159 171
172=item dumpval $ref
173
160=cut 174=cut
175
176sub dumpval {
177 eval {
178 local $SIG{__DIE__};
179 my $d;
180 if (1) {
181 $d = new Data::Dumper([$_[0]], ["*var"]);
182 $d->Terse(1);
183 $d->Indent(2);
184 $d->Quotekeys(0);
185 $d->Useqq(1);
186 #$d->Bless(...);
187 $d->Seen($_[1]) if @_ > 1;
188 $d = $d->Dump();
189 }
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d
192 } || "[unable to dump $_[0]: '$@']";
193}
161 194
162use JSON::Syck (); # TODO# replace by JSON::PC once working 195use JSON::Syck (); # TODO# replace by JSON::PC once working
163 196
164=item $ref = cf::from_json $json 197=item $ref = cf::from_json $json
165 198
181sub to_json($) { 214sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 216 JSON::Syck::Dump $_[0]
184} 217}
185 218
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string 219=item cf::lock_wait $string
209 220
210Wait until the given lock is available. See cf::lock_acquire. 221Wait until the given lock is available. See cf::lock_acquire.
211 222
212=item my $lock = cf::lock_acquire $string 223=item my $lock = cf::lock_acquire $string
213 224
214Wait until the given lock is available and then acquires it and returns 225Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope, 226a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 227for example when the coroutine gets canceled), the lock is automatically
217returned. 228returned.
218 229
219Lock names should begin with a unique identifier (for example, find_map 230Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 231uses map_find and cf::map::load uses map_load).
221 232
222=cut 233=cut
223 234
224our %LOCK; 235our %LOCK;
225 236
239 # wait, to be sure we are not locked 250 # wait, to be sure we are not locked
240 lock_wait $key; 251 lock_wait $key;
241 252
242 $LOCK{$key} = []; 253 $LOCK{$key} = [];
243 254
244 cf::guard { 255 Coro::guard {
245 # wake up all waiters, to be on the safe side 256 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 257 $_->ready for @{ delete $LOCK{$key} };
247 } 258 }
248} 259}
249 260
261sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active;
263
264 my $guard = Coro::guard {
265 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop;
270 $guard
271}
272
250=item cf::async { BLOCK } 273=item cf::async { BLOCK }
251 274
252Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the 275Currently the same as Coro::async_pool, meaning you cannot use
253error instead of exiting the server in case of a problem. 276C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
277thing you are allowed to do is call C<prio> on it.
254 278
255=cut 279=cut
256 280
257sub async(&) { 281BEGIN { *async = \&Coro::async_pool }
258 my ($cb) = @_;
259
260 Coro::async {
261 eval { $cb->() };
262 warn $@ if $@;
263 }
264}
265 282
266=item cf::sync_job { BLOCK } 283=item cf::sync_job { BLOCK }
267 284
268The design of crossfire+ requires that the main coro ($Coro::main) is 285The design of crossfire+ requires that the main coro ($Coro::main) is
269always able to handle events or runnable, as crossfire+ is only partly 286always able to handle events or runnable, as crossfire+ is only partly
283 # this is the main coro, too bad, we have to block 300 # this is the main coro, too bad, we have to block
284 # till the operation succeeds, freezing the server :/ 301 # till the operation succeeds, freezing the server :/
285 302
286 # TODO: use suspend/resume instead 303 # TODO: use suspend/resume instead
287 # (but this is cancel-safe) 304 # (but this is cancel-safe)
288 local $FREEZE = 1; 305 my $freeze_guard = freeze_mainloop;
289 306
290 my $busy = 1; 307 my $busy = 1;
291 my @res; 308 my @res;
292 309
293 (Coro::async { 310 (async {
294 @res = eval { $job->() }; 311 @res = eval { $job->() };
295 warn $@ if $@; 312 warn $@ if $@;
296 undef $busy; 313 undef $busy;
297 })->prio (Coro::PRIO_MAX); 314 })->prio (Coro::PRIO_MAX);
298 315
299 while ($busy) { 316 while ($busy) {
300 Coro::cede_notself; 317 Coro::cede or Event::one_event;
301 Event::one_event unless Coro::nready;
302 } 318 }
303 319
304 wantarray ? @res : $res[0] 320 wantarray ? @res : $res[0]
305 } else { 321 } else {
306 # we are in another coroutine, how wonderful, everything just works 322 # we are in another coroutine, how wonderful, everything just works
307 323
308 $job->() 324 $job->()
309 } 325 }
310} 326}
311 327
312=item $coro = cf::coro { BLOCK } 328=item $coro = cf::async_ext { BLOCK }
313 329
314Creates and returns a new coro. This coro is automcatially being canceled 330Like async, but this coro is automatically being canceled when the
315when the extension calling this is being unloaded. 331extension calling this is being unloaded.
316 332
317=cut 333=cut
318 334
319sub coro(&) { 335sub async_ext(&) {
320 my $cb = shift; 336 my $cb = shift;
321 337
322 my $coro = &cf::async ($cb); 338 my $coro = &Coro::async ($cb);
323 339
324 $coro->on_destroy (sub { 340 $coro->on_destroy (sub {
325 delete $EXT_CORO{$coro+0}; 341 delete $EXT_CORO{$coro+0};
326 }); 342 });
327 $EXT_CORO{$coro+0} = $coro; 343 $EXT_CORO{$coro+0} = $coro;
352} 368}
353 369
354=back 370=back
355 371
356=cut 372=cut
357
358#############################################################################
359
360package cf::path;
361
362sub new {
363 my ($class, $path, $base) = @_;
364
365 $path = $path->as_string if ref $path;
366
367 my $self = bless { }, $class;
368
369 # {... are special paths that are not touched
370 # ?xxx/... are special absolute paths
371 # ?random/... random maps
372 # /! non-realised random map exit
373 # /... normal maps
374 # ~/... per-player maps without a specific player (DO NOT USE)
375 # ~user/... per-player map of a specific user
376
377 if ($path =~ /^{/) {
378 # fine as it is
379 } elsif ($path =~ s{^\?random/}{}) {
380 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
381 $self->{random} = cf::from_json $data;
382 } else {
383 if ($path =~ s{^~([^/]+)?}{}) {
384 $self->{user_rel} = 1;
385
386 if (defined $1) {
387 $self->{user} = $1;
388 } elsif ($base =~ m{^~([^/]+)/}) {
389 $self->{user} = $1;
390 } else {
391 warn "cannot resolve user-relative path without user <$path,$base>\n";
392 }
393 } elsif ($path =~ /^\//) {
394 # already absolute
395 } else {
396 $base =~ s{[^/]+/?$}{};
397 return $class->new ("$base/$path");
398 }
399
400 for ($path) {
401 redo if s{/\.?/}{/};
402 redo if s{/[^/]+/\.\./}{/};
403 }
404 }
405
406 $self->{path} = $path;
407
408 $self
409}
410
411# the name / primary key / in-game path
412sub as_string {
413 my ($self) = @_;
414
415 $self->{user_rel} ? "~$self->{user}$self->{path}"
416 : $self->{random} ? "?random/$self->{path}"
417 : $self->{path}
418}
419
420# the displayed name, this is a one way mapping
421sub visible_name {
422 my ($self) = @_;
423
424# if (my $rmp = $self->{random}) {
425# # todo: be more intelligent about this
426# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
427# } else {
428 $self->as_string
429# }
430}
431
432# escape the /'s in the path
433sub _escaped_path {
434 # ∕ is U+2215
435 (my $path = $_[0]{path}) =~ s/\//∕/g;
436 $path
437}
438
439# the original (read-only) location
440sub load_path {
441 my ($self) = @_;
442
443 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
444}
445
446# the temporary/swap location
447sub save_path {
448 my ($self) = @_;
449
450 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
451 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
452 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
453}
454
455# the unique path, might be eq to save_path
456sub uniq_path {
457 my ($self) = @_;
458
459 $self->{user_rel} || $self->{random}
460 ? undef
461 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
462}
463
464# return random map parameters, or undef
465sub random_map_params {
466 my ($self) = @_;
467
468 $self->{random}
469}
470
471# this is somewhat ugly, but style maps do need special treatment
472sub is_style_map {
473 $_[0]{path} =~ m{^/styles/}
474}
475
476package cf;
477 373
478############################################################################# 374#############################################################################
479 375
480=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
481 377
787# object support 683# object support
788 684
789sub reattach { 685sub reattach {
790 # basically do the same as instantiate, without calling instantiate 686 # basically do the same as instantiate, without calling instantiate
791 my ($obj) = @_; 687 my ($obj) = @_;
688
689 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
792 690
793 my $registry = $obj->registry; 691 my $registry = $obj->registry;
794 692
795 @$registry = (); 693 @$registry = ();
796 694
928=cut 826=cut
929 827
930sub register_extcmd { 828sub register_extcmd {
931 my ($name, $cb) = @_; 829 my ($name, $cb) = @_;
932 830
933 my $caller = caller;
934 #warn "registering extcmd '$name' to '$caller'";
935
936 $EXTCMD{$name} = [$cb, $caller]; 831 $EXTCMD{$name} = $cb;
937} 832}
938 833
939cf::player->attach ( 834cf::player->attach (
940 on_command => sub { 835 on_command => sub {
941 my ($pl, $name, $params) = @_; 836 my ($pl, $name, $params) = @_;
954 849
955 my $msg = eval { from_json $buf }; 850 my $msg = eval { from_json $buf };
956 851
957 if (ref $msg) { 852 if (ref $msg) {
958 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 853 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
959 if (my %reply = $cb->[0]->($pl, $msg)) { 854 if (my %reply = $cb->($pl, $msg)) {
960 $pl->ext_reply ($msg->{msgid}, %reply); 855 $pl->ext_reply ($msg->{msgid}, %reply);
961 } 856 }
962 } 857 }
963 } else { 858 } else {
964 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 859 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
966 861
967 cf::override; 862 cf::override;
968 }, 863 },
969); 864);
970 865
971sub register {
972 my ($base, $pkg) = @_;
973
974 #TODO
975}
976
977sub load_extension { 866sub load_extension {
978 my ($path) = @_; 867 my ($path) = @_;
979 868
980 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 869 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
981 my $base = $1; 870 my $base = $1;
982 my $pkg = $1; 871 my $pkg = $1;
983 $pkg =~ s/[^[:word:]]/_/g; 872 $pkg =~ s/[^[:word:]]/_/g;
984 $pkg = "ext::$pkg"; 873 $pkg = "ext::$pkg";
985 874
986 warn "loading '$path' into '$pkg'\n"; 875 warn "... loading '$path' into '$pkg'\n";
987 876
988 open my $fh, "<:utf8", $path 877 open my $fh, "<:utf8", $path
989 or die "$path: $!"; 878 or die "$path: $!";
990 879
991 my $source = 880 my $source =
992 "package $pkg; use strict; use utf8;\n" 881 "package $pkg; use strict; use utf8;\n"
993 . "#line 1 \"$path\"\n{\n" 882 . "#line 1 \"$path\"\n{\n"
994 . (do { local $/; <$fh> }) 883 . (do { local $/; <$fh> })
995 . "\n};\n1"; 884 . "\n};\n1";
996 885
997 eval $source 886 unless (eval $source) {
998 or die $@ ? "$path: $@\n" 887 my $msg = $@ ? "$path: $@\n"
999 : "extension disabled.\n"; 888 : "extension disabled.\n";
1000 889 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1001 push @exts, $pkg; 890 warn $@;
1002 $ext_pkg{$base} = $pkg; 891 warn "mandatory extension failed to load, exiting.\n";
1003 892 exit 1;
1004# no strict 'refs'; 893 }
1005# @{"$pkg\::ISA"} = ext::; 894 die $@;
1006
1007 register $base, $pkg;
1008}
1009
1010sub unload_extension {
1011 my ($pkg) = @_;
1012
1013 warn "removing extension $pkg\n";
1014
1015 # remove hooks
1016 #TODO
1017# for my $idx (0 .. $#PLUGIN_EVENT) {
1018# delete $hook[$idx]{$pkg};
1019# } 895 }
1020 896
1021 # remove commands 897 push @EXTS, $pkg;
1022 for my $name (keys %COMMAND) {
1023 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1024
1025 if (@cb) {
1026 $COMMAND{$name} = \@cb;
1027 } else {
1028 delete $COMMAND{$name};
1029 }
1030 }
1031
1032 # remove extcmds
1033 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1034 delete $EXTCMD{$name};
1035 }
1036
1037 if (my $cb = $pkg->can ("unload")) {
1038 eval {
1039 $cb->($pkg);
1040 1
1041 } or warn "$pkg unloaded, but with errors: $@";
1042 }
1043
1044 Symbol::delete_package $pkg;
1045} 898}
1046 899
1047sub load_extensions { 900sub load_extensions {
1048 for my $ext (<$LIBDIR/*.ext>) { 901 for my $ext (<$LIBDIR/*.ext>) {
1049 next unless -r $ext; 902 next unless -r $ext;
1053 } or warn "$ext not loaded: $@"; 906 } or warn "$ext not loaded: $@";
1054 } 907 }
1055} 908}
1056 909
1057############################################################################# 910#############################################################################
1058# load/save/clean perl data associated with a map
1059
1060*cf::mapsupport::on_clean = sub {
1061 my ($map) = @_;
1062
1063 my $path = $map->tmpname;
1064 defined $path or return;
1065
1066 unlink "$path.pst";
1067};
1068
1069cf::map->attach (prio => -10000, package => cf::mapsupport::);
1070
1071#############################################################################
1072# load/save perl data associated with player->ob objects
1073
1074sub all_objects(@) {
1075 @_, map all_objects ($_->inv), @_
1076}
1077
1078# TODO: compatibility cruft, remove when no longer needed
1079cf::player->attach (
1080 on_load => sub {
1081 my ($pl, $path) = @_;
1082
1083 for my $o (all_objects $pl->ob) {
1084 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1085 $o->set_ob_key_value ("_perl_data");
1086
1087 %$o = %{ Storable::thaw pack "H*", $value };
1088 }
1089 }
1090 },
1091);
1092
1093#############################################################################
1094 911
1095=head2 CORE EXTENSIONS 912=head2 CORE EXTENSIONS
1096 913
1097Functions and methods that extend core crossfire objects. 914Functions and methods that extend core crossfire objects.
1098 915
916=cut
917
918package cf::player;
919
920use Coro::AIO;
921
1099=head3 cf::player 922=head3 cf::player
1100 923
1101=over 4 924=over 4
1102 925
1103=item cf::player::exists $login 926=item cf::player::find $login
1104 927
1105Returns true when the given account exists. 928Returns the given player object, loading it if necessary (might block).
1106 929
1107=cut 930=cut
1108 931
1109sub cf::player::exists($) { 932sub playerdir($) {
1110 cf::player::find $_[0] 933 cf::localdir
1111 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 934 . "/"
935 . cf::playerdir
936 . "/"
937 . (ref $_[0] ? $_[0]->ob->name : $_[0])
938}
939
940sub path($) {
941 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
942
943 (playerdir $login) . "/$login.pl"
944}
945
946sub find_active($) {
947 $cf::PLAYER{$_[0]}
948 and $cf::PLAYER{$_[0]}->active
949 and $cf::PLAYER{$_[0]}
950}
951
952sub exists($) {
953 my ($login) = @_;
954
955 $cf::PLAYER{$login}
956 or cf::sync_job { !aio_stat $login }
957}
958
959sub find($) {
960 return $cf::PLAYER{$_[0]} || do {
961 my $login = $_[0];
962
963 my $guard = cf::lock_acquire "user_find:$login";
964
965 $cf::PLAYER{$_[0]} || do {
966 my $pl = load_pl path $login
967 or return;
968 $cf::PLAYER{$login} = $pl
969 }
970 }
971}
972
973sub save($) {
974 my ($pl) = @_;
975
976 return if $pl->{deny_save};
977
978 my $path = path $pl;
979 my $guard = cf::lock_acquire "user_save:$path";
980
981 return if $pl->{deny_save};
982
983 aio_mkdir playerdir $pl, 0770;
984 $pl->{last_save} = $cf::RUNTIME;
985
986 $pl->save_pl ($path);
987 Coro::cede;
988}
989
990sub new($) {
991 my ($login) = @_;
992
993 my $self = create;
994
995 $self->ob->name ($login);
996 $self->{deny_save} = 1;
997
998 $cf::PLAYER{$login} = $self;
999
1000 $self
1001}
1002
1003=item $pl->quit_character
1004
1005Nukes the player without looking back. If logged in, the connection will
1006be destroyed. May block for a long time.
1007
1008=cut
1009
1010sub quit_character {
1011 my ($pl) = @_;
1012
1013 $pl->{deny_save} = 1;
1014 $pl->password ("*"); # this should lock out the player until we nuked the dir
1015
1016 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1017 $pl->deactivate;
1018 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1019 $pl->ns->destroy if $pl->ns;
1020
1021 my $path = playerdir $pl;
1022 my $temp = "$path~$cf::RUNTIME~deleting~";
1023 aio_rename $path, $temp;
1024 delete $cf::PLAYER{$pl->ob->name};
1025 $pl->destroy;
1026 IO::AIO::aio_rmtree $temp;
1027}
1028
1029=item cf::player::list_logins
1030
1031Returns am arrayref of all valid playernames in the system, can take a
1032while and may block, so not sync_job-capable, ever.
1033
1034=cut
1035
1036sub list_logins {
1037 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1038 or return [];
1039
1040 my @logins;
1041
1042 for my $login (@$dirs) {
1043 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1044 aio_read $fh, 0, 512, my $buf, 0 or next;
1045 $buf !~ /^password -------------$/m or next; # official not-valid tag
1046
1047 utf8::decode $login;
1048 push @logins, $login;
1049 }
1050
1051 \@logins
1052}
1053
1054=item $player->maps
1055
1056Returns an arrayref of map paths that are private for this
1057player. May block.
1058
1059=cut
1060
1061sub maps($) {
1062 my ($pl) = @_;
1063
1064 my $files = aio_readdir playerdir $pl
1065 or return;
1066
1067 my @paths;
1068
1069 for (@$files) {
1070 utf8::decode $_;
1071 next if /\.(?:pl|pst)$/;
1072 next unless /^$PATH_SEP/o;
1073
1074 s/\.map$//;
1075 push @paths, "~" . $pl->ob->name . "/" . $_;
1076 }
1077
1078 \@paths
1112} 1079}
1113 1080
1114=item $player->ext_reply ($msgid, $msgtype, %msg) 1081=item $player->ext_reply ($msgid, $msgtype, %msg)
1115 1082
1116Sends an ext reply to the player. 1083Sends an ext reply to the player.
1117 1084
1118=cut 1085=cut
1119 1086
1120sub cf::player::ext_reply($$$%) { 1087sub ext_reply($$$%) {
1121 my ($self, $id, %msg) = @_; 1088 my ($self, $id, %msg) = @_;
1122 1089
1123 $msg{msgid} = $id; 1090 $msg{msgid} = $id;
1124 1091
1125 $self->send ("ext " . to_json \%msg); 1092 $self->send ("ext " . cf::to_json \%msg);
1126} 1093}
1094
1095package cf;
1127 1096
1128=back 1097=back
1129 1098
1130 1099
1131=head3 cf::map 1100=head3 cf::map
1137package cf::map; 1106package cf::map;
1138 1107
1139use Fcntl; 1108use Fcntl;
1140use Coro::AIO; 1109use Coro::AIO;
1141 1110
1111use overload
1112 '""' => \&as_string;
1113
1142our $MAX_RESET = 7200; 1114our $MAX_RESET = 3600;
1143our $DEFAULT_RESET = 3600; 1115our $DEFAULT_RESET = 3000;
1144 1116
1145sub generate_random_map { 1117sub generate_random_map {
1146 my ($path, $rmp) = @_; 1118 my ($self, $rmp) = @_;
1147 1119
1148 # mit "rum" bekleckern, nicht 1120 # mit "rum" bekleckern, nicht
1149 cf::map::_create_random_map 1121 $self->_create_random_map (
1150 $path,
1151 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1122 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1152 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1123 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1153 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1124 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1154 $rmp->{exit_on_final_map}, 1125 $rmp->{exit_on_final_map},
1155 $rmp->{xsize}, $rmp->{ysize}, 1126 $rmp->{xsize}, $rmp->{ysize},
1156 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1127 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1157 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1128 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1158 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1129 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1159 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1130 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1160 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1131 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1161 (cf::region::find $rmp->{region}) 1132 (cf::region::find $rmp->{region}), $rmp->{custom}
1133 )
1134}
1135
1136sub register {
1137 my (undef, $regex) = @_;
1138 my $pkg = caller;
1139
1140 no strict;
1141 push @{"$pkg\::ISA"}, __PACKAGE__;
1142
1143 $EXT_MAP{$pkg} = qr<$regex>;
1144}
1145
1146# also paths starting with '/'
1147$EXT_MAP{"cf::map"} = qr{^(?=/)};
1148
1149sub normalise {
1150 my ($path, $base) = @_;
1151
1152 # map plan:
1153 #
1154 # /! non-realised random map exit (special hack!)
1155 # {... are special paths that are not being touched
1156 # ?xxx/... are special absolute paths
1157 # ?random/... random maps
1158 # /... normal maps
1159 # ~user/... per-player map of a specific user
1160
1161 $path =~ s/$PATH_SEP/\//go;
1162
1163 # treat it as relative path if it starts with
1164 # something that looks reasonable
1165 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1166 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1167
1168 $base =~ s{[^/]+/?$}{};
1169 $path = "$base/$path";
1170 }
1171
1172 for ($path) {
1173 redo if s{//}{/};
1174 redo if s{/\.?/}{/};
1175 redo if s{/[^/]+/\.\./}{/};
1176 }
1177
1178 $path
1179}
1180
1181sub new_from_path {
1182 my (undef, $path, $base) = @_;
1183
1184 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1185
1186 $path = normalise $path, $base;
1187
1188 for my $pkg (keys %EXT_MAP) {
1189 if ($path =~ $EXT_MAP{$pkg}) {
1190 my $self = bless cf::map::new, $pkg;
1191 $self->{path} = $path; $self->path ($path);
1192 $self->init; # pass $1 etc.
1193 return $self;
1194 }
1195 }
1196
1197 Carp::carp "unable to resolve path '$path'.";
1198 ()
1199}
1200
1201sub init {
1202 my ($self) = @_;
1203
1204 $self
1205}
1206
1207sub as_string {
1208 my ($self) = @_;
1209
1210 "$self->{path}"
1211}
1212
1213# the displayed name, this is a one way mapping
1214sub visible_name {
1215 &as_string
1216}
1217
1218# the original (read-only) location
1219sub load_path {
1220 my ($self) = @_;
1221
1222 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1223}
1224
1225# the temporary/swap location
1226sub save_path {
1227 my ($self) = @_;
1228
1229 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1230 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1231}
1232
1233# the unique path, undef == no special unique path
1234sub uniq_path {
1235 my ($self) = @_;
1236
1237 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1238 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1162} 1239}
1163 1240
1164# and all this just because we cannot iterate over 1241# and all this just because we cannot iterate over
1165# all maps in C++... 1242# all maps in C++...
1166sub change_all_map_light { 1243sub change_all_map_light {
1168 1245
1169 $_->change_map_light ($change) 1246 $_->change_map_light ($change)
1170 for grep $_->outdoor, values %cf::MAP; 1247 for grep $_->outdoor, values %cf::MAP;
1171} 1248}
1172 1249
1250sub unlink_save {
1251 my ($self) = @_;
1252
1253 utf8::encode (my $save = $self->save_path);
1254 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1255 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1256}
1257
1173sub try_load_header($) { 1258sub load_header_from($) {
1174 my ($path) = @_; 1259 my ($self, $path) = @_;
1175 1260
1176 utf8::encode $path; 1261 utf8::encode $path;
1177 aio_open $path, O_RDONLY, 0 1262 aio_open $path, O_RDONLY, 0
1178 or return; 1263 or return;
1179 1264
1180 my $map = cf::map::new 1265 $self->_load_header ($path)
1181 or return; 1266 or return;
1182 1267
1183 $map->load_header ($path) 1268 $self->{load_path} = $path;
1269
1270 1
1271}
1272
1273sub load_orig {
1274 my ($self) = @_;
1275
1276 $self->load_header_from ($self->load_path)
1277}
1278
1279sub load_temp {
1280 my ($self) = @_;
1281
1282 $self->load_header_from ($self->save_path)
1283}
1284
1285sub load_header {
1286 my ($self) = @_;
1287
1288 if ($self->load_temp) {
1289 $self->last_access ((delete $self->{last_access})
1290 || $cf::RUNTIME); #d#
1291 # safety
1292 $self->{instantiate_time} = $cf::RUNTIME
1293 if $self->{instantiate_time} > $cf::RUNTIME;
1294 } else {
1295 $self->load_orig
1184 or return; 1296 or return;
1185 1297
1186 $map->{load_path} = $path; 1298 $self->{load_original} = 1;
1299 $self->{instantiate_time} = $cf::RUNTIME;
1300 $self->last_access ($cf::RUNTIME);
1301 $self->instantiate;
1302 }
1187 1303
1188 $map 1304 1
1189} 1305}
1190 1306
1191sub find_map; 1307sub find;
1192sub find_map { 1308sub find {
1193 my ($path, $origin) = @_; 1309 my ($path, $origin) = @_;
1194 1310
1195 #warn "find_map<$path,$origin>\n";#d#
1196
1197 $path = new cf::path $path, $origin && $origin->path; 1311 $path = normalise $path, $origin && $origin->path;
1198 my $key = $path->as_string;
1199 1312
1200 cf::lock_wait "map_find:$key"; 1313 cf::lock_wait "map_find:$path";
1201 1314
1202 $cf::MAP{$key} || do { 1315 $cf::MAP{$path} || do {
1203 my $guard = cf::lock_acquire "map_find:$key"; 1316 my $guard = cf::lock_acquire "map_find:$path";
1204 1317 my $map = new_from_path cf::map $path
1205 # do it the slow way
1206 my $map = try_load_header $path->save_path;
1207
1208 if ($map) {
1209 # safety
1210 $map->{instantiate_time} = $cf::RUNTIME
1211 if $map->{instantiate_time} > $cf::RUNTIME;
1212 } else {
1213 if (my $rmp = $path->random_map_params) {
1214 $map = generate_random_map $key, $rmp;
1215 } else {
1216 $map = try_load_header $path->load_path;
1217 }
1218
1219 $map or return; 1318 or return;
1220 1319
1221 $map->{load_original} = 1;
1222 $map->{instantiate_time} = $cf::RUNTIME;
1223 $map->instantiate;
1224
1225 # per-player maps become, after loading, normal maps
1226 $map->per_player (0) if $path->{user_rel};
1227 }
1228
1229 $map->path ($key);
1230 $map->{path} = $path;
1231 $map->{last_save} = $cf::RUNTIME; 1320 $map->{last_save} = $cf::RUNTIME;
1232 $map->last_access ($cf::RUNTIME); 1321
1322 $map->load_header
1323 or return;
1233 1324
1234 if ($map->should_reset) { 1325 if ($map->should_reset) {
1235 $map->reset; 1326 $map->reset;
1236 undef $guard; 1327 undef $guard;
1237 $map = find_map $path 1328 $map = find $path
1238 or return; 1329 or return;
1239 } 1330 }
1240 1331
1241 $cf::MAP{$key} = $map 1332 $cf::MAP{$path} = $map
1242 } 1333 }
1243} 1334}
1244 1335
1245sub load { 1336sub load {
1246 my ($self) = @_; 1337 my ($self) = @_;
1247 1338
1248 my $path = $self->{path}; 1339 my $path = $self->{path};
1249 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1340 my $guard = cf::lock_acquire "map_load:$path";
1250 1341
1251 return if $self->in_memory != cf::MAP_SWAPPED; 1342 return if $self->in_memory != cf::MAP_SWAPPED;
1252 1343
1253 $self->in_memory (cf::MAP_LOADING); 1344 $self->in_memory (cf::MAP_LOADING);
1254 1345
1255 $self->alloc; 1346 $self->alloc;
1256 $self->load_objects ($self->{load_path}, 1) 1347 $self->_load_objects ($self->{load_path}, 1)
1257 or return; 1348 or return;
1258 1349
1259 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1350 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1260 if delete $self->{load_original}; 1351 if delete $self->{load_original};
1261 1352
1262 if (my $uniq = $path->uniq_path) { 1353 if (my $uniq = $self->uniq_path) {
1263 utf8::encode $uniq; 1354 utf8::encode $uniq;
1264 if (aio_open $uniq, O_RDONLY, 0) { 1355 if (aio_open $uniq, O_RDONLY, 0) {
1265 $self->clear_unique_items; 1356 $self->clear_unique_items;
1266 $self->load_objects ($uniq, 0); 1357 $self->_load_objects ($uniq, 0);
1267 } 1358 }
1268 } 1359 }
1360
1361 Coro::cede;
1269 1362
1270 # now do the right thing for maps 1363 # now do the right thing for maps
1271 $self->link_multipart_objects; 1364 $self->link_multipart_objects;
1272 1365
1273 if ($self->{path}->is_style_map) { 1366 unless ($self->{deny_activate}) {
1274 $self->{deny_save} = 1; 1367 $self->decay_objects;
1275 $self->{deny_reset} = 1;
1276 } else {
1277 $self->fix_auto_apply; 1368 $self->fix_auto_apply;
1278 $self->decay_objects;
1279 $self->update_buttons; 1369 $self->update_buttons;
1370 Coro::cede;
1280 $self->set_darkness_map; 1371 $self->set_darkness_map;
1281 $self->difficulty ($self->estimate_difficulty) 1372 $self->difficulty ($self->estimate_difficulty)
1282 unless $self->difficulty; 1373 unless $self->difficulty;
1374 Coro::cede;
1283 $self->activate; 1375 $self->activate;
1284 } 1376 }
1285 1377
1286 $self->in_memory (cf::MAP_IN_MEMORY); 1378 $self->in_memory (cf::MAP_IN_MEMORY);
1287} 1379}
1288 1380
1289sub load_map_sync { 1381sub customise_for {
1382 my ($self, $ob) = @_;
1383
1384 return find "~" . $ob->name . "/" . $self->{path}
1385 if $self->per_player;
1386
1387 $self
1388}
1389
1390# find and load all maps in the 3x3 area around a map
1391sub load_diag {
1392 my ($map) = @_;
1393
1394 my @diag; # diagonal neighbours
1395
1396 for (0 .. 3) {
1397 my $neigh = $map->tile_path ($_)
1398 or next;
1399 $neigh = find $neigh, $map
1400 or next;
1401 $neigh->load;
1402
1403 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1404 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1405 }
1406
1407 for (@diag) {
1408 my $neigh = find @$_
1409 or next;
1410 $neigh->load;
1411 }
1412}
1413
1414sub find_sync {
1290 my ($path, $origin) = @_; 1415 my ($path, $origin) = @_;
1291 1416
1292 #warn "load_map_sync<$path, $origin>\n";#d# 1417 cf::sync_job { find $path, $origin }
1418}
1293 1419
1294 cf::sync_job { 1420sub do_load_sync {
1295 my $map = cf::map::find_map $path, $origin 1421 my ($map) = @_;
1422
1423 cf::sync_job { $map->load };
1424}
1425
1426our %MAP_PREFETCH;
1427our $MAP_PREFETCHER = Coro::async {
1428 while () {
1429 for my $path (keys %MAP_PREFETCH) {
1430 my $map = find $path
1296 or return; 1431 or next;
1297 $map->load; 1432 $map->load;
1298 $map 1433
1434 delete $MAP_PREFETCH{$path};
1435 }
1436 Coro::schedule;
1299 } 1437 }
1438};
1439
1440sub find_async {
1441 my ($path, $origin) = @_;
1442
1443 $path = normalise $path, $origin && $origin->{path};
1444
1445 if (my $map = $cf::MAP{$path}) {
1446 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1447 }
1448
1449 $MAP_PREFETCH{$path} = 0;
1450 $MAP_PREFETCHER->ready;
1451
1452 ()
1300} 1453}
1301 1454
1302sub save { 1455sub save {
1303 my ($self) = @_; 1456 my ($self) = @_;
1304 1457
1458 my $lock = cf::lock_acquire "map_data:" . $self->path;
1459
1305 $self->{last_save} = $cf::RUNTIME; 1460 $self->{last_save} = $cf::RUNTIME;
1306 1461
1307 return unless $self->dirty; 1462 return unless $self->dirty;
1308 1463
1309 my $save = $self->{path}->save_path; utf8::encode $save; 1464 my $save = $self->save_path; utf8::encode $save;
1310 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1465 my $uniq = $self->uniq_path; utf8::encode $uniq;
1311 1466
1312 $self->{load_path} = $save; 1467 $self->{load_path} = $save;
1313 1468
1314 return if $self->{deny_save}; 1469 return if $self->{deny_save};
1315 1470
1471 local $self->{last_access} = $self->last_access;#d#
1472
1473 cf::async {
1474 $_->contr->save for $self->players;
1475 };
1476
1316 if ($uniq) { 1477 if ($uniq) {
1317 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1478 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1318 $self->save_objects ($uniq, cf::IO_UNIQUES); 1479 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1319 } else { 1480 } else {
1320 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1481 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1321 } 1482 }
1322} 1483}
1323 1484
1324sub swap_out { 1485sub swap_out {
1325 my ($self) = @_; 1486 my ($self) = @_;
1487
1488 # save first because save cedes
1489 $self->save;
1490
1491 my $lock = cf::lock_acquire "map_data:" . $self->path;
1326 1492
1327 return if $self->players; 1493 return if $self->players;
1328 return if $self->in_memory != cf::MAP_IN_MEMORY; 1494 return if $self->in_memory != cf::MAP_IN_MEMORY;
1329 return if $self->{deny_save}; 1495 return if $self->{deny_save};
1330 1496
1331 $self->save;
1332 $self->clear; 1497 $self->clear;
1333 $self->in_memory (cf::MAP_SWAPPED); 1498 $self->in_memory (cf::MAP_SWAPPED);
1334} 1499}
1335 1500
1336sub reset_at { 1501sub reset_at {
1337 my ($self) = @_; 1502 my ($self) = @_;
1338 1503
1339 # TODO: safety, remove and allow resettable per-player maps 1504 # TODO: safety, remove and allow resettable per-player maps
1340 return 1e99 if $self->{path}{user_rel}; 1505 return 1e99 if $self->isa ("ext::map_per_player");#d#
1341 return 1e99 if $self->{deny_reset}; 1506 return 1e99 if $self->{deny_reset};
1342 1507
1343 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1508 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1344 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1509 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1345 1510
1350 my ($self) = @_; 1515 my ($self) = @_;
1351 1516
1352 $self->reset_at <= $cf::RUNTIME 1517 $self->reset_at <= $cf::RUNTIME
1353} 1518}
1354 1519
1355sub unlink_save {
1356 my ($self) = @_;
1357
1358 utf8::encode (my $save = $self->{path}->save_path);
1359 aioreq_pri 3; IO::AIO::aio_unlink $save;
1360 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1361}
1362
1363sub rename { 1520sub rename {
1364 my ($self, $new_path) = @_; 1521 my ($self, $new_path) = @_;
1365 1522
1523 normalise $new_path;
1524
1366 $self->unlink_save; 1525 $self->unlink_save;
1367 1526
1368 delete $cf::MAP{$self->path}; 1527 delete $cf::MAP{$self->path};
1369 $self->{path} = new cf::path $new_path; 1528 $self->{path} = $new_path; $self->path ($self->{path});
1370 $self->path ($self->{path}->as_string);
1371 $cf::MAP{$self->path} = $self; 1529 $cf::MAP{$self->path} = $self;
1372 1530
1373 $self->save; 1531 $self->save;
1374} 1532}
1375 1533
1376sub reset { 1534sub reset {
1377 my ($self) = @_; 1535 my ($self) = @_;
1378 1536
1537 my $lock = cf::lock_acquire "map_data:$self->{path}";
1538
1379 return if $self->players; 1539 return if $self->players;
1380 return if $self->{path}{user_rel};#d# 1540 return if $self->isa ("ext::map_per_player");#d#
1381 1541
1382 warn "resetting map ", $self->path;#d# 1542 warn "resetting map ", $self->path;#d#
1383 1543
1384 delete $cf::MAP{$self->path}; 1544 delete $cf::MAP{$self->path};
1545
1546 $self->in_memory (cf::MAP_SWAPPED);
1547 $self->clear;
1385 1548
1386 $_->clear_links_to ($self) for values %cf::MAP; 1549 $_->clear_links_to ($self) for values %cf::MAP;
1387 1550
1388 $self->unlink_save; 1551 $self->unlink_save;
1389 $self->destroy; 1552 $self->destroy;
1398 $self->reset_timeout (1); 1561 $self->reset_timeout (1);
1399 $self->rename ("{nuke}/" . ($nuke_counter++)); 1562 $self->rename ("{nuke}/" . ($nuke_counter++));
1400 $self->reset; # polite request, might not happen 1563 $self->reset; # polite request, might not happen
1401} 1564}
1402 1565
1403sub customise_for { 1566=item cf::map::unique_maps
1404 my ($map, $ob) = @_;
1405 1567
1406 if ($map->per_player) { 1568Returns an arrayref of paths of all shared maps that have
1407 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1569instantiated unique items. May block.
1408 }
1409 1570
1410 $map 1571=cut
1411}
1412 1572
1413sub emergency_save { 1573sub unique_maps() {
1414 local $cf::FREEZE = 1; 1574 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1575 or return;
1415 1576
1416 warn "enter emergency map save\n"; 1577 my @paths;
1417 1578
1418 cf::sync_job { 1579 for (@$files) {
1419 warn "begin emergency map save\n"; 1580 utf8::decode $_;
1420 $_->save for values %cf::MAP; 1581 next if /\.pst$/;
1582 next unless /^$PATH_SEP/o;
1583
1584 s/\.map$//;
1585 push @paths, $_;
1421 }; 1586 }
1422 1587
1423 warn "end emergency map save\n"; 1588 \@paths
1424} 1589}
1425 1590
1426package cf; 1591package cf;
1427 1592
1428=back 1593=back
1429 1594
1595=head3 cf::object
1596
1597=cut
1598
1599package cf::object;
1600
1601=over 4
1602
1603=item $ob->inv_recursive
1604
1605Returns the inventory of the object _and_ their inventories, recursively.
1606
1607=cut
1608
1609sub inv_recursive_;
1610sub inv_recursive_ {
1611 map { $_, inv_recursive_ $_->inv } @_
1612}
1613
1614sub inv_recursive {
1615 inv_recursive_ inv $_[0]
1616}
1617
1618package cf;
1619
1620=back
1430 1621
1431=head3 cf::object::player 1622=head3 cf::object::player
1432 1623
1433=over 4 1624=over 4
1434 1625
1474 1665
1475=item $player_object->enter_link 1666=item $player_object->enter_link
1476 1667
1477Freezes the player and moves him/her to a special map (C<{link}>). 1668Freezes the player and moves him/her to a special map (C<{link}>).
1478 1669
1479The player should be reaosnably safe there for short amounts of time. You 1670The player should be reasonably safe there for short amounts of time. You
1480I<MUST> call C<leave_link> as soon as possible, though. 1671I<MUST> call C<leave_link> as soon as possible, though.
1481 1672
1673Will never block.
1674
1482=item $player_object->leave_link ($map, $x, $y) 1675=item $player_object->leave_link ($map, $x, $y)
1483 1676
1484Moves the player out of the specila link map onto the given map. If the 1677Moves the player out of the special C<{link}> map onto the specified
1485map is not valid (or omitted), the player will be moved back to the 1678map. If the map is not valid (or omitted), the player will be moved back
1486location he/she was before the call to C<enter_link>, or, if that fails, 1679to the location he/she was before the call to C<enter_link>, or, if that
1487to the emergency map position. 1680fails, to the emergency map position.
1488 1681
1489Might block. 1682Might block.
1490 1683
1491=cut 1684=cut
1685
1686sub link_map {
1687 unless ($LINK_MAP) {
1688 $LINK_MAP = cf::map::find "{link}"
1689 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1690 $LINK_MAP->load;
1691 }
1692
1693 $LINK_MAP
1694}
1492 1695
1493sub cf::object::player::enter_link { 1696sub cf::object::player::enter_link {
1494 my ($self) = @_; 1697 my ($self) = @_;
1495 1698
1496 $self->deactivate_recursive; 1699 $self->deactivate_recursive;
1497 1700
1498 return if $self->map == $LINK_MAP; 1701 return if UNIVERSAL::isa $self->map, "ext::map_link";
1499 1702
1500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1703 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1501 if $self->map; 1704 if $self->map;
1502 1705
1503 $self->enter_map ($LINK_MAP, 20, 20); 1706 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1504} 1707}
1505 1708
1506sub cf::object::player::leave_link { 1709sub cf::object::player::leave_link {
1507 my ($self, $map, $x, $y) = @_; 1710 my ($self, $map, $x, $y) = @_;
1508 1711
1509 my $link_pos = delete $self->{_link_pos}; 1712 my $link_pos = delete $self->{_link_pos};
1510 1713
1511 unless ($map) { 1714 unless ($map) {
1512 # restore original map position 1715 # restore original map position
1513 ($map, $x, $y) = @{ $link_pos || [] }; 1716 ($map, $x, $y) = @{ $link_pos || [] };
1514 $map = cf::map::find_map $map; 1717 $map = cf::map::find $map;
1515 1718
1516 unless ($map) { 1719 unless ($map) {
1517 ($map, $x, $y) = @$EMERGENCY_POSITION; 1720 ($map, $x, $y) = @$EMERGENCY_POSITION;
1518 $map = cf::map::find_map $map 1721 $map = cf::map::find $map
1519 or die "FATAL: cannot load emergency map\n"; 1722 or die "FATAL: cannot load emergency map\n";
1520 } 1723 }
1521 } 1724 }
1522 1725
1523 ($x, $y) = (-1, -1) 1726 ($x, $y) = (-1, -1)
1526 # use -1 or undef as default coordinates, not 0, 0 1729 # use -1 or undef as default coordinates, not 0, 0
1527 ($x, $y) = ($map->enter_x, $map->enter_y) 1730 ($x, $y) = ($map->enter_x, $map->enter_y)
1528 if $x <=0 && $y <= 0; 1731 if $x <=0 && $y <= 0;
1529 1732
1530 $map->load; 1733 $map->load;
1734 $map->load_diag;
1531 1735
1736 return unless $self->contr->active;
1532 $self->activate_recursive; 1737 $self->activate_recursive;
1533 $self->enter_map ($map, $x, $y); 1738 $self->enter_map ($map, $x, $y);
1534} 1739}
1535 1740
1536cf::player->attach ( 1741cf::player->attach (
1549 1754
1550 # try to abort aborted map switching on player login :) 1755 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes 1756 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) { 1757 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link; 1758 $pl->ob->enter_link;
1554 cf::async { 1759 (async {
1555 # we need this sleep as the login has a concurrent enter_exit running 1760 # we need this sleep as the login has a concurrent enter_exit running
1556 # and this sleep increases chances of the player not ending up in scorn 1761 # and this sleep increases chances of the player not ending up in scorn
1762 $pl->ob->reply (undef,
1763 "There was an internal problem at your last logout, "
1764 . "the server will try to bring you to your intended destination in a second.",
1765 cf::NDI_RED);
1557 Coro::Timer::sleep 1; 1766 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link; 1767 $pl->ob->leave_link;
1559 }; 1768 })->prio (2);
1560 } 1769 }
1561 }, 1770 },
1562); 1771);
1563 1772
1564=item $player_object->goto_map ($path, $x, $y) 1773=item $player_object->goto ($path, $x, $y)
1565 1774
1566=cut 1775=cut
1567 1776
1568sub cf::object::player::goto_map { 1777sub cf::object::player::goto {
1569 my ($self, $path, $x, $y) = @_; 1778 my ($self, $path, $x, $y) = @_;
1570 1779
1571 $self->enter_link; 1780 $self->enter_link;
1572 1781
1573 (cf::async { 1782 (async {
1574 $path = new cf::path $path;
1575
1576 my $map = cf::map::find_map $path->as_string; 1783 my $map = cf::map::find $path;
1577 $map = $map->customise_for ($self) if $map; 1784 $map = $map->customise_for ($self) if $map;
1578 1785
1579# warn "entering ", $map->path, " at ($x, $y)\n" 1786# warn "entering ", $map->path, " at ($x, $y)\n"
1580# if $map; 1787# if $map;
1581 1788
1582 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1789 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1583 1790
1584 $self->leave_link ($map, $x, $y); 1791 $self->leave_link ($map, $x, $y);
1585 })->prio (1); 1792 })->prio (1);
1586} 1793}
1587 1794
1640 1847
1641 return unless $self->type == cf::PLAYER; 1848 return unless $self->type == cf::PLAYER;
1642 1849
1643 $self->enter_link; 1850 $self->enter_link;
1644 1851
1645 (cf::async { 1852 (async {
1853 $self->deactivate_recursive; # just to be sure
1646 unless (eval { 1854 unless (eval {
1647 prepare_random_map $exit 1855 prepare_random_map $exit
1648 if $exit->slaying eq "/!"; 1856 if $exit->slaying eq "/!";
1649 1857
1650 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1858 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1651 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1859 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1652 1860
1653 1; 1861 1;
1654 }) { 1862 }) {
1655 $self->message ("Something went wrong deep within the crossfire server. " 1863 $self->message ("Something went wrong deep within the crossfire server. "
1656 . "I'll try to bring you back to the map you were before. " 1864 . "I'll try to bring you back to the map you were before. "
1657 . "Please report this to the dungeon master", 1865 . "Please report this to the dungeon master!",
1658 cf::NDI_UNIQUE | cf::NDI_RED); 1866 cf::NDI_UNIQUE | cf::NDI_RED);
1659 1867
1660 warn "ERROR in enter_exit: $@"; 1868 warn "ERROR in enter_exit: $@";
1661 $self->leave_link; 1869 $self->leave_link;
1662 } 1870 }
1713 on_reply => sub { 1921 on_reply => sub {
1714 my ($ns, $msg) = @_; 1922 my ($ns, $msg) = @_;
1715 1923
1716 # this weird shuffling is so that direct followup queries 1924 # this weird shuffling is so that direct followup queries
1717 # get handled first 1925 # get handled first
1718 my $queue = delete $ns->{query_queue}; 1926 my $queue = delete $ns->{query_queue}
1927 or return; # be conservative, not sure how that can happen, but we saw a crash here
1719 1928
1720 (shift @$queue)->[1]->($msg); 1929 (shift @$queue)->[1]->($msg);
1721 1930
1722 push @{ $ns->{query_queue} }, @$queue; 1931 push @{ $ns->{query_queue} }, @$queue;
1723 1932
1729 } 1938 }
1730 } 1939 }
1731 }, 1940 },
1732); 1941);
1733 1942
1734=item $client->coro (\&cb) 1943=item $client->async (\&cb)
1735 1944
1736Create a new coroutine, running the specified callback. The coroutine will 1945Create a new coroutine, running the specified callback. The coroutine will
1737be automatically cancelled when the client gets destroyed (e.g. on logout, 1946be automatically cancelled when the client gets destroyed (e.g. on logout,
1738or loss of connection). 1947or loss of connection).
1739 1948
1740=cut 1949=cut
1741 1950
1742sub cf::client::coro { 1951sub cf::client::async {
1743 my ($self, $cb) = @_; 1952 my ($self, $cb) = @_;
1744 1953
1745 my $coro = &cf::async ($cb); 1954 my $coro = &Coro::async ($cb);
1746 1955
1747 $coro->on_destroy (sub { 1956 $coro->on_destroy (sub {
1748 delete $self->{_coro}{$coro+0}; 1957 delete $self->{_coro}{$coro+0};
1749 }); 1958 });
1750 1959
1985 open my $fh, "<:utf8", cf::confdir . "/config" 2194 open my $fh, "<:utf8", cf::confdir . "/config"
1986 or return; 2195 or return;
1987 2196
1988 local $/; 2197 local $/;
1989 *CFG = YAML::Syck::Load <$fh>; 2198 *CFG = YAML::Syck::Load <$fh>;
2199
2200 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2201
2202 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2203 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2204
2205 if (exists $CFG{mlockall}) {
2206 eval {
2207 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2208 and die "WARNING: m(un)lockall failed: $!\n";
2209 };
2210 warn $@ if $@;
2211 }
1990} 2212}
1991 2213
1992sub main { 2214sub main {
1993 # we must not ever block the main coroutine 2215 # we must not ever block the main coroutine
1994 local $Coro::idle = sub { 2216 local $Coro::idle = sub {
1995 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2217 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1996 (Coro::unblock_sub {
1997 Event::one_event; 2218 async { Event::one_event };
1998 })->();
1999 }; 2219 };
2000 2220
2001 cfg_load; 2221 cfg_load;
2002 db_load; 2222 db_load;
2003 load_extensions; 2223 load_extensions;
2004 Event::loop; 2224 Event::loop;
2005} 2225}
2006 2226
2007############################################################################# 2227#############################################################################
2008# initialisation 2228# initialisation and cleanup
2229
2230# install some emergency cleanup handlers
2231BEGIN {
2232 for my $signal (qw(INT HUP TERM)) {
2233 Event->signal (
2234 data => WF_AUTOCANCEL,
2235 signal => $signal,
2236 cb => sub {
2237 cf::cleanup "SIG$signal";
2238 },
2239 );
2240 }
2241}
2242
2243sub emergency_save() {
2244 my $freeze_guard = cf::freeze_mainloop;
2245
2246 warn "enter emergency perl save\n";
2247
2248 cf::sync_job {
2249 # use a peculiar iteration method to avoid tripping on perl
2250 # refcount bugs in for. also avoids problems with players
2251 # and maps saved/destroyed asynchronously.
2252 warn "begin emergency player save\n";
2253 for my $login (keys %cf::PLAYER) {
2254 my $pl = $cf::PLAYER{$login} or next;
2255 $pl->valid or next;
2256 $pl->save;
2257 }
2258 warn "end emergency player save\n";
2259
2260 warn "begin emergency map save\n";
2261 for my $path (keys %cf::MAP) {
2262 my $map = $cf::MAP{$path} or next;
2263 $map->valid or next;
2264 $map->save;
2265 }
2266 warn "end emergency map save\n";
2267 };
2268
2269 warn "leave emergency perl save\n";
2270}
2009 2271
2010sub reload() { 2272sub reload() {
2011 # can/must only be called in main 2273 # can/must only be called in main
2012 if ($Coro::current != $Coro::main) { 2274 if ($Coro::current != $Coro::main) {
2013 warn "can only reload from main coroutine\n"; 2275 warn "can only reload from main coroutine\n";
2014 return; 2276 return;
2015 } 2277 }
2016 2278
2017 warn "reloading..."; 2279 warn "reloading...";
2018 2280
2019 local $FREEZE = 1; 2281 warn "freezing server";
2282 my $guard = freeze_mainloop;
2020 cf::emergency_save; 2283 cf::emergency_save;
2284
2285 warn "sync database to disk";
2286 cf::db_sync;
2287 IO::AIO::flush;
2021 2288
2022 eval { 2289 eval {
2023 # if anything goes wrong in here, we should simply crash as we already saved 2290 # if anything goes wrong in here, we should simply crash as we already saved
2024 2291
2025 # cancel all watchers 2292 warn "cancel all watchers";
2026 for (Event::all_watchers) { 2293 for (Event::all_watchers) {
2027 $_->cancel if $_->data & WF_AUTOCANCEL; 2294 $_->cancel if $_->data & WF_AUTOCANCEL;
2028 } 2295 }
2029 2296
2030 # cancel all extension coros 2297 warn "cancel all extension coros";
2031 $_->cancel for values %EXT_CORO; 2298 $_->cancel for values %EXT_CORO;
2032 %EXT_CORO = (); 2299 %EXT_CORO = ();
2033 2300
2301 warn "remove commands";
2302 %COMMAND = ();
2303
2304 warn "remove ext commands";
2305 %EXTCMD = ();
2306
2034 # unload all extensions 2307 warn "unload/nuke all extensions";
2035 for (@exts) { 2308 for my $pkg (@EXTS) {
2036 warn "unloading <$_>"; 2309 warn "... unloading $pkg";
2037 unload_extension $_; 2310
2311 if (my $cb = $pkg->can ("unload")) {
2312 eval {
2313 $cb->($pkg);
2314 1
2315 } or warn "$pkg unloaded, but with errors: $@";
2038 } 2316 }
2039 2317
2318 warn "... nuking $pkg";
2319 Symbol::delete_package $pkg;
2320 }
2321
2040 # unload all modules loaded from $LIBDIR 2322 warn "unload all perl modules loaded from $LIBDIR";
2041 while (my ($k, $v) = each %INC) { 2323 while (my ($k, $v) = each %INC) {
2042 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2324 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2043 2325
2044 warn "removing <$k>"; 2326 warn "removing <$k>";
2045 delete $INC{$k}; 2327 delete $INC{$k};
2052 } 2334 }
2053 2335
2054 Symbol::delete_package $k; 2336 Symbol::delete_package $k;
2055 } 2337 }
2056 2338
2057 # sync database to disk
2058 cf::db_sync;
2059 IO::AIO::flush;
2060
2061 # get rid of safe::, as good as possible 2339 warn "get rid of safe::, as good as possible";
2062 Symbol::delete_package "safe::$_" 2340 Symbol::delete_package "safe::$_"
2063 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2341 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2064 2342
2065 # remove register_script_function callbacks
2066 # TODO
2067
2068 # unload cf.pm "a bit" 2343 warn "unload cf.pm \"a bit\"";
2069 delete $INC{"cf.pm"}; 2344 delete $INC{"cf.pm"};
2070 2345
2071 # don't, removes xs symbols, too, 2346 # don't, removes xs symbols, too,
2072 # and global variables created in xs 2347 # and global variables created in xs
2073 #Symbol::delete_package __PACKAGE__; 2348 #Symbol::delete_package __PACKAGE__;
2074 2349
2075 # reload cf.pm
2076 warn "reloading cf.pm"; 2350 warn "reloading cf.pm";
2077 require cf; 2351 require cf;
2078 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2352 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2079 2353
2080 # load config and database again 2354 warn "load config and database again";
2081 cf::cfg_load; 2355 cf::cfg_load;
2082 cf::db_load; 2356 cf::db_load;
2083 2357
2084 # load extensions
2085 warn "load extensions"; 2358 warn "load extensions";
2086 cf::load_extensions; 2359 cf::load_extensions;
2087 2360
2088 # reattach attachments to objects 2361 warn "reattach attachments to objects/players";
2089 warn "reattach";
2090 _global_reattach; 2362 _global_reattach;
2363 warn "reattach attachments to maps";
2364 reattach $_ for values %MAP;
2091 }; 2365 };
2092 2366
2093 if ($@) { 2367 if ($@) {
2094 warn $@; 2368 warn $@;
2095 warn "error while reloading, exiting."; 2369 warn "error while reloading, exiting.";
2096 exit 1; 2370 exit 1;
2097 } 2371 }
2098 2372
2099 warn "reloaded successfully"; 2373 warn "reloaded";
2100}; 2374};
2101
2102#############################################################################
2103
2104unless ($LINK_MAP) {
2105 $LINK_MAP = cf::map::new;
2106
2107 $LINK_MAP->width (41);
2108 $LINK_MAP->height (41);
2109 $LINK_MAP->alloc;
2110 $LINK_MAP->path ("{link}");
2111 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2112 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2113
2114 # dirty hack because... archetypes are not yet loaded
2115 Event->timer (
2116 after => 2,
2117 cb => sub {
2118 $_[0]->w->cancel;
2119
2120 # provide some exits "home"
2121 my $exit = cf::object::new "exit";
2122
2123 $exit->slaying ($EMERGENCY_POSITION->[0]);
2124 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2125 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2126
2127 $LINK_MAP->insert ($exit->clone, 19, 19);
2128 $LINK_MAP->insert ($exit->clone, 19, 20);
2129 $LINK_MAP->insert ($exit->clone, 19, 21);
2130 $LINK_MAP->insert ($exit->clone, 20, 19);
2131 $LINK_MAP->insert ($exit->clone, 20, 21);
2132 $LINK_MAP->insert ($exit->clone, 21, 19);
2133 $LINK_MAP->insert ($exit->clone, 21, 20);
2134 $LINK_MAP->insert ($exit->clone, 21, 21);
2135
2136 $exit->destroy;
2137 });
2138
2139 $LINK_MAP->{deny_save} = 1;
2140 $LINK_MAP->{deny_reset} = 1;
2141
2142 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2143}
2144
2145register "<global>", __PACKAGE__;
2146 2375
2147register_command "reload" => sub { 2376register_command "reload" => sub {
2148 my ($who, $arg) = @_; 2377 my ($who, $arg) = @_;
2149 2378
2150 if ($who->flag (FLAG_WIZ)) { 2379 if ($who->flag (FLAG_WIZ)) {
2160 reentrant => 0, 2389 reentrant => 0,
2161 prio => 0, 2390 prio => 0,
2162 at => $NEXT_TICK || $TICK, 2391 at => $NEXT_TICK || $TICK,
2163 data => WF_AUTOCANCEL, 2392 data => WF_AUTOCANCEL,
2164 cb => sub { 2393 cb => sub {
2165 unless ($FREEZE) { 2394 $NOW = Event::time;
2395
2166 cf::server_tick; # one server iteration 2396 cf::server_tick; # one server iteration
2167 $RUNTIME += $TICK; 2397 $RUNTIME += $TICK;
2168 }
2169
2170 $NEXT_TICK += $TICK; 2398 $NEXT_TICK += $TICK;
2399
2400 $WAIT_FOR_TICK->broadcast;
2401 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2171 2402
2172 # if we are delayed by four ticks or more, skip them all 2403 # if we are delayed by four ticks or more, skip them all
2173 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2404 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2174 2405
2175 $TICK_WATCHER->at ($NEXT_TICK); 2406 $TICK_WATCHER->at ($NEXT_TICK);
2177 }, 2408 },
2178); 2409);
2179 2410
2180IO::AIO::max_poll_time $TICK * 0.2; 2411IO::AIO::max_poll_time $TICK * 0.2;
2181 2412
2182Event->io ( 2413$AIO_POLL_WATCHER = Event->io (
2183 fd => IO::AIO::poll_fileno, 2414 fd => IO::AIO::poll_fileno,
2184 poll => 'r', 2415 poll => 'r',
2185 prio => 5, 2416 prio => 5,
2186 data => WF_AUTOCANCEL, 2417 data => WF_AUTOCANCEL,
2187 cb => \&IO::AIO::poll_cb, 2418 cb => \&IO::AIO::poll_cb,
2188); 2419);
2189 2420
2190Event->timer ( 2421$WRITE_RUNTIME_WATCHER = Event->timer (
2191 data => WF_AUTOCANCEL, 2422 data => WF_AUTOCANCEL,
2192 after => 0, 2423 after => 0,
2193 interval => 10, 2424 interval => 10,
2194 cb => sub { 2425 cb => sub {
2195 (Coro::unblock_sub { 2426 (Coro::unblock_sub {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines