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.468 by root, Thu Jan 8 19:23:44 2009 UTC vs.
Revision 1.624 by root, Sat Nov 17 23:40:02 2018 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2018 Marc Alexander Lehmann / the Deliantra team
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 6#
6# Deliantra is free software: you can redistribute it and/or modify 7# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 8# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 9# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 10# option) any later version.
10# 11#
11# This program is distributed in the hope that it will be useful, 12# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 13# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 15# GNU General Public License for more details.
15# 16#
16# You should have received a copy of the GNU General Public License 17# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 18# and the GNU General Public License along with this program. If not, see
18# 19# <http://www.gnu.org/licenses/>.
20#
19# The authors can be reached via e-mail to <support@deliantra.net> 21# The authors can be reached via e-mail to <support@deliantra.net>
20# 22#
21 23
22package cf; 24package cf;
23 25
24use 5.10.0; 26use common::sense;
25use utf8;
26use strict qw(vars subs);
27 27
28use Symbol; 28use Symbol;
29use List::Util; 29use List::Util;
30use Socket; 30use Socket;
31use EV; 31use EV;
32use Opcode; 32use Opcode;
33use Safe; 33use Safe;
34use Safe::Hole; 34use Safe::Hole;
35use Storable (); 35use Storable ();
36
37use Guard (); 36use Carp ();
37
38use AnyEvent ();
39use AnyEvent::IO ();
40use AnyEvent::DNS ();
41
38use Coro (); 42use Coro ();
39use Coro::State; 43use Coro::State;
40use Coro::Handle; 44use Coro::Handle;
41use Coro::EV; 45use Coro::EV;
42use Coro::AnyEvent; 46use Coro::AnyEvent;
48use Coro::AIO; 52use Coro::AIO;
49use Coro::BDB 1.6; 53use Coro::BDB 1.6;
50use Coro::Storable; 54use Coro::Storable;
51use Coro::Util (); 55use Coro::Util ();
52 56
57use Guard ();
53use JSON::XS 2.01 (); 58use JSON::XS 2.01 ();
54use BDB (); 59use BDB ();
55use Data::Dumper; 60use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 61use Fcntl;
58use YAML (); 62use YAML::XS ();
63use CBOR::XS ();
59use IO::AIO (); 64use IO::AIO ();
60use Time::HiRes;
61use Compress::LZF; 65use Compress::LZF;
62use Digest::MD5 (); 66use Digest::MD5 ();
63 67
64AnyEvent::detect; 68AnyEvent::detect;
65 69
72 76
73# make sure c-lzf reinitialises itself 77# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 78Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 79Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 80
81# strictly for debugging
82$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
83
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 84sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
85
86our @ORIG_INC;
78 87
79our %COMMAND = (); 88our %COMMAND = ();
80our %COMMAND_TIME = (); 89our %COMMAND_TIME = ();
81 90
82our @EXTS = (); # list of extension package names 91our @EXTS = (); # list of extension package names
83our %EXTCMD = (); 92our %EXTCMD = ();
93our %EXTACMD = ();
84our %EXTICMD = (); 94our %EXTICMD = ();
95our %EXTIACMD = ();
85our %EXT_CORO = (); # coroutines bound to extensions 96our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
87 98
88our $RELOAD; # number of reloads so far, non-zero while in reload 99our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 100our @EVENT;
101our @REFLECT; # set by XS
102our %REFLECT; # set by us
90 103
91our $CONFDIR = confdir; 104our $CONFDIR = confdir;
105
92our $DATADIR = datadir; 106our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 107our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 108our $PODDIR = "$DATADIR/pod";
95our $MAPDIR = "$DATADIR/" . mapdir; 109our $MAPDIR = "$DATADIR/" . mapdir;
110
96our $LOCALDIR = localdir; 111our $LOCALDIR = localdir;
97our $TMPDIR = "$LOCALDIR/" . tmpdir; 112our $TMPDIR = "$LOCALDIR/" . tmpdir;
98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 113our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99our $PLAYERDIR = "$LOCALDIR/" . playerdir; 114our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100our $RANDOMDIR = "$LOCALDIR/random"; 115our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 116our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 117our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 118our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 119
105our %RESOURCE; 120#our %RESOURCE; # unused
121
122our $OUTPUT_RATE_MIN = 3000;
123our $OUTPUT_RATE_MAX = 1000000;
124
125our $MAX_LINKS = 32; # how many chained exits to follow
126our $VERBOSE_IO = 1;
106 127
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 128our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 129our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 130our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 131our $USE_FSYNC = 1; # use fsync to write maps - default on
111 132
112our $BDB_DEADLOCK_WATCHER; 133our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 134our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 135our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 136our $DB_ENV;
116 137
117our @EXTRA_MODULES = qw(pod mapscript); 138our @EXTRA_MODULES = qw(pod match mapscript incloader);
118 139
119our %CFG; 140our %CFG;
141our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
120 142
121our $UPTIME; $UPTIME ||= time; 143our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 144our $RUNTIME = 0;
145our $SERVER_TICK = 0;
123our $NOW; 146our $NOW;
124 147
125our (%PLAYER, %PLAYER_LOADING); # all users 148our (%PLAYER, %PLAYER_LOADING); # all users
126our (%MAP, %MAP_LOADING ); # all maps 149our (%MAP, %MAP_LOADING ); # all maps
127our $LINK_MAP; # the special {link} map, which is always available 150our $LINK_MAP; # the special {link} map, which is always available
134our $JITTER; # average jitter 157our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 158our $TICK_START; # for load detecting purposes
136 159
137our @POST_INIT; 160our @POST_INIT;
138 161
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 162our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
163our $REALLY_UNLOOP; # never set to true, please :)
164
165our $WAIT_FOR_TICK = new Coro::Signal;
166our @WAIT_FOR_TICK_BEGIN;
140 167
141binmode STDOUT; 168binmode STDOUT;
142binmode STDERR; 169binmode STDERR;
143 170
144# read virtual server time, if available 171# read virtual server time, if available
155 182
156our $EMERGENCY_POSITION; 183our $EMERGENCY_POSITION;
157 184
158sub cf::map::normalise; 185sub cf::map::normalise;
159 186
187sub in_main() {
188 $Coro::current == $Coro::main
189}
190
160############################################################################# 191#############################################################################
161 192
193%REFLECT = ();
194for (@REFLECT) {
195 my $reflect = JSON::XS::decode_json $_;
196 $REFLECT{$reflect->{class}} = $reflect;
197}
198
199# this is decidedly evil
200$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
201
202#############################################################################
203
162=head2 GLOBAL VARIABLES 204=head2 GLOBAL VARIABLES
163 205
164=over 4 206=over 4
165 207
166=item $cf::UPTIME 208=item $cf::UPTIME
167 209
168The timestamp of the server start (so not actually an uptime). 210The timestamp of the server start (so not actually an "uptime").
211
212=item $cf::SERVER_TICK
213
214An unsigned integer that starts at zero when the server is started and is
215incremented on every tick.
216
217=item $cf::NOW
218
219The (real) time of the last (current) server tick - updated before and
220after tick processing, so this is useful only as a rough "what time is it
221now" estimate.
222
223=item $cf::TICK
224
225The interval between each server tick, in seconds.
169 226
170=item $cf::RUNTIME 227=item $cf::RUNTIME
171 228
172The time this server has run, starts at 0 and is increased by $cf::TICK on 229The time this server has run, starts at 0 and is increased by $cf::TICK on
173every server tick. 230every server tick.
174 231
175=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 232=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
176$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 233$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
177$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 234$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
178 235
179Various directories - "/etc", read-only install directory, perl-library 236Various directories - "/etc", read-only install directory, perl-library
180directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 237directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
181unique-items directory, player file directory, random maps directory and 238unique-items directory, player file directory, random maps directory and
182database environment. 239database environment.
183 240
184=item $cf::NOW
185
186The time of the last (current) server tick.
187
188=item $cf::TICK
189
190The interval between server ticks, in seconds.
191
192=item $cf::LOADAVG 241=item $cf::LOADAVG
193 242
194The current CPU load on the server (alpha-smoothed), as a value between 0 243The current CPU load on the server (alpha-smoothed), as a value between 0
195(none) and 1 (overloaded), indicating how much time is spent on processing 244(none) and 1 (overloaded), indicating how much time is spent on processing
196objects per tick. Healthy values are < 0.5. 245objects per tick. Healthy values are < 0.5.
204Configuration for the server, loaded from C</etc/deliantra-server/config>, or 253Configuration for the server, loaded from C</etc/deliantra-server/config>, or
205from wherever your confdir points to. 254from wherever your confdir points to.
206 255
207=item cf::wait_for_tick, cf::wait_for_tick_begin 256=item cf::wait_for_tick, cf::wait_for_tick_begin
208 257
209These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 258These are functions that inhibit the current coroutine one tick.
210returns directly I<after> the tick processing (and consequently, can only wake one process 259cf::wait_for_tick_begin only returns directly I<after> the tick
260processing (and consequently, can only wake one thread per tick), while
211per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 261cf::wait_for_tick wakes up all waiters after tick processing.
262
263Note that cf::wait_for_tick will immediately return when the server is not
264ticking, making it suitable for small pauses in threads that need to run
265when the server is paused. If that is not applicable (i.e. you I<really>
266want to wait, use C<$cf::WAIT_FOR_TICK>).
267
268=item $cf::WAIT_FOR_TICK
269
270Note that C<cf::wait_for_tick> is probably the correct thing to use. This
271variable contains a L<Coro::Signal> that is broadcats after every server
272tick. Calling C<< ->wait >> on it will suspend the caller until after the
273next server tick.
274
275=cut
276
277sub wait_for_tick();
278sub wait_for_tick_begin();
212 279
213=item @cf::INVOKE_RESULTS 280=item @cf::INVOKE_RESULTS
214 281
215This array contains the results of the last C<invoke ()> call. When 282This array contains the results of the last C<invoke ()> call. When
216C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 283C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 284that call.
218 285
286=item %cf::REFLECT
287
288Contains, for each (C++) class name, a hash reference with information
289about object members (methods, scalars, arrays and flags) and other
290metadata, which is useful for introspection.
291
219=back 292=back
220 293
221=cut 294=cut
222 295
223BEGIN { 296sub error(@) { LOG llevError, join "", @_ }
224 *CORE::GLOBAL::warn = sub { 297sub warn (@) { LOG llevWarn , join "", @_ }
298sub info (@) { LOG llevInfo , join "", @_ }
299sub debug(@) { LOG llevDebug, join "", @_ }
300sub trace(@) { LOG llevTrace, join "", @_ }
301
302$Coro::State::WARNHOOK = sub {
225 my $msg = join "", @_; 303 my $msg = join "", @_;
226 304
227 $msg .= "\n" 305 $msg .= "\n"
228 unless $msg =~ /\n$/; 306 unless $msg =~ /\n$/;
229 307
230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 308 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
231 309
232 LOG llevError, $msg; 310 LOG llevWarn, $msg;
233 }; 311};
234}
235 312
236$Coro::State::DIEHOOK = sub { 313$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 314 return unless $^S eq 0; # "eq", not "=="
238 315
239 if ($Coro::current == $Coro::main) {#d# 316 error Carp::longmess $_[0];
317
318 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 319 error "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 320 return;#d#
242 }#d# 321 }#d#
243 322
244 # kill coroutine otherwise 323 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 324 Coro::terminate
247}; 325};
248
249$SIG{__DIE__} = sub { }; #d#?
250 326
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 327@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 328@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 329@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 330@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
268)) { 344)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 345 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 346}
271 347
272$EV::DIED = sub { 348$EV::DIED = sub {
273 warn "error in event callback: @_"; 349 warn "error in event callback: $@";
274}; 350};
351
352#############################################################################
353
354sub fork_call(&@);
355sub get_slot($;$$);
275 356
276############################################################################# 357#############################################################################
277 358
278=head2 UTILITY FUNCTIONS 359=head2 UTILITY FUNCTIONS
279 360
300 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 381 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
301 $d 382 $d
302 } || "[unable to dump $_[0]: '$@']"; 383 } || "[unable to dump $_[0]: '$@']";
303} 384}
304 385
386=item $scalar = cf::load_file $path
387
388Loads the given file from path and returns its contents. Croaks on error
389and can block.
390
391=cut
392
393sub load_file($) {
394 0 <= aio_load $_[0], my $data
395 or Carp::croak "$_[0]: $!";
396
397 $data
398}
399
400=item $success = cf::replace_file $path, $data, $sync
401
402Atomically replaces the file at the given $path with new $data, and
403optionally $sync the data to disk before replacing the file.
404
405=cut
406
407sub replace_file($$;$) {
408 my ($path, $data, $sync) = @_;
409
410 my $lock = cf::lock_acquire ("replace_file:$path");
411
412 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
413 or return;
414
415 $data = $data->() if ref $data;
416
417 length $data == aio_write $fh, 0, (length $data), $data, 0
418 or return;
419
420 !$sync
421 or !aio_fsync $fh
422 or return;
423
424 aio_close $fh
425 and return;
426
427 aio_rename "$path~", $path
428 and return;
429
430 if ($sync) {
431 $path =~ s%/[^/]*$%%;
432 aio_pathsync $path;
433 }
434
435 1
436}
437
305=item $ref = cf::decode_json $json 438=item $ref = cf::decode_json $json
306 439
307Converts a JSON string into the corresponding perl data structure. 440Converts a JSON string into the corresponding perl data structure.
308 441
309=item $json = cf::encode_json $ref 442=item $json = cf::encode_json $ref
315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 448our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
316 449
317sub encode_json($) { $json_coder->encode ($_[0]) } 450sub encode_json($) { $json_coder->encode ($_[0]) }
318sub decode_json($) { $json_coder->decode ($_[0]) } 451sub decode_json($) { $json_coder->decode ($_[0]) }
319 452
453=item $ref = cf::decode_storable $scalar
454
455Same as Coro::Storable::thaw, so blocks.
456
457=cut
458
459BEGIN { *decode_storable = \&Coro::Storable::thaw }
460
461=item $ref = cf::decode_yaml $scalar
462
463Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
464
465=cut
466
467sub decode_yaml($) {
468 fork_call { YAML::XS::Load $_[0] } @_
469}
470
471=item $scalar = cf::decode_cbor $scalar
472
473Same as CBOR::XS::decode_cbor, but takes server ticks into account, so
474blocks. For small amounts of data, C<CBOR::XS::decode_cbor> is the better
475alternative.
476
477=cut
478
479sub decode_cbor($) {
480 # we assume 10mb/s minimum decoding speed (on a ~2ghz machine)
481 cf::get_slot +(length $_[0]) / 10_000_000, 0, "decode_cbor";
482 CBOR::XS::decode_cbor $_[0]
483}
484
485=item $scalar = cf::unlzf $scalar
486
487Same as Compress::LZF::compress, but takes server ticks into account, so
488blocks.
489
490=cut
491
492sub unlzf($) {
493 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
494 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
495 Compress::LZF::decompress $_[0]
496}
497
320=item cf::post_init { BLOCK } 498=item cf::post_init { BLOCK }
321 499
322Execute the given codeblock, I<after> all extensions have been (re-)loaded, 500Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again. 501but I<before> the server starts ticking again.
324 502
325The cdoeblock will have a single boolean argument to indicate whether this 503The codeblock will have a single boolean argument to indicate whether this
326is a reload or not. 504is a reload or not.
327 505
328=cut 506=cut
329 507
330sub post_init(&) { 508sub post_init(&) {
331 push @POST_INIT, shift; 509 push @POST_INIT, shift;
332} 510}
333 511
512sub _post_init {
513 trace "running post_init jobs";
514
515 # run them in parallel...
516
517 my @join;
518
519 while () {
520 push @join, map &Coro::async ($_, 0), @POST_INIT;
521 @POST_INIT = ();
522
523 @join or last;
524
525 (pop @join)->join;
526 }
527}
528
334=item cf::lock_wait $string 529=item cf::lock_wait $string
335 530
336Wait until the given lock is available. See cf::lock_acquire. 531Wait until the given lock is available. See cf::lock_acquire.
337 532
338=item my $lock = cf::lock_acquire $string 533=item my $lock = cf::lock_acquire $string
339 534
340Wait until the given lock is available and then acquires it and returns 535Wait until the given lock is available and then acquires it and returns
341a L<Guard> object. If the guard object gets destroyed (goes out of scope, 536a L<Guard> object. If the guard object gets destroyed (goes out of scope,
375} 570}
376 571
377=item cf::periodic $interval, $cb 572=item cf::periodic $interval, $cb
378 573
379Like EV::periodic, but randomly selects a starting point so that the actions 574Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer. 575get spread over time.
381 576
382=cut 577=cut
383 578
384sub periodic($$) { 579sub periodic($$) {
385 my ($interval, $cb) = @_; 580 my ($interval, $cb) = @_;
389 EV::periodic $start, $interval, 0, $cb 584 EV::periodic $start, $interval, 0, $cb
390} 585}
391 586
392=item cf::get_slot $time[, $priority[, $name]] 587=item cf::get_slot $time[, $priority[, $name]]
393 588
394Allocate $time seconds of blocking CPU time at priority C<$priority>: 589Allocate $time seconds of blocking CPU time at priority C<$priority>
395This call blocks and returns only when you have at least C<$time> seconds 590(default: 0): This call blocks and returns only when you have at least
396of cpu time till the next tick. The slot is only valid till the next cede. 591C<$time> seconds of cpu time till the next tick. The slot is only valid
592till the next cede.
593
594Background jobs should use a priority less than zero, interactive jobs
595should use 100 or more.
397 596
398The optional C<$name> can be used to identify the job to run. It might be 597The optional C<$name> can be used to identify the job to run. It might be
399used for statistical purposes and should identify the same time-class. 598used for statistical purposes and should identify the same time-class.
400 599
401Useful for short background jobs. 600Useful for short background jobs.
402 601
403=cut 602=cut
404 603
405our @SLOT_QUEUE; 604our @SLOT_QUEUE;
406our $SLOT_QUEUE; 605our $SLOT_QUEUE;
606our $SLOT_DECAY = 0.9;
407 607
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 608$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 609$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 610 $Coro::current->desc ("timeslot manager");
411 611
412 my $signal = new Coro::Signal; 612 my $signal = new Coro::Signal;
613 my $busy;
413 614
414 while () { 615 while () {
415 next_job: 616 next_job:
617
618 Coro::cede;
619
416 my $avail = cf::till_tick; 620 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 621
418 for (0 .. $#SLOT_QUEUE) { 622 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 623 if ($SLOT_QUEUE[$_][0] <= $avail) {
624 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 625 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 626 $job->[2]->send;
422 Coro::cede;
423 goto next_job; 627 goto next_job;
424 } 628 } else {
629 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 630 }
426 } 631 }
427 632
428 if (@SLOT_QUEUE) { 633 if (@SLOT_QUEUE) {
429 # we do not use wait_for_tick() as it returns immediately when tick is inactive 634 wait_for_tick;
430 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait;
432 } else { 635 } else {
636 $busy = 0;
433 Coro::schedule; 637 Coro::schedule;
434 } 638 }
435 } 639 }
436}; 640};
437 641
438sub get_slot($;$$) { 642sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 643 return if tick_inhibit || $Coro::current == $Coro::main;
440 644
441 my ($time, $pri, $name) = @_; 645 my ($time, $pri, $name) = @_;
442 646
443 $time = $TICK * .6 if $time > $TICK * .6; 647 $time = clamp $time, 0.01, $TICK * .6;
648
444 my $sig = new Coro::Signal; 649 my $sig = new Coro::Signal;
445 650
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 651 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 652 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 653 $SLOT_QUEUE->ready;
460BEGIN { *async = \&Coro::async_pool } 665BEGIN { *async = \&Coro::async_pool }
461 666
462=item cf::sync_job { BLOCK } 667=item cf::sync_job { BLOCK }
463 668
464The design of Deliantra requires that the main coroutine ($Coro::main) 669The design of Deliantra requires that the main coroutine ($Coro::main)
465is always able to handle events or runnable, as Deliantra is only 670is always able to handle events or is runnable, as Deliantra is only
466partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 671partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
467acceptable. 672acceptable.
468 673
469If it must be done, put the blocking parts into C<sync_job>. This will run 674If it must be done, put the blocking parts into C<sync_job>. This will run
470the given BLOCK in another coroutine while waiting for the result. The 675the given BLOCK in another coroutine while waiting for the result. The
474=cut 679=cut
475 680
476sub sync_job(&) { 681sub sync_job(&) {
477 my ($job) = @_; 682 my ($job) = @_;
478 683
479 if ($Coro::current == $Coro::main) { 684 if (in_main) {
480 my $time = EV::time; 685 my $time = AE::time;
481 686
482 # this is the main coro, too bad, we have to block 687 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 688 # till the operation succeeds, freezing the server :/
484 689
485 LOG llevError, Carp::longmess "sync job";#d# 690 #LOG llevError, Carp::longmess "sync job";#d#
486 691
487 my $freeze_guard = freeze_mainloop; 692 my $freeze_guard = freeze_mainloop;
488 693
489 my $busy = 1; 694 my $busy = 1;
490 my @res; 695 my @res;
491 696
492 (async { 697 (async {
493 $Coro::current->desc ("sync job coro"); 698 $Coro::current->desc ("sync job coro");
494 @res = eval { $job->() }; 699 @res = eval { $job->() };
495 warn $@ if $@; 700 error $@ if $@;
496 undef $busy; 701 undef $busy;
497 })->prio (Coro::PRIO_MAX); 702 })->prio (Coro::PRIO_MAX);
498 703
499 while ($busy) { 704 while ($busy) {
500 if (Coro::nready) { 705 if (Coro::nready) {
501 Coro::cede_notself; 706 Coro::cede_notself;
502 } else { 707 } else {
503 EV::loop EV::LOOP_ONESHOT; 708 EV::run EV::RUN_ONCE;
504 } 709 }
505 } 710 }
506 711
507 my $time = EV::time - $time; 712 my $time = AE::time - $time;
508 713
509 $TICK_START += $time; # do not account sync jobs to server load 714 $TICK_START += $time; # do not account sync jobs to server load
510 715
511 wantarray ? @res : $res[0] 716 wantarray ? @res : $res[0]
512 } else { 717 } else {
534 $EXT_CORO{$coro+0} = $coro; 739 $EXT_CORO{$coro+0} = $coro;
535 740
536 $coro 741 $coro
537} 742}
538 743
539=item fork_call { }, $args 744=item fork_call { }, @args
540 745
541Executes the given code block with the given arguments in a seperate 746Executes the given code block with the given arguments in a seperate
542process, returning the results. Everything must be serialisable with 747process, returning the results. Everything must be serialisable with
543Coro::Storable. May, of course, block. Note that the executed sub may 748Coro::Storable. May, of course, block. Note that the executed sub may
544never block itself or use any form of event handling. 749never block itself or use any form of event handling.
545 750
546=cut 751=cut
547 752
753sub post_fork {
754 reset_signals;
755}
756
548sub fork_call(&@) { 757sub fork_call(&@) {
549 my ($cb, @args) = @_; 758 my ($cb, @args) = @_;
550 759
551 # we seemingly have to make a local copy of the whole thing,
552 # otherwise perl prematurely frees the stuff :/
553 # TODO: investigate and fix (likely this will be rather laborious)
554
555 my @res = Coro::Util::fork_eval { 760 my @res = Coro::Util::fork_eval {
556 reset_signals; 761 cf::post_fork;
557 &$cb 762 &$cb
558 }, @args; 763 } @args;
559 764
560 wantarray ? @res : $res[-1] 765 wantarray ? @res : $res[-1]
766}
767
768sub objinfo {
769 (
770 "counter value" => cf::object::object_count,
771 "objects created" => cf::object::create_count,
772 "objects destroyed" => cf::object::destroy_count,
773 "freelist size" => cf::object::free_count,
774 "allocated objects" => cf::object::objects_size,
775 "active objects" => cf::object::actives_size,
776 )
561} 777}
562 778
563=item $coin = coin_from_name $name 779=item $coin = coin_from_name $name
564 780
565=cut 781=cut
602within each server. 818within each server.
603 819
604=cut 820=cut
605 821
606sub db_table($) { 822sub db_table($) {
823 cf::error "db_get called from main context"
824 if $Coro::current == $Coro::main;
825
607 my ($name) = @_; 826 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV; 827 my $db = BDB::db_create $DB_ENV;
609 828
610 eval { 829 eval {
611 $db->set_flags (BDB::CHKSUM); 830 $db->set_flags (BDB::CHKSUM);
621} 840}
622 841
623our $DB; 842our $DB;
624 843
625sub db_init { 844sub db_init {
626 cf::sync_job {
627 $DB ||= db_table "db"; 845 $DB ||= db_table "db";
628 };
629} 846}
630 847
631sub db_get($$) { 848sub db_get($$) {
632 my $key = "$_[0]/$_[1]"; 849 my $key = "$_[0]/$_[1]";
633 850
634 cf::sync_job { 851 cf::error "db_get called from main context"
852 if $Coro::current == $Coro::main;
853
635 BDB::db_get $DB, undef, $key, my $data; 854 BDB::db_get $DB, undef, $key, my $data;
636 855
637 $! ? () 856 $! ? ()
638 : $data 857 : $data
639 }
640} 858}
641 859
642sub db_put($$$) { 860sub db_put($$$) {
643 BDB::dbreq_pri 4; 861 BDB::dbreq_pri 4;
644 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 862 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
672 890
673 my @data; 891 my @data;
674 my $md5; 892 my $md5;
675 893
676 for (0 .. $#$src) { 894 for (0 .. $#$src) {
677 0 <= aio_load $src->[$_], $data[$_] 895 $data[$_] = load_file $src->[$_];
678 or Carp::croak "$src->[$_]: $!";
679 } 896 }
680 897
681 # if processing is expensive, check 898 # if processing is expensive, check
682 # checksum first 899 # checksum first
683 if (1) { 900 if (1) {
696 913
697 return db_get cache => "$id/data"; 914 return db_get cache => "$id/data";
698 } 915 }
699 } 916 }
700 917
701 my $t1 = Time::HiRes::time; 918 my $t1 = EV::time;
702 my $data = $process->(\@data); 919 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time; 920 my $t2 = EV::time;
704 921
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 922 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706 923
707 db_put cache => "$id/data", $data; 924 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5; 925 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta; 926 db_put cache => "$id/meta", $meta;
710 927
720 937
721=cut 938=cut
722 939
723sub datalog($@) { 940sub datalog($@) {
724 my ($type, %kv) = @_; 941 my ($type, %kv) = @_;
725 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 942 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726} 943}
727 944
728=back 945=back
729 946
730=cut 947=cut
925 1142
926 } elsif (exists $cb_id{$type}) { 1143 } elsif (exists $cb_id{$type}) {
927 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1144 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928 1145
929 } elsif (ref $type) { 1146 } elsif (ref $type) {
930 warn "attaching objects not supported, ignoring.\n"; 1147 error "attaching objects not supported, ignoring.\n";
931 1148
932 } else { 1149 } else {
933 shift @arg; 1150 shift @arg;
934 warn "attach argument '$type' not supported, ignoring.\n"; 1151 error "attach argument '$type' not supported, ignoring.\n";
935 } 1152 }
936 } 1153 }
937} 1154}
938 1155
939sub _object_attach { 1156sub _object_attach {
949 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
950 } 1167 }
951 1168
952 $obj->{$name} = \%arg; 1169 $obj->{$name} = \%arg;
953 } else { 1170 } else {
954 warn "object uses attachment '$name' which is not available, postponing.\n"; 1171 info "object uses attachment '$name' which is not available, postponing.\n";
955 } 1172 }
956 1173
957 $obj->{_attachment}{$name} = undef; 1174 $obj->{_attachment}{$name} = undef;
958} 1175}
959 1176
1018 1235
1019 for (@$callbacks) { 1236 for (@$callbacks) {
1020 eval { &{$_->[1]} }; 1237 eval { &{$_->[1]} };
1021 1238
1022 if ($@) { 1239 if ($@) {
1023 warn "$@";
1024 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1240 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025 override; 1241 override;
1026 } 1242 }
1027 1243
1028 return 1 if $override; 1244 return 1 if $override;
1029 } 1245 }
1108 for (@$attach) { 1324 for (@$attach) {
1109 my ($klass, @attach) = @$_; 1325 my ($klass, @attach) = @$_;
1110 _attach $registry, $klass, @attach; 1326 _attach $registry, $klass, @attach;
1111 } 1327 }
1112 } else { 1328 } else {
1113 warn "object uses attachment '$name' that is not available, postponing.\n"; 1329 info "object uses attachment '$name' that is not available, postponing.\n";
1114 } 1330 }
1115 } 1331 }
1116} 1332}
1117 1333
1118cf::attachable->attach ( 1334cf::attachable->attach (
1145 my ($filename, $rdata, $objs) = @_; 1361 my ($filename, $rdata, $objs) = @_;
1146 1362
1147 sync_job { 1363 sync_job {
1148 if (length $$rdata) { 1364 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1365 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1366 trace sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1367 $decname, length $$rdata, scalar @$objs
1368 if $VERBOSE_IO;
1152 1369
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1370 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1371 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1372 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1373 if ($cf::USE_FSYNC) {
1374 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1375 aio_fsync $fh;
1376 }
1157 aio_close $fh; 1377 aio_close $fh;
1158 1378
1159 if (@$objs) { 1379 if (@$objs) {
1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1380 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1161 aio_chmod $fh, SAVE_MODE; 1381 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1382 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1383 aio_write $fh, 0, (length $data), $data, 0;
1164 aio_fsync $fh if $cf::USE_FSYNC; 1384 if ($cf::USE_FSYNC) {
1385 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1386 aio_fsync $fh;
1387 }
1165 aio_close $fh; 1388 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1389 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1390 }
1168 } else { 1391 } else {
1169 aio_unlink "$filename.pst"; 1392 aio_unlink "$filename.pst";
1172 aio_rename "$filename~", $filename; 1395 aio_rename "$filename~", $filename;
1173 1396
1174 $filename =~ s%/[^/]+$%%; 1397 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC; 1398 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1399 } else {
1177 warn "unable to save objects: $filename~: $!\n"; 1400 error "unable to save objects: $filename~: $!\n";
1178 } 1401 }
1179 } else { 1402 } else {
1180 aio_unlink $filename; 1403 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1404 aio_unlink "$filename.pst";
1182 } 1405 }
1206 my $st = eval { Coro::Storable::thaw $av }; 1429 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs}; 1430 $av = $st->{objs};
1208 } 1431 }
1209 1432
1210 utf8::decode (my $decname = $filename); 1433 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1434 trace sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1435 $decname, length $data, scalar @{$av || []}
1436 if $VERBOSE_IO;
1213 1437
1214 ($data, $av) 1438 ($data, $av)
1215} 1439}
1216 1440
1217=head2 COMMAND CALLBACKS 1441=head2 COMMAND CALLBACKS
1221=cut 1445=cut
1222 1446
1223############################################################################# 1447#############################################################################
1224# command handling &c 1448# command handling &c
1225 1449
1226=item cf::register_command $name => \&callback($ob,$args); 1450=item cf::register_command $name => \&callback($ob,$args)
1227 1451
1228Register a callback for execution when the client sends the user command 1452Register a callback for execution when the client sends the user command
1229$name. 1453$name.
1230 1454
1231=cut 1455=cut
1237 #warn "registering command '$name/$time' to '$caller'"; 1461 #warn "registering command '$name/$time' to '$caller'";
1238 1462
1239 push @{ $COMMAND{$name} }, [$caller, $cb]; 1463 push @{ $COMMAND{$name} }, [$caller, $cb];
1240} 1464}
1241 1465
1242=item cf::register_extcmd $name => \&callback($pl,$packet); 1466=item cf::register_extcmd $name => \&callback($pl,@args)
1243 1467
1244Register a callback for execution when the client sends an (synchronous) 1468Register a callback for execution when the client sends an (synchronous)
1245extcmd packet. Ext commands will be processed in the order they are 1469extcmd packet. Ext commands will be processed in the order they are
1246received by the server, like other user commands. The first argument is 1470received by the server, like other user commands. The first argument is
1247the logged-in player. Ext commands can only be processed after a player 1471the logged-in player. Ext commands can only be processed after a player
1248has logged in successfully. 1472has logged in successfully.
1249 1473
1250If the callback returns something, it is sent back as if reply was being 1474The values will be sent back to the client.
1251called.
1252 1475
1476=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1477
1478Same as C<cf::register_extcmd>, but instead of returning values, the
1479callback needs to clal the C<$reply> function.
1480
1253=item cf::register_exticmd $name => \&callback($ns,$packet); 1481=item cf::register_exticmd $name => \&callback($ns,@args)
1254 1482
1255Register a callback for execution when the client sends an (asynchronous) 1483Register a callback for execution when the client sends an (asynchronous)
1256exticmd packet. Exti commands are processed by the server as soon as they 1484exticmd packet. Exti commands are processed by the server as soon as they
1257are received, i.e. out of order w.r.t. other commands. The first argument 1485are received, i.e. out of order w.r.t. other commands. The first argument
1258is a client socket. Exti commands can be received anytime, even before 1486is a client socket. Exti commands can be received anytime, even before
1259log-in. 1487log-in.
1260 1488
1261If the callback returns something, it is sent back as if reply was being 1489The values will be sent back to the client.
1262called.
1263 1490
1264=cut 1491=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1265 1492
1493Same as C<cf::register_extcmd>, but instead of returning values, the
1494callback needs to clal the C<$reply> function.
1495
1496=cut
1497
1266sub register_extcmd { 1498sub register_extcmd($$) {
1267 my ($name, $cb) = @_; 1499 my ($name, $cb) = @_;
1268 1500
1269 $EXTCMD{$name} = $cb; 1501 $EXTCMD{$name} = $cb;
1270} 1502}
1271 1503
1272sub register_exticmd { 1504sub register_async_extcmd($$) {
1273 my ($name, $cb) = @_; 1505 my ($name, $cb) = @_;
1274 1506
1507 $EXTACMD{$name} = $cb;
1508}
1509
1510sub register_exticmd($$) {
1511 my ($name, $cb) = @_;
1512
1275 $EXTICMD{$name} = $cb; 1513 $EXTICMD{$name} = $cb;
1276} 1514}
1277 1515
1516sub register_async_exticmd($$) {
1517 my ($name, $cb) = @_;
1518
1519 $EXTIACMD{$name} = $cb;
1520}
1521
1278use File::Glob (); 1522use File::Glob ();
1279 1523
1280cf::player->attach ( 1524cf::player->attach (
1281 on_command => sub { 1525 on_unknown_command => sub {
1282 my ($pl, $name, $params) = @_; 1526 my ($pl, $name, $params) = @_;
1283 1527
1284 my $cb = $COMMAND{$name} 1528 my $cb = $COMMAND{$name}
1285 or return; 1529 or return;
1286 1530
1294 my ($pl, $buf) = @_; 1538 my ($pl, $buf) = @_;
1295 1539
1296 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1540 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1297 1541
1298 if (ref $msg) { 1542 if (ref $msg) {
1299 my ($type, $reply, @payload) = 1543 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1300 "ARRAY" eq ref $msg
1301 ? @$msg
1302 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1303 1544
1304 my @reply;
1305
1306 if (my $cb = $EXTCMD{$type}) { 1545 if (my $cb = $EXTACMD{$type}) {
1546 $cb->(
1547 $pl,
1548 sub {
1549 $pl->ext_msg ("reply-$reply", @_)
1550 if $reply;
1551 },
1552 @payload
1553 );
1554 } else {
1555 my @reply;
1556
1557 if (my $cb = $EXTCMD{$type}) {
1307 @reply = $cb->($pl, @payload); 1558 @reply = $cb->($pl, @payload);
1559 }
1560
1561 $pl->ext_msg ("reply-$reply", @reply)
1562 if $reply;
1308 } 1563 }
1309 1564
1310 $pl->ext_reply ($reply, @reply)
1311 if $reply;
1312
1313 } else { 1565 } else {
1314 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1566 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1315 } 1567 }
1316 1568
1317 cf::override; 1569 cf::override;
1318 }, 1570 },
1319); 1571);
1320 1572
1321# "readahead" all extensions 1573# "readahead" all extensions
1322sub cache_extensions { 1574sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1575 my $grp = IO::AIO::aio_group;
1324 1576
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1577 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1578 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1579 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1580 }
1329 }; 1581 };
1330 1582
1331 $grp 1583 $grp
1332} 1584}
1333 1585
1586sub _ext_cfg_reg($$$$) {
1587 my ($rvar, $varname, $cfgname, $default) = @_;
1588
1589 $cfgname = lc $varname
1590 unless length $cfgname;
1591
1592 $EXT_CFG{$cfgname} = [$rvar, $default];
1593
1594 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1595}
1596
1334sub load_extensions { 1597sub load_extensions {
1598 info "loading extensions...";
1599
1600 %EXT_CFG = ();
1601
1335 cf::sync_job { 1602 cf::sync_job {
1336 my %todo; 1603 my %todo;
1337 1604
1338 for my $path (<$LIBDIR/*.ext>) { 1605 for my $path (<$LIBDIR/*.ext>) {
1339 next unless -r $path; 1606 next unless -r $path;
1357 1624
1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1625 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1626 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1360 1627
1361 $ext{source} = 1628 $ext{source} =
1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1629 "package $pkg; use common::sense;\n"
1363 . "#line 1 \"$path\"\n{\n" 1630 . "#line 1 \"$path\"\n{\n"
1364 . $source 1631 . $source
1365 . "\n};\n1"; 1632 . "\n};\n1";
1366 1633
1367 $todo{$base} = \%ext; 1634 $todo{$base} = \%ext;
1368 } 1635 }
1369 1636
1637 my $pass = 0;
1370 my %done; 1638 my %done;
1371 while (%todo) { 1639 while (%todo) {
1372 my $progress; 1640 my $progress;
1373 1641
1642 ++$pass;
1643
1644 ext:
1374 while (my ($k, $v) = each %todo) { 1645 while (my ($k, $v) = each %todo) {
1375 for (split /,\s*/, $v->{meta}{depends}) { 1646 for (split /,\s*/, $v->{meta}{depends}) {
1376 goto skip 1647 next ext
1377 unless exists $done{$_}; 1648 unless exists $done{$_};
1378 } 1649 }
1379 1650
1380 warn "... loading '$k' into '$v->{pkg}'\n"; 1651 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381 1652
1382 unless (eval $v->{source}) { 1653 my $source = $v->{source};
1654
1655 # support "CONF varname :confname = default" pseudo-statements
1656 $source =~ s{
1657 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1658 }{
1659 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1660 }gmxe;
1661
1662 my $active = eval $source;
1663
1664 if (length $@) {
1383 my $msg = $@ ? "$v->{path}: $@\n" 1665 error "$v->{path}: $@\n";
1384 : "$v->{base}: extension inactive.\n";
1385 1666
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1667 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1668 if exists $v->{meta}{mandatory};
1390 1669
1391 warn $msg; 1670 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1671 delete $todo{$k};
1672 } else {
1673 $done{$k} = delete $todo{$k};
1674 push @EXTS, $v->{pkg};
1675 $progress = 1;
1676
1677 info "$v->{base}: extension inactive.\n"
1678 unless $active;
1392 } 1679 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1680 }
1398 1681
1399 skip: 1682 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1683 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 unless $progress; 1684
1685 while (my ($k, $v) = each %todo) {
1686 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1687 if exists $v->{meta}{mandatory};
1688 }
1689
1690 last;
1691 }
1402 } 1692 }
1403 }; 1693 };
1404} 1694}
1405 1695
1406############################################################################# 1696#############################################################################
1490 $cf::PLAYER{$login} = $pl 1780 $cf::PLAYER{$login} = $pl
1491 } 1781 }
1492 } 1782 }
1493} 1783}
1494 1784
1785cf::player->attach (
1786 on_load => sub {
1787 my ($pl, $path) = @_;
1788
1789 # restore slots saved in save, below
1790 my $slots = delete $pl->{_slots};
1791
1792 $pl->ob->current_weapon ($slots->[0]);
1793 $pl->combat_ob ($slots->[1]);
1794 $pl->ranged_ob ($slots->[2]);
1795 },
1796);
1797
1495sub save($) { 1798sub save($) {
1496 my ($pl) = @_; 1799 my ($pl) = @_;
1497 1800
1498 return if $pl->{deny_save}; 1801 return if $pl->{deny_save};
1499 1802
1504 1807
1505 aio_mkdir playerdir $pl, 0770; 1808 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1809 $pl->{last_save} = $cf::RUNTIME;
1507 1810
1508 cf::get_slot 0.01; 1811 cf::get_slot 0.01;
1812
1813 # save slots, to be restored later
1814 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1509 1815
1510 $pl->save_pl ($path); 1816 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1817 cf::cede_to_tick;
1512} 1818}
1513 1819
1547 my $name = $pl->ob->name; 1853 my $name = $pl->ob->name;
1548 1854
1549 $pl->{deny_save} = 1; 1855 $pl->{deny_save} = 1;
1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1856 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1551 1857
1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1858 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1553 $pl->deactivate; 1859 $pl->deactivate;
1860
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1861 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1556 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1862 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1863 ext::highscore::check ($pl->ob);
1864
1557 $pl->ns->destroy if $pl->ns; 1865 $pl->ns->destroy if $pl->ns;
1558 1866
1559 my $path = playerdir $pl; 1867 my $path = playerdir $pl;
1560 my $temp = "$path~$cf::RUNTIME~deleting~"; 1868 my $temp = "$path~$cf::RUNTIME~deleting~";
1561 aio_rename $path, $temp; 1869 aio_rename $path, $temp;
1615 \@logins 1923 \@logins
1616} 1924}
1617 1925
1618=item $player->maps 1926=item $player->maps
1619 1927
1928=item cf::player::maps $login
1929
1620Returns an arrayref of map paths that are private for this 1930Returns an arrayref of map paths that are private for this
1621player. May block. 1931player. May block.
1622 1932
1623=cut 1933=cut
1624 1934
1645 1955
1646=item $protocol_xml = $player->expand_cfpod ($cfpod) 1956=item $protocol_xml = $player->expand_cfpod ($cfpod)
1647 1957
1648Expand deliantra pod fragments into protocol xml. 1958Expand deliantra pod fragments into protocol xml.
1649 1959
1650=item $player->ext_reply ($msgid, @msg)
1651
1652Sends an ext reply to the player.
1653
1654=cut
1655
1656sub ext_reply($$@) {
1657 my ($self, $id, @msg) = @_;
1658
1659 $self->ns->ext_reply ($id, @msg)
1660}
1661
1662=item $player->ext_msg ($type, @msg) 1960=item $player->ext_msg ($type, @msg)
1663 1961
1664Sends an ext event to the client. 1962Sends an ext event to the client.
1665 1963
1666=cut 1964=cut
1685 1983
1686=cut 1984=cut
1687 1985
1688sub find_by_path($) { 1986sub find_by_path($) {
1689 my ($path) = @_; 1987 my ($path) = @_;
1988
1989 $path =~ s/^~[^\/]*//; # skip ~login
1690 1990
1691 my ($match, $specificity); 1991 my ($match, $specificity);
1692 1992
1693 for my $region (list) { 1993 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1994 if ($region->{match} && $path =~ $region->{match}) {
1723sub generate_random_map { 2023sub generate_random_map {
1724 my ($self, $rmp) = @_; 2024 my ($self, $rmp) = @_;
1725 2025
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2026 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727 2027
1728 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 2028 $self->_create_random_map ($rmp);
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1737 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1738 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1739 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1740 (cf::region::find $rmp->{region}), $rmp->{custom}
1741 )
1742} 2029}
1743 2030
1744=item cf::map->register ($regex, $prio) 2031=item cf::map->register ($regex, $prio)
1745 2032
1746Register a handler for the map path matching the given regex at the 2033Register a handler for the map path matching the given regex at the
1751 2038
1752sub register { 2039sub register {
1753 my (undef, $regex, $prio) = @_; 2040 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 2041 my $pkg = caller;
1755 2042
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 2043 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 2044
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2045 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 2046}
1761 2047
1762# also paths starting with '/' 2048# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2049$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 2050
1765sub thawer_merge { 2051sub thawer_merge {
1766 my ($self, $merge) = @_; 2052 my ($self, $merge) = @_;
1767 2053
1768 # we have to keep some variables in memory intact 2054 # we have to keep some variables in memory intact
1773} 2059}
1774 2060
1775sub normalise { 2061sub normalise {
1776 my ($path, $base) = @_; 2062 my ($path, $base) = @_;
1777 2063
1778 $path = "$path"; # make sure its a string 2064 $path = "$path"; # make sure it's a string
1779 2065
1780 $path =~ s/\.map$//; 2066 $path =~ s/\.map$//;
1781 2067
1782 # map plan: 2068 # map plan:
1783 # 2069 #
1798 $base =~ s{[^/]+/?$}{}; 2084 $base =~ s{[^/]+/?$}{};
1799 $path = "$base/$path"; 2085 $path = "$base/$path";
1800 } 2086 }
1801 2087
1802 for ($path) { 2088 for ($path) {
1803 redo if s{//}{/};
1804 redo if s{/\.?/}{/}; 2089 redo if s{/\.?/}{/};
1805 redo if s{/[^/]+/\.\./}{/}; 2090 redo if s{/[^/]+/\.\./}{/};
1806 } 2091 }
1807 2092
1808 $path 2093 $path
1822 $self->init; # pass $1 etc. 2107 $self->init; # pass $1 etc.
1823 return $self; 2108 return $self;
1824 } 2109 }
1825 } 2110 }
1826 2111
1827 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2112 Carp::cluck "unable to resolve path '$path' (base '$base')";
1828 () 2113 ()
1829} 2114}
1830 2115
2116# may re-bless or do other evil things
1831sub init { 2117sub init {
1832 my ($self) = @_; 2118 my ($self) = @_;
1833 2119
1834 $self 2120 $self
1835} 2121}
1900 $self->{load_path} = $path; 2186 $self->{load_path} = $path;
1901 2187
1902 1 2188 1
1903} 2189}
1904 2190
2191# used to laod the header of an original map
1905sub load_header_orig { 2192sub load_header_orig {
1906 my ($self) = @_; 2193 my ($self) = @_;
1907 2194
1908 $self->load_header_from ($self->load_path) 2195 $self->load_header_from ($self->load_path)
1909} 2196}
1910 2197
2198# used to laod the header of an instantiated map
1911sub load_header_temp { 2199sub load_header_temp {
1912 my ($self) = @_; 2200 my ($self) = @_;
1913 2201
1914 $self->load_header_from ($self->save_path) 2202 $self->load_header_from ($self->save_path)
1915} 2203}
1916 2204
2205# called after loading the header from an instantiated map
1917sub prepare_temp { 2206sub prepare_temp {
1918 my ($self) = @_; 2207 my ($self) = @_;
1919 2208
1920 $self->last_access ((delete $self->{last_access}) 2209 $self->last_access ((delete $self->{last_access})
1921 || $cf::RUNTIME); #d# 2210 || $cf::RUNTIME); #d#
1922 # safety 2211 # safety
1923 $self->{instantiate_time} = $cf::RUNTIME 2212 $self->{instantiate_time} = $cf::RUNTIME
1924 if $self->{instantiate_time} > $cf::RUNTIME; 2213 if $self->{instantiate_time} > $cf::RUNTIME;
1925} 2214}
1926 2215
2216# called after loading the header from an original map
1927sub prepare_orig { 2217sub prepare_orig {
1928 my ($self) = @_; 2218 my ($self) = @_;
1929 2219
1930 $self->{load_original} = 1; 2220 $self->{load_original} = 1;
1931 $self->{instantiate_time} = $cf::RUNTIME; 2221 $self->{instantiate_time} = $cf::RUNTIME;
1955 2245
1956sub find; 2246sub find;
1957sub find { 2247sub find {
1958 my ($path, $origin) = @_; 2248 my ($path, $origin) = @_;
1959 2249
2250 cf::cede_to_tick;
2251
1960 $path = normalise $path, $origin && $origin->path; 2252 $path = normalise $path, $origin;
1961 2253
1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2254 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1963 my $guard2 = cf::lock_acquire "map_find:$path"; 2255 my $guard2 = cf::lock_acquire "map_find:$path";
1964 2256
1965 $cf::MAP{$path} || do { 2257 $cf::MAP{$path} || do {
1982 2274
1983 $cf::MAP{$path} = $map 2275 $cf::MAP{$path} = $map
1984 } 2276 }
1985} 2277}
1986 2278
1987sub pre_load { } 2279sub pre_load { }
1988sub post_load { } 2280#sub post_load { } # XS
1989 2281
1990sub load { 2282sub load {
1991 my ($self) = @_; 2283 my ($self) = @_;
1992 2284
1993 local $self->{deny_reset} = 1; # loading can take a long time 2285 local $self->{deny_reset} = 1; # loading can take a long time
1996 2288
1997 { 2289 {
1998 my $guard = cf::lock_acquire "map_data:$path"; 2290 my $guard = cf::lock_acquire "map_data:$path";
1999 2291
2000 return unless $self->valid; 2292 return unless $self->valid;
2001 return unless $self->in_memory == cf::MAP_SWAPPED; 2293 return unless $self->state == cf::MAP_SWAPPED;
2002
2003 $self->in_memory (cf::MAP_LOADING);
2004 2294
2005 $self->alloc; 2295 $self->alloc;
2006 2296
2007 $self->pre_load; 2297 $self->pre_load;
2008 cf::cede_to_tick; 2298 cf::cede_to_tick;
2009 2299
2300 if (exists $self->{load_path}) {
2010 my $f = new_from_file cf::object::thawer $self->{load_path}; 2301 my $f = new_from_file cf::object::thawer $self->{load_path};
2011 $f->skip_block; 2302 $f->skip_block;
2012 $self->_load_objects ($f) 2303 $self->_load_objects ($f)
2013 or return; 2304 or return;
2014 2305
2015 $self->post_load_original 2306 $self->post_load_original
2016 if delete $self->{load_original}; 2307 if delete $self->{load_original};
2017 2308
2018 if (my $uniq = $self->uniq_path) { 2309 if (my $uniq = $self->uniq_path) {
2019 utf8::encode $uniq; 2310 utf8::encode $uniq;
2020 unless (aio_stat $uniq) { 2311 unless (aio_stat $uniq) {
2021 if (my $f = new_from_file cf::object::thawer $uniq) { 2312 if (my $f = new_from_file cf::object::thawer $uniq) {
2022 $self->clear_unique_items; 2313 $self->clear_unique_items;
2023 $self->_load_objects ($f); 2314 $self->_load_objects ($f);
2024 $f->resolve_delayed_derefs; 2315 $f->resolve_delayed_derefs;
2316 }
2025 } 2317 }
2026 } 2318 }
2027 }
2028 2319
2029 $f->resolve_delayed_derefs; 2320 $f->resolve_delayed_derefs;
2321 } else {
2322 $self->post_load_original
2323 if delete $self->{load_original};
2324 }
2325
2326 $self->state (cf::MAP_INACTIVE);
2030 2327
2031 cf::cede_to_tick; 2328 cf::cede_to_tick;
2032 # now do the right thing for maps 2329 # now do the right thing for maps
2033 $self->link_multipart_objects; 2330 $self->link_multipart_objects;
2034 $self->difficulty ($self->estimate_difficulty) 2331 $self->difficulty ($self->estimate_difficulty)
2038 unless ($self->{deny_activate}) { 2335 unless ($self->{deny_activate}) {
2039 $self->decay_objects; 2336 $self->decay_objects;
2040 $self->fix_auto_apply; 2337 $self->fix_auto_apply;
2041 $self->update_buttons; 2338 $self->update_buttons;
2042 cf::cede_to_tick; 2339 cf::cede_to_tick;
2043 $self->activate; 2340 #$self->activate; # no longer activate maps automatically
2044 } 2341 }
2045 2342
2046 $self->{last_save} = $cf::RUNTIME; 2343 $self->{last_save} = $cf::RUNTIME;
2047 $self->last_access ($cf::RUNTIME); 2344 $self->last_access ($cf::RUNTIME);
2048
2049 $self->in_memory (cf::MAP_ACTIVE);
2050 } 2345 }
2051 2346
2052 $self->post_load; 2347 $self->post_load;
2053}
2054 2348
2349 1
2350}
2351
2352# customize the map for a given player, i.e.
2353# return the _real_ map. used by e.g. per-player
2354# maps to change the path to ~playername/mappath
2055sub customise_for { 2355sub customise_for {
2056 my ($self, $ob) = @_; 2356 my ($self, $ob) = @_;
2057 2357
2058 return find "~" . $ob->name . "/" . $self->{path} 2358 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2359 if $self->per_player;
2062# if $self->per_party; 2362# if $self->per_party;
2063 2363
2064 $self 2364 $self
2065} 2365}
2066 2366
2067# find and load all maps in the 3x3 area around a map
2068sub load_neighbours {
2069 my ($map) = @_;
2070
2071 my @neigh; # diagonal neighbours
2072
2073 for (0 .. 3) {
2074 my $neigh = $map->tile_path ($_)
2075 or next;
2076 $neigh = find $neigh, $map
2077 or next;
2078 $neigh->load;
2079
2080 push @neigh,
2081 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2082 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2083 }
2084
2085 for (grep defined $_->[0], @neigh) {
2086 my ($path, $origin) = @$_;
2087 my $neigh = find $path, $origin
2088 or next;
2089 $neigh->load;
2090 }
2091}
2092
2093sub find_sync { 2367sub find_sync {
2094 my ($path, $origin) = @_; 2368 my ($path, $origin) = @_;
2095 2369
2096 cf::sync_job { find $path, $origin } 2370 # it's a bug to call this from the main context
2371 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2372 if $Coro::current == $Coro::main;
2373
2374 find $path, $origin
2097} 2375}
2098 2376
2099sub do_load_sync { 2377sub do_load_sync {
2100 my ($map) = @_; 2378 my ($map) = @_;
2101 2379
2380 # it's a bug to call this from the main context
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2381 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main; 2382 if $Coro::current == $Coro::main;
2104 2383
2105 cf::sync_job { $map->load }; 2384 $map->load;
2106} 2385}
2107 2386
2108our %MAP_PREFETCH; 2387our %MAP_PREFETCH;
2109our $MAP_PREFETCHER = undef; 2388our $MAP_PREFETCHER = undef;
2110 2389
2111sub find_async { 2390sub find_async {
2112 my ($path, $origin, $load) = @_; 2391 my ($path, $origin, $load) = @_;
2113 2392
2114 $path = normalise $path, $origin && $origin->{path}; 2393 $path = normalise $path, $origin;
2115 2394
2116 if (my $map = $cf::MAP{$path}) { 2395 if (my $map = $cf::MAP{$path}) {
2117 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2396 return $map if !$load || $map->linkable;
2118 } 2397 }
2119 2398
2120 $MAP_PREFETCH{$path} |= $load; 2399 $MAP_PREFETCH{$path} |= $load;
2121 2400
2122 $MAP_PREFETCHER ||= cf::async { 2401 $MAP_PREFETCHER ||= cf::async {
2123 $Coro::current->{desc} = "map prefetcher"; 2402 $Coro::current->{desc} = "map prefetcher";
2124 2403
2125 while (%MAP_PREFETCH) { 2404 while (%MAP_PREFETCH) {
2126 while (my ($k, $v) = each %MAP_PREFETCH) { 2405 for my $k (keys %MAP_PREFETCH) {
2127 if (my $map = find $k) { 2406 if (my $map = find $k) {
2128 $map->load if $v; 2407 $map->load if $MAP_PREFETCH{$k};
2129 } 2408 }
2130 2409
2131 delete $MAP_PREFETCH{$k}; 2410 delete $MAP_PREFETCH{$k};
2132 } 2411 }
2133 } 2412 }
2136 $MAP_PREFETCHER->prio (6); 2415 $MAP_PREFETCHER->prio (6);
2137 2416
2138 () 2417 ()
2139} 2418}
2140 2419
2420# common code, used by both ->save and ->swapout
2141sub save { 2421sub _save {
2142 my ($self) = @_; 2422 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2423
2146 $self->{last_save} = $cf::RUNTIME; 2424 $self->{last_save} = $cf::RUNTIME;
2147 2425
2148 return unless $self->dirty; 2426 return unless $self->dirty;
2149 2427
2169 } else { 2447 } else {
2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2448 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171 } 2449 }
2172} 2450}
2173 2451
2452sub save {
2453 my ($self) = @_;
2454
2455 my $lock = cf::lock_acquire "map_data:$self->{path}";
2456
2457 $self->_save;
2458}
2459
2174sub swap_out { 2460sub swap_out {
2175 my ($self) = @_; 2461 my ($self) = @_;
2176 2462
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2463 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2464
2465 return if !$self->linkable;
2466 return if $self->{deny_save};
2182 return if $self->players; 2467 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2468
2469 # first deactivate the map and "unlink" it from the core
2470 $self->deactivate;
2471 $_->clear_links_to ($self) for values %cf::MAP;
2472 $self->state (cf::MAP_SWAPPED);
2473
2474 # then atomically save
2475 $self->_save;
2476
2477 # then free the map
2478 $self->clear;
2479}
2480
2481sub reset_at {
2482 my ($self) = @_;
2483
2484 # TODO: safety, remove and allow resettable per-player maps
2184 return if $self->{deny_save}; 2485 return 1e99 if $self->{deny_reset};
2185 2486
2487 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2488 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2489
2490 $time + $to
2491}
2492
2493sub should_reset {
2494 my ($self) = @_;
2495
2496 $self->reset_at <= $cf::RUNTIME
2497}
2498
2499sub reset {
2500 my ($self) = @_;
2501
2502 my $lock = cf::lock_acquire "map_data:$self->{path}";
2503
2504 return if $self->players;
2505
2506 cf::trace "resetting map ", $self->path, "\n";
2507
2186 $self->in_memory (cf::MAP_SWAPPED); 2508 $self->state (cf::MAP_SWAPPED);
2509
2510 # need to save uniques path
2511 unless ($self->{deny_save}) {
2512 my $uniq = $self->uniq_path; utf8::encode $uniq;
2513
2514 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2515 if $uniq;
2516 }
2517
2518 delete $cf::MAP{$self->path};
2187 2519
2188 $self->deactivate; 2520 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2521 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2522 $self->clear;
2191}
2192
2193sub reset_at {
2194 my ($self) = @_;
2195
2196 # TODO: safety, remove and allow resettable per-player maps
2197 return 1e99 if $self->{deny_reset};
2198
2199 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2200 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2201
2202 $time + $to
2203}
2204
2205sub should_reset {
2206 my ($self) = @_;
2207
2208 $self->reset_at <= $cf::RUNTIME
2209}
2210
2211sub reset {
2212 my ($self) = @_;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215
2216 return if $self->players;
2217
2218 warn "resetting map ", $self->path;
2219
2220 $self->in_memory (cf::MAP_SWAPPED);
2221
2222 # need to save uniques path
2223 unless ($self->{deny_save}) {
2224 my $uniq = $self->uniq_path; utf8::encode $uniq;
2225
2226 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2227 if $uniq;
2228 }
2229
2230 delete $cf::MAP{$self->path};
2231
2232 $self->deactivate;
2233 $_->clear_links_to ($self) for values %cf::MAP;
2234 $self->clear;
2235 2523
2236 $self->unlink_save; 2524 $self->unlink_save;
2237 $self->destroy; 2525 $self->destroy;
2238} 2526}
2239 2527
2247 2535
2248 delete $cf::MAP{$self->path}; 2536 delete $cf::MAP{$self->path};
2249 2537
2250 $self->unlink_save; 2538 $self->unlink_save;
2251 2539
2252 bless $self, "cf::map"; 2540 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2541 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2542 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2543 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2544 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2545
2314 : normalise $_ 2602 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2603 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2604 ]
2317} 2605}
2318 2606
2607=item cf::map::static_maps
2608
2609Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2610file in the shared directory excluding F</styles> and F</editor>). May
2611block.
2612
2613=cut
2614
2615sub static_maps() {
2616 my @dirs = "";
2617 my @maps;
2618
2619 while (@dirs) {
2620 my $dir = shift @dirs;
2621
2622 next if $dir eq "/styles" || $dir eq "/editor";
2623
2624 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2625 or return;
2626
2627 for (@$files) {
2628 s/\.map$// or next;
2629 utf8::decode $_;
2630 push @maps, "$dir/$_";
2631 }
2632
2633 push @dirs, map "$dir/$_", @$dirs;
2634 }
2635
2636 \@maps
2637}
2638
2319=back 2639=back
2320 2640
2321=head3 cf::object 2641=head3 cf::object
2322 2642
2323=cut 2643=cut
2346 2666
2347Creates and returns a persistent reference to an object that can be stored as a string. 2667Creates and returns a persistent reference to an object that can be stored as a string.
2348 2668
2349=item $ob = cf::object::deref ($refstring) 2669=item $ob = cf::object::deref ($refstring)
2350 2670
2351returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2671returns the objetc referenced by refstring. may return undef when it cannot find the object,
2352even if the object actually exists. May block. 2672even if the object actually exists. May block.
2353 2673
2354=cut 2674=cut
2355 2675
2356sub deref { 2676sub deref {
2438=item $player_object->may ("access") 2758=item $player_object->may ("access")
2439 2759
2440Returns wether the given player is authorized to access resource "access" 2760Returns wether the given player is authorized to access resource "access"
2441(e.g. "command_wizcast"). 2761(e.g. "command_wizcast").
2442 2762
2763This is implemented by checking a config setting of C<may_access> where
2764C<access> is replaced by the access string. The following alternatives are
2765possible (and are tested in order):
2766
2767=over 4
2768
2769=item * Player is DM
2770
2771The request will succeed.
2772
2773=item * may_access is an array reference
2774
2775If either the player nickname or UUID is in the array, the request will
2776succeed, otherwise it will fail.
2777
2778=item * may_access is a true value
2779
2780The request will succeed.
2781
2782=item * may_access is missing or false
2783
2784The request will fail.
2785
2786=back
2787
2443=cut 2788=cut
2444 2789
2445sub cf::object::player::may { 2790sub cf::object::player::may {
2446 my ($self, $access) = @_; 2791 my ($self, $access) = @_;
2447 2792
2448 $self->flag (cf::FLAG_WIZ) || 2793 $self->flag (cf::FLAG_WIZ) ||
2449 (ref $cf::CFG{"may_$access"} 2794 (ref $cf::CFG{"may_$access"}
2450 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2795 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2451 : $cf::CFG{"may_$access"}) 2796 : $cf::CFG{"may_$access"})
2452} 2797}
2453 2798
2454=item $player_object->enter_link 2799=item $player_object->enter_link
2455 2800
2456Freezes the player and moves him/her to a special map (C<{link}>). 2801Freezes the player and moves him/her to a special map (C<{link}>).
2457 2802
2458The player should be reasonably safe there for short amounts of time (e.g. 2803The player should be reasonably safe there for short amounts of time (e.g.
2459for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2804for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link 2805though, as the player cannot control the character while it is on the link
2461map. 2806map.
2462 2807
2463Will never block. 2808This method will never block, which is the whole reaosn for it's
2809existance: you can I<always> put a player onto the link map, which is the
2810only place to put objects that is guaranteed to exist.
2811
2812A typical usage pattern is to call C<enter_link> synchronously from the
2813server, then start a new thread, do your blocking stuff there and then
2814call C<leave_link> from that thread.
2464 2815
2465=item $player_object->leave_link ($map, $x, $y) 2816=item $player_object->leave_link ($map, $x, $y)
2466 2817
2467Moves the player out of the special C<{link}> map onto the specified 2818Moves the player out of the special C<{link}> map onto the specified
2468map. If the map is not valid (or omitted), the player will be moved back 2819map. If the map is not valid (or omitted), the player will be moved back
2486sub cf::object::player::enter_link { 2837sub cf::object::player::enter_link {
2487 my ($self) = @_; 2838 my ($self) = @_;
2488 2839
2489 $self->deactivate_recursive; 2840 $self->deactivate_recursive;
2490 2841
2842 ++$self->{_link_recursion};
2843
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2844 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2845
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2846 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2847 if $self->map && $self->map->{path} ne "{link}";
2495 2848
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2849 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2850}
2498 2851
2499sub cf::object::player::leave_link { 2852sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2853 my ($self, $map, $x, $y) = @_;
2501 2854
2518 ($x, $y) = (-1, -1) 2871 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2872 unless (defined $x) && (defined $y);
2520 2873
2521 # use -1 or undef as default coordinates, not 0, 0 2874 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2875 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2876 if $x <= 0 && $y <= 0;
2524 2877
2525 $map->load; 2878 $map->load;
2526 $map->load_neighbours;
2527 2879
2528 return unless $self->contr->active; 2880 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2881
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2882 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2883 if ($self->enter_map ($map, $x, $y)) {
2534} 2884 # entering was successful
2885 delete $self->{_link_recursion};
2886 # only activate afterwards, to support waiting in hooks
2887 $self->activate_recursive;
2888 }
2535 2889
2890}
2891
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2892=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2537 2893
2538Moves the player to the given map-path and coordinates by first freezing 2894Moves the player to the given map-path and coordinates by first freezing
2539her, loading and preparing them map, calling the provided $check callback 2895her, loading and preparing them map, calling the provided $check callback
2540that has to return the map if sucecssful, and then unfreezes the player on 2896that has to return the map if sucecssful, and then unfreezes the player on
2541the new (success) or old (failed) map position. In either case, $done will 2897the new (success) or old (failed) map position. In either case, $done will
2548 2904
2549our $GOTOGEN; 2905our $GOTOGEN;
2550 2906
2551sub cf::object::player::goto { 2907sub cf::object::player::goto {
2552 my ($self, $path, $x, $y, $check, $done) = @_; 2908 my ($self, $path, $x, $y, $check, $done) = @_;
2909
2910 if ($self->{_link_recursion} >= $MAX_LINKS) {
2911 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2912 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2913 ($path, $x, $y) = @$EMERGENCY_POSITION;
2914 }
2553 2915
2554 # do generation counting so two concurrent goto's will be executed in-order 2916 # do generation counting so two concurrent goto's will be executed in-order
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2917 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2918
2557 $self->enter_link; 2919 $self->enter_link;
2577 ($path, $x, $y) = (undef, undef, undef); 2939 ($path, $x, $y) = (undef, undef, undef);
2578 } 2940 }
2579 } 2941 }
2580 2942
2581 my $map = eval { 2943 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2944 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2583 2945
2584 if ($map) { 2946 if ($map) {
2585 $map = $map->customise_for ($self); 2947 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2948 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2949 } else {
2588 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2950 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 } 2951 }
2590 2952
2591 $map 2953 $map
2599 if ($gen == $self->{_goto_generation}) { 2961 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2962 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2963 $self->leave_link ($map, $x, $y);
2602 } 2964 }
2603 2965
2604 $done->() if $done; 2966 $done->($self) if $done;
2605 })->prio (1); 2967 })->prio (1);
2606} 2968}
2607 2969
2608=item $player_object->enter_exit ($exit_object) 2970=item $player_object->enter_exit ($exit_object)
2609 2971
2677 $Coro::current->{desc} = "enter_exit"; 3039 $Coro::current->{desc} = "enter_exit";
2678 3040
2679 unless (eval { 3041 unless (eval {
2680 $self->deactivate_recursive; # just to be sure 3042 $self->deactivate_recursive; # just to be sure
2681 3043
2682 # random map handling
2683 {
2684 my $guard = cf::lock_acquire "exit_prepare:$exit";
2685
2686 prepare_random_map $exit
2687 if $exit->slaying eq "/!";
2688 }
2689
2690 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3044 my $map = cf::map::normalise $exit->slaying, $exit->map;
2691 my $x = $exit->stats->hp; 3045 my $x = $exit->stats->hp;
2692 my $y = $exit->stats->sp; 3046 my $y = $exit->stats->sp;
3047
3048 # special map handling
3049 my $slaying = $exit->slaying;
3050
3051 # special map handling
3052 if ($slaying eq "/!") {
3053 my $guard = cf::lock_acquire "exit_prepare:$exit";
3054
3055 prepare_random_map $exit
3056 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3057
3058 $map = $exit->slaying;
3059
3060 } elsif ($slaying eq '!up') {
3061 $map = $exit->map->tile_path (cf::TILE_UP);
3062 $x = $exit->x;
3063 $y = $exit->y;
3064
3065 } elsif ($slaying eq '!down') {
3066 $map = $exit->map->tile_path (cf::TILE_DOWN);
3067 $x = $exit->x;
3068 $y = $exit->y;
3069 }
2693 3070
2694 $self->goto ($map, $x, $y); 3071 $self->goto ($map, $x, $y);
2695 3072
2696 # if exit is damned, update players death & WoR home-position 3073 # if exit is damned, update players death & WoR home-position
2697 $self->contr->savebed ($map, $x, $y) 3074 $self->contr->savebed ($map, $x, $y)
2702 $self->message ("Something went wrong deep within the deliantra server. " 3079 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "I'll try to bring you back to the map you were before. " 3080 . "I'll try to bring you back to the map you were before. "
2704 . "Please report this to the dungeon master!", 3081 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 3082 cf::NDI_UNIQUE | cf::NDI_RED);
2706 3083
2707 warn "ERROR in enter_exit: $@"; 3084 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 3085 $self->leave_link;
2709 } 3086 }
2710 })->prio (1); 3087 })->prio (1);
2711} 3088}
2712 3089
2713=head3 cf::client 3090=head3 cf::client
2714 3091
2715=over 4 3092=over 4
2716 3093
2717=item $client->send_drawinfo ($text, $flags) 3094=item $client->send_big_packet ($pkt)
2718 3095
2719Sends a drawinfo packet to the client. Circumvents output buffering so 3096Like C<send_packet>, but tries to compress large packets, and fragments
2720should not be used under normal circumstances. 3097them as required.
2721 3098
2722=cut 3099=cut
2723 3100
3101our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3102
2724sub cf::client::send_drawinfo { 3103sub cf::client::send_big_packet {
2725 my ($self, $text, $flags) = @_; 3104 my ($self, $pkt) = @_;
2726 3105
2727 utf8::encode $text; 3106 # try lzf for large packets
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3107 $pkt = "lzf " . Compress::LZF::compress $pkt
3108 if 1024 <= length $pkt and $self->{can_lzf};
3109
3110 # split very large packets
3111 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3112 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3113 $pkt = "frag";
3114 }
3115
3116 $self->send_packet ($pkt);
2729} 3117}
2730 3118
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 3119=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 3120
2733Send a drawinfo or msg packet to the client, formatting the msg for the 3121Send a msg packet to the client, formatting the msg for the client if
2734client if neccessary. C<$type> should be a string identifying the type of 3122necessary. C<$type> should be a string identifying the type of the
2735the message, with C<log> being the default. If C<$color> is negative, suppress 3123message, with C<log> being the default. If C<$color> is negative, suppress
2736the message unless the client supports the msg packet. 3124the message unless the client supports the msg packet.
2737 3125
2738=cut 3126=cut
2739 3127
2740# non-persistent channels (usually the info channel) 3128# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 3129our %CHANNEL = (
3130 "c/motd" => {
3131 id => "infobox",
3132 title => "MOTD",
3133 reply => undef,
3134 tooltip => "The message of the day",
3135 },
2742 "c/identify" => { 3136 "c/identify" => {
2743 id => "infobox", 3137 id => "infobox",
2744 title => "Identify", 3138 title => "Identify",
2745 reply => undef, 3139 reply => undef,
2746 tooltip => "Items recently identified", 3140 tooltip => "Items recently identified",
2748 "c/examine" => { 3142 "c/examine" => {
2749 id => "infobox", 3143 id => "infobox",
2750 title => "Examine", 3144 title => "Examine",
2751 reply => undef, 3145 reply => undef,
2752 tooltip => "Signs and other items you examined", 3146 tooltip => "Signs and other items you examined",
3147 },
3148 "c/shopinfo" => {
3149 id => "infobox",
3150 title => "Shop Info",
3151 reply => undef,
3152 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 3153 },
2754 "c/book" => { 3154 "c/book" => {
2755 id => "infobox", 3155 id => "infobox",
2756 title => "Book", 3156 title => "Book",
2757 reply => undef, 3157 reply => undef,
2771 }, 3171 },
2772 "c/body" => { 3172 "c/body" => {
2773 id => "infobox", 3173 id => "infobox",
2774 title => "Body Parts", 3174 title => "Body Parts",
2775 reply => undef, 3175 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available", 3176 tooltip => "Shows which body parts you possess and are available",
2777 }, 3177 },
2778 "c/statistics" => { 3178 "c/statistics" => {
2779 id => "infobox", 3179 id => "infobox",
2780 title => "Statistics", 3180 title => "Statistics",
2781 reply => undef, 3181 reply => undef,
2785 id => "infobox", 3185 id => "infobox",
2786 title => "Skills", 3186 title => "Skills",
2787 reply => undef, 3187 reply => undef,
2788 tooltip => "Shows your experience per skill and item power", 3188 tooltip => "Shows your experience per skill and item power",
2789 }, 3189 },
3190 "c/shopitems" => {
3191 id => "infobox",
3192 title => "Shop Items",
3193 reply => undef,
3194 tooltip => "Shows the items currently for sale in this shop",
3195 },
2790 "c/resistances" => { 3196 "c/resistances" => {
2791 id => "infobox", 3197 id => "infobox",
2792 title => "Resistances", 3198 title => "Resistances",
2793 reply => undef, 3199 reply => undef,
2794 tooltip => "Shows your resistances", 3200 tooltip => "Shows your resistances",
2796 "c/pets" => { 3202 "c/pets" => {
2797 id => "infobox", 3203 id => "infobox",
2798 title => "Pets", 3204 title => "Pets",
2799 reply => undef, 3205 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet", 3206 tooltip => "Shows information abotu your pets/a specific pet",
3207 },
3208 "c/perceiveself" => {
3209 id => "infobox",
3210 title => "Perceive Self",
3211 reply => undef,
3212 tooltip => "You gained detailed knowledge about yourself",
2801 }, 3213 },
2802 "c/uptime" => { 3214 "c/uptime" => {
2803 id => "infobox", 3215 id => "infobox",
2804 title => "Uptime", 3216 title => "Uptime",
2805 reply => undef, 3217 reply => undef,
2821 id => "death", 3233 id => "death",
2822 title => "Death", 3234 title => "Death",
2823 reply => undef, 3235 reply => undef,
2824 tooltip => "Reason for and more info about your most recent death", 3236 tooltip => "Reason for and more info about your most recent death",
2825 }, 3237 },
3238 "c/fatal" => {
3239 id => "fatal",
3240 title => "Fatal Error",
3241 reply => undef,
3242 tooltip => "Reason for the server disconnect",
3243 },
2826 "c/say" => $SAY_CHANNEL, 3244 "c/say" => $SAY_CHANNEL,
2827 "c/chat" => $CHAT_CHANNEL, 3245 "c/chat" => $CHAT_CHANNEL,
2828); 3246);
2829 3247
2830sub cf::client::send_msg { 3248sub cf::client::send_msg {
2861 my $pkt = "msg " 3279 my $pkt = "msg "
2862 . $self->{json_coder}->encode ( 3280 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3281 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 ); 3282 );
2865 3283
2866 # try lzf for large packets
2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2868 if 1024 <= length $pkt and $self->{can_lzf};
2869
2870 # split very large packets
2871 if (8192 < length $pkt and $self->{can_lzf}) {
2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2873 $pkt = "frag";
2874 }
2875
2876 $self->send_packet ($pkt); 3284 $self->send_big_packet ($pkt);
2877} 3285}
2878 3286
2879=item $client->ext_msg ($type, @msg) 3287=item $client->ext_msg ($type, @msg)
2880 3288
2881Sends an ext event to the client. 3289Sends an ext event to the client.
2883=cut 3291=cut
2884 3292
2885sub cf::client::ext_msg($$@) { 3293sub cf::client::ext_msg($$@) {
2886 my ($self, $type, @msg) = @_; 3294 my ($self, $type, @msg) = @_;
2887 3295
2888 if ($self->extcmd == 2) {
2889 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3296 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2890 } elsif ($self->extcmd == 1) { # TODO: remove
2891 push @msg, msgtype => "event_$type";
2892 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2893 }
2894}
2895
2896=item $client->ext_reply ($msgid, @msg)
2897
2898Sends an ext reply to the client.
2899
2900=cut
2901
2902sub cf::client::ext_reply($$@) {
2903 my ($self, $id, @msg) = @_;
2904
2905 if ($self->extcmd == 2) {
2906 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2907 } elsif ($self->extcmd == 1) {
2908 #TODO: version 1, remove
2909 unshift @msg, msgtype => "reply", msgid => $id;
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 }
2912} 3297}
2913 3298
2914=item $success = $client->query ($flags, "text", \&cb) 3299=item $success = $client->query ($flags, "text", \&cb)
2915 3300
2916Queues a query to the client, calling the given callback with 3301Queues a query to the client, calling the given callback with
2936 3321
2937 $self->send_packet ($self->{query_queue}[0][0]) 3322 $self->send_packet ($self->{query_queue}[0][0])
2938 if @{ $self->{query_queue} } == 1; 3323 if @{ $self->{query_queue} } == 1;
2939 3324
2940 1 3325 1
3326}
3327
3328=item $client->update_command_faces
3329
3330=cut
3331
3332our %COMMAND_FACE;
3333
3334sub cf::client::update_command_faces {
3335 my ($self) = @_;
3336
3337 my @faces = grep $_,
3338 $COMMAND_FACE{preferred},
3339 $COMMAND_FACE{standard},
3340 $COMMAND_FACE{skill},
3341 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3342 $COMMAND_FACE{emote},
3343 ;
3344
3345 $self->send_face ($_)
3346 for @faces;
3347 $self->flush_fx;
3348
3349 $self->ext_msg (command_list => @faces);
3350}
3351
3352=item cf::client::set_command_face $type, $commands
3353
3354=cut
3355
3356sub cf::client::set_command_face {
3357 my ($type, $list) = @_;
3358
3359 my $idx = &cf::face::set ( #d# ugly forward reference
3360 "command_list/$type" => cf::FT_RSRC,
3361 JSON::XS->new->utf8->encode ([ sort @$list ])
3362 );
3363
3364 $COMMAND_FACE{$type} = $idx;
2941} 3365}
2942 3366
2943cf::client->attach ( 3367cf::client->attach (
2944 on_connect => sub { 3368 on_connect => sub {
2945 my ($ns) = @_; 3369 my ($ns) = @_;
2971 my ($ns, $buf) = @_; 3395 my ($ns, $buf) = @_;
2972 3396
2973 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3397 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2974 3398
2975 if (ref $msg) { 3399 if (ref $msg) {
2976 my ($type, $reply, @payload) = 3400 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2977 "ARRAY" eq ref $msg
2978 ? @$msg
2979 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2980 3401
2981 my @reply;
2982
2983 if (my $cb = $EXTICMD{$type}) { 3402 if (my $cb = $EXTIACMD{$type}) {
3403 $cb->(
3404 $ns,
3405 sub {
3406 $ns->ext_msg ("reply-$reply", @_)
3407 if $reply;
3408 },
3409 @payload
3410 );
3411 } else {
3412 my @reply;
3413
3414 if (my $cb = $EXTICMD{$type}) {
2984 @reply = $cb->($ns, @payload); 3415 @reply = $cb->($ns, @payload);
3416 }
3417
3418 $ns->ext_msg ("reply-$reply", @reply)
3419 if $reply;
2985 } 3420 }
2986
2987 $ns->ext_reply ($reply, @reply)
2988 if $reply;
2989
2990 } else { 3421 } else {
2991 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3422 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2992 } 3423 }
2993 3424
2994 cf::override; 3425 cf::override;
2995 }, 3426 },
2996); 3427);
3016 3447
3017 $coro 3448 $coro
3018} 3449}
3019 3450
3020cf::client->attach ( 3451cf::client->attach (
3021 on_destroy => sub { 3452 on_client_destroy => sub {
3022 my ($ns) = @_; 3453 my ($ns) = @_;
3023 3454
3024 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3455 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3025 }, 3456 },
3026); 3457);
3042our $safe_hole = new Safe::Hole; 3473our $safe_hole = new Safe::Hole;
3043 3474
3044$SIG{FPE} = 'IGNORE'; 3475$SIG{FPE} = 'IGNORE';
3045 3476
3046$safe->permit_only (Opcode::opset qw( 3477$safe->permit_only (Opcode::opset qw(
3047 :base_core :base_mem :base_orig :base_math 3478 :base_core :base_mem :base_orig :base_math :base_loop
3048 grepstart grepwhile mapstart mapwhile 3479 grepstart grepwhile mapstart mapwhile
3049 sort time 3480 sort time
3050)); 3481));
3051 3482
3052# here we export the classes and methods available to script code 3483# here we export the classes and methods available to script code
3077 decrease split destroy change_exp value msg lore send_msg)], 3508 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3509 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful send_msg)], 3510 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3511 ["cf::map" => qw(trigger)],
3081) { 3512) {
3082 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3513 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3514 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3085 for @funs; 3515 for @funs;
3086} 3516}
3087 3517
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3534 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3535 $qcode =~ s/\n/\\n/g;
3106 3536
3107 %vars = (_dummy => 0) unless %vars; 3537 %vars = (_dummy => 0) unless %vars;
3108 3538
3539 my @res;
3109 local $_; 3540 local $_;
3110 local @safe::cf::_safe_eval_args = values %vars;
3111 3541
3112 my $eval = 3542 my $eval =
3113 "do {\n" 3543 "do {\n"
3114 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3544 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3115 . "#line 0 \"{$qcode}\"\n" 3545 . "#line 0 \"{$qcode}\"\n"
3116 . $code 3546 . $code
3117 . "\n}" 3547 . "\n}"
3118 ; 3548 ;
3119 3549
3550 if ($CFG{safe_eval}) {
3120 sub_generation_inc; 3551 sub_generation_inc;
3552 local @safe::cf::_safe_eval_args = values %vars;
3121 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3553 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3122 sub_generation_inc; 3554 sub_generation_inc;
3555 } else {
3556 local @cf::_safe_eval_args = values %vars;
3557 @res = wantarray ? eval eval : scalar eval $eval;
3558 }
3123 3559
3124 if ($@) { 3560 if ($@) {
3125 warn "$@"; 3561 warn "$@",
3126 warn "while executing safe code '$code'\n"; 3562 "while executing safe code '$code'\n",
3127 warn "with arguments " . (join " ", %vars) . "\n"; 3563 "with arguments " . (join " ", %vars) . "\n";
3128 } 3564 }
3129 3565
3130 wantarray ? @res : $res[0] 3566 wantarray ? @res : $res[0]
3131} 3567}
3132 3568
3146=cut 3582=cut
3147 3583
3148sub register_script_function { 3584sub register_script_function {
3149 my ($fun, $cb) = @_; 3585 my ($fun, $cb) = @_;
3150 3586
3151 no strict 'refs'; 3587 $fun = "safe::$fun" if $CFG{safe_eval};
3152 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3588 *$fun = $safe_hole->wrap ($cb);
3153} 3589}
3154 3590
3155=back 3591=back
3156 3592
3157=cut 3593=cut
3158 3594
3159############################################################################# 3595#############################################################################
3160# the server's init and main functions 3596# the server's init and main functions
3161 3597
3598{
3599 package cf::face;
3600
3601 our %HASH; # hash => idx
3602 our @DATA; # dynamically-created facedata, only faceste 0 used
3603 our @FOFS; # file offset, if > 0
3604 our @SIZE; # size of face, in octets
3605 our @META; # meta hash of face, if any
3606 our $DATAFH; # facedata filehandle
3607
3608 # internal api, not finalised
3609 sub set {
3610 my ($name, $type, $data) = @_;
3611
3612 my $idx = cf::face::find $name;
3613
3614 if ($idx) {
3615 delete $HASH{cf::face::get_csum $idx};
3616 } else {
3617 $idx = cf::face::alloc $name;
3618 }
3619
3620 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3621
3622 cf::face::set_type $idx, $type;
3623 cf::face::set_csum $idx, 0, $hash;
3624
3625 # we need to destroy the SV itself, not just modify it, as a running ix
3626 # might hold a reference to it: "delete" achieves that.
3627 delete $FOFS[0][$idx];
3628 delete $DATA[0][$idx];
3629 $DATA[0][$idx] = $data;
3630 $SIZE[0][$idx] = length $data;
3631 delete $META[$idx];
3632 $HASH{$hash} = $idx;#d#
3633
3634 $idx
3635 }
3636
3637 sub _get_data($$$) {
3638 my ($idx, $set, $cb) = @_;
3639
3640 if (defined $DATA[$set][$idx]) {
3641 $cb->($DATA[$set][$idx]);
3642 } elsif (my $fofs = $FOFS[$set][$idx]) {
3643 my $size = $SIZE[$set][$idx];
3644 my $buf;
3645 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3646 if ($_[0] == $size) {
3647 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3648 $cb->($buf);
3649 } else {
3650 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3651 }
3652 };
3653 } else {
3654 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3655 }
3656 }
3657
3658 # rather ineffient
3659 sub cf::face::get_data($;$) {
3660 my ($idx, $set) = @_;
3661
3662 _get_data $idx, $set, Coro::rouse_cb;
3663 Coro::rouse_wait
3664 }
3665
3666 sub cf::face::ix {
3667 my ($ns, $set, $idx, $pri) = @_;
3668
3669 _get_data $idx, $set, sub {
3670 $ns->ix_send ($idx, $pri, $_[0]);
3671 };
3672 }
3673}
3674
3162sub load_facedata($) { 3675sub load_facedata($) {
3163 my ($path) = @_; 3676 my ($path) = @_;
3164 3677
3165 # HACK to clear player env face cache, we need some signal framework
3166 # for this (global event?)
3167 %ext::player_env::MUSIC_FACE_CACHE = ();
3168
3169 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3678 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3170 3679
3171 warn "loading facedata from $path\n"; 3680 trace "loading facedata from $path\n";
3172 3681
3173 my $facedata; 3682 my $facedata = decode_storable load_file "$path/faceinfo";
3174 0 < aio_load $path, $facedata
3175 or die "$path: $!";
3176
3177 $facedata = Coro::Storable::thaw $facedata;
3178 3683
3179 $facedata->{version} == 2 3684 $facedata->{version} == 2
3180 or cf::cleanup "$path: version mismatch, cannot proceed."; 3685 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3181 3686
3182 # patch in the exptable 3687 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3183 $facedata->{resource}{"res/exp_table"} = { 3688 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3184 type => FT_RSRC, 3689
3185 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3690 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3186 }; 3691
3187 cf::cede_to_tick; 3692 # BEGIN ATOMIC
3693 # from here on, everything must be atomic - no thread switch allowed
3694 my $t1 = EV::time;
3188 3695
3189 { 3696 {
3190 my $faces = $facedata->{faceinfo}; 3697 my $faces = $facedata->{faceinfo};
3191 3698
3192 while (my ($face, $info) = each %$faces) { 3699 for my $face (sort keys %$faces) {
3700 my $info = $faces->{$face};
3193 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3701 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3194 3702
3195 cf::face::set_visibility $idx, $info->{visibility}; 3703 cf::face::set_visibility $idx, $info->{visibility};
3196 cf::face::set_magicmap $idx, $info->{magicmap}; 3704 cf::face::set_magicmap $idx, $info->{magicmap};
3197 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3705 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3198 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3706 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3199 3707 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3200 cf::cede_to_tick; 3708 $cf::face::HASH{$info->{hash64}} = $idx;
3709 delete $cf::face::META[$idx];
3201 } 3710 }
3202 3711
3203 while (my ($face, $info) = each %$faces) { 3712 while (my ($face, $info) = each %$faces) {
3204 next unless $info->{smooth}; 3713 next unless $info->{smooth};
3205 3714
3208 3717
3209 if (my $smooth = cf::face::find $info->{smooth}) { 3718 if (my $smooth = cf::face::find $info->{smooth}) {
3210 cf::face::set_smooth $idx, $smooth; 3719 cf::face::set_smooth $idx, $smooth;
3211 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3720 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3212 } else { 3721 } else {
3213 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3722 error "smooth face '$info->{smooth}' not found for face '$face'";
3214 } 3723 }
3215
3216 cf::cede_to_tick;
3217 } 3724 }
3218 } 3725 }
3219 3726
3220 { 3727 {
3221 my $anims = $facedata->{animinfo}; 3728 my $anims = $facedata->{animinfo};
3222 3729
3223 while (my ($anim, $info) = each %$anims) { 3730 while (my ($anim, $info) = each %$anims) {
3224 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3731 cf::anim::set $anim, $info->{frames}, $info->{facings};
3225 cf::cede_to_tick;
3226 } 3732 }
3227 3733
3228 cf::anim::invalidate_all; # d'oh 3734 cf::anim::invalidate_all; # d'oh
3229 } 3735 }
3230 3736
3231 { 3737 {
3232 # TODO: for gcfclient pleasure, we should give resources
3233 # that gcfclient doesn't grok a >10000 face index.
3234 my $res = $facedata->{resource}; 3738 my $res = $facedata->{resource};
3235 3739
3236 while (my ($name, $info) = each %$res) { 3740 while (my ($name, $info) = each %$res) {
3237 if (defined $info->{type}) { 3741 if (defined (my $type = $info->{type})) {
3742 # TODO: different hash - must free and use new index, or cache ixface data queue
3238 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3743 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3239 my $data;
3240 3744
3241 if ($info->{type} & 1) {
3242 # prepend meta info
3243
3244 my $meta = $enc->encode ({
3245 name => $name,
3246 %{ $info->{meta} || {} },
3247 });
3248
3249 $data = pack "(w/a*)*", $meta, $info->{data};
3250 } else {
3251 $data = $info->{data};
3252 }
3253
3254 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3255 cf::face::set_type $idx, $info->{type}; 3745 cf::face::set_type $idx, $type;
3746 cf::face::set_csum $idx, 0, $info->{hash};
3747 $cf::face::SIZE[0][$idx] = $info->{size};
3748 $cf::face::FOFS[0][$idx] = $info->{fofs};
3749 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3750 $cf::face::HASH{$info->{hash}} = $idx;
3256 } else { 3751 } else {
3257 $RESOURCE{$name} = $info; 3752# $RESOURCE{$name} = $info; # unused
3258 } 3753 }
3259
3260 cf::cede_to_tick;
3261 } 3754 }
3262 } 3755 }
3756
3757 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3758
3759 # HACK to clear player env face cache, we need some signal framework
3760 # for this (global event?)
3761 %ext::player_env::MUSIC_FACE_CACHE = ();
3762
3763 # END ATOMIC
3764
3765 cf::debug "facedata atomic update time ", EV::time - $t1;
3263 3766
3264 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3767 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3265 3768
3769 aio_close $fh if $fh; # close old facedata
3770
3266 1 3771 1
3267} 3772}
3268
3269cf::global->attach (on_resource_update => sub {
3270 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3271 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3272
3273 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3274 my $sound = $soundconf->{compat}[$_]
3275 or next;
3276
3277 my $face = cf::face::find "sound/$sound->[1]";
3278 cf::sound::set $sound->[0] => $face;
3279 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3280 }
3281
3282 while (my ($k, $v) = each %{$soundconf->{event}}) {
3283 my $face = cf::face::find "sound/$v";
3284 cf::sound::set $k => $face;
3285 }
3286 }
3287});
3288 3773
3289register_exticmd fx_want => sub { 3774register_exticmd fx_want => sub {
3290 my ($ns, $want) = @_; 3775 my ($ns, $want) = @_;
3291 3776
3292 while (my ($k, $v) = each %$want) { 3777 while (my ($k, $v) = each %$want) {
3300 my $status = load_resource_file_ $_[0]; 3785 my $status = load_resource_file_ $_[0];
3301 get_slot 0.1, 100; 3786 get_slot 0.1, 100;
3302 cf::arch::commit_load; 3787 cf::arch::commit_load;
3303 3788
3304 $status 3789 $status
3790}
3791
3792sub reload_exp_table {
3793 _reload_exp_table;
3794
3795 cf::face::set
3796 "res/exp_table" => FT_RSRC,
3797 JSON::XS->new->utf8->canonical->encode (
3798 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3799 );
3800}
3801
3802sub reload_materials {
3803 _reload_materials;
3305} 3804}
3306 3805
3307sub reload_regions { 3806sub reload_regions {
3308 # HACK to clear player env face cache, we need some signal framework 3807 # HACK to clear player env face cache, we need some signal framework
3309 # for this (global event?) 3808 # for this (global event?)
3317 if exists $_->{match}; 3816 if exists $_->{match};
3318 } 3817 }
3319} 3818}
3320 3819
3321sub reload_facedata { 3820sub reload_facedata {
3322 load_facedata "$DATADIR/facedata" 3821 load_facedata $DATADIR
3323 or die "unable to load facedata\n"; 3822 or die "unable to load facedata\n";
3324} 3823}
3325 3824
3326sub reload_archetypes { 3825sub reload_archetypes {
3327 load_resource_file "$DATADIR/archetypes" 3826 load_resource_file "$DATADIR/archetypes"
3328 or die "unable to load archetypes\n"; 3827 or die "unable to load archetypes\n";
3828
3829 cf::face::set
3830 "res/skill_info" => FT_RSRC,
3831 JSON::XS->new->utf8->canonical->encode (
3832 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3833 );
3834
3835 cf::face::set
3836 "res/spell_paths" => FT_RSRC,
3837 JSON::XS->new->utf8->canonical->encode (
3838 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3839 );
3840
3841 # command completion
3842 my @commands;
3843
3844 for (0..cf::arch::skillvec_size - 1) {
3845 my $skill = cf::arch::skillvec $_;
3846 my $name = $skill->name;
3847 my $flags = cf::skill_flags $skill->subtype;
3848
3849 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3850 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3851 }
3852
3853 cf::client::set_command_face skill => \@commands;
3329} 3854}
3330 3855
3331sub reload_treasures { 3856sub reload_treasures {
3332 load_resource_file "$DATADIR/treasures" 3857 load_resource_file "$DATADIR/treasures"
3333 or die "unable to load treasurelists\n"; 3858 or die "unable to load treasurelists\n";
3334} 3859}
3335 3860
3861sub reload_sound {
3862 trace "loading sound config from $DATADIR/sound\n";
3863
3864 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3865
3866 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3867 my $sound = $soundconf->{compat}[$_]
3868 or next;
3869
3870 my $face = cf::face::find "sound/$sound->[1]";
3871 cf::sound::set $sound->[0] => $face;
3872 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3873 }
3874
3875 while (my ($k, $v) = each %{$soundconf->{event}}) {
3876 my $face = cf::face::find "sound/$v";
3877 cf::sound::set $k => $face;
3878 }
3879}
3880
3336sub reload_resources { 3881sub reload_resources {
3337 warn "reloading resource files...\n"; 3882 trace "reloading resource files...\n";
3338 3883
3884 reload_materials;
3339 reload_facedata; 3885 reload_facedata;
3886 reload_exp_table;
3887 reload_sound;
3340 reload_archetypes; 3888 reload_archetypes;
3341 reload_regions; 3889 reload_regions;
3342 reload_treasures; 3890 reload_treasures;
3343 3891
3344 warn "finished reloading resource files\n"; 3892 trace "finished reloading resource files\n";
3345} 3893}
3346 3894
3347sub reload_config { 3895sub reload_config {
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3896 trace "reloading config file...\n";
3349 or return;
3350 3897
3351 local $/; 3898 my $config = load_file "$CONFDIR/config";
3352 *CFG = YAML::Load <$fh>; 3899 utf8::decode $config;
3900 *CFG = decode_yaml $config;
3353 3901
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3902 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3355 3903
3356 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3904 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3357 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3905 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3358 3906
3359 if (exists $CFG{mlockall}) { 3907 if (exists $CFG{mlockall}) {
3382 3930
3383 seek $fh, 0, 0; 3931 seek $fh, 0, 0;
3384 print $fh $$; 3932 print $fh $$;
3385} 3933}
3386 3934
3935sub main_loop {
3936 trace "EV::run starting\n";
3937 if (1) {
3938 EV::run;
3939 }
3940 trace "EV::run returned\n";
3941 goto &main_loop unless $REALLY_UNLOOP;
3942}
3943
3387sub main { 3944sub main {
3388 cf::init_globals; # initialise logging 3945 cf::init_globals; # initialise logging
3389 3946
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3947 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3948 LOG llevInfo, "Copyright (C) 2017-2018 Marc Alexander Lehmann / the Deliantra team.";
3391 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3949 LOG llevInfo, "Copyright (C) 2005-2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3950 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3951 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394 3952
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399
3400 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3953 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3401 3954
3402 # we must not ever block the main coroutine 3955 # we must not ever block the main coroutine
3403 local $Coro::idle = sub { 3956 $Coro::idle = sub {
3404 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3957 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3405 (async { 3958 (async {
3406 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3959 $Coro::current->{desc} = "IDLE BUG HANDLER";
3407 EV::loop EV::LOOP_ONESHOT; 3960 EV::run EV::RUN_ONCE;
3408 })->prio (Coro::PRIO_MAX); 3961 })->prio (Coro::PRIO_MAX);
3409 }; 3962 };
3410 3963
3411 evthread_start IO::AIO::poll_fileno; 3964 evthread_start IO::AIO::poll_fileno;
3412 3965
3413 cf::sync_job { 3966 cf::sync_job {
3967 cf::incloader::init ();
3968
3969 db_init;
3970
3971 cf::init_anim;
3972 cf::init_attackmess;
3973 cf::init_dynamic;
3974
3975 cf::load_settings;
3976
3414 reload_resources; 3977 reload_resources;
3415 reload_config; 3978 reload_config;
3416 db_init;
3417 3979
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid; 3980 cf::init_uuid;
3421 cf::init_signals; 3981 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills; 3982 cf::init_skills;
3424 3983
3425 cf::init_beforeplay; 3984 cf::init_beforeplay;
3426 3985
3427 atomic; 3986 atomic;
3429 load_extensions; 3988 load_extensions;
3430 3989
3431 utime time, time, $RUNTIMEFILE; 3990 utime time, time, $RUNTIMEFILE;
3432 3991
3433 # no (long-running) fork's whatsoever before this point(!) 3992 # no (long-running) fork's whatsoever before this point(!)
3993 use POSIX ();
3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3994 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435 3995
3436 (pop @POST_INIT)->(0) while @POST_INIT; 3996 cf::_post_init 0;
3437 }; 3997 };
3438 3998
3439 EV::loop; 3999 cf::object::thawer::errors_are_fatal 0;
4000 info "parse errors in files are no longer fatal from this point on.\n";
4001
4002 AE::postpone {
4003 undef &main; # free gobs of memory :)
4004 };
4005
4006 goto &main_loop;
3440} 4007}
3441 4008
3442############################################################################# 4009#############################################################################
3443# initialisation and cleanup 4010# initialisation and cleanup
3444 4011
3445# install some emergency cleanup handlers 4012# install some emergency cleanup handlers
3446BEGIN { 4013BEGIN {
3447 our %SIGWATCHER = (); 4014 our %SIGWATCHER = ();
3448 for my $signal (qw(INT HUP TERM)) { 4015 for my $signal (qw(INT HUP TERM)) {
3449 $SIGWATCHER{$signal} = EV::signal $signal, sub { 4016 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3450 cf::cleanup "SIG$signal"; 4017 cf::cleanup "SIG$signal";
3451 }; 4018 };
3452 } 4019 }
3453} 4020}
3454 4021
3455sub write_runtime_sync { 4022sub write_runtime_sync {
4023 my $t0 = AE::time;
4024
3456 # first touch the runtime file to show we are still running: 4025 # first touch the runtime file to show we are still running:
3457 # the fsync below can take a very very long time. 4026 # the fsync below can take a very very long time.
3458 4027
3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 4028 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3460 4029
3461 my $guard = cf::lock_acquire "write_runtime"; 4030 my $guard = cf::lock_acquire "write_runtime";
3462 4031
3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 4032 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3464 or return; 4033 or return;
3465 4034
3466 my $value = $cf::RUNTIME + 90 + 10; 4035 my $value = $cf::RUNTIME + 90 + 10;
3467 # 10 is the runtime save interval, for a monotonic clock 4036 # 10 is the runtime save interval, for a monotonic clock
3468 # 60 allows for the watchdog to kill the server. 4037 # 60 allows for the watchdog to kill the server.
3481 or return; 4050 or return;
3482 4051
3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4052 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3484 and return; 4053 and return;
3485 4054
3486 warn "runtime file written.\n"; 4055 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3487 4056
3488 1 4057 1
3489} 4058}
3490 4059
3491our $uuid_lock; 4060our $uuid_lock;
3503 or return; 4072 or return;
3504 4073
3505 my $value = uuid_seq uuid_cur; 4074 my $value = uuid_seq uuid_cur;
3506 4075
3507 unless ($value) { 4076 unless ($value) {
3508 warn "cowardly refusing to write zero uuid value!\n"; 4077 info "cowardly refusing to write zero uuid value!\n";
3509 return; 4078 return;
3510 } 4079 }
3511 4080
3512 my $value = uuid_str $value + $uuid_skip; 4081 my $value = uuid_str $value + $uuid_skip;
3513 $uuid_skip = 0; 4082 $uuid_skip = 0;
3523 or return; 4092 or return;
3524 4093
3525 aio_rename "$uuid~", $uuid 4094 aio_rename "$uuid~", $uuid
3526 and return; 4095 and return;
3527 4096
3528 warn "uuid file written ($value).\n"; 4097 trace "uuid file written ($value).\n";
3529 4098
3530 1 4099 1
3531 4100
3532} 4101}
3533 4102
3539} 4108}
3540 4109
3541sub emergency_save() { 4110sub emergency_save() {
3542 my $freeze_guard = cf::freeze_mainloop; 4111 my $freeze_guard = cf::freeze_mainloop;
3543 4112
3544 warn "emergency_perl_save: enter\n"; 4113 info "emergency_perl_save: enter\n";
4114
4115 # this is a trade-off: we want to be very quick here, so
4116 # save all maps without fsync, and later call a global sync
4117 # (which in turn might be very very slow)
4118 local $USE_FSYNC = 0;
3545 4119
3546 cf::sync_job { 4120 cf::sync_job {
3547 # this is a trade-off: we want to be very quick here, so 4121 cf::write_runtime_sync; # external watchdog should not bark
3548 # save all maps without fsync, and later call a global sync
3549 # (which in turn might be very very slow)
3550 local $USE_FSYNC = 0;
3551 4122
3552 # use a peculiar iteration method to avoid tripping on perl 4123 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 4124 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 4125 # and maps saved/destroyed asynchronously.
3555 warn "emergency_perl_save: begin player save\n"; 4126 info "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 4127 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 4128 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 4129 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4130 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 4131 $pl->save;
3561 } 4132 }
3562 warn "emergency_perl_save: end player save\n"; 4133 info "emergency_perl_save: end player save\n";
3563 4134
4135 cf::write_runtime_sync; # external watchdog should not bark
4136
3564 warn "emergency_perl_save: begin map save\n"; 4137 info "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 4138 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 4139 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 4140 $map->valid or next;
3568 $map->save; 4141 $map->save;
3569 } 4142 }
3570 warn "emergency_perl_save: end map save\n"; 4143 info "emergency_perl_save: end map save\n";
3571 4144
4145 cf::write_runtime_sync; # external watchdog should not bark
4146
3572 warn "emergency_perl_save: begin database checkpoint\n"; 4147 info "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 4148 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "emergency_perl_save: end database checkpoint\n"; 4149 info "emergency_perl_save: end database checkpoint\n";
3575 4150
3576 warn "emergency_perl_save: begin write uuid\n"; 4151 info "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 4152 write_uuid_sync 1;
3578 warn "emergency_perl_save: end write uuid\n"; 4153 info "emergency_perl_save: end write uuid\n";
4154
4155 cf::write_runtime_sync; # external watchdog should not bark
4156
4157 trace "emergency_perl_save: syncing database to disk";
4158 BDB::db_env_txn_checkpoint $DB_ENV;
4159
4160 info "emergency_perl_save: starting sync\n";
4161 IO::AIO::aio_sync sub {
4162 info "emergency_perl_save: finished sync\n";
4163 };
4164
4165 cf::write_runtime_sync; # external watchdog should not bark
4166
4167 trace "emergency_perl_save: flushing outstanding aio requests";
4168 while (IO::AIO::nreqs || BDB::nreqs) {
4169 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4170 }
4171
4172 cf::write_runtime_sync; # external watchdog should not bark
3579 }; 4173 };
3580 4174
3581 warn "emergency_perl_save: starting sync()\n";
3582 IO::AIO::aio_sync sub {
3583 warn "emergency_perl_save: finished sync()\n";
3584 };
3585
3586 warn "emergency_perl_save: leave\n"; 4175 info "emergency_perl_save: leave\n";
3587} 4176}
3588 4177
3589sub post_cleanup { 4178sub post_cleanup {
3590 my ($make_core) = @_; 4179 my ($make_core) = @_;
3591 4180
4181 IO::AIO::flush;
4182
3592 warn Carp::longmess "post_cleanup backtrace" 4183 error Carp::longmess "post_cleanup backtrace"
3593 if $make_core; 4184 if $make_core;
3594 4185
3595 my $fh = pidfile; 4186 my $fh = pidfile;
3596 unlink $PIDFILE if <$fh> == $$; 4187 unlink $PIDFILE if <$fh> == $$;
3597} 4188}
3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4208 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3618 for my $name (keys %$leaf_symtab) { 4209 for my $name (keys %$leaf_symtab) {
3619 _gv_clear *{"$pkg$name"}; 4210 _gv_clear *{"$pkg$name"};
3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4211# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3621 } 4212 }
3622 warn "cleared package $pkg\n";#d#
3623} 4213}
3624 4214
3625sub do_reload_perl() { 4215sub do_reload_perl() {
3626 # can/must only be called in main 4216 # can/must only be called in main
3627 if ($Coro::current != $Coro::main) { 4217 unless (in_main) {
3628 warn "can only reload from main coroutine"; 4218 error "can only reload from main coroutine";
3629 return; 4219 return;
3630 } 4220 }
3631 4221
3632 return if $RELOAD++; 4222 return if $RELOAD++;
3633 4223
3634 my $t1 = EV::time; 4224 my $t1 = AE::time;
3635 4225
3636 while ($RELOAD) { 4226 while ($RELOAD) {
3637 warn "reloading..."; 4227 cf::get_slot 0.1, -1, "reload_perl";
4228 info "perl_reload: reloading...";
3638 4229
3639 warn "entering sync_job"; 4230 trace "perl_reload: entering sync_job";
3640 4231
3641 cf::sync_job { 4232 cf::sync_job {
3642 cf::write_runtime_sync; # external watchdog should not bark
3643 cf::emergency_save; 4233 #cf::emergency_save;
3644 cf::write_runtime_sync; # external watchdog should not bark
3645 4234
3646 warn "syncing database to disk";
3647 BDB::db_env_txn_checkpoint $DB_ENV;
3648
3649 # if anything goes wrong in here, we should simply crash as we already saved
3650
3651 warn "flushing outstanding aio requests";
3652 while (IO::AIO::nreqs || BDB::nreqs) {
3653 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3654 }
3655
3656 warn "cancelling all extension coros"; 4235 trace "perl_reload: cancelling all extension coros";
3657 $_->cancel for values %EXT_CORO; 4236 $_->cancel for values %EXT_CORO;
3658 %EXT_CORO = (); 4237 %EXT_CORO = ();
3659 4238
3660 warn "removing commands"; 4239 trace "perl_reload: removing commands";
3661 %COMMAND = (); 4240 %COMMAND = ();
3662 4241
3663 warn "removing ext/exti commands"; 4242 trace "perl_reload: removing ext/exti commands";
3664 %EXTCMD = (); 4243 %EXTCMD = ();
3665 %EXTICMD = (); 4244 %EXTICMD = ();
3666 4245
3667 warn "unloading/nuking all extensions"; 4246 trace "perl_reload: unloading/nuking all extensions";
3668 for my $pkg (@EXTS) { 4247 for my $pkg (@EXTS) {
3669 warn "... unloading $pkg"; 4248 trace "... unloading $pkg";
3670 4249
3671 if (my $cb = $pkg->can ("unload")) { 4250 if (my $cb = $pkg->can ("unload")) {
3672 eval { 4251 eval {
3673 $cb->($pkg); 4252 $cb->($pkg);
3674 1 4253 1
3675 } or warn "$pkg unloaded, but with errors: $@"; 4254 } or error "$pkg unloaded, but with errors: $@";
3676 } 4255 }
3677 4256
3678 warn "... clearing $pkg"; 4257 trace "... clearing $pkg";
3679 clear_package $pkg; 4258 clear_package $pkg;
3680 } 4259 }
3681 4260
3682 warn "unloading all perl modules loaded from $LIBDIR"; 4261 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3683 while (my ($k, $v) = each %INC) { 4262 while (my ($k, $v) = each %INC) {
3684 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4263 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3685 4264
3686 warn "... unloading $k"; 4265 trace "... unloading $k";
3687 delete $INC{$k}; 4266 delete $INC{$k};
3688 4267
3689 $k =~ s/\.pm$//; 4268 $k =~ s/\.pm$//;
3690 $k =~ s/\//::/g; 4269 $k =~ s/\//::/g;
3691 4270
3694 } 4273 }
3695 4274
3696 clear_package $k; 4275 clear_package $k;
3697 } 4276 }
3698 4277
3699 warn "getting rid of safe::, as good as possible"; 4278 trace "perl_reload: getting rid of safe::, as good as possible";
3700 clear_package "safe::$_" 4279 clear_package "safe::$_"
3701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4280 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3702 4281
3703 warn "unloading cf.pm \"a bit\""; 4282 trace "perl_reload: unloading cf.pm \"a bit\"";
3704 delete $INC{"cf.pm"}; 4283 delete $INC{"cf.pm"};
3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4284 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3706 4285
3707 # don't, removes xs symbols, too, 4286 # don't, removes xs symbols, too,
3708 # and global variables created in xs 4287 # and global variables created in xs
3709 #clear_package __PACKAGE__; 4288 #clear_package __PACKAGE__;
3710 4289
3711 warn "unload completed, starting to reload now"; 4290 info "perl_reload: unload completed, starting to reload now";
3712 4291
3713 warn "reloading cf.pm"; 4292 trace "perl_reload: reloading cf.pm";
3714 require cf; 4293 require cf;
3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4294 cf::_connect_to_perl_1;
3716 4295
3717 warn "loading config and database again"; 4296 trace "perl_reload: loading config and database again";
3718 cf::reload_config; 4297 cf::reload_config;
3719 4298
3720 warn "loading extensions"; 4299 trace "perl_reload: loading extensions";
3721 cf::load_extensions; 4300 cf::load_extensions;
3722 4301
3723 if ($REATTACH_ON_RELOAD) { 4302 if ($REATTACH_ON_RELOAD) {
3724 warn "reattaching attachments to objects/players"; 4303 trace "perl_reload: reattaching attachments to objects/players";
3725 _global_reattach; # objects, sockets 4304 _global_reattach; # objects, sockets
3726 warn "reattaching attachments to maps"; 4305 trace "perl_reload: reattaching attachments to maps";
3727 reattach $_ for values %MAP; 4306 reattach $_ for values %MAP;
3728 warn "reattaching attachments to players"; 4307 trace "perl_reload: reattaching attachments to players";
3729 reattach $_ for values %PLAYER; 4308 reattach $_ for values %PLAYER;
3730 } 4309 }
3731 4310
3732 warn "running post_init jobs"; 4311 cf::_post_init 1;
3733 (pop @POST_INIT)->(1) while @POST_INIT;
3734 4312
3735 warn "leaving sync_job"; 4313 trace "perl_reload: leaving sync_job";
3736 4314
3737 1 4315 1
3738 } or do { 4316 } or do {
3739 warn $@; 4317 error $@;
3740 cf::cleanup "error while reloading, exiting."; 4318 cf::cleanup "perl_reload: error, exiting.";
3741 }; 4319 };
3742 4320
3743 warn "reloaded";
3744 --$RELOAD; 4321 --$RELOAD;
3745 } 4322 }
3746 4323
3747 $t1 = EV::time - $t1; 4324 $t1 = AE::time - $t1;
3748 warn "reload completed in ${t1}s\n"; 4325 info "perl_reload: completed in ${t1}s\n";
3749}; 4326};
3750 4327
3751our $RELOAD_WATCHER; # used only during reload 4328our $RELOAD_WATCHER; # used only during reload
3752 4329
3753sub reload_perl() { 4330sub reload_perl() {
3755 # coro crashes during coro_state_free->destroy here. 4332 # coro crashes during coro_state_free->destroy here.
3756 4333
3757 $RELOAD_WATCHER ||= cf::async { 4334 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions; 4335 Coro::AIO::aio_wait cache_extensions;
3759 4336
3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4337 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3761 do_reload_perl; 4338 do_reload_perl;
3762 undef $RELOAD_WATCHER; 4339 undef $RELOAD_WATCHER;
3763 }; 4340 };
3764 }; 4341 };
3765} 4342}
3774 reload_perl; 4351 reload_perl;
3775 }; 4352 };
3776 } 4353 }
3777}; 4354};
3778 4355
3779unshift @INC, $LIBDIR; 4356#############################################################################
3780 4357
3781my $bug_warning = 0; 4358my $bug_warning = 0;
3782 4359
3783our @WAIT_FOR_TICK;
3784our @WAIT_FOR_TICK_BEGIN;
3785
3786sub wait_for_tick { 4360sub wait_for_tick() {
3787 return if tick_inhibit || $Coro::current == $Coro::main; 4361 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3788 4362
3789 my $signal = new Coro::Signal; 4363 $WAIT_FOR_TICK->wait;
3790 push @WAIT_FOR_TICK, $signal;
3791 $signal->wait;
3792} 4364}
3793 4365
3794sub wait_for_tick_begin { 4366sub wait_for_tick_begin() {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 4367 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3796 4368
3797 my $signal = new Coro::Signal; 4369 my $signal = new Coro::Signal;
3798 push @WAIT_FOR_TICK_BEGIN, $signal; 4370 push @WAIT_FOR_TICK_BEGIN, $signal;
3799 $signal->wait; 4371 $signal->wait;
3800} 4372}
3804 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4376 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3805 unless ++$bug_warning > 10; 4377 unless ++$bug_warning > 10;
3806 return; 4378 return;
3807 } 4379 }
3808 4380
3809 cf::server_tick; # one server iteration 4381 cf::one_tick; # one server iteration
4382
4383 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3810 4384
3811 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4385 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3812 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4386 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3813 Coro::async_pool { 4387 Coro::async_pool {
3814 $Coro::current->{desc} = "runtime saver"; 4388 $Coro::current->{desc} = "runtime saver";
3815 write_runtime_sync 4389 write_runtime_sync
3816 or warn "ERROR: unable to write runtime file: $!"; 4390 or error "ERROR: unable to write runtime file: $!";
3817 }; 4391 };
3818 } 4392 }
3819 4393
3820 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4394 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3821 $sig->send; 4395 $sig->send;
3822 } 4396 }
3823 while (my $sig = shift @WAIT_FOR_TICK) { 4397 $WAIT_FOR_TICK->broadcast;
3824 $sig->send;
3825 }
3826 4398
3827 $LOAD = ($NOW - $TICK_START) / $TICK; 4399 $LOAD = ($NOW - $TICK_START) / $TICK;
3828 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4400 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3829 4401
3830 if (0) { 4402 if (0) {
3831 if ($NEXT_TICK) { 4403 if ($NEXT_TICK) {
3832 my $jitter = $TICK_START - $NEXT_TICK; 4404 my $jitter = $TICK_START - $NEXT_TICK;
3833 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4405 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3834 warn "jitter $JITTER\n";#d# 4406 debug "jitter $JITTER\n";#d#
3835 } 4407 }
3836 } 4408 }
3837} 4409}
3838 4410
3839{ 4411{
3840 # configure BDB 4412 # configure BDB
4413 info "initialising database";
3841 4414
3842 BDB::min_parallel 8; 4415 BDB::min_parallel 16;
3843 BDB::max_poll_reqs $TICK * 0.1; 4416 BDB::max_poll_reqs $TICK * 0.1;
3844 $AnyEvent::BDB::WATCHER->priority (1); 4417 #$AnyEvent::BDB::WATCHER->priority (1);
3845 4418
3846 unless ($DB_ENV) { 4419 unless ($DB_ENV) {
3847 $DB_ENV = BDB::db_env_create; 4420 $DB_ENV = BDB::db_env_create;
3848 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4421 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3849 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4422 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3874 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4447 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3875 }; 4448 };
3876 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4449 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3877 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4450 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3878 }; 4451 };
4452
4453 info "database initialised";
3879} 4454}
3880 4455
3881{ 4456{
3882 # configure IO::AIO 4457 # configure IO::AIO
3883 4458
4459 info "initialising aio";
3884 IO::AIO::min_parallel 8; 4460 IO::AIO::min_parallel 8;
3885 IO::AIO::max_poll_time $TICK * 0.1; 4461 IO::AIO::max_poll_time $TICK * 0.1;
3886 undef $AnyEvent::AIO::WATCHER; 4462 undef $AnyEvent::AIO::WATCHER;
4463 info "aio initialised";
3887} 4464}
3888 4465
3889my $_log_backtrace; 4466our $_log_backtrace;
4467our $_log_backtrace_last;
3890 4468
3891sub _log_backtrace { 4469sub _log_backtrace {
3892 my ($msg, @addr) = @_; 4470 my ($msg, @addr) = @_;
3893 4471
3894 $msg =~ s/\n//; 4472 $msg =~ s/\n$//;
3895 4473
4474 if ($_log_backtrace_last eq $msg) {
4475 LOG llevInfo, "[ABT] $msg\n";
4476 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3896 # limit the # of concurrent backtraces 4477 # limit the # of concurrent backtraces
3897 if ($_log_backtrace < 2) { 4478 } elsif ($_log_backtrace < 2) {
4479 $_log_backtrace_last = $msg;
3898 ++$_log_backtrace; 4480 ++$_log_backtrace;
3899 my $perl_bt = Carp::longmess $msg; 4481 my $perl_bt = Carp::longmess $msg;
3900 async { 4482 async {
3901 $Coro::current->{desc} = "abt $msg"; 4483 $Coro::current->{desc} = "abt $msg";
3902 4484
3922 LOG llevInfo, "[ABT] $_\n" for @bt; 4504 LOG llevInfo, "[ABT] $_\n" for @bt;
3923 --$_log_backtrace; 4505 --$_log_backtrace;
3924 }; 4506 };
3925 } else { 4507 } else {
3926 LOG llevInfo, "[ABT] $msg\n"; 4508 LOG llevInfo, "[ABT] $msg\n";
3927 LOG llevInfo, "[ABT] [suppressed]\n"; 4509 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3928 } 4510 }
3929} 4511}
3930 4512
3931# load additional modules 4513# load additional modules
3932require "cf/$_.pm" for @EXTRA_MODULES; 4514require "cf/$_.pm" for @EXTRA_MODULES;
4515cf::_connect_to_perl_2;
3933 4516
3934END { cf::emergency_save } 4517END { cf::emergency_save }
3935 4518
39361 45191
3937 4520

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines