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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines