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.474 by root, Thu Jul 16 21:42:56 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
77# strictly for debugging 81# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 82$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 83
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 84sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
81 85
86our @ORIG_INC;
87
82our %COMMAND = (); 88our %COMMAND = ();
83our %COMMAND_TIME = (); 89our %COMMAND_TIME = ();
84 90
85our @EXTS = (); # list of extension package names 91our @EXTS = (); # list of extension package names
86our %EXTCMD = (); 92our %EXTCMD = ();
93our %EXTACMD = ();
87our %EXTICMD = (); 94our %EXTICMD = ();
95our %EXTIACMD = ();
88our %EXT_CORO = (); # coroutines bound to extensions 96our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
90 98
91our $RELOAD; # number of reloads so far, non-zero while in reload 99our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 100our @EVENT;
101our @REFLECT; # set by XS
102our %REFLECT; # set by us
93 103
94our $CONFDIR = confdir; 104our $CONFDIR = confdir;
105
95our $DATADIR = datadir; 106our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 107our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 108our $PODDIR = "$DATADIR/pod";
98our $MAPDIR = "$DATADIR/" . mapdir; 109our $MAPDIR = "$DATADIR/" . mapdir;
110
99our $LOCALDIR = localdir; 111our $LOCALDIR = localdir;
100our $TMPDIR = "$LOCALDIR/" . tmpdir; 112our $TMPDIR = "$LOCALDIR/" . tmpdir;
101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 113our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
102our $PLAYERDIR = "$LOCALDIR/" . playerdir; 114our $PLAYERDIR = "$LOCALDIR/" . playerdir;
103our $RANDOMDIR = "$LOCALDIR/random"; 115our $RANDOMDIR = "$LOCALDIR/random";
104our $BDBDIR = "$LOCALDIR/db"; 116our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid"; 117our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 118our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 119
108our %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;
109 127
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 128our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 129our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 130our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 131our $USE_FSYNC = 1; # use fsync to write maps - default on
115our $BDB_DEADLOCK_WATCHER; 133our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 134our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 135our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 136our $DB_ENV;
119 137
120our @EXTRA_MODULES = qw(pod mapscript); 138our @EXTRA_MODULES = qw(pod match mapscript incloader);
121 139
122our %CFG; 140our %CFG;
141our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
123 142
124our $UPTIME; $UPTIME ||= time; 143our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 144our $RUNTIME = 0;
145our $SERVER_TICK = 0;
126our $NOW; 146our $NOW;
127 147
128our (%PLAYER, %PLAYER_LOADING); # all users 148our (%PLAYER, %PLAYER_LOADING); # all users
129our (%MAP, %MAP_LOADING ); # all maps 149our (%MAP, %MAP_LOADING ); # all maps
130our $LINK_MAP; # the special {link} map, which is always available 150our $LINK_MAP; # the special {link} map, which is always available
139 159
140our @POST_INIT; 160our @POST_INIT;
141 161
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 162our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :) 163our $REALLY_UNLOOP; # never set to true, please :)
164
165our $WAIT_FOR_TICK = new Coro::Signal;
166our @WAIT_FOR_TICK_BEGIN;
144 167
145binmode STDOUT; 168binmode STDOUT;
146binmode STDERR; 169binmode STDERR;
147 170
148# read virtual server time, if available 171# read virtual server time, if available
159 182
160our $EMERGENCY_POSITION; 183our $EMERGENCY_POSITION;
161 184
162sub cf::map::normalise; 185sub cf::map::normalise;
163 186
187sub in_main() {
188 $Coro::current == $Coro::main
189}
190
164############################################################################# 191#############################################################################
165 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
166=head2 GLOBAL VARIABLES 204=head2 GLOBAL VARIABLES
167 205
168=over 4 206=over 4
169 207
170=item $cf::UPTIME 208=item $cf::UPTIME
171 209
172The 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.
173 226
174=item $cf::RUNTIME 227=item $cf::RUNTIME
175 228
176The 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
177every server tick. 230every server tick.
178 231
179=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 232=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
180$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 233$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
181$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 234$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
182 235
183Various directories - "/etc", read-only install directory, perl-library 236Various directories - "/etc", read-only install directory, perl-library
184directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 237directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
185unique-items directory, player file directory, random maps directory and 238unique-items directory, player file directory, random maps directory and
186database environment. 239database environment.
187 240
188=item $cf::NOW
189
190The time of the last (current) server tick.
191
192=item $cf::TICK
193
194The interval between server ticks, in seconds.
195
196=item $cf::LOADAVG 241=item $cf::LOADAVG
197 242
198The 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
199(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
200objects per tick. Healthy values are < 0.5. 245objects per tick. Healthy values are < 0.5.
208Configuration for the server, loaded from C</etc/deliantra-server/config>, or 253Configuration for the server, loaded from C</etc/deliantra-server/config>, or
209from wherever your confdir points to. 254from wherever your confdir points to.
210 255
211=item cf::wait_for_tick, cf::wait_for_tick_begin 256=item cf::wait_for_tick, cf::wait_for_tick_begin
212 257
213These 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.
214returns 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
215per 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();
216 279
217=item @cf::INVOKE_RESULTS 280=item @cf::INVOKE_RESULTS
218 281
219This array contains the results of the last C<invoke ()> call. When 282This array contains the results of the last C<invoke ()> call. When
220C<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
221that call. 284that call.
222 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
223=back 292=back
224 293
225=cut 294=cut
226 295
227BEGIN { 296sub error(@) { LOG llevError, join "", @_ }
228 *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 {
229 my $msg = join "", @_; 303 my $msg = join "", @_;
230 304
231 $msg .= "\n" 305 $msg .= "\n"
232 unless $msg =~ /\n$/; 306 unless $msg =~ /\n$/;
233 307
234 $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;
235 309
236 LOG llevError, $msg; 310 LOG llevWarn, $msg;
237 }; 311};
238}
239 312
240$Coro::State::DIEHOOK = sub { 313$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "==" 314 return unless $^S eq 0; # "eq", not "=="
242 315
243 if ($Coro::current == $Coro::main) {#d# 316 error Carp::longmess $_[0];
317
318 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 319 error "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 320 return;#d#
246 }#d# 321 }#d#
247 322
248 # kill coroutine otherwise 323 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate 324 Coro::terminate
251}; 325};
252
253$SIG{__DIE__} = sub { }; #d#?
254 326
255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 327@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 328@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 329@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 330@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
272)) { 344)) {
273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 345 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274} 346}
275 347
276$EV::DIED = sub { 348$EV::DIED = sub {
277 warn "error in event callback: @_"; 349 warn "error in event callback: $@";
278}; 350};
351
352#############################################################################
353
354sub fork_call(&@);
355sub get_slot($;$$);
279 356
280############################################################################# 357#############################################################################
281 358
282=head2 UTILITY FUNCTIONS 359=head2 UTILITY FUNCTIONS
283 360
304 $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;
305 $d 382 $d
306 } || "[unable to dump $_[0]: '$@']"; 383 } || "[unable to dump $_[0]: '$@']";
307} 384}
308 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
309=item $ref = cf::decode_json $json 438=item $ref = cf::decode_json $json
310 439
311Converts a JSON string into the corresponding perl data structure. 440Converts a JSON string into the corresponding perl data structure.
312 441
313=item $json = cf::encode_json $ref 442=item $json = cf::encode_json $ref
319our $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
320 449
321sub encode_json($) { $json_coder->encode ($_[0]) } 450sub encode_json($) { $json_coder->encode ($_[0]) }
322sub decode_json($) { $json_coder->decode ($_[0]) } 451sub decode_json($) { $json_coder->decode ($_[0]) }
323 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
324=item cf::post_init { BLOCK } 498=item cf::post_init { BLOCK }
325 499
326Execute the given codeblock, I<after> all extensions have been (re-)loaded, 500Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again. 501but I<before> the server starts ticking again.
328 502
329The cdoeblock will have a single boolean argument to indicate whether this 503The codeblock will have a single boolean argument to indicate whether this
330is a reload or not. 504is a reload or not.
331 505
332=cut 506=cut
333 507
334sub post_init(&) { 508sub post_init(&) {
335 push @POST_INIT, shift; 509 push @POST_INIT, shift;
336} 510}
337 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
338=item cf::lock_wait $string 529=item cf::lock_wait $string
339 530
340Wait until the given lock is available. See cf::lock_acquire. 531Wait until the given lock is available. See cf::lock_acquire.
341 532
342=item my $lock = cf::lock_acquire $string 533=item my $lock = cf::lock_acquire $string
343 534
344Wait 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
345a 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,
379} 570}
380 571
381=item cf::periodic $interval, $cb 572=item cf::periodic $interval, $cb
382 573
383Like 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
384get spread over timer. 575get spread over time.
385 576
386=cut 577=cut
387 578
388sub periodic($$) { 579sub periodic($$) {
389 my ($interval, $cb) = @_; 580 my ($interval, $cb) = @_;
393 EV::periodic $start, $interval, 0, $cb 584 EV::periodic $start, $interval, 0, $cb
394} 585}
395 586
396=item cf::get_slot $time[, $priority[, $name]] 587=item cf::get_slot $time[, $priority[, $name]]
397 588
398Allocate $time seconds of blocking CPU time at priority C<$priority>: 589Allocate $time seconds of blocking CPU time at priority C<$priority>
399This 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
400of 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.
401 596
402The 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
403used for statistical purposes and should identify the same time-class. 598used for statistical purposes and should identify the same time-class.
404 599
405Useful for short background jobs. 600Useful for short background jobs.
406 601
407=cut 602=cut
408 603
409our @SLOT_QUEUE; 604our @SLOT_QUEUE;
410our $SLOT_QUEUE; 605our $SLOT_QUEUE;
606our $SLOT_DECAY = 0.9;
411 607
412$SLOT_QUEUE->cancel if $SLOT_QUEUE; 608$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413$SLOT_QUEUE = Coro::async { 609$SLOT_QUEUE = Coro::async {
414 $Coro::current->desc ("timeslot manager"); 610 $Coro::current->desc ("timeslot manager");
415 611
416 my $signal = new Coro::Signal; 612 my $signal = new Coro::Signal;
613 my $busy;
417 614
418 while () { 615 while () {
419 next_job: 616 next_job:
617
618 Coro::cede;
619
420 my $avail = cf::till_tick; 620 my $avail = cf::till_tick;
421 if ($avail > 0.01) { 621
422 for (0 .. $#SLOT_QUEUE) { 622 for (0 .. $#SLOT_QUEUE) {
423 if ($SLOT_QUEUE[$_][0] < $avail) { 623 if ($SLOT_QUEUE[$_][0] <= $avail) {
624 $busy = 0;
424 my $job = splice @SLOT_QUEUE, $_, 1, (); 625 my $job = splice @SLOT_QUEUE, $_, 1, ();
425 $job->[2]->send; 626 $job->[2]->send;
426 Coro::cede;
427 goto next_job; 627 goto next_job;
428 } 628 } else {
629 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429 } 630 }
430 } 631 }
431 632
432 if (@SLOT_QUEUE) { 633 if (@SLOT_QUEUE) {
433 # we do not use wait_for_tick() as it returns immediately when tick is inactive 634 wait_for_tick;
434 push @cf::WAIT_FOR_TICK, $signal;
435 $signal->wait;
436 } else { 635 } else {
636 $busy = 0;
437 Coro::schedule; 637 Coro::schedule;
438 } 638 }
439 } 639 }
440}; 640};
441 641
442sub get_slot($;$$) { 642sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main; 643 return if tick_inhibit || $Coro::current == $Coro::main;
444 644
445 my ($time, $pri, $name) = @_; 645 my ($time, $pri, $name) = @_;
446 646
447 $time = $TICK * .6 if $time > $TICK * .6; 647 $time = clamp $time, 0.01, $TICK * .6;
648
448 my $sig = new Coro::Signal; 649 my $sig = new Coro::Signal;
449 650
450 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 651 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 652 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452 $SLOT_QUEUE->ready; 653 $SLOT_QUEUE->ready;
464BEGIN { *async = \&Coro::async_pool } 665BEGIN { *async = \&Coro::async_pool }
465 666
466=item cf::sync_job { BLOCK } 667=item cf::sync_job { BLOCK }
467 668
468The design of Deliantra requires that the main coroutine ($Coro::main) 669The design of Deliantra requires that the main coroutine ($Coro::main)
469is always able to handle events or runnable, as Deliantra is only 670is always able to handle events or is runnable, as Deliantra is only
470partly 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
471acceptable. 672acceptable.
472 673
473If 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
474the given BLOCK in another coroutine while waiting for the result. The 675the given BLOCK in another coroutine while waiting for the result. The
478=cut 679=cut
479 680
480sub sync_job(&) { 681sub sync_job(&) {
481 my ($job) = @_; 682 my ($job) = @_;
482 683
483 if ($Coro::current == $Coro::main) { 684 if (in_main) {
484 my $time = EV::time; 685 my $time = AE::time;
485 686
486 # this is the main coro, too bad, we have to block 687 # this is the main coro, too bad, we have to block
487 # till the operation succeeds, freezing the server :/ 688 # till the operation succeeds, freezing the server :/
488 689
489 LOG llevError, Carp::longmess "sync job";#d# 690 #LOG llevError, Carp::longmess "sync job";#d#
490 691
491 my $freeze_guard = freeze_mainloop; 692 my $freeze_guard = freeze_mainloop;
492 693
493 my $busy = 1; 694 my $busy = 1;
494 my @res; 695 my @res;
495 696
496 (async { 697 (async {
497 $Coro::current->desc ("sync job coro"); 698 $Coro::current->desc ("sync job coro");
498 @res = eval { $job->() }; 699 @res = eval { $job->() };
499 warn $@ if $@; 700 error $@ if $@;
500 undef $busy; 701 undef $busy;
501 })->prio (Coro::PRIO_MAX); 702 })->prio (Coro::PRIO_MAX);
502 703
503 while ($busy) { 704 while ($busy) {
504 if (Coro::nready) { 705 if (Coro::nready) {
505 Coro::cede_notself; 706 Coro::cede_notself;
506 } else { 707 } else {
507 EV::loop EV::LOOP_ONESHOT; 708 EV::run EV::RUN_ONCE;
508 } 709 }
509 } 710 }
510 711
511 my $time = EV::time - $time; 712 my $time = AE::time - $time;
512 713
513 $TICK_START += $time; # do not account sync jobs to server load 714 $TICK_START += $time; # do not account sync jobs to server load
514 715
515 wantarray ? @res : $res[0] 716 wantarray ? @res : $res[0]
516 } else { 717 } else {
538 $EXT_CORO{$coro+0} = $coro; 739 $EXT_CORO{$coro+0} = $coro;
539 740
540 $coro 741 $coro
541} 742}
542 743
543=item fork_call { }, $args 744=item fork_call { }, @args
544 745
545Executes the given code block with the given arguments in a seperate 746Executes the given code block with the given arguments in a seperate
546process, returning the results. Everything must be serialisable with 747process, returning the results. Everything must be serialisable with
547Coro::Storable. May, of course, block. Note that the executed sub may 748Coro::Storable. May, of course, block. Note that the executed sub may
548never block itself or use any form of event handling. 749never block itself or use any form of event handling.
549 750
550=cut 751=cut
551 752
753sub post_fork {
754 reset_signals;
755}
756
552sub fork_call(&@) { 757sub fork_call(&@) {
553 my ($cb, @args) = @_; 758 my ($cb, @args) = @_;
554 759
555 # we seemingly have to make a local copy of the whole thing,
556 # otherwise perl prematurely frees the stuff :/
557 # TODO: investigate and fix (likely this will be rather laborious)
558
559 my @res = Coro::Util::fork_eval { 760 my @res = Coro::Util::fork_eval {
560 reset_signals; 761 cf::post_fork;
561 &$cb 762 &$cb
562 }, @args; 763 } @args;
563 764
564 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 )
565} 777}
566 778
567=item $coin = coin_from_name $name 779=item $coin = coin_from_name $name
568 780
569=cut 781=cut
606within each server. 818within each server.
607 819
608=cut 820=cut
609 821
610sub db_table($) { 822sub db_table($) {
823 cf::error "db_get called from main context"
824 if $Coro::current == $Coro::main;
825
611 my ($name) = @_; 826 my ($name) = @_;
612 my $db = BDB::db_create $DB_ENV; 827 my $db = BDB::db_create $DB_ENV;
613 828
614 eval { 829 eval {
615 $db->set_flags (BDB::CHKSUM); 830 $db->set_flags (BDB::CHKSUM);
625} 840}
626 841
627our $DB; 842our $DB;
628 843
629sub db_init { 844sub db_init {
630 cf::sync_job {
631 $DB ||= db_table "db"; 845 $DB ||= db_table "db";
632 };
633} 846}
634 847
635sub db_get($$) { 848sub db_get($$) {
636 my $key = "$_[0]/$_[1]"; 849 my $key = "$_[0]/$_[1]";
637 850
638 cf::sync_job { 851 cf::error "db_get called from main context"
852 if $Coro::current == $Coro::main;
853
639 BDB::db_get $DB, undef, $key, my $data; 854 BDB::db_get $DB, undef, $key, my $data;
640 855
641 $! ? () 856 $! ? ()
642 : $data 857 : $data
643 }
644} 858}
645 859
646sub db_put($$$) { 860sub db_put($$$) {
647 BDB::dbreq_pri 4; 861 BDB::dbreq_pri 4;
648 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 862 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
676 890
677 my @data; 891 my @data;
678 my $md5; 892 my $md5;
679 893
680 for (0 .. $#$src) { 894 for (0 .. $#$src) {
681 0 <= aio_load $src->[$_], $data[$_] 895 $data[$_] = load_file $src->[$_];
682 or Carp::croak "$src->[$_]: $!";
683 } 896 }
684 897
685 # if processing is expensive, check 898 # if processing is expensive, check
686 # checksum first 899 # checksum first
687 if (1) { 900 if (1) {
700 913
701 return db_get cache => "$id/data"; 914 return db_get cache => "$id/data";
702 } 915 }
703 } 916 }
704 917
705 my $t1 = Time::HiRes::time; 918 my $t1 = EV::time;
706 my $data = $process->(\@data); 919 my $data = $process->(\@data);
707 my $t2 = Time::HiRes::time; 920 my $t2 = EV::time;
708 921
709 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 922 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
710 923
711 db_put cache => "$id/data", $data; 924 db_put cache => "$id/data", $data;
712 db_put cache => "$id/md5" , $md5; 925 db_put cache => "$id/md5" , $md5;
713 db_put cache => "$id/meta", $meta; 926 db_put cache => "$id/meta", $meta;
714 927
724 937
725=cut 938=cut
726 939
727sub datalog($@) { 940sub datalog($@) {
728 my ($type, %kv) = @_; 941 my ($type, %kv) = @_;
729 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 942 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
730} 943}
731 944
732=back 945=back
733 946
734=cut 947=cut
929 1142
930 } elsif (exists $cb_id{$type}) { 1143 } elsif (exists $cb_id{$type}) {
931 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1144 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
932 1145
933 } elsif (ref $type) { 1146 } elsif (ref $type) {
934 warn "attaching objects not supported, ignoring.\n"; 1147 error "attaching objects not supported, ignoring.\n";
935 1148
936 } else { 1149 } else {
937 shift @arg; 1150 shift @arg;
938 warn "attach argument '$type' not supported, ignoring.\n"; 1151 error "attach argument '$type' not supported, ignoring.\n";
939 } 1152 }
940 } 1153 }
941} 1154}
942 1155
943sub _object_attach { 1156sub _object_attach {
953 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
954 } 1167 }
955 1168
956 $obj->{$name} = \%arg; 1169 $obj->{$name} = \%arg;
957 } else { 1170 } else {
958 warn "object uses attachment '$name' which is not available, postponing.\n"; 1171 info "object uses attachment '$name' which is not available, postponing.\n";
959 } 1172 }
960 1173
961 $obj->{_attachment}{$name} = undef; 1174 $obj->{_attachment}{$name} = undef;
962} 1175}
963 1176
1022 1235
1023 for (@$callbacks) { 1236 for (@$callbacks) {
1024 eval { &{$_->[1]} }; 1237 eval { &{$_->[1]} };
1025 1238
1026 if ($@) { 1239 if ($@) {
1027 warn "$@";
1028 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1240 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1029 override; 1241 override;
1030 } 1242 }
1031 1243
1032 return 1 if $override; 1244 return 1 if $override;
1033 } 1245 }
1112 for (@$attach) { 1324 for (@$attach) {
1113 my ($klass, @attach) = @$_; 1325 my ($klass, @attach) = @$_;
1114 _attach $registry, $klass, @attach; 1326 _attach $registry, $klass, @attach;
1115 } 1327 }
1116 } else { 1328 } else {
1117 warn "object uses attachment '$name' that is not available, postponing.\n"; 1329 info "object uses attachment '$name' that is not available, postponing.\n";
1118 } 1330 }
1119 } 1331 }
1120} 1332}
1121 1333
1122cf::attachable->attach ( 1334cf::attachable->attach (
1149 my ($filename, $rdata, $objs) = @_; 1361 my ($filename, $rdata, $objs) = @_;
1150 1362
1151 sync_job { 1363 sync_job {
1152 if (length $$rdata) { 1364 if (length $$rdata) {
1153 utf8::decode (my $decname = $filename); 1365 utf8::decode (my $decname = $filename);
1154 warn sprintf "saving %s (%d,%d)\n", 1366 trace sprintf "saving %s (%d,%d)\n",
1155 $decname, length $$rdata, scalar @$objs; 1367 $decname, length $$rdata, scalar @$objs
1368 if $VERBOSE_IO;
1156 1369
1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1370 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1158 aio_chmod $fh, SAVE_MODE; 1371 aio_chmod $fh, SAVE_MODE;
1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1372 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1160 if ($cf::USE_FSYNC) { 1373 if ($cf::USE_FSYNC) {
1182 aio_rename "$filename~", $filename; 1395 aio_rename "$filename~", $filename;
1183 1396
1184 $filename =~ s%/[^/]+$%%; 1397 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC; 1398 aio_pathsync $filename if $cf::USE_FSYNC;
1186 } else { 1399 } else {
1187 warn "unable to save objects: $filename~: $!\n"; 1400 error "unable to save objects: $filename~: $!\n";
1188 } 1401 }
1189 } else { 1402 } else {
1190 aio_unlink $filename; 1403 aio_unlink $filename;
1191 aio_unlink "$filename.pst"; 1404 aio_unlink "$filename.pst";
1192 } 1405 }
1216 my $st = eval { Coro::Storable::thaw $av }; 1429 my $st = eval { Coro::Storable::thaw $av };
1217 $av = $st->{objs}; 1430 $av = $st->{objs};
1218 } 1431 }
1219 1432
1220 utf8::decode (my $decname = $filename); 1433 utf8::decode (my $decname = $filename);
1221 warn sprintf "loading %s (%d,%d)\n", 1434 trace sprintf "loading %s (%d,%d)\n",
1222 $decname, length $data, scalar @{$av || []}; 1435 $decname, length $data, scalar @{$av || []}
1436 if $VERBOSE_IO;
1223 1437
1224 ($data, $av) 1438 ($data, $av)
1225} 1439}
1226 1440
1227=head2 COMMAND CALLBACKS 1441=head2 COMMAND CALLBACKS
1231=cut 1445=cut
1232 1446
1233############################################################################# 1447#############################################################################
1234# command handling &c 1448# command handling &c
1235 1449
1236=item cf::register_command $name => \&callback($ob,$args); 1450=item cf::register_command $name => \&callback($ob,$args)
1237 1451
1238Register a callback for execution when the client sends the user command 1452Register a callback for execution when the client sends the user command
1239$name. 1453$name.
1240 1454
1241=cut 1455=cut
1247 #warn "registering command '$name/$time' to '$caller'"; 1461 #warn "registering command '$name/$time' to '$caller'";
1248 1462
1249 push @{ $COMMAND{$name} }, [$caller, $cb]; 1463 push @{ $COMMAND{$name} }, [$caller, $cb];
1250} 1464}
1251 1465
1252=item cf::register_extcmd $name => \&callback($pl,$packet); 1466=item cf::register_extcmd $name => \&callback($pl,@args)
1253 1467
1254Register a callback for execution when the client sends an (synchronous) 1468Register a callback for execution when the client sends an (synchronous)
1255extcmd packet. Ext commands will be processed in the order they are 1469extcmd packet. Ext commands will be processed in the order they are
1256received by the server, like other user commands. The first argument is 1470received by the server, like other user commands. The first argument is
1257the 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
1258has logged in successfully. 1472has logged in successfully.
1259 1473
1260If the callback returns something, it is sent back as if reply was being 1474The values will be sent back to the client.
1261called.
1262 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
1263=item cf::register_exticmd $name => \&callback($ns,$packet); 1481=item cf::register_exticmd $name => \&callback($ns,@args)
1264 1482
1265Register a callback for execution when the client sends an (asynchronous) 1483Register a callback for execution when the client sends an (asynchronous)
1266exticmd 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
1267are 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
1268is a client socket. Exti commands can be received anytime, even before 1486is a client socket. Exti commands can be received anytime, even before
1269log-in. 1487log-in.
1270 1488
1271If the callback returns something, it is sent back as if reply was being 1489The values will be sent back to the client.
1272called.
1273 1490
1274=cut 1491=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1275 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
1276sub register_extcmd { 1498sub register_extcmd($$) {
1277 my ($name, $cb) = @_; 1499 my ($name, $cb) = @_;
1278 1500
1279 $EXTCMD{$name} = $cb; 1501 $EXTCMD{$name} = $cb;
1280} 1502}
1281 1503
1282sub register_exticmd { 1504sub register_async_extcmd($$) {
1283 my ($name, $cb) = @_; 1505 my ($name, $cb) = @_;
1284 1506
1507 $EXTACMD{$name} = $cb;
1508}
1509
1510sub register_exticmd($$) {
1511 my ($name, $cb) = @_;
1512
1285 $EXTICMD{$name} = $cb; 1513 $EXTICMD{$name} = $cb;
1286} 1514}
1287 1515
1516sub register_async_exticmd($$) {
1517 my ($name, $cb) = @_;
1518
1519 $EXTIACMD{$name} = $cb;
1520}
1521
1288use File::Glob (); 1522use File::Glob ();
1289 1523
1290cf::player->attach ( 1524cf::player->attach (
1291 on_command => sub { 1525 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1526 my ($pl, $name, $params) = @_;
1293 1527
1294 my $cb = $COMMAND{$name} 1528 my $cb = $COMMAND{$name}
1295 or return; 1529 or return;
1296 1530
1304 my ($pl, $buf) = @_; 1538 my ($pl, $buf) = @_;
1305 1539
1306 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1540 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1307 1541
1308 if (ref $msg) { 1542 if (ref $msg) {
1309 my ($type, $reply, @payload) = 1543 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1310 "ARRAY" eq ref $msg
1311 ? @$msg
1312 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1313 1544
1314 my @reply;
1315
1316 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}) {
1317 @reply = $cb->($pl, @payload); 1558 @reply = $cb->($pl, @payload);
1559 }
1560
1561 $pl->ext_msg ("reply-$reply", @reply)
1562 if $reply;
1318 } 1563 }
1319 1564
1320 $pl->ext_reply ($reply, @reply)
1321 if $reply;
1322
1323 } else { 1565 } else {
1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1566 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1325 } 1567 }
1326 1568
1327 cf::override; 1569 cf::override;
1328 }, 1570 },
1329); 1571);
1339 }; 1581 };
1340 1582
1341 $grp 1583 $grp
1342} 1584}
1343 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
1344sub load_extensions { 1597sub load_extensions {
1598 info "loading extensions...";
1599
1600 %EXT_CFG = ();
1601
1345 cf::sync_job { 1602 cf::sync_job {
1346 my %todo; 1603 my %todo;
1347 1604
1348 for my $path (<$LIBDIR/*.ext>) { 1605 for my $path (<$LIBDIR/*.ext>) {
1349 next unless -r $path; 1606 next unless -r $path;
1367 1624
1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1625 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1626 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1370 1627
1371 $ext{source} = 1628 $ext{source} =
1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1629 "package $pkg; use common::sense;\n"
1373 . "#line 1 \"$path\"\n{\n" 1630 . "#line 1 \"$path\"\n{\n"
1374 . $source 1631 . $source
1375 . "\n};\n1"; 1632 . "\n};\n1";
1376 1633
1377 $todo{$base} = \%ext; 1634 $todo{$base} = \%ext;
1378 } 1635 }
1379 1636
1637 my $pass = 0;
1380 my %done; 1638 my %done;
1381 while (%todo) { 1639 while (%todo) {
1382 my $progress; 1640 my $progress;
1383 1641
1642 ++$pass;
1643
1644 ext:
1384 while (my ($k, $v) = each %todo) { 1645 while (my ($k, $v) = each %todo) {
1385 for (split /,\s*/, $v->{meta}{depends}) { 1646 for (split /,\s*/, $v->{meta}{depends}) {
1386 goto skip 1647 next ext
1387 unless exists $done{$_}; 1648 unless exists $done{$_};
1388 } 1649 }
1389 1650
1390 warn "... loading '$k' into '$v->{pkg}'\n"; 1651 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391 1652
1392 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 $@) {
1393 my $msg = $@ ? "$v->{path}: $@\n" 1665 error "$v->{path}: $@\n";
1394 : "$v->{base}: extension inactive.\n";
1395 1666
1396 if (exists $v->{meta}{mandatory}) {
1397 warn $msg;
1398 cf::cleanup "mandatory extension failed to load, exiting."; 1667 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399 } 1668 if exists $v->{meta}{mandatory};
1400 1669
1401 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;
1402 } 1679 }
1403
1404 $done{$k} = delete $todo{$k};
1405 push @EXTS, $v->{pkg};
1406 $progress = 1;
1407 } 1680 }
1408 1681
1409 skip: 1682 unless ($progress) {
1410 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1683 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411 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 }
1412 } 1692 }
1413 }; 1693 };
1414} 1694}
1415 1695
1416############################################################################# 1696#############################################################################
1500 $cf::PLAYER{$login} = $pl 1780 $cf::PLAYER{$login} = $pl
1501 } 1781 }
1502 } 1782 }
1503} 1783}
1504 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
1505sub save($) { 1798sub save($) {
1506 my ($pl) = @_; 1799 my ($pl) = @_;
1507 1800
1508 return if $pl->{deny_save}; 1801 return if $pl->{deny_save};
1509 1802
1514 1807
1515 aio_mkdir playerdir $pl, 0770; 1808 aio_mkdir playerdir $pl, 0770;
1516 $pl->{last_save} = $cf::RUNTIME; 1809 $pl->{last_save} = $cf::RUNTIME;
1517 1810
1518 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];
1519 1815
1520 $pl->save_pl ($path); 1816 $pl->save_pl ($path);
1521 cf::cede_to_tick; 1817 cf::cede_to_tick;
1522} 1818}
1523 1819
1557 my $name = $pl->ob->name; 1853 my $name = $pl->ob->name;
1558 1854
1559 $pl->{deny_save} = 1; 1855 $pl->{deny_save} = 1;
1560 $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
1561 1857
1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1858 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1563 $pl->deactivate; 1859 $pl->deactivate;
1860
1564 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;
1565 $pl->ob->check_score;
1566 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1862 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1863 ext::highscore::check ($pl->ob);
1864
1567 $pl->ns->destroy if $pl->ns; 1865 $pl->ns->destroy if $pl->ns;
1568 1866
1569 my $path = playerdir $pl; 1867 my $path = playerdir $pl;
1570 my $temp = "$path~$cf::RUNTIME~deleting~"; 1868 my $temp = "$path~$cf::RUNTIME~deleting~";
1571 aio_rename $path, $temp; 1869 aio_rename $path, $temp;
1625 \@logins 1923 \@logins
1626} 1924}
1627 1925
1628=item $player->maps 1926=item $player->maps
1629 1927
1928=item cf::player::maps $login
1929
1630Returns an arrayref of map paths that are private for this 1930Returns an arrayref of map paths that are private for this
1631player. May block. 1931player. May block.
1632 1932
1633=cut 1933=cut
1634 1934
1655 1955
1656=item $protocol_xml = $player->expand_cfpod ($cfpod) 1956=item $protocol_xml = $player->expand_cfpod ($cfpod)
1657 1957
1658Expand deliantra pod fragments into protocol xml. 1958Expand deliantra pod fragments into protocol xml.
1659 1959
1660=item $player->ext_reply ($msgid, @msg)
1661
1662Sends an ext reply to the player.
1663
1664=cut
1665
1666sub ext_reply($$@) {
1667 my ($self, $id, @msg) = @_;
1668
1669 $self->ns->ext_reply ($id, @msg)
1670}
1671
1672=item $player->ext_msg ($type, @msg) 1960=item $player->ext_msg ($type, @msg)
1673 1961
1674Sends an ext event to the client. 1962Sends an ext event to the client.
1675 1963
1676=cut 1964=cut
1695 1983
1696=cut 1984=cut
1697 1985
1698sub find_by_path($) { 1986sub find_by_path($) {
1699 my ($path) = @_; 1987 my ($path) = @_;
1988
1989 $path =~ s/^~[^\/]*//; # skip ~login
1700 1990
1701 my ($match, $specificity); 1991 my ($match, $specificity);
1702 1992
1703 for my $region (list) { 1993 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1994 if ($region->{match} && $path =~ $region->{match}) {
1733sub generate_random_map { 2023sub generate_random_map {
1734 my ($self, $rmp) = @_; 2024 my ($self, $rmp) = @_;
1735 2025
1736 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
1737 2027
1738 # mit "rum" bekleckern, nicht
1739 $self->_create_random_map ( 2028 $self->_create_random_map ($rmp);
1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743 $rmp->{exit_on_final_map},
1744 $rmp->{xsize}, $rmp->{ysize},
1745 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1747 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1748 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1749 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1750 (cf::region::find $rmp->{region}), $rmp->{custom}
1751 )
1752} 2029}
1753 2030
1754=item cf::map->register ($regex, $prio) 2031=item cf::map->register ($regex, $prio)
1755 2032
1756Register 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
1761 2038
1762sub register { 2039sub register {
1763 my (undef, $regex, $prio) = @_; 2040 my (undef, $regex, $prio) = @_;
1764 my $pkg = caller; 2041 my $pkg = caller;
1765 2042
1766 no strict;
1767 push @{"$pkg\::ISA"}, __PACKAGE__; 2043 push @{"$pkg\::ISA"}, __PACKAGE__;
1768 2044
1769 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2045 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770} 2046}
1771 2047
1772# also paths starting with '/' 2048# also paths starting with '/'
1773$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2049$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774 2050
1775sub thawer_merge { 2051sub thawer_merge {
1776 my ($self, $merge) = @_; 2052 my ($self, $merge) = @_;
1777 2053
1778 # we have to keep some variables in memory intact 2054 # we have to keep some variables in memory intact
1783} 2059}
1784 2060
1785sub normalise { 2061sub normalise {
1786 my ($path, $base) = @_; 2062 my ($path, $base) = @_;
1787 2063
1788 $path = "$path"; # make sure its a string 2064 $path = "$path"; # make sure it's a string
1789 2065
1790 $path =~ s/\.map$//; 2066 $path =~ s/\.map$//;
1791 2067
1792 # map plan: 2068 # map plan:
1793 # 2069 #
1808 $base =~ s{[^/]+/?$}{}; 2084 $base =~ s{[^/]+/?$}{};
1809 $path = "$base/$path"; 2085 $path = "$base/$path";
1810 } 2086 }
1811 2087
1812 for ($path) { 2088 for ($path) {
1813 redo if s{//}{/};
1814 redo if s{/\.?/}{/}; 2089 redo if s{/\.?/}{/};
1815 redo if s{/[^/]+/\.\./}{/}; 2090 redo if s{/[^/]+/\.\./}{/};
1816 } 2091 }
1817 2092
1818 $path 2093 $path
1832 $self->init; # pass $1 etc. 2107 $self->init; # pass $1 etc.
1833 return $self; 2108 return $self;
1834 } 2109 }
1835 } 2110 }
1836 2111
1837 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2112 Carp::cluck "unable to resolve path '$path' (base '$base')";
1838 () 2113 ()
1839} 2114}
1840 2115
2116# may re-bless or do other evil things
1841sub init { 2117sub init {
1842 my ($self) = @_; 2118 my ($self) = @_;
1843 2119
1844 $self 2120 $self
1845} 2121}
1910 $self->{load_path} = $path; 2186 $self->{load_path} = $path;
1911 2187
1912 1 2188 1
1913} 2189}
1914 2190
2191# used to laod the header of an original map
1915sub load_header_orig { 2192sub load_header_orig {
1916 my ($self) = @_; 2193 my ($self) = @_;
1917 2194
1918 $self->load_header_from ($self->load_path) 2195 $self->load_header_from ($self->load_path)
1919} 2196}
1920 2197
2198# used to laod the header of an instantiated map
1921sub load_header_temp { 2199sub load_header_temp {
1922 my ($self) = @_; 2200 my ($self) = @_;
1923 2201
1924 $self->load_header_from ($self->save_path) 2202 $self->load_header_from ($self->save_path)
1925} 2203}
1926 2204
2205# called after loading the header from an instantiated map
1927sub prepare_temp { 2206sub prepare_temp {
1928 my ($self) = @_; 2207 my ($self) = @_;
1929 2208
1930 $self->last_access ((delete $self->{last_access}) 2209 $self->last_access ((delete $self->{last_access})
1931 || $cf::RUNTIME); #d# 2210 || $cf::RUNTIME); #d#
1932 # safety 2211 # safety
1933 $self->{instantiate_time} = $cf::RUNTIME 2212 $self->{instantiate_time} = $cf::RUNTIME
1934 if $self->{instantiate_time} > $cf::RUNTIME; 2213 if $self->{instantiate_time} > $cf::RUNTIME;
1935} 2214}
1936 2215
2216# called after loading the header from an original map
1937sub prepare_orig { 2217sub prepare_orig {
1938 my ($self) = @_; 2218 my ($self) = @_;
1939 2219
1940 $self->{load_original} = 1; 2220 $self->{load_original} = 1;
1941 $self->{instantiate_time} = $cf::RUNTIME; 2221 $self->{instantiate_time} = $cf::RUNTIME;
1965 2245
1966sub find; 2246sub find;
1967sub find { 2247sub find {
1968 my ($path, $origin) = @_; 2248 my ($path, $origin) = @_;
1969 2249
2250 cf::cede_to_tick;
2251
1970 $path = normalise $path, $origin && $origin->path; 2252 $path = normalise $path, $origin;
1971 2253
1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2254 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 my $guard2 = cf::lock_acquire "map_find:$path"; 2255 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2256
1975 $cf::MAP{$path} || do { 2257 $cf::MAP{$path} || do {
1992 2274
1993 $cf::MAP{$path} = $map 2275 $cf::MAP{$path} = $map
1994 } 2276 }
1995} 2277}
1996 2278
1997sub pre_load { } 2279sub pre_load { }
1998sub post_load { } 2280#sub post_load { } # XS
1999 2281
2000sub load { 2282sub load {
2001 my ($self) = @_; 2283 my ($self) = @_;
2002 2284
2003 local $self->{deny_reset} = 1; # loading can take a long time 2285 local $self->{deny_reset} = 1; # loading can take a long time
2006 2288
2007 { 2289 {
2008 my $guard = cf::lock_acquire "map_data:$path"; 2290 my $guard = cf::lock_acquire "map_data:$path";
2009 2291
2010 return unless $self->valid; 2292 return unless $self->valid;
2011 return unless $self->in_memory == cf::MAP_SWAPPED; 2293 return unless $self->state == cf::MAP_SWAPPED;
2012
2013 $self->in_memory (cf::MAP_LOADING);
2014 2294
2015 $self->alloc; 2295 $self->alloc;
2016 2296
2017 $self->pre_load; 2297 $self->pre_load;
2018 cf::cede_to_tick; 2298 cf::cede_to_tick;
2019 2299
2300 if (exists $self->{load_path}) {
2020 my $f = new_from_file cf::object::thawer $self->{load_path}; 2301 my $f = new_from_file cf::object::thawer $self->{load_path};
2021 $f->skip_block; 2302 $f->skip_block;
2022 $self->_load_objects ($f) 2303 $self->_load_objects ($f)
2023 or return; 2304 or return;
2024 2305
2025 $self->post_load_original 2306 $self->post_load_original
2026 if delete $self->{load_original}; 2307 if delete $self->{load_original};
2027 2308
2028 if (my $uniq = $self->uniq_path) { 2309 if (my $uniq = $self->uniq_path) {
2029 utf8::encode $uniq; 2310 utf8::encode $uniq;
2030 unless (aio_stat $uniq) { 2311 unless (aio_stat $uniq) {
2031 if (my $f = new_from_file cf::object::thawer $uniq) { 2312 if (my $f = new_from_file cf::object::thawer $uniq) {
2032 $self->clear_unique_items; 2313 $self->clear_unique_items;
2033 $self->_load_objects ($f); 2314 $self->_load_objects ($f);
2034 $f->resolve_delayed_derefs; 2315 $f->resolve_delayed_derefs;
2316 }
2035 } 2317 }
2036 } 2318 }
2037 }
2038 2319
2039 $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);
2040 2327
2041 cf::cede_to_tick; 2328 cf::cede_to_tick;
2042 # now do the right thing for maps 2329 # now do the right thing for maps
2043 $self->link_multipart_objects; 2330 $self->link_multipart_objects;
2044 $self->difficulty ($self->estimate_difficulty) 2331 $self->difficulty ($self->estimate_difficulty)
2048 unless ($self->{deny_activate}) { 2335 unless ($self->{deny_activate}) {
2049 $self->decay_objects; 2336 $self->decay_objects;
2050 $self->fix_auto_apply; 2337 $self->fix_auto_apply;
2051 $self->update_buttons; 2338 $self->update_buttons;
2052 cf::cede_to_tick; 2339 cf::cede_to_tick;
2053 $self->activate; 2340 #$self->activate; # no longer activate maps automatically
2054 } 2341 }
2055 2342
2056 $self->{last_save} = $cf::RUNTIME; 2343 $self->{last_save} = $cf::RUNTIME;
2057 $self->last_access ($cf::RUNTIME); 2344 $self->last_access ($cf::RUNTIME);
2058
2059 $self->in_memory (cf::MAP_ACTIVE);
2060 } 2345 }
2061 2346
2062 $self->post_load; 2347 $self->post_load;
2063}
2064 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
2065sub customise_for { 2355sub customise_for {
2066 my ($self, $ob) = @_; 2356 my ($self, $ob) = @_;
2067 2357
2068 return find "~" . $ob->name . "/" . $self->{path} 2358 return find "~" . $ob->name . "/" . $self->{path}
2069 if $self->per_player; 2359 if $self->per_player;
2072# if $self->per_party; 2362# if $self->per_party;
2073 2363
2074 $self 2364 $self
2075} 2365}
2076 2366
2077# find and load all maps in the 3x3 area around a map
2078sub load_neighbours {
2079 my ($map) = @_;
2080
2081 my @neigh; # diagonal neighbours
2082
2083 for (0 .. 3) {
2084 my $neigh = $map->tile_path ($_)
2085 or next;
2086 $neigh = find $neigh, $map
2087 or next;
2088 $neigh->load;
2089
2090 push @neigh,
2091 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2092 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2093 }
2094
2095 for (grep defined $_->[0], @neigh) {
2096 my ($path, $origin) = @$_;
2097 my $neigh = find $path, $origin
2098 or next;
2099 $neigh->load;
2100 }
2101}
2102
2103sub find_sync { 2367sub find_sync {
2104 my ($path, $origin) = @_; 2368 my ($path, $origin) = @_;
2105 2369
2106 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
2107} 2375}
2108 2376
2109sub do_load_sync { 2377sub do_load_sync {
2110 my ($map) = @_; 2378 my ($map) = @_;
2111 2379
2380 # it's a bug to call this from the main context
2112 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2381 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2113 if $Coro::current == $Coro::main; 2382 if $Coro::current == $Coro::main;
2114 2383
2115 cf::sync_job { $map->load }; 2384 $map->load;
2116} 2385}
2117 2386
2118our %MAP_PREFETCH; 2387our %MAP_PREFETCH;
2119our $MAP_PREFETCHER = undef; 2388our $MAP_PREFETCHER = undef;
2120 2389
2121sub find_async { 2390sub find_async {
2122 my ($path, $origin, $load) = @_; 2391 my ($path, $origin, $load) = @_;
2123 2392
2124 $path = normalise $path, $origin && $origin->{path}; 2393 $path = normalise $path, $origin;
2125 2394
2126 if (my $map = $cf::MAP{$path}) { 2395 if (my $map = $cf::MAP{$path}) {
2127 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2396 return $map if !$load || $map->linkable;
2128 } 2397 }
2129 2398
2130 $MAP_PREFETCH{$path} |= $load; 2399 $MAP_PREFETCH{$path} |= $load;
2131 2400
2132 $MAP_PREFETCHER ||= cf::async { 2401 $MAP_PREFETCHER ||= cf::async {
2133 $Coro::current->{desc} = "map prefetcher"; 2402 $Coro::current->{desc} = "map prefetcher";
2134 2403
2135 while (%MAP_PREFETCH) { 2404 while (%MAP_PREFETCH) {
2136 while (my ($k, $v) = each %MAP_PREFETCH) { 2405 for my $k (keys %MAP_PREFETCH) {
2137 if (my $map = find $k) { 2406 if (my $map = find $k) {
2138 $map->load if $v; 2407 $map->load if $MAP_PREFETCH{$k};
2139 } 2408 }
2140 2409
2141 delete $MAP_PREFETCH{$k}; 2410 delete $MAP_PREFETCH{$k};
2142 } 2411 }
2143 } 2412 }
2146 $MAP_PREFETCHER->prio (6); 2415 $MAP_PREFETCHER->prio (6);
2147 2416
2148 () 2417 ()
2149} 2418}
2150 2419
2420# common code, used by both ->save and ->swapout
2151sub save { 2421sub _save {
2152 my ($self) = @_; 2422 my ($self) = @_;
2153
2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
2155 2423
2156 $self->{last_save} = $cf::RUNTIME; 2424 $self->{last_save} = $cf::RUNTIME;
2157 2425
2158 return unless $self->dirty; 2426 return unless $self->dirty;
2159 2427
2179 } else { 2447 } else {
2180 $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);
2181 } 2449 }
2182} 2450}
2183 2451
2452sub save {
2453 my ($self) = @_;
2454
2455 my $lock = cf::lock_acquire "map_data:$self->{path}";
2456
2457 $self->_save;
2458}
2459
2184sub swap_out { 2460sub swap_out {
2185 my ($self) = @_; 2461 my ($self) = @_;
2186 2462
2187 # save first because save cedes
2188 $self->save;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2463 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2464
2465 return if !$self->linkable;
2466 return if $self->{deny_save};
2192 return if $self->players; 2467 return if $self->players;
2193 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
2194 return if $self->{deny_save}; 2485 return 1e99 if $self->{deny_reset};
2195 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
2196 $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};
2197 2519
2198 $self->deactivate; 2520 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP; 2521 $_->clear_links_to ($self) for values %cf::MAP;
2200 $self->clear; 2522 $self->clear;
2201}
2202
2203sub reset_at {
2204 my ($self) = @_;
2205
2206 # TODO: safety, remove and allow resettable per-player maps
2207 return 1e99 if $self->{deny_reset};
2208
2209 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2210 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2211
2212 $time + $to
2213}
2214
2215sub should_reset {
2216 my ($self) = @_;
2217
2218 $self->reset_at <= $cf::RUNTIME
2219}
2220
2221sub reset {
2222 my ($self) = @_;
2223
2224 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225
2226 return if $self->players;
2227
2228 warn "resetting map ", $self->path;
2229
2230 $self->in_memory (cf::MAP_SWAPPED);
2231
2232 # need to save uniques path
2233 unless ($self->{deny_save}) {
2234 my $uniq = $self->uniq_path; utf8::encode $uniq;
2235
2236 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2237 if $uniq;
2238 }
2239
2240 delete $cf::MAP{$self->path};
2241
2242 $self->deactivate;
2243 $_->clear_links_to ($self) for values %cf::MAP;
2244 $self->clear;
2245 2523
2246 $self->unlink_save; 2524 $self->unlink_save;
2247 $self->destroy; 2525 $self->destroy;
2248} 2526}
2249 2527
2257 2535
2258 delete $cf::MAP{$self->path}; 2536 delete $cf::MAP{$self->path};
2259 2537
2260 $self->unlink_save; 2538 $self->unlink_save;
2261 2539
2262 bless $self, "cf::map"; 2540 bless $self, "cf::map::wrap";
2263 delete $self->{deny_reset}; 2541 delete $self->{deny_reset};
2264 $self->{deny_save} = 1; 2542 $self->{deny_save} = 1;
2265 $self->reset_timeout (1); 2543 $self->reset_timeout (1);
2266 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2544 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267 2545
2324 : normalise $_ 2602 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2603 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2604 ]
2327} 2605}
2328 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
2329=back 2639=back
2330 2640
2331=head3 cf::object 2641=head3 cf::object
2332 2642
2333=cut 2643=cut
2356 2666
2357Creates 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.
2358 2668
2359=item $ob = cf::object::deref ($refstring) 2669=item $ob = cf::object::deref ($refstring)
2360 2670
2361returns 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,
2362even if the object actually exists. May block. 2672even if the object actually exists. May block.
2363 2673
2364=cut 2674=cut
2365 2675
2366sub deref { 2676sub deref {
2448=item $player_object->may ("access") 2758=item $player_object->may ("access")
2449 2759
2450Returns wether the given player is authorized to access resource "access" 2760Returns wether the given player is authorized to access resource "access"
2451(e.g. "command_wizcast"). 2761(e.g. "command_wizcast").
2452 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
2453=cut 2788=cut
2454 2789
2455sub cf::object::player::may { 2790sub cf::object::player::may {
2456 my ($self, $access) = @_; 2791 my ($self, $access) = @_;
2457 2792
2458 $self->flag (cf::FLAG_WIZ) || 2793 $self->flag (cf::FLAG_WIZ) ||
2459 (ref $cf::CFG{"may_$access"} 2794 (ref $cf::CFG{"may_$access"}
2460 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2795 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2461 : $cf::CFG{"may_$access"}) 2796 : $cf::CFG{"may_$access"})
2462} 2797}
2463 2798
2464=item $player_object->enter_link 2799=item $player_object->enter_link
2465 2800
2466Freezes 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}>).
2467 2802
2468The 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.
2469for 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,
2470though, 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
2471map. 2806map.
2472 2807
2473Will 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.
2474 2815
2475=item $player_object->leave_link ($map, $x, $y) 2816=item $player_object->leave_link ($map, $x, $y)
2476 2817
2477Moves 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
2478map. 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
2496sub cf::object::player::enter_link { 2837sub cf::object::player::enter_link {
2497 my ($self) = @_; 2838 my ($self) = @_;
2498 2839
2499 $self->deactivate_recursive; 2840 $self->deactivate_recursive;
2500 2841
2842 ++$self->{_link_recursion};
2843
2501 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2844 return if UNIVERSAL::isa $self->map, "ext::map_link";
2502 2845
2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2846 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504 if $self->map && $self->map->{path} ne "{link}"; 2847 if $self->map && $self->map->{path} ne "{link}";
2505 2848
2506 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2849 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2507} 2850}
2508 2851
2509sub cf::object::player::leave_link { 2852sub cf::object::player::leave_link {
2510 my ($self, $map, $x, $y) = @_; 2853 my ($self, $map, $x, $y) = @_;
2511 2854
2528 ($x, $y) = (-1, -1) 2871 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2872 unless (defined $x) && (defined $y);
2530 2873
2531 # use -1 or undef as default coordinates, not 0, 0 2874 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2875 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2876 if $x <= 0 && $y <= 0;
2534 2877
2535 $map->load; 2878 $map->load;
2536 $map->load_neighbours;
2537 2879
2538 return unless $self->contr->active; 2880 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2540 $self->activate_recursive;
2541 2881
2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2882 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2543 $self->enter_map ($map, $x, $y); 2883 if ($self->enter_map ($map, $x, $y)) {
2544} 2884 # entering was successful
2885 delete $self->{_link_recursion};
2886 # only activate afterwards, to support waiting in hooks
2887 $self->activate_recursive;
2888 }
2545 2889
2890}
2891
2546=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)]])
2547 2893
2548Moves 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
2549her, loading and preparing them map, calling the provided $check callback 2895her, loading and preparing them map, calling the provided $check callback
2550that 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
2551the 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
2558 2904
2559our $GOTOGEN; 2905our $GOTOGEN;
2560 2906
2561sub cf::object::player::goto { 2907sub cf::object::player::goto {
2562 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 }
2563 2915
2564 # 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
2565 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2917 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2566 2918
2567 $self->enter_link; 2919 $self->enter_link;
2587 ($path, $x, $y) = (undef, undef, undef); 2939 ($path, $x, $y) = (undef, undef, undef);
2588 } 2940 }
2589 } 2941 }
2590 2942
2591 my $map = eval { 2943 my $map = eval {
2592 my $map = defined $path ? cf::map::find $path : undef; 2944 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2593 2945
2594 if ($map) { 2946 if ($map) {
2595 $map = $map->customise_for ($self); 2947 $map = $map->customise_for ($self);
2596 $map = $check->($map) if $check && $map; 2948 $map = $check->($map, $x, $y, $self) if $check && $map;
2597 } else { 2949 } else {
2598 $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);
2599 } 2951 }
2600 2952
2601 $map 2953 $map
2609 if ($gen == $self->{_goto_generation}) { 2961 if ($gen == $self->{_goto_generation}) {
2610 delete $self->{_goto_generation}; 2962 delete $self->{_goto_generation};
2611 $self->leave_link ($map, $x, $y); 2963 $self->leave_link ($map, $x, $y);
2612 } 2964 }
2613 2965
2614 $done->() if $done; 2966 $done->($self) if $done;
2615 })->prio (1); 2967 })->prio (1);
2616} 2968}
2617 2969
2618=item $player_object->enter_exit ($exit_object) 2970=item $player_object->enter_exit ($exit_object)
2619 2971
2687 $Coro::current->{desc} = "enter_exit"; 3039 $Coro::current->{desc} = "enter_exit";
2688 3040
2689 unless (eval { 3041 unless (eval {
2690 $self->deactivate_recursive; # just to be sure 3042 $self->deactivate_recursive; # just to be sure
2691 3043
2692 # random map handling
2693 {
2694 my $guard = cf::lock_acquire "exit_prepare:$exit";
2695
2696 prepare_random_map $exit
2697 if $exit->slaying eq "/!";
2698 }
2699
2700 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3044 my $map = cf::map::normalise $exit->slaying, $exit->map;
2701 my $x = $exit->stats->hp; 3045 my $x = $exit->stats->hp;
2702 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 }
2703 3070
2704 $self->goto ($map, $x, $y); 3071 $self->goto ($map, $x, $y);
2705 3072
2706 # if exit is damned, update players death & WoR home-position 3073 # if exit is damned, update players death & WoR home-position
2707 $self->contr->savebed ($map, $x, $y) 3074 $self->contr->savebed ($map, $x, $y)
2712 $self->message ("Something went wrong deep within the deliantra server. " 3079 $self->message ("Something went wrong deep within the deliantra server. "
2713 . "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. "
2714 . "Please report this to the dungeon master!", 3081 . "Please report this to the dungeon master!",
2715 cf::NDI_UNIQUE | cf::NDI_RED); 3082 cf::NDI_UNIQUE | cf::NDI_RED);
2716 3083
2717 warn "ERROR in enter_exit: $@"; 3084 error "ERROR in enter_exit: $@";
2718 $self->leave_link; 3085 $self->leave_link;
2719 } 3086 }
2720 })->prio (1); 3087 })->prio (1);
2721} 3088}
2722 3089
2723=head3 cf::client 3090=head3 cf::client
2724 3091
2725=over 4 3092=over 4
2726 3093
2727=item $client->send_drawinfo ($text, $flags) 3094=item $client->send_big_packet ($pkt)
2728 3095
2729Sends a drawinfo packet to the client. Circumvents output buffering so 3096Like C<send_packet>, but tries to compress large packets, and fragments
2730should not be used under normal circumstances. 3097them as required.
2731 3098
2732=cut 3099=cut
2733 3100
3101our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3102
2734sub cf::client::send_drawinfo { 3103sub cf::client::send_big_packet {
2735 my ($self, $text, $flags) = @_; 3104 my ($self, $pkt) = @_;
2736 3105
2737 utf8::encode $text; 3106 # try lzf for large packets
2738 $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);
2739} 3117}
2740 3118
2741=item $client->send_msg ($channel, $msg, $color, [extra...]) 3119=item $client->send_msg ($channel, $msg, $color, [extra...])
2742 3120
2743Send 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
2744client if neccessary. C<$type> should be a string identifying the type of 3122necessary. C<$type> should be a string identifying the type of the
2745the 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
2746the message unless the client supports the msg packet. 3124the message unless the client supports the msg packet.
2747 3125
2748=cut 3126=cut
2749 3127
2750# non-persistent channels (usually the info channel) 3128# non-persistent channels (usually the info channel)
2751our %CHANNEL = ( 3129our %CHANNEL = (
3130 "c/motd" => {
3131 id => "infobox",
3132 title => "MOTD",
3133 reply => undef,
3134 tooltip => "The message of the day",
3135 },
2752 "c/identify" => { 3136 "c/identify" => {
2753 id => "infobox", 3137 id => "infobox",
2754 title => "Identify", 3138 title => "Identify",
2755 reply => undef, 3139 reply => undef,
2756 tooltip => "Items recently identified", 3140 tooltip => "Items recently identified",
2758 "c/examine" => { 3142 "c/examine" => {
2759 id => "infobox", 3143 id => "infobox",
2760 title => "Examine", 3144 title => "Examine",
2761 reply => undef, 3145 reply => undef,
2762 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",
2763 }, 3153 },
2764 "c/book" => { 3154 "c/book" => {
2765 id => "infobox", 3155 id => "infobox",
2766 title => "Book", 3156 title => "Book",
2767 reply => undef, 3157 reply => undef,
2781 }, 3171 },
2782 "c/body" => { 3172 "c/body" => {
2783 id => "infobox", 3173 id => "infobox",
2784 title => "Body Parts", 3174 title => "Body Parts",
2785 reply => undef, 3175 reply => undef,
2786 tooltip => "Shows which body parts you posess and are available", 3176 tooltip => "Shows which body parts you possess and are available",
2787 }, 3177 },
2788 "c/statistics" => { 3178 "c/statistics" => {
2789 id => "infobox", 3179 id => "infobox",
2790 title => "Statistics", 3180 title => "Statistics",
2791 reply => undef, 3181 reply => undef,
2843 id => "death", 3233 id => "death",
2844 title => "Death", 3234 title => "Death",
2845 reply => undef, 3235 reply => undef,
2846 tooltip => "Reason for and more info about your most recent death", 3236 tooltip => "Reason for and more info about your most recent death",
2847 }, 3237 },
3238 "c/fatal" => {
3239 id => "fatal",
3240 title => "Fatal Error",
3241 reply => undef,
3242 tooltip => "Reason for the server disconnect",
3243 },
2848 "c/say" => $SAY_CHANNEL, 3244 "c/say" => $SAY_CHANNEL,
2849 "c/chat" => $CHAT_CHANNEL, 3245 "c/chat" => $CHAT_CHANNEL,
2850); 3246);
2851 3247
2852sub cf::client::send_msg { 3248sub cf::client::send_msg {
2883 my $pkt = "msg " 3279 my $pkt = "msg "
2884 . $self->{json_coder}->encode ( 3280 . $self->{json_coder}->encode (
2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3281 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2886 ); 3282 );
2887 3283
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if (8192 < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt); 3284 $self->send_big_packet ($pkt);
2899} 3285}
2900 3286
2901=item $client->ext_msg ($type, @msg) 3287=item $client->ext_msg ($type, @msg)
2902 3288
2903Sends an ext event to the client. 3289Sends an ext event to the client.
2905=cut 3291=cut
2906 3292
2907sub cf::client::ext_msg($$@) { 3293sub cf::client::ext_msg($$@) {
2908 my ($self, $type, @msg) = @_; 3294 my ($self, $type, @msg) = @_;
2909 3295
2910 if ($self->extcmd == 2) {
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3296 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2912 } elsif ($self->extcmd == 1) { # TODO: remove
2913 push @msg, msgtype => "event_$type";
2914 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2915 }
2916}
2917
2918=item $client->ext_reply ($msgid, @msg)
2919
2920Sends an ext reply to the client.
2921
2922=cut
2923
2924sub cf::client::ext_reply($$@) {
2925 my ($self, $id, @msg) = @_;
2926
2927 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2929 } elsif ($self->extcmd == 1) {
2930 #TODO: version 1, remove
2931 unshift @msg, msgtype => "reply", msgid => $id;
2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933 }
2934} 3297}
2935 3298
2936=item $success = $client->query ($flags, "text", \&cb) 3299=item $success = $client->query ($flags, "text", \&cb)
2937 3300
2938Queues a query to the client, calling the given callback with 3301Queues a query to the client, calling the given callback with
2958 3321
2959 $self->send_packet ($self->{query_queue}[0][0]) 3322 $self->send_packet ($self->{query_queue}[0][0])
2960 if @{ $self->{query_queue} } == 1; 3323 if @{ $self->{query_queue} } == 1;
2961 3324
2962 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;
2963} 3365}
2964 3366
2965cf::client->attach ( 3367cf::client->attach (
2966 on_connect => sub { 3368 on_connect => sub {
2967 my ($ns) = @_; 3369 my ($ns) = @_;
2993 my ($ns, $buf) = @_; 3395 my ($ns, $buf) = @_;
2994 3396
2995 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3397 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2996 3398
2997 if (ref $msg) { 3399 if (ref $msg) {
2998 my ($type, $reply, @payload) = 3400 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2999 "ARRAY" eq ref $msg
3000 ? @$msg
3001 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3002 3401
3003 my @reply;
3004
3005 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}) {
3006 @reply = $cb->($ns, @payload); 3415 @reply = $cb->($ns, @payload);
3416 }
3417
3418 $ns->ext_msg ("reply-$reply", @reply)
3419 if $reply;
3007 } 3420 }
3008
3009 $ns->ext_reply ($reply, @reply)
3010 if $reply;
3011
3012 } else { 3421 } else {
3013 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";
3014 } 3423 }
3015 3424
3016 cf::override; 3425 cf::override;
3017 }, 3426 },
3018); 3427);
3038 3447
3039 $coro 3448 $coro
3040} 3449}
3041 3450
3042cf::client->attach ( 3451cf::client->attach (
3043 on_destroy => sub { 3452 on_client_destroy => sub {
3044 my ($ns) = @_; 3453 my ($ns) = @_;
3045 3454
3046 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3455 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3047 }, 3456 },
3048); 3457);
3064our $safe_hole = new Safe::Hole; 3473our $safe_hole = new Safe::Hole;
3065 3474
3066$SIG{FPE} = 'IGNORE'; 3475$SIG{FPE} = 'IGNORE';
3067 3476
3068$safe->permit_only (Opcode::opset qw( 3477$safe->permit_only (Opcode::opset qw(
3069 :base_core :base_mem :base_orig :base_math 3478 :base_core :base_mem :base_orig :base_math :base_loop
3070 grepstart grepwhile mapstart mapwhile 3479 grepstart grepwhile mapstart mapwhile
3071 sort time 3480 sort time
3072)); 3481));
3073 3482
3074# here we export the classes and methods available to script code 3483# here we export the classes and methods available to script code
3099 decrease split destroy change_exp value msg lore send_msg)], 3508 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3509 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful send_msg)], 3510 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3511 ["cf::map" => qw(trigger)],
3103) { 3512) {
3104 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3513 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3514 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107 for @funs; 3515 for @funs;
3108} 3516}
3109 3517
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3534 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3535 $qcode =~ s/\n/\\n/g;
3128 3536
3129 %vars = (_dummy => 0) unless %vars; 3537 %vars = (_dummy => 0) unless %vars;
3130 3538
3539 my @res;
3131 local $_; 3540 local $_;
3132 local @safe::cf::_safe_eval_args = values %vars;
3133 3541
3134 my $eval = 3542 my $eval =
3135 "do {\n" 3543 "do {\n"
3136 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3544 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3137 . "#line 0 \"{$qcode}\"\n" 3545 . "#line 0 \"{$qcode}\"\n"
3138 . $code 3546 . $code
3139 . "\n}" 3547 . "\n}"
3140 ; 3548 ;
3141 3549
3550 if ($CFG{safe_eval}) {
3142 sub_generation_inc; 3551 sub_generation_inc;
3552 local @safe::cf::_safe_eval_args = values %vars;
3143 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3553 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3144 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 }
3145 3559
3146 if ($@) { 3560 if ($@) {
3147 warn "$@"; 3561 warn "$@",
3148 warn "while executing safe code '$code'\n"; 3562 "while executing safe code '$code'\n",
3149 warn "with arguments " . (join " ", %vars) . "\n"; 3563 "with arguments " . (join " ", %vars) . "\n";
3150 } 3564 }
3151 3565
3152 wantarray ? @res : $res[0] 3566 wantarray ? @res : $res[0]
3153} 3567}
3154 3568
3168=cut 3582=cut
3169 3583
3170sub register_script_function { 3584sub register_script_function {
3171 my ($fun, $cb) = @_; 3585 my ($fun, $cb) = @_;
3172 3586
3173 no strict 'refs'; 3587 $fun = "safe::$fun" if $CFG{safe_eval};
3174 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3588 *$fun = $safe_hole->wrap ($cb);
3175} 3589}
3176 3590
3177=back 3591=back
3178 3592
3179=cut 3593=cut
3180 3594
3181############################################################################# 3595#############################################################################
3182# the server's init and main functions 3596# the server's init and main functions
3183 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
3184sub load_facedata($) { 3675sub load_facedata($) {
3185 my ($path) = @_; 3676 my ($path) = @_;
3186 3677
3187 # HACK to clear player env face cache, we need some signal framework
3188 # for this (global event?)
3189 %ext::player_env::MUSIC_FACE_CACHE = ();
3190
3191 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3678 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3192 3679
3193 warn "loading facedata from $path\n"; 3680 trace "loading facedata from $path\n";
3194 3681
3195 my $facedata; 3682 my $facedata = decode_storable load_file "$path/faceinfo";
3196 0 < aio_load $path, $facedata
3197 or die "$path: $!";
3198
3199 $facedata = Coro::Storable::thaw $facedata;
3200 3683
3201 $facedata->{version} == 2 3684 $facedata->{version} == 2
3202 or cf::cleanup "$path: version mismatch, cannot proceed."; 3685 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3203 3686
3204 # patch in the exptable 3687 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3205 $facedata->{resource}{"res/exp_table"} = { 3688 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3206 type => FT_RSRC, 3689
3207 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
3208 }; 3691
3209 cf::cede_to_tick; 3692 # BEGIN ATOMIC
3693 # from here on, everything must be atomic - no thread switch allowed
3694 my $t1 = EV::time;
3210 3695
3211 { 3696 {
3212 my $faces = $facedata->{faceinfo}; 3697 my $faces = $facedata->{faceinfo};
3213 3698
3214 while (my ($face, $info) = each %$faces) { 3699 for my $face (sort keys %$faces) {
3700 my $info = $faces->{$face};
3215 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3701 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216 3702
3217 cf::face::set_visibility $idx, $info->{visibility}; 3703 cf::face::set_visibility $idx, $info->{visibility};
3218 cf::face::set_magicmap $idx, $info->{magicmap}; 3704 cf::face::set_magicmap $idx, $info->{magicmap};
3219 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};
3220 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};
3221 3707 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3222 cf::cede_to_tick; 3708 $cf::face::HASH{$info->{hash64}} = $idx;
3709 delete $cf::face::META[$idx];
3223 } 3710 }
3224 3711
3225 while (my ($face, $info) = each %$faces) { 3712 while (my ($face, $info) = each %$faces) {
3226 next unless $info->{smooth}; 3713 next unless $info->{smooth};
3227 3714
3230 3717
3231 if (my $smooth = cf::face::find $info->{smooth}) { 3718 if (my $smooth = cf::face::find $info->{smooth}) {
3232 cf::face::set_smooth $idx, $smooth; 3719 cf::face::set_smooth $idx, $smooth;
3233 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3720 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3234 } else { 3721 } else {
3235 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3722 error "smooth face '$info->{smooth}' not found for face '$face'";
3236 } 3723 }
3237
3238 cf::cede_to_tick;
3239 } 3724 }
3240 } 3725 }
3241 3726
3242 { 3727 {
3243 my $anims = $facedata->{animinfo}; 3728 my $anims = $facedata->{animinfo};
3244 3729
3245 while (my ($anim, $info) = each %$anims) { 3730 while (my ($anim, $info) = each %$anims) {
3246 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3731 cf::anim::set $anim, $info->{frames}, $info->{facings};
3247 cf::cede_to_tick;
3248 } 3732 }
3249 3733
3250 cf::anim::invalidate_all; # d'oh 3734 cf::anim::invalidate_all; # d'oh
3251 } 3735 }
3252 3736
3253 { 3737 {
3254 # TODO: for gcfclient pleasure, we should give resources
3255 # that gcfclient doesn't grok a >10000 face index.
3256 my $res = $facedata->{resource}; 3738 my $res = $facedata->{resource};
3257 3739
3258 while (my ($name, $info) = each %$res) { 3740 while (my ($name, $info) = each %$res) {
3259 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
3260 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3743 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3261 my $data;
3262 3744
3263 if ($info->{type} & 1) {
3264 # prepend meta info
3265
3266 my $meta = $enc->encode ({
3267 name => $name,
3268 %{ $info->{meta} || {} },
3269 });
3270
3271 $data = pack "(w/a*)*", $meta, $info->{data};
3272 } else {
3273 $data = $info->{data};
3274 }
3275
3276 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3277 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;
3278 } else { 3751 } else {
3279 $RESOURCE{$name} = $info; 3752# $RESOURCE{$name} = $info; # unused
3280 } 3753 }
3281
3282 cf::cede_to_tick;
3283 } 3754 }
3284 } 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;
3285 3766
3286 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3767 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3287 3768
3769 aio_close $fh if $fh; # close old facedata
3770
3288 1 3771 1
3289} 3772}
3290
3291cf::global->attach (on_resource_update => sub {
3292 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3293 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3294
3295 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3296 my $sound = $soundconf->{compat}[$_]
3297 or next;
3298
3299 my $face = cf::face::find "sound/$sound->[1]";
3300 cf::sound::set $sound->[0] => $face;
3301 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3302 }
3303
3304 while (my ($k, $v) = each %{$soundconf->{event}}) {
3305 my $face = cf::face::find "sound/$v";
3306 cf::sound::set $k => $face;
3307 }
3308 }
3309});
3310 3773
3311register_exticmd fx_want => sub { 3774register_exticmd fx_want => sub {
3312 my ($ns, $want) = @_; 3775 my ($ns, $want) = @_;
3313 3776
3314 while (my ($k, $v) = each %$want) { 3777 while (my ($k, $v) = each %$want) {
3322 my $status = load_resource_file_ $_[0]; 3785 my $status = load_resource_file_ $_[0];
3323 get_slot 0.1, 100; 3786 get_slot 0.1, 100;
3324 cf::arch::commit_load; 3787 cf::arch::commit_load;
3325 3788
3326 $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;
3327} 3804}
3328 3805
3329sub reload_regions { 3806sub reload_regions {
3330 # 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
3331 # for this (global event?) 3808 # for this (global event?)
3339 if exists $_->{match}; 3816 if exists $_->{match};
3340 } 3817 }
3341} 3818}
3342 3819
3343sub reload_facedata { 3820sub reload_facedata {
3344 load_facedata "$DATADIR/facedata" 3821 load_facedata $DATADIR
3345 or die "unable to load facedata\n"; 3822 or die "unable to load facedata\n";
3346} 3823}
3347 3824
3348sub reload_archetypes { 3825sub reload_archetypes {
3349 load_resource_file "$DATADIR/archetypes" 3826 load_resource_file "$DATADIR/archetypes"
3350 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;
3351} 3854}
3352 3855
3353sub reload_treasures { 3856sub reload_treasures {
3354 load_resource_file "$DATADIR/treasures" 3857 load_resource_file "$DATADIR/treasures"
3355 or die "unable to load treasurelists\n"; 3858 or die "unable to load treasurelists\n";
3356} 3859}
3357 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
3358sub reload_resources { 3881sub reload_resources {
3359 warn "reloading resource files...\n"; 3882 trace "reloading resource files...\n";
3360 3883
3884 reload_materials;
3361 reload_facedata; 3885 reload_facedata;
3886 reload_exp_table;
3887 reload_sound;
3362 reload_archetypes; 3888 reload_archetypes;
3363 reload_regions; 3889 reload_regions;
3364 reload_treasures; 3890 reload_treasures;
3365 3891
3366 warn "finished reloading resource files\n"; 3892 trace "finished reloading resource files\n";
3367} 3893}
3368 3894
3369sub reload_config { 3895sub reload_config {
3370 open my $fh, "<:utf8", "$CONFDIR/config" 3896 trace "reloading config file...\n";
3371 or return;
3372 3897
3373 local $/; 3898 my $config = load_file "$CONFDIR/config";
3374 *CFG = YAML::Load <$fh>; 3899 utf8::decode $config;
3900 *CFG = decode_yaml $config;
3375 3901
3376 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3902 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3377 3903
3378 $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};
3379 $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};
3380 3906
3381 if (exists $CFG{mlockall}) { 3907 if (exists $CFG{mlockall}) {
3405 seek $fh, 0, 0; 3931 seek $fh, 0, 0;
3406 print $fh $$; 3932 print $fh $$;
3407} 3933}
3408 3934
3409sub main_loop { 3935sub main_loop {
3410 warn "EV::loop starting\n"; 3936 trace "EV::run starting\n";
3411 if (1) { 3937 if (1) {
3412 EV::loop; 3938 EV::run;
3413 } 3939 }
3414 warn "EV::loop returned\n"; 3940 trace "EV::run returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP; 3941 goto &main_loop unless $REALLY_UNLOOP;
3416} 3942}
3417 3943
3418sub main { 3944sub main {
3419 cf::init_globals; # initialise logging 3945 cf::init_globals; # initialise logging
3420 3946
3421 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.";
3422 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.";
3423 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3950 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3951 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425 3952
3426 cf::init_experience;
3427 cf::init_anim;
3428 cf::init_attackmess;
3429 cf::init_dynamic;
3430
3431 $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
3432 3954
3433 # we must not ever block the main coroutine 3955 # we must not ever block the main coroutine
3434 local $Coro::idle = sub { 3956 $Coro::idle = sub {
3435 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#
3436 (async { 3958 (async {
3437 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3959 $Coro::current->{desc} = "IDLE BUG HANDLER";
3438 EV::loop EV::LOOP_ONESHOT; 3960 EV::run EV::RUN_ONCE;
3439 })->prio (Coro::PRIO_MAX); 3961 })->prio (Coro::PRIO_MAX);
3440 }; 3962 };
3441 3963
3442 evthread_start IO::AIO::poll_fileno; 3964 evthread_start IO::AIO::poll_fileno;
3443 3965
3444 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
3445 reload_resources; 3977 reload_resources;
3446 reload_config; 3978 reload_config;
3447 db_init;
3448 3979
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid; 3980 cf::init_uuid;
3452 cf::init_signals; 3981 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills; 3982 cf::init_skills;
3455 3983
3456 cf::init_beforeplay; 3984 cf::init_beforeplay;
3457 3985
3458 atomic; 3986 atomic;
3460 load_extensions; 3988 load_extensions;
3461 3989
3462 utime time, time, $RUNTIMEFILE; 3990 utime time, time, $RUNTIMEFILE;
3463 3991
3464 # no (long-running) fork's whatsoever before this point(!) 3992 # no (long-running) fork's whatsoever before this point(!)
3993 use POSIX ();
3465 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};
3466 3995
3467 (pop @POST_INIT)->(0) while @POST_INIT; 3996 cf::_post_init 0;
3468 }; 3997 };
3469 3998
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
3470 main_loop; 4006 goto &main_loop;
3471} 4007}
3472 4008
3473############################################################################# 4009#############################################################################
3474# initialisation and cleanup 4010# initialisation and cleanup
3475 4011
3476# install some emergency cleanup handlers 4012# install some emergency cleanup handlers
3477BEGIN { 4013BEGIN {
3478 our %SIGWATCHER = (); 4014 our %SIGWATCHER = ();
3479 for my $signal (qw(INT HUP TERM)) { 4015 for my $signal (qw(INT HUP TERM)) {
3480 $SIGWATCHER{$signal} = EV::signal $signal, sub { 4016 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3481 cf::cleanup "SIG$signal"; 4017 cf::cleanup "SIG$signal";
3482 }; 4018 };
3483 } 4019 }
3484} 4020}
3485 4021
3486sub write_runtime_sync { 4022sub write_runtime_sync {
4023 my $t0 = AE::time;
4024
3487 # first touch the runtime file to show we are still running: 4025 # first touch the runtime file to show we are still running:
3488 # the fsync below can take a very very long time. 4026 # the fsync below can take a very very long time.
3489 4027
3490 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 4028 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3491 4029
3492 my $guard = cf::lock_acquire "write_runtime"; 4030 my $guard = cf::lock_acquire "write_runtime";
3493 4031
3494 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 4032 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3495 or return; 4033 or return;
3496 4034
3497 my $value = $cf::RUNTIME + 90 + 10; 4035 my $value = $cf::RUNTIME + 90 + 10;
3498 # 10 is the runtime save interval, for a monotonic clock 4036 # 10 is the runtime save interval, for a monotonic clock
3499 # 60 allows for the watchdog to kill the server. 4037 # 60 allows for the watchdog to kill the server.
3512 or return; 4050 or return;
3513 4051
3514 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4052 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3515 and return; 4053 and return;
3516 4054
3517 warn "runtime file written.\n"; 4055 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3518 4056
3519 1 4057 1
3520} 4058}
3521 4059
3522our $uuid_lock; 4060our $uuid_lock;
3534 or return; 4072 or return;
3535 4073
3536 my $value = uuid_seq uuid_cur; 4074 my $value = uuid_seq uuid_cur;
3537 4075
3538 unless ($value) { 4076 unless ($value) {
3539 warn "cowardly refusing to write zero uuid value!\n"; 4077 info "cowardly refusing to write zero uuid value!\n";
3540 return; 4078 return;
3541 } 4079 }
3542 4080
3543 my $value = uuid_str $value + $uuid_skip; 4081 my $value = uuid_str $value + $uuid_skip;
3544 $uuid_skip = 0; 4082 $uuid_skip = 0;
3554 or return; 4092 or return;
3555 4093
3556 aio_rename "$uuid~", $uuid 4094 aio_rename "$uuid~", $uuid
3557 and return; 4095 and return;
3558 4096
3559 warn "uuid file written ($value).\n"; 4097 trace "uuid file written ($value).\n";
3560 4098
3561 1 4099 1
3562 4100
3563} 4101}
3564 4102
3570} 4108}
3571 4109
3572sub emergency_save() { 4110sub emergency_save() {
3573 my $freeze_guard = cf::freeze_mainloop; 4111 my $freeze_guard = cf::freeze_mainloop;
3574 4112
3575 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;
3576 4119
3577 cf::sync_job { 4120 cf::sync_job {
3578 # this is a trade-off: we want to be very quick here, so 4121 cf::write_runtime_sync; # external watchdog should not bark
3579 # save all maps without fsync, and later call a global sync
3580 # (which in turn might be very very slow)
3581 local $USE_FSYNC = 0;
3582 4122
3583 # use a peculiar iteration method to avoid tripping on perl 4123 # use a peculiar iteration method to avoid tripping on perl
3584 # refcount bugs in for. also avoids problems with players 4124 # refcount bugs in for. also avoids problems with players
3585 # and maps saved/destroyed asynchronously. 4125 # and maps saved/destroyed asynchronously.
3586 warn "emergency_perl_save: begin player save\n"; 4126 info "emergency_perl_save: begin player save\n";
3587 for my $login (keys %cf::PLAYER) { 4127 for my $login (keys %cf::PLAYER) {
3588 my $pl = $cf::PLAYER{$login} or next; 4128 my $pl = $cf::PLAYER{$login} or next;
3589 $pl->valid or next; 4129 $pl->valid or next;
3590 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4130 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3591 $pl->save; 4131 $pl->save;
3592 } 4132 }
3593 warn "emergency_perl_save: end player save\n"; 4133 info "emergency_perl_save: end player save\n";
3594 4134
4135 cf::write_runtime_sync; # external watchdog should not bark
4136
3595 warn "emergency_perl_save: begin map save\n"; 4137 info "emergency_perl_save: begin map save\n";
3596 for my $path (keys %cf::MAP) { 4138 for my $path (keys %cf::MAP) {
3597 my $map = $cf::MAP{$path} or next; 4139 my $map = $cf::MAP{$path} or next;
3598 $map->valid or next; 4140 $map->valid or next;
3599 $map->save; 4141 $map->save;
3600 } 4142 }
3601 warn "emergency_perl_save: end map save\n"; 4143 info "emergency_perl_save: end map save\n";
3602 4144
4145 cf::write_runtime_sync; # external watchdog should not bark
4146
3603 warn "emergency_perl_save: begin database checkpoint\n"; 4147 info "emergency_perl_save: begin database checkpoint\n";
3604 BDB::db_env_txn_checkpoint $DB_ENV; 4148 BDB::db_env_txn_checkpoint $DB_ENV;
3605 warn "emergency_perl_save: end database checkpoint\n"; 4149 info "emergency_perl_save: end database checkpoint\n";
3606 4150
3607 warn "emergency_perl_save: begin write uuid\n"; 4151 info "emergency_perl_save: begin write uuid\n";
3608 write_uuid_sync 1; 4152 write_uuid_sync 1;
3609 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
3610 }; 4173 };
3611 4174
3612 warn "emergency_perl_save: starting sync()\n";
3613 IO::AIO::aio_sync sub {
3614 warn "emergency_perl_save: finished sync()\n";
3615 };
3616
3617 warn "emergency_perl_save: leave\n"; 4175 info "emergency_perl_save: leave\n";
3618} 4176}
3619 4177
3620sub post_cleanup { 4178sub post_cleanup {
3621 my ($make_core) = @_; 4179 my ($make_core) = @_;
3622 4180
4181 IO::AIO::flush;
4182
3623 warn Carp::longmess "post_cleanup backtrace" 4183 error Carp::longmess "post_cleanup backtrace"
3624 if $make_core; 4184 if $make_core;
3625 4185
3626 my $fh = pidfile; 4186 my $fh = pidfile;
3627 unlink $PIDFILE if <$fh> == $$; 4187 unlink $PIDFILE if <$fh> == $$;
3628} 4188}
3648 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4208 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3649 for my $name (keys %$leaf_symtab) { 4209 for my $name (keys %$leaf_symtab) {
3650 _gv_clear *{"$pkg$name"}; 4210 _gv_clear *{"$pkg$name"};
3651# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4211# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3652 } 4212 }
3653 warn "cleared package $pkg\n";#d#
3654} 4213}
3655 4214
3656sub do_reload_perl() { 4215sub do_reload_perl() {
3657 # can/must only be called in main 4216 # can/must only be called in main
3658 if ($Coro::current != $Coro::main) { 4217 unless (in_main) {
3659 warn "can only reload from main coroutine"; 4218 error "can only reload from main coroutine";
3660 return; 4219 return;
3661 } 4220 }
3662 4221
3663 return if $RELOAD++; 4222 return if $RELOAD++;
3664 4223
3665 my $t1 = EV::time; 4224 my $t1 = AE::time;
3666 4225
3667 while ($RELOAD) { 4226 while ($RELOAD) {
3668 warn "reloading..."; 4227 cf::get_slot 0.1, -1, "reload_perl";
4228 info "perl_reload: reloading...";
3669 4229
3670 warn "entering sync_job"; 4230 trace "perl_reload: entering sync_job";
3671 4231
3672 cf::sync_job { 4232 cf::sync_job {
3673 cf::write_runtime_sync; # external watchdog should not bark
3674 cf::emergency_save; 4233 #cf::emergency_save;
3675 cf::write_runtime_sync; # external watchdog should not bark
3676 4234
3677 warn "syncing database to disk";
3678 BDB::db_env_txn_checkpoint $DB_ENV;
3679
3680 # if anything goes wrong in here, we should simply crash as we already saved
3681
3682 warn "flushing outstanding aio requests";
3683 while (IO::AIO::nreqs || BDB::nreqs) {
3684 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3685 }
3686
3687 warn "cancelling all extension coros"; 4235 trace "perl_reload: cancelling all extension coros";
3688 $_->cancel for values %EXT_CORO; 4236 $_->cancel for values %EXT_CORO;
3689 %EXT_CORO = (); 4237 %EXT_CORO = ();
3690 4238
3691 warn "removing commands"; 4239 trace "perl_reload: removing commands";
3692 %COMMAND = (); 4240 %COMMAND = ();
3693 4241
3694 warn "removing ext/exti commands"; 4242 trace "perl_reload: removing ext/exti commands";
3695 %EXTCMD = (); 4243 %EXTCMD = ();
3696 %EXTICMD = (); 4244 %EXTICMD = ();
3697 4245
3698 warn "unloading/nuking all extensions"; 4246 trace "perl_reload: unloading/nuking all extensions";
3699 for my $pkg (@EXTS) { 4247 for my $pkg (@EXTS) {
3700 warn "... unloading $pkg"; 4248 trace "... unloading $pkg";
3701 4249
3702 if (my $cb = $pkg->can ("unload")) { 4250 if (my $cb = $pkg->can ("unload")) {
3703 eval { 4251 eval {
3704 $cb->($pkg); 4252 $cb->($pkg);
3705 1 4253 1
3706 } or warn "$pkg unloaded, but with errors: $@"; 4254 } or error "$pkg unloaded, but with errors: $@";
3707 } 4255 }
3708 4256
3709 warn "... clearing $pkg"; 4257 trace "... clearing $pkg";
3710 clear_package $pkg; 4258 clear_package $pkg;
3711 } 4259 }
3712 4260
3713 warn "unloading all perl modules loaded from $LIBDIR"; 4261 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3714 while (my ($k, $v) = each %INC) { 4262 while (my ($k, $v) = each %INC) {
3715 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4263 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3716 4264
3717 warn "... unloading $k"; 4265 trace "... unloading $k";
3718 delete $INC{$k}; 4266 delete $INC{$k};
3719 4267
3720 $k =~ s/\.pm$//; 4268 $k =~ s/\.pm$//;
3721 $k =~ s/\//::/g; 4269 $k =~ s/\//::/g;
3722 4270
3725 } 4273 }
3726 4274
3727 clear_package $k; 4275 clear_package $k;
3728 } 4276 }
3729 4277
3730 warn "getting rid of safe::, as good as possible"; 4278 trace "perl_reload: getting rid of safe::, as good as possible";
3731 clear_package "safe::$_" 4279 clear_package "safe::$_"
3732 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);
3733 4281
3734 warn "unloading cf.pm \"a bit\""; 4282 trace "perl_reload: unloading cf.pm \"a bit\"";
3735 delete $INC{"cf.pm"}; 4283 delete $INC{"cf.pm"};
3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4284 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3737 4285
3738 # don't, removes xs symbols, too, 4286 # don't, removes xs symbols, too,
3739 # and global variables created in xs 4287 # and global variables created in xs
3740 #clear_package __PACKAGE__; 4288 #clear_package __PACKAGE__;
3741 4289
3742 warn "unload completed, starting to reload now"; 4290 info "perl_reload: unload completed, starting to reload now";
3743 4291
3744 warn "reloading cf.pm"; 4292 trace "perl_reload: reloading cf.pm";
3745 require cf; 4293 require cf;
3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4294 cf::_connect_to_perl_1;
3747 4295
3748 warn "loading config and database again"; 4296 trace "perl_reload: loading config and database again";
3749 cf::reload_config; 4297 cf::reload_config;
3750 4298
3751 warn "loading extensions"; 4299 trace "perl_reload: loading extensions";
3752 cf::load_extensions; 4300 cf::load_extensions;
3753 4301
3754 if ($REATTACH_ON_RELOAD) { 4302 if ($REATTACH_ON_RELOAD) {
3755 warn "reattaching attachments to objects/players"; 4303 trace "perl_reload: reattaching attachments to objects/players";
3756 _global_reattach; # objects, sockets 4304 _global_reattach; # objects, sockets
3757 warn "reattaching attachments to maps"; 4305 trace "perl_reload: reattaching attachments to maps";
3758 reattach $_ for values %MAP; 4306 reattach $_ for values %MAP;
3759 warn "reattaching attachments to players"; 4307 trace "perl_reload: reattaching attachments to players";
3760 reattach $_ for values %PLAYER; 4308 reattach $_ for values %PLAYER;
3761 } 4309 }
3762 4310
3763 warn "running post_init jobs"; 4311 cf::_post_init 1;
3764 (pop @POST_INIT)->(1) while @POST_INIT;
3765 4312
3766 warn "leaving sync_job"; 4313 trace "perl_reload: leaving sync_job";
3767 4314
3768 1 4315 1
3769 } or do { 4316 } or do {
3770 warn $@; 4317 error $@;
3771 cf::cleanup "error while reloading, exiting."; 4318 cf::cleanup "perl_reload: error, exiting.";
3772 }; 4319 };
3773 4320
3774 warn "reloaded";
3775 --$RELOAD; 4321 --$RELOAD;
3776 } 4322 }
3777 4323
3778 $t1 = EV::time - $t1; 4324 $t1 = AE::time - $t1;
3779 warn "reload completed in ${t1}s\n"; 4325 info "perl_reload: completed in ${t1}s\n";
3780}; 4326};
3781 4327
3782our $RELOAD_WATCHER; # used only during reload 4328our $RELOAD_WATCHER; # used only during reload
3783 4329
3784sub reload_perl() { 4330sub reload_perl() {
3786 # coro crashes during coro_state_free->destroy here. 4332 # coro crashes during coro_state_free->destroy here.
3787 4333
3788 $RELOAD_WATCHER ||= cf::async { 4334 $RELOAD_WATCHER ||= cf::async {
3789 Coro::AIO::aio_wait cache_extensions; 4335 Coro::AIO::aio_wait cache_extensions;
3790 4336
3791 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4337 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3792 do_reload_perl; 4338 do_reload_perl;
3793 undef $RELOAD_WATCHER; 4339 undef $RELOAD_WATCHER;
3794 }; 4340 };
3795 }; 4341 };
3796} 4342}
3805 reload_perl; 4351 reload_perl;
3806 }; 4352 };
3807 } 4353 }
3808}; 4354};
3809 4355
3810unshift @INC, $LIBDIR; 4356#############################################################################
3811 4357
3812my $bug_warning = 0; 4358my $bug_warning = 0;
3813 4359
3814our @WAIT_FOR_TICK;
3815our @WAIT_FOR_TICK_BEGIN;
3816
3817sub wait_for_tick { 4360sub wait_for_tick() {
3818 return if tick_inhibit || $Coro::current == $Coro::main; 4361 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3819 4362
3820 my $signal = new Coro::Signal; 4363 $WAIT_FOR_TICK->wait;
3821 push @WAIT_FOR_TICK, $signal;
3822 $signal->wait;
3823} 4364}
3824 4365
3825sub wait_for_tick_begin { 4366sub wait_for_tick_begin() {
3826 return if tick_inhibit || $Coro::current == $Coro::main; 4367 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3827 4368
3828 my $signal = new Coro::Signal; 4369 my $signal = new Coro::Signal;
3829 push @WAIT_FOR_TICK_BEGIN, $signal; 4370 push @WAIT_FOR_TICK_BEGIN, $signal;
3830 $signal->wait; 4371 $signal->wait;
3831} 4372}
3835 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"
3836 unless ++$bug_warning > 10; 4377 unless ++$bug_warning > 10;
3837 return; 4378 return;
3838 } 4379 }
3839 4380
3840 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#
3841 4384
3842 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4385 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3843 $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.;
3844 Coro::async_pool { 4387 Coro::async_pool {
3845 $Coro::current->{desc} = "runtime saver"; 4388 $Coro::current->{desc} = "runtime saver";
3846 write_runtime_sync 4389 write_runtime_sync
3847 or warn "ERROR: unable to write runtime file: $!"; 4390 or error "ERROR: unable to write runtime file: $!";
3848 }; 4391 };
3849 } 4392 }
3850 4393
3851 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4394 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3852 $sig->send; 4395 $sig->send;
3853 } 4396 }
3854 while (my $sig = shift @WAIT_FOR_TICK) { 4397 $WAIT_FOR_TICK->broadcast;
3855 $sig->send;
3856 }
3857 4398
3858 $LOAD = ($NOW - $TICK_START) / $TICK; 4399 $LOAD = ($NOW - $TICK_START) / $TICK;
3859 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4400 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3860 4401
3861 if (0) { 4402 if (0) {
3862 if ($NEXT_TICK) { 4403 if ($NEXT_TICK) {
3863 my $jitter = $TICK_START - $NEXT_TICK; 4404 my $jitter = $TICK_START - $NEXT_TICK;
3864 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4405 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3865 warn "jitter $JITTER\n";#d# 4406 debug "jitter $JITTER\n";#d#
3866 } 4407 }
3867 } 4408 }
3868} 4409}
3869 4410
3870{ 4411{
3871 # configure BDB 4412 # configure BDB
4413 info "initialising database";
3872 4414
3873 BDB::min_parallel 8; 4415 BDB::min_parallel 16;
3874 BDB::max_poll_reqs $TICK * 0.1; 4416 BDB::max_poll_reqs $TICK * 0.1;
3875 $AnyEvent::BDB::WATCHER->priority (1); 4417 #$AnyEvent::BDB::WATCHER->priority (1);
3876 4418
3877 unless ($DB_ENV) { 4419 unless ($DB_ENV) {
3878 $DB_ENV = BDB::db_env_create; 4420 $DB_ENV = BDB::db_env_create;
3879 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4421 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3880 $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;
3905 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4447 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3906 }; 4448 };
3907 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4449 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3908 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4450 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3909 }; 4451 };
4452
4453 info "database initialised";
3910} 4454}
3911 4455
3912{ 4456{
3913 # configure IO::AIO 4457 # configure IO::AIO
3914 4458
4459 info "initialising aio";
3915 IO::AIO::min_parallel 8; 4460 IO::AIO::min_parallel 8;
3916 IO::AIO::max_poll_time $TICK * 0.1; 4461 IO::AIO::max_poll_time $TICK * 0.1;
3917 undef $AnyEvent::AIO::WATCHER; 4462 undef $AnyEvent::AIO::WATCHER;
4463 info "aio initialised";
3918} 4464}
3919 4465
3920my $_log_backtrace; 4466our $_log_backtrace;
4467our $_log_backtrace_last;
3921 4468
3922sub _log_backtrace { 4469sub _log_backtrace {
3923 my ($msg, @addr) = @_; 4470 my ($msg, @addr) = @_;
3924 4471
3925 $msg =~ s/\n//; 4472 $msg =~ s/\n$//;
3926 4473
4474 if ($_log_backtrace_last eq $msg) {
4475 LOG llevInfo, "[ABT] $msg\n";
4476 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3927 # limit the # of concurrent backtraces 4477 # limit the # of concurrent backtraces
3928 if ($_log_backtrace < 2) { 4478 } elsif ($_log_backtrace < 2) {
4479 $_log_backtrace_last = $msg;
3929 ++$_log_backtrace; 4480 ++$_log_backtrace;
3930 my $perl_bt = Carp::longmess $msg; 4481 my $perl_bt = Carp::longmess $msg;
3931 async { 4482 async {
3932 $Coro::current->{desc} = "abt $msg"; 4483 $Coro::current->{desc} = "abt $msg";
3933 4484
3953 LOG llevInfo, "[ABT] $_\n" for @bt; 4504 LOG llevInfo, "[ABT] $_\n" for @bt;
3954 --$_log_backtrace; 4505 --$_log_backtrace;
3955 }; 4506 };
3956 } else { 4507 } else {
3957 LOG llevInfo, "[ABT] $msg\n"; 4508 LOG llevInfo, "[ABT] $msg\n";
3958 LOG llevInfo, "[ABT] [suppressed]\n"; 4509 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3959 } 4510 }
3960} 4511}
3961 4512
3962# load additional modules 4513# load additional modules
3963require "cf/$_.pm" for @EXTRA_MODULES; 4514require "cf/$_.pm" for @EXTRA_MODULES;
4515cf::_connect_to_perl_2;
3964 4516
3965END { cf::emergency_save } 4517END { cf::emergency_save }
3966 4518
39671 45191
3968 4520

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines