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.542 by root, Wed May 5 09:05:03 2010 UTC vs.
Revision 1.620 by root, Tue Aug 11 02:13:26 2015 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 (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
… …
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp (); 35use Carp ();
36 36
37use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Fcntl; 60use Fcntl;
57use YAML::XS (); 61use YAML::XS ();
58use IO::AIO (); 62use IO::AIO ();
59use Time::HiRes;
60use Compress::LZF; 63use Compress::LZF;
61use Digest::MD5 (); 64use Digest::MD5 ();
62 65
63AnyEvent::detect; 66AnyEvent::detect;
64 67
… …
83our %COMMAND = (); 86our %COMMAND = ();
84our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
85 88
86our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
88our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
91 96
92our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 98our @EVENT;
94our @REFLECT; # set by XS 99our @REFLECT; # set by XS
95our %REFLECT; # set by us 100our %REFLECT; # set by us
96 101
97our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
98our $DATADIR = datadir; 104our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
102our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 117
111our %RESOURCE; # unused 118#our %RESOURCE; # unused
112 119
113our $OUTPUT_RATE_MIN = 3000; 120our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 121our $OUTPUT_RATE_MAX = 1000000;
115 122
116our $MAX_LINKS = 32; # how many chained exits to follow 123our $MAX_LINKS = 32; # how many chained exits to follow
… …
124our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 134our $DB_ENV;
128 135
129our @EXTRA_MODULES = qw(pod match mapscript); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 137
131our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 140
133our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
135our $NOW; 144our $NOW;
136 145
137our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
… …
148 157
149our @POST_INIT; 158our @POST_INIT;
150 159
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
153 165
154binmode STDOUT; 166binmode STDOUT;
155binmode STDERR; 167binmode STDERR;
156 168
157# read virtual server time, if available 169# read virtual server time, if available
… …
191 203
192=over 4 204=over 4
193 205
194=item $cf::UPTIME 206=item $cf::UPTIME
195 207
196The timestamp of the server start (so not actually an uptime). 208The timestamp of the server start (so not actually an "uptime").
209
210=item $cf::SERVER_TICK
211
212An unsigned integer that starts at zero when the server is started and is
213incremented on every tick.
214
215=item $cf::NOW
216
217The (real) time of the last (current) server tick - updated before and
218after tick processing, so this is useful only as a rough "what time is it
219now" estimate.
220
221=item $cf::TICK
222
223The interval between each server tick, in seconds.
197 224
198=item $cf::RUNTIME 225=item $cf::RUNTIME
199 226
200The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 228every server tick.
202 229
203=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206 233
207Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
210database environment. 237database environment.
211 238
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 239=item $cf::LOADAVG
221 240
222The current CPU load on the server (alpha-smoothed), as a value between 0 241The current CPU load on the server (alpha-smoothed), as a value between 0
223(none) and 1 (overloaded), indicating how much time is spent on processing 242(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
… …
232Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
233from wherever your confdir points to. 252from wherever your confdir points to.
234 253
235=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
236 255
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
238returns directly I<after> the tick processing (and consequently, can only wake one process 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
260
261Note that cf::wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
272
273=cut
274
275sub wait_for_tick();
276sub wait_for_tick_begin();
240 277
241=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
242 279
243This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 281C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
305)) { 342)) {
306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
307} 344}
308 345
309$EV::DIED = sub { 346$EV::DIED = sub {
310 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
311}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
312 354
313############################################################################# 355#############################################################################
314 356
315=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
316 358
… …
337 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 379 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338 $d 380 $d
339 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
340} 382}
341 383
384=item $scalar = cf::load_file $path
385
386Loads the given file from path and returns its contents. Croaks on error
387and can block.
388
389=cut
390
391sub load_file($) {
392 0 <= aio_load $_[0], my $data
393 or Carp::croak "$_[0]: $!";
394
395 $data
396}
397
398=item $success = cf::replace_file $path, $data, $sync
399
400Atomically replaces the file at the given $path with new $data, and
401optionally $sync the data to disk before replacing the file.
402
403=cut
404
405sub replace_file($$;$) {
406 my ($path, $data, $sync) = @_;
407
408 my $lock = cf::lock_acquire ("replace_file:$path");
409
410 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
411 or return;
412
413 $data = $data->() if ref $data;
414
415 length $data == aio_write $fh, 0, (length $data), $data, 0
416 or return;
417
418 !$sync
419 or !aio_fsync $fh
420 or return;
421
422 aio_close $fh
423 and return;
424
425 aio_rename "$path~", $path
426 and return;
427
428 if ($sync) {
429 $path =~ s%/[^/]*$%%;
430 aio_pathsync $path;
431 }
432
433 1
434}
435
342=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
343 437
344Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
345 439
346=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
… …
352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 446our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353 447
354sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
356 450
451=item $ref = cf::decode_storable $scalar
452
453Same as Coro::Storable::thaw, so blocks.
454
455=cut
456
457BEGIN { *decode_storable = \&Coro::Storable::thaw }
458
459=item $ref = cf::decode_yaml $scalar
460
461Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
462
463=cut
464
465sub decode_yaml($) {
466 fork_call { YAML::XS::Load $_[0] } @_
467}
468
469=item $scalar = cf::unlzf $scalar
470
471Same as Compress::LZF::compress, but takes server ticks into account, so
472blocks.
473
474=cut
475
476sub unlzf($) {
477 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
478 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
479 Compress::LZF::decompress $_[0]
480}
481
357=item cf::post_init { BLOCK } 482=item cf::post_init { BLOCK }
358 483
359Execute the given codeblock, I<after> all extensions have been (re-)loaded, 484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again. 485but I<before> the server starts ticking again.
361 486
362The cdoeblock will have a single boolean argument to indicate whether this 487The codeblock will have a single boolean argument to indicate whether this
363is a reload or not. 488is a reload or not.
364 489
365=cut 490=cut
366 491
367sub post_init(&) { 492sub post_init(&) {
368 push @POST_INIT, shift; 493 push @POST_INIT, shift;
494}
495
496sub _post_init {
497 trace "running post_init jobs";
498
499 # run them in parallel...
500
501 my @join;
502
503 while () {
504 push @join, map &Coro::async ($_, 0), @POST_INIT;
505 @POST_INIT = ();
506
507 @join or last;
508
509 (pop @join)->join;
510 }
369} 511}
370 512
371=item cf::lock_wait $string 513=item cf::lock_wait $string
372 514
373Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
… …
426 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
427} 569}
428 570
429=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
430 572
431Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
432This call blocks and returns only when you have at least C<$time> seconds 574(default: 0): This call blocks and returns only when you have at least
433of cpu time till the next tick. The slot is only valid till the next cede. 575C<$time> seconds of cpu time till the next tick. The slot is only valid
576till the next cede.
577
578Background jobs should use a priority less than zero, interactive jobs
579should use 100 or more.
434 580
435The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
436used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
437 583
438Useful for short background jobs. 584Useful for short background jobs.
… …
450 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
451 my $busy; 597 my $busy;
452 598
453 while () { 599 while () {
454 next_job: 600 next_job:
601
602 Coro::cede;
455 603
456 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
457 605
458 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
459 if ($SLOT_QUEUE[$_][0] <= $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0; 608 $busy = 0;
461 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
462 $job->[2]->send; 610 $job->[2]->send;
463 Coro::cede;
464 goto next_job; 611 goto next_job;
465 } else { 612 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
467 } 614 }
468 } 615 }
469 616
470 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
471 # we do not use wait_for_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
472 push @cf::WAIT_FOR_TICK, $signal;
473 $signal->wait;
474 } else { 619 } else {
475 $busy = 0; 620 $busy = 0;
476 Coro::schedule; 621 Coro::schedule;
477 } 622 }
478 } 623 }
… …
542 687
543 while ($busy) { 688 while ($busy) {
544 if (Coro::nready) { 689 if (Coro::nready) {
545 Coro::cede_notself; 690 Coro::cede_notself;
546 } else { 691 } else {
547 EV::loop EV::LOOP_ONESHOT; 692 EV::run EV::RUN_ONCE;
548 } 693 }
549 } 694 }
550 695
551 my $time = AE::time - $time; 696 my $time = AE::time - $time;
552 697
… …
578 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
579 724
580 $coro 725 $coro
581} 726}
582 727
583=item fork_call { }, $args 728=item fork_call { }, @args
584 729
585Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
586process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling. 733never block itself or use any form of event handling.
589 734
590=cut 735=cut
591 736
737sub post_fork {
738 reset_signals;
739}
740
592sub fork_call(&@) { 741sub fork_call(&@) {
593 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
594 743
595 # we seemingly have to make a local copy of the whole thing,
596 # otherwise perl prematurely frees the stuff :/
597 # TODO: investigate and fix (likely this will be rather laborious)
598
599 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
600 reset_signals; 745 cf::post_fork;
601 &$cb 746 &$cb
602 }, @args; 747 } @args;
603 748
604 wantarray ? @res : $res[-1] 749 wantarray ? @res : $res[-1]
605} 750}
606 751
607sub objinfo { 752sub objinfo {
… …
729 874
730 my @data; 875 my @data;
731 my $md5; 876 my $md5;
732 877
733 for (0 .. $#$src) { 878 for (0 .. $#$src) {
734 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
735 or Carp::croak "$src->[$_]: $!";
736 } 880 }
737 881
738 # if processing is expensive, check 882 # if processing is expensive, check
739 # checksum first 883 # checksum first
740 if (1) { 884 if (1) {
… …
753 897
754 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
755 } 899 }
756 } 900 }
757 901
758 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
759 my $data = $process->(\@data); 903 my $data = $process->(\@data);
760 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
761 905
762 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
763 907
764 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
765 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
… …
1285=cut 1429=cut
1286 1430
1287############################################################################# 1431#############################################################################
1288# command handling &c 1432# command handling &c
1289 1433
1290=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1291 1435
1292Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1293$name. 1437$name.
1294 1438
1295=cut 1439=cut
… …
1301 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1302 1446
1303 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1304} 1448}
1305 1449
1306=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1307 1451
1308Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1309extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1310received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1311the logged-in player. Ext commands can only be processed after a player 1455the logged-in player. Ext commands can only be processed after a player
1312has logged in successfully. 1456has logged in successfully.
1313 1457
1314If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1315called.
1316 1459
1460=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1461
1462Same as C<cf::register_extcmd>, but instead of returning values, the
1463callback needs to clal the C<$reply> function.
1464
1317=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1318 1466
1319Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1320exticmd packet. Exti commands are processed by the server as soon as they 1468exticmd packet. Exti commands are processed by the server as soon as they
1321are received, i.e. out of order w.r.t. other commands. The first argument 1469are received, i.e. out of order w.r.t. other commands. The first argument
1322is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1323log-in. 1471log-in.
1324 1472
1325If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1326called.
1327 1474
1328=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1329 1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1480=cut
1481
1330sub register_extcmd { 1482sub register_extcmd($$) {
1331 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1332 1484
1333 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1334} 1486}
1335 1487
1336sub register_exticmd { 1488sub register_async_extcmd($$) {
1337 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1338 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1339 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1498}
1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1340} 1504}
1341 1505
1342use File::Glob (); 1506use File::Glob ();
1343 1507
1344cf::player->attach ( 1508cf::player->attach (
… …
1358 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1359 1523
1360 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1361 1525
1362 if (ref $msg) { 1526 if (ref $msg) {
1363 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1364 "ARRAY" eq ref $msg
1365 ? @$msg
1366 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1367 1528
1368 my @reply;
1369
1370 if (my $cb = $EXTCMD{$type}) { 1529 if (my $cb = $EXTACMD{$type}) {
1530 $cb->(
1531 $pl,
1532 sub {
1533 $pl->ext_msg ("reply-$reply", @_)
1534 if $reply;
1535 },
1536 @payload
1537 );
1538 } else {
1539 my @reply;
1540
1541 if (my $cb = $EXTCMD{$type}) {
1371 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1372 } 1547 }
1373
1374 $pl->ext_reply ($reply, @reply)
1375 if $reply;
1376 1548
1377 } else { 1549 } else {
1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1379 } 1551 }
1380 1552
… …
1393 }; 1565 };
1394 1566
1395 $grp 1567 $grp
1396} 1568}
1397 1569
1570sub _ext_cfg_reg($$$$) {
1571 my ($rvar, $varname, $cfgname, $default) = @_;
1572
1573 $cfgname = lc $varname
1574 unless length $cfgname;
1575
1576 $EXT_CFG{$cfgname} = [$rvar, $default];
1577
1578 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1579}
1580
1398sub load_extensions { 1581sub load_extensions {
1399 info "loading extensions..."; 1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1400 1585
1401 cf::sync_job { 1586 cf::sync_job {
1402 my %todo; 1587 my %todo;
1403 1588
1404 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
… …
1447 unless exists $done{$_}; 1632 unless exists $done{$_};
1448 } 1633 }
1449 1634
1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1451 1636
1637 my $source = $v->{source};
1638
1639 # support "CONF varname :confname = default" pseudo-statements
1640 $source =~ s{
1641 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1642 }{
1643 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1644 }gmxe;
1645
1452 my $active = eval $v->{source}; 1646 my $active = eval $source;
1453 1647
1454 if (length $@) { 1648 if (length $@) {
1455 error "$v->{path}: $@\n"; 1649 error "$v->{path}: $@\n";
1456 1650
1457 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1474 1668
1475 while (my ($k, $v) = each %todo) { 1669 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1670 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory}; 1671 if exists $v->{meta}{mandatory};
1478 } 1672 }
1673
1674 last;
1479 } 1675 }
1480 } 1676 }
1481 }; 1677 };
1482} 1678}
1483 1679
… …
1641 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1642 1838
1643 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1840 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1645 1841
1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1647 $pl->deactivate; 1843 $pl->deactivate;
1844
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1845 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1649 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1650 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1651 1850
1652 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1653 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1654 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
… …
1740 1939
1741=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1742 1941
1743Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1744 1943
1745=item $player->ext_reply ($msgid, @msg)
1746
1747Sends an ext reply to the player.
1748
1749=cut
1750
1751sub ext_reply($$@) {
1752 my ($self, $id, @msg) = @_;
1753
1754 $self->ns->ext_reply ($id, @msg)
1755}
1756
1757=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1758 1945
1759Sends an ext event to the client. 1946Sends an ext event to the client.
1760 1947
1761=cut 1948=cut
… …
1820sub generate_random_map { 2007sub generate_random_map {
1821 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1822 2009
1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2010 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824 2011
1825 # mit "rum" bekleckern, nicht
1826 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1830 $rmp->{exit_on_final_map},
1831 $rmp->{xsize}, $rmp->{ysize},
1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1834 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1835 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1836 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1837 (cf::region::find $rmp->{region}), $rmp->{custom}
1838 )
1839} 2013}
1840 2014
1841=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1842 2016
1843Register a handler for the map path matching the given regex at the 2017Register a handler for the map path matching the given regex at the
… …
1869} 2043}
1870 2044
1871sub normalise { 2045sub normalise {
1872 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1873 2047
1874 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1875 2049
1876 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1877 2051
1878 # map plan: 2052 # map plan:
1879 # 2053 #
… …
1894 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1895 $path = "$base/$path"; 2069 $path = "$base/$path";
1896 } 2070 }
1897 2071
1898 for ($path) { 2072 for ($path) {
1899 redo if s{//}{/};
1900 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1901 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1902 } 2075 }
1903 2076
1904 $path 2077 $path
… …
1918 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1919 return $self; 2092 return $self;
1920 } 2093 }
1921 } 2094 }
1922 2095
1923 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1924 () 2097 ()
1925} 2098}
1926 2099
2100# may re-bless or do other evil things
1927sub init { 2101sub init {
1928 my ($self) = @_; 2102 my ($self) = @_;
1929 2103
1930 $self 2104 $self
1931} 2105}
… …
1996 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1997 2171
1998 1 2172 1
1999} 2173}
2000 2174
2175# used to laod the header of an original map
2001sub load_header_orig { 2176sub load_header_orig {
2002 my ($self) = @_; 2177 my ($self) = @_;
2003 2178
2004 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
2005} 2180}
2006 2181
2182# used to laod the header of an instantiated map
2007sub load_header_temp { 2183sub load_header_temp {
2008 my ($self) = @_; 2184 my ($self) = @_;
2009 2185
2010 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
2011} 2187}
2012 2188
2189# called after loading the header from an instantiated map
2013sub prepare_temp { 2190sub prepare_temp {
2014 my ($self) = @_; 2191 my ($self) = @_;
2015 2192
2016 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
2017 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
2018 # safety 2195 # safety
2019 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
2020 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
2021} 2198}
2022 2199
2200# called after loading the header from an original map
2023sub prepare_orig { 2201sub prepare_orig {
2024 my ($self) = @_; 2202 my ($self) = @_;
2025 2203
2026 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
2027 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
… …
2051 2229
2052sub find; 2230sub find;
2053sub find { 2231sub find {
2054 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
2055 2233
2234 cf::cede_to_tick;
2235
2056 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
2057 2237
2058 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2059 my $guard2 = cf::lock_acquire "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
2060 2240
2061 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
… …
2092 2272
2093 { 2273 {
2094 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2095 2275
2096 return unless $self->valid; 2276 return unless $self->valid;
2097 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2098
2099 $self->in_memory (cf::MAP_LOADING);
2100 2278
2101 $self->alloc; 2279 $self->alloc;
2102 2280
2103 $self->pre_load; 2281 $self->pre_load;
2104 cf::cede_to_tick; 2282 cf::cede_to_tick;
2105 2283
2284 if (exists $self->{load_path}) {
2106 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2107 $f->skip_block; 2286 $f->skip_block;
2108 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2109 or return; 2288 or return;
2110 2289
2111 $self->post_load_original 2290 $self->post_load_original
2112 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2113 2292
2114 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2115 utf8::encode $uniq; 2294 utf8::encode $uniq;
2116 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2117 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2118 $self->clear_unique_items; 2297 $self->clear_unique_items;
2119 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2120 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2121 } 2301 }
2122 } 2302 }
2123 }
2124 2303
2125 $f->resolve_delayed_derefs; 2304 $f->resolve_delayed_derefs;
2305 } else {
2306 $self->post_load_original
2307 if delete $self->{load_original};
2308 }
2309
2310 $self->state (cf::MAP_INACTIVE);
2126 2311
2127 cf::cede_to_tick; 2312 cf::cede_to_tick;
2128 # now do the right thing for maps 2313 # now do the right thing for maps
2129 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2130 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
… …
2134 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2135 $self->decay_objects; 2320 $self->decay_objects;
2136 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2137 $self->update_buttons; 2322 $self->update_buttons;
2138 cf::cede_to_tick; 2323 cf::cede_to_tick;
2139 $self->activate; 2324 #$self->activate; # no longer activate maps automatically
2140 } 2325 }
2141 2326
2142 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2143 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2144
2145 $self->in_memory (cf::MAP_ACTIVE);
2146 } 2329 }
2147 2330
2148 $self->post_load; 2331 $self->post_load;
2332
2333 1
2149} 2334}
2150 2335
2151# customize the map for a given player, i.e. 2336# customize the map for a given player, i.e.
2152# return the _real_ map. used by e.g. per-player 2337# return the _real_ map. used by e.g. per-player
2153# maps to change the path to ~playername/mappath 2338# maps to change the path to ~playername/mappath
… …
2161# if $self->per_party; 2346# if $self->per_party;
2162 2347
2163 $self 2348 $self
2164} 2349}
2165 2350
2166# find and load all maps in the 3x3 area around a map
2167sub load_neighbours {
2168 my ($map) = @_;
2169
2170 my @neigh; # diagonal neighbours
2171
2172 for (0 .. 3) {
2173 my $neigh = $map->tile_path ($_)
2174 or next;
2175 $neigh = find $neigh, $map
2176 or next;
2177 $neigh->load;
2178
2179 # now find the diagonal neighbours
2180 push @neigh,
2181 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2182 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2183 }
2184
2185 for (grep defined $_->[0], @neigh) {
2186 my ($path, $origin) = @$_;
2187 my $neigh = find $path, $origin
2188 or next;
2189 $neigh->load;
2190 }
2191}
2192
2193sub find_sync { 2351sub find_sync {
2194 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2195 2353
2354 # it's a bug to call this from the main context
2196 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2355 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2197 if $Coro::current == $Coro::main; 2356 if $Coro::current == $Coro::main;
2198 2357
2199 find $path, $origin 2358 find $path, $origin
2200} 2359}
2201 2360
2202sub do_load_sync { 2361sub do_load_sync {
2203 my ($map) = @_; 2362 my ($map) = @_;
2204 2363
2364 # it's a bug to call this from the main context
2205 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2206 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2207 2367
2208 $map->load; 2368 $map->load;
2209} 2369}
… …
2212our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2213 2373
2214sub find_async { 2374sub find_async {
2215 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2216 2376
2217 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2218 2378
2219 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2220 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2221 } 2381 }
2222 2382
2223 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2224 2384
2225 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2226 $Coro::current->{desc} = "map prefetcher"; 2386 $Coro::current->{desc} = "map prefetcher";
2227 2387
2228 while (%MAP_PREFETCH) { 2388 while (%MAP_PREFETCH) {
2229 while (my ($k, $v) = each %MAP_PREFETCH) { 2389 for my $k (keys %MAP_PREFETCH) {
2230 if (my $map = find $k) { 2390 if (my $map = find $k) {
2231 $map->load if $v; 2391 $map->load if $MAP_PREFETCH{$k};
2232 } 2392 }
2233 2393
2234 delete $MAP_PREFETCH{$k}; 2394 delete $MAP_PREFETCH{$k};
2235 } 2395 }
2236 } 2396 }
… …
2284sub swap_out { 2444sub swap_out {
2285 my ($self) = @_; 2445 my ($self) = @_;
2286 2446
2287 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288 2448
2289 return if $self->in_memory != cf::MAP_ACTIVE; 2449 return if !$self->linkable;
2290 return if $self->{deny_save}; 2450 return if $self->{deny_save};
2291 return if $self->players; 2451 return if $self->players;
2292 2452
2293 # first deactivate the map and "unlink" it from the core 2453 # first deactivate the map and "unlink" it from the core
2294 $self->deactivate; 2454 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP; 2455 $_->clear_links_to ($self) for values %cf::MAP;
2296 $self->in_memory (cf::MAP_SWAPPED); 2456 $self->state (cf::MAP_SWAPPED);
2297 2457
2298 # then atomically save 2458 # then atomically save
2299 $self->_save; 2459 $self->_save;
2300 2460
2301 # then free the map 2461 # then free the map
… …
2327 2487
2328 return if $self->players; 2488 return if $self->players;
2329 2489
2330 cf::trace "resetting map ", $self->path, "\n"; 2490 cf::trace "resetting map ", $self->path, "\n";
2331 2491
2332 $self->in_memory (cf::MAP_SWAPPED); 2492 $self->state (cf::MAP_SWAPPED);
2333 2493
2334 # need to save uniques path 2494 # need to save uniques path
2335 unless ($self->{deny_save}) { 2495 unless ($self->{deny_save}) {
2336 my $uniq = $self->uniq_path; utf8::encode $uniq; 2496 my $uniq = $self->uniq_path; utf8::encode $uniq;
2337 2497
… …
2490 2650
2491Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2492 2652
2493=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2494 2654
2495returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2496even if the object actually exists. May block. 2656even if the object actually exists. May block.
2497 2657
2498=cut 2658=cut
2499 2659
2500sub deref { 2660sub deref {
… …
2582=item $player_object->may ("access") 2742=item $player_object->may ("access")
2583 2743
2584Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2585(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2586 2746
2747This is implemented by checking a config setting of C<may_access> where
2748C<access> is replaced by the access string. The following alternatives are
2749possible (and are tested in order):
2750
2751=over 4
2752
2753=item * Player is DM
2754
2755The request will succeed.
2756
2757=item * may_access is an array reference
2758
2759If either the player nickname or UUID is in the array, the request will
2760succeed, otherwise it will fail.
2761
2762=item * may_access is a true value
2763
2764The request will succeed.
2765
2766=item * may_access is missing or false
2767
2768The request will fail.
2769
2770=back
2771
2587=cut 2772=cut
2588 2773
2589sub cf::object::player::may { 2774sub cf::object::player::may {
2590 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2591 2776
2592 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2593 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2594 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2595 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2596} 2781}
2597 2782
2598=item $player_object->enter_link 2783=item $player_object->enter_link
2599 2784
… …
2602The player should be reasonably safe there for short amounts of time (e.g. 2787The player should be reasonably safe there for short amounts of time (e.g.
2603for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2788for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2604though, as the player cannot control the character while it is on the link 2789though, as the player cannot control the character while it is on the link
2605map. 2790map.
2606 2791
2607Will never block. 2792This method will never block, which is the whole reaosn for it's
2793existance: you can I<always> put a player onto the link map, which is the
2794only place to put objects that is guaranteed to exist.
2795
2796A typical usage pattern is to call C<enter_link> synchronously from the
2797server, then start a new thread, do your blocking stuff there and then
2798call C<leave_link> from that thread.
2608 2799
2609=item $player_object->leave_link ($map, $x, $y) 2800=item $player_object->leave_link ($map, $x, $y)
2610 2801
2611Moves the player out of the special C<{link}> map onto the specified 2802Moves the player out of the special C<{link}> map onto the specified
2612map. If the map is not valid (or omitted), the player will be moved back 2803map. If the map is not valid (or omitted), the player will be moved back
… …
2667 # use -1 or undef as default coordinates, not 0, 0 2858 # use -1 or undef as default coordinates, not 0, 0
2668 ($x, $y) = ($map->enter_x, $map->enter_y) 2859 ($x, $y) = ($map->enter_x, $map->enter_y)
2669 if $x <= 0 && $y <= 0; 2860 if $x <= 0 && $y <= 0;
2670 2861
2671 $map->load; 2862 $map->load;
2672 $map->load_neighbours;
2673 2863
2674 return unless $self->contr->active; 2864 return unless $self->contr->active;
2675 2865
2676 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2866 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2677 if ($self->enter_map ($map, $x, $y)) { 2867 if ($self->enter_map ($map, $x, $y)) {
… …
2733 ($path, $x, $y) = (undef, undef, undef); 2923 ($path, $x, $y) = (undef, undef, undef);
2734 } 2924 }
2735 } 2925 }
2736 2926
2737 my $map = eval { 2927 my $map = eval {
2738 my $map = defined $path ? cf::map::find $path : undef; 2928 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2739 2929
2740 if ($map) { 2930 if ($map) {
2741 $map = $map->customise_for ($self); 2931 $map = $map->customise_for ($self);
2742 $map = $check->($map, $x, $y, $self) if $check && $map; 2932 $map = $check->($map, $x, $y, $self) if $check && $map;
2743 } else { 2933 } else {
… …
2833 $Coro::current->{desc} = "enter_exit"; 3023 $Coro::current->{desc} = "enter_exit";
2834 3024
2835 unless (eval { 3025 unless (eval {
2836 $self->deactivate_recursive; # just to be sure 3026 $self->deactivate_recursive; # just to be sure
2837 3027
2838 # random map handling
2839 {
2840 my $guard = cf::lock_acquire "exit_prepare:$exit";
2841
2842 prepare_random_map $exit
2843 if $exit->slaying eq "/!";
2844 }
2845
2846 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3028 my $map = cf::map::normalise $exit->slaying, $exit->map;
2847 my $x = $exit->stats->hp; 3029 my $x = $exit->stats->hp;
2848 my $y = $exit->stats->sp; 3030 my $y = $exit->stats->sp;
3031
3032 # special map handling
3033 my $slaying = $exit->slaying;
3034
3035 # special map handling
3036 if ($slaying eq "/!") {
3037 my $guard = cf::lock_acquire "exit_prepare:$exit";
3038
3039 prepare_random_map $exit
3040 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3041
3042 $map = $exit->slaying;
3043
3044 } elsif ($slaying eq '!up') {
3045 $map = $exit->map->tile_path (cf::TILE_UP);
3046 $x = $exit->x;
3047 $y = $exit->y;
3048
3049 } elsif ($slaying eq '!down') {
3050 $map = $exit->map->tile_path (cf::TILE_DOWN);
3051 $x = $exit->x;
3052 $y = $exit->y;
3053 }
2849 3054
2850 $self->goto ($map, $x, $y); 3055 $self->goto ($map, $x, $y);
2851 3056
2852 # if exit is damned, update players death & WoR home-position 3057 # if exit is damned, update players death & WoR home-position
2853 $self->contr->savebed ($map, $x, $y) 3058 $self->contr->savebed ($map, $x, $y)
… …
2868 3073
2869=head3 cf::client 3074=head3 cf::client
2870 3075
2871=over 4 3076=over 4
2872 3077
2873=item $client->send_drawinfo ($text, $flags)
2874
2875Sends a drawinfo packet to the client. Circumvents output buffering so
2876should not be used under normal circumstances.
2877
2878=cut
2879
2880sub cf::client::send_drawinfo {
2881 my ($self, $text, $flags) = @_;
2882
2883 utf8::encode $text;
2884 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2885}
2886
2887=item $client->send_big_packet ($pkt) 3078=item $client->send_big_packet ($pkt)
2888 3079
2889Like C<send_packet>, but tries to compress large packets, and fragments 3080Like C<send_packet>, but tries to compress large packets, and fragments
2890them as required. 3081them as required.
2891 3082
… …
2909 $self->send_packet ($pkt); 3100 $self->send_packet ($pkt);
2910} 3101}
2911 3102
2912=item $client->send_msg ($channel, $msg, $color, [extra...]) 3103=item $client->send_msg ($channel, $msg, $color, [extra...])
2913 3104
2914Send a drawinfo or msg packet to the client, formatting the msg for the 3105Send a msg packet to the client, formatting the msg for the client if
2915client if neccessary. C<$type> should be a string identifying the type of 3106necessary. C<$type> should be a string identifying the type of the
2916the message, with C<log> being the default. If C<$color> is negative, suppress 3107message, with C<log> being the default. If C<$color> is negative, suppress
2917the message unless the client supports the msg packet. 3108the message unless the client supports the msg packet.
2918 3109
2919=cut 3110=cut
2920 3111
2921# non-persistent channels (usually the info channel) 3112# non-persistent channels (usually the info channel)
… …
3026 id => "death", 3217 id => "death",
3027 title => "Death", 3218 title => "Death",
3028 reply => undef, 3219 reply => undef,
3029 tooltip => "Reason for and more info about your most recent death", 3220 tooltip => "Reason for and more info about your most recent death",
3030 }, 3221 },
3222 "c/fatal" => {
3223 id => "fatal",
3224 title => "Fatal Error",
3225 reply => undef,
3226 tooltip => "Reason for the server disconnect",
3227 },
3031 "c/say" => $SAY_CHANNEL, 3228 "c/say" => $SAY_CHANNEL,
3032 "c/chat" => $CHAT_CHANNEL, 3229 "c/chat" => $CHAT_CHANNEL,
3033); 3230);
3034 3231
3035sub cf::client::send_msg { 3232sub cf::client::send_msg {
… …
3078=cut 3275=cut
3079 3276
3080sub cf::client::ext_msg($$@) { 3277sub cf::client::ext_msg($$@) {
3081 my ($self, $type, @msg) = @_; 3278 my ($self, $type, @msg) = @_;
3082 3279
3083 if ($self->extcmd == 2) {
3084 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3280 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3085 } elsif ($self->extcmd == 1) { # TODO: remove
3086 push @msg, msgtype => "event_$type";
3087 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3088 }
3089}
3090
3091=item $client->ext_reply ($msgid, @msg)
3092
3093Sends an ext reply to the client.
3094
3095=cut
3096
3097sub cf::client::ext_reply($$@) {
3098 my ($self, $id, @msg) = @_;
3099
3100 if ($self->extcmd == 2) {
3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3102 } elsif ($self->extcmd == 1) {
3103 #TODO: version 1, remove
3104 unshift @msg, msgtype => "reply", msgid => $id;
3105 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3106 }
3107} 3281}
3108 3282
3109=item $success = $client->query ($flags, "text", \&cb) 3283=item $success = $client->query ($flags, "text", \&cb)
3110 3284
3111Queues a query to the client, calling the given callback with 3285Queues a query to the client, calling the given callback with
… …
3131 3305
3132 $self->send_packet ($self->{query_queue}[0][0]) 3306 $self->send_packet ($self->{query_queue}[0][0])
3133 if @{ $self->{query_queue} } == 1; 3307 if @{ $self->{query_queue} } == 1;
3134 3308
3135 1 3309 1
3310}
3311
3312=item $client->update_command_faces
3313
3314=cut
3315
3316our %COMMAND_FACE;
3317
3318sub cf::client::update_command_faces {
3319 my ($self) = @_;
3320
3321 my @faces = grep $_,
3322 $COMMAND_FACE{preferred},
3323 $COMMAND_FACE{standard},
3324 $COMMAND_FACE{skill},
3325 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3326 $COMMAND_FACE{emote},
3327 ;
3328
3329 $self->send_face ($_)
3330 for @faces;
3331 $self->flush_fx;
3332
3333 $self->ext_msg (command_list => @faces);
3334}
3335
3336=item cf::client::set_command_face $type, $commands
3337
3338=cut
3339
3340sub cf::client::set_command_face {
3341 my ($type, $list) = @_;
3342
3343 my $idx = &cf::face::set ( #d# ugly forward reference
3344 "command_list/$type" => cf::FT_RSRC,
3345 JSON::XS->new->utf8->encode ([ sort @$list ])
3346 );
3347
3348 $COMMAND_FACE{$type} = $idx;
3136} 3349}
3137 3350
3138cf::client->attach ( 3351cf::client->attach (
3139 on_connect => sub { 3352 on_connect => sub {
3140 my ($ns) = @_; 3353 my ($ns) = @_;
… …
3166 my ($ns, $buf) = @_; 3379 my ($ns, $buf) = @_;
3167 3380
3168 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3381 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3169 3382
3170 if (ref $msg) { 3383 if (ref $msg) {
3171 my ($type, $reply, @payload) = 3384 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3172 "ARRAY" eq ref $msg
3173 ? @$msg
3174 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3175 3385
3176 my @reply;
3177
3178 if (my $cb = $EXTICMD{$type}) { 3386 if (my $cb = $EXTIACMD{$type}) {
3387 $cb->(
3388 $ns,
3389 sub {
3390 $ns->ext_msg ("reply-$reply", @_)
3391 if $reply;
3392 },
3393 @payload
3394 );
3395 } else {
3396 my @reply;
3397
3398 if (my $cb = $EXTICMD{$type}) {
3179 @reply = $cb->($ns, @payload); 3399 @reply = $cb->($ns, @payload);
3400 }
3401
3402 $ns->ext_msg ("reply-$reply", @reply)
3403 if $reply;
3180 } 3404 }
3181
3182 $ns->ext_reply ($reply, @reply)
3183 if $reply;
3184
3185 } else { 3405 } else {
3186 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3406 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3187 } 3407 }
3188 3408
3189 cf::override; 3409 cf::override;
… …
3357=cut 3577=cut
3358 3578
3359############################################################################# 3579#############################################################################
3360# the server's init and main functions 3580# the server's init and main functions
3361 3581
3362# async inc loader. yay. 3582{
3363sub inc_loader { 3583 package cf::face;
3364 my $mod = $_[1];
3365 3584
3366 if (in_main && !tick_inhibit) { 3585 our %HASH; # hash => idx
3367 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)"; 3586 our @DATA; # dynamically-created facedata, only faceste 0 used
3587 our @FOFS; # file offset, if > 0
3588 our @SIZE; # size of face, in octets
3589 our @META; # meta hash of face, if any
3590 our $DATAFH; # facedata filehandle
3591
3592 # internal api, not finalised
3593 sub set {
3594 my ($name, $type, $data) = @_;
3595
3596 my $idx = cf::face::find $name;
3597
3598 if ($idx) {
3599 delete $HASH{cf::face::get_csum $idx};
3368 } else { 3600 } else {
3369 debug "loading perl module $mod\n"; 3601 $idx = cf::face::alloc $name;
3370 } 3602 }
3371 3603
3372 # 1. find real file 3604 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3373 for my $dir (@ORIG_INC) {
3374 ref $dir and next;
3375 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3376 or next;
3377 3605
3378 $data = "#line 1 $dir/$mod\n$data"; 3606 cf::face::set_type $idx, $type;
3607 cf::face::set_csum $idx, 0, $hash;
3379 3608
3380 open my $fh, "<", \$data or die; 3609 # we need to destroy the SV itself, not just modify it, as a running ix
3610 # might hold a reference to it: "delete" achieves that.
3611 delete $FOFS[0][$idx];
3612 delete $DATA[0][$idx];
3613 $DATA[0][$idx] = $data;
3614 $SIZE[0][$idx] = length $data;
3615 delete $META[$idx];
3616 $HASH{$hash} = $idx;#d#
3381 3617
3382 return $fh; 3618 $idx
3383 } 3619 }
3384 3620
3385 () 3621 sub _get_data($$$) {
3386} 3622 my ($idx, $set, $cb) = @_;
3387 3623
3388sub init_inc { 3624 if (defined $DATA[$set][$idx]) {
3389 # save original @INC 3625 $cb->($DATA[$set][$idx]);
3390 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC; 3626 } elsif (my $fofs = $FOFS[$set][$idx]) {
3627 my $size = $SIZE[$set][$idx];
3628 my $buf;
3629 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3630 if ($_[0] == $size) {
3631 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3632 $cb->($buf);
3633 } else {
3634 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3635 }
3636 };
3637 } else {
3638 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3639 }
3640 }
3391 3641
3392 # make sure we can do scalar-opens 3642 # rather ineffient
3393 open my $dummy, "<", \my $dummy2; 3643 sub cf::face::get_data($;$) {
3644 my ($idx, $set) = @_;
3394 3645
3395 # execute some stuff so perl load's some of the core modules 3646 _get_data $idx, $set, Coro::rouse_cb;
3396 /Ü/ =~ /ü/i; 3647 Coro::rouse_wait
3397 eval { &Storable::nstore_fd }; 3648 }
3398 3649
3399 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc. 3650 sub cf::face::ix {
3651 my ($ns, $set, $idx, $pri) = @_;
3400 3652
3401 debug "module loading will be asynchronous from this point on."; 3653 _get_data $idx, $set, sub {
3654 $ns->ix_send ($idx, $pri, $_[0]);
3655 };
3656 }
3402} 3657}
3403 3658
3404sub load_facedata($) { 3659sub load_facedata($) {
3405 my ($path) = @_; 3660 my ($path) = @_;
3406 3661
3407 # HACK to clear player env face cache, we need some signal framework
3408 # for this (global event?)
3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3410
3411 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3662 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3412 3663
3413 trace "loading facedata from $path\n"; 3664 trace "loading facedata from $path\n";
3414 3665
3415 my $facedata; 3666 my $facedata = decode_storable load_file "$path/faceinfo";
3416 0 < aio_load $path, $facedata
3417 or die "$path: $!";
3418
3419 $facedata = Coro::Storable::thaw $facedata;
3420 3667
3421 $facedata->{version} == 2 3668 $facedata->{version} == 2
3422 or cf::cleanup "$path: version mismatch, cannot proceed."; 3669 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3423 3670
3424 # patch in the exptable 3671 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3425 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3672 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3426 $facedata->{resource}{"res/exp_table"} = { 3673
3427 type => FT_RSRC, 3674 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3428 data => $exp_table, 3675
3429 hash => (Digest::MD5::md5 $exp_table), 3676 # BEGIN ATOMIC
3430 }; 3677 # from here on, everything must be atomic - no thread switch allowed
3431 cf::cede_to_tick; 3678 my $t1 = EV::time;
3432 3679
3433 { 3680 {
3434 my $faces = $facedata->{faceinfo}; 3681 my $faces = $facedata->{faceinfo};
3435 3682
3436 while (my ($face, $info) = each %$faces) { 3683 for my $face (sort keys %$faces) {
3684 my $info = $faces->{$face};
3437 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3685 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3438 3686
3439 cf::face::set_visibility $idx, $info->{visibility}; 3687 cf::face::set_visibility $idx, $info->{visibility};
3440 cf::face::set_magicmap $idx, $info->{magicmap}; 3688 cf::face::set_magicmap $idx, $info->{magicmap};
3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3689 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3690 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3443 3691 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3444 cf::cede_to_tick; 3692 $cf::face::HASH{$info->{hash64}} = $idx;
3693 delete $cf::face::META[$idx];
3445 } 3694 }
3446 3695
3447 while (my ($face, $info) = each %$faces) { 3696 while (my ($face, $info) = each %$faces) {
3448 next unless $info->{smooth}; 3697 next unless $info->{smooth};
3449 3698
… …
3454 cf::face::set_smooth $idx, $smooth; 3703 cf::face::set_smooth $idx, $smooth;
3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3704 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3456 } else { 3705 } else {
3457 error "smooth face '$info->{smooth}' not found for face '$face'"; 3706 error "smooth face '$info->{smooth}' not found for face '$face'";
3458 } 3707 }
3459
3460 cf::cede_to_tick;
3461 } 3708 }
3462 } 3709 }
3463 3710
3464 { 3711 {
3465 my $anims = $facedata->{animinfo}; 3712 my $anims = $facedata->{animinfo};
3466 3713
3467 while (my ($anim, $info) = each %$anims) { 3714 while (my ($anim, $info) = each %$anims) {
3468 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3715 cf::anim::set $anim, $info->{frames}, $info->{facings};
3469 cf::cede_to_tick;
3470 } 3716 }
3471 3717
3472 cf::anim::invalidate_all; # d'oh 3718 cf::anim::invalidate_all; # d'oh
3473 } 3719 }
3474 3720
3475 { 3721 {
3476 my $res = $facedata->{resource}; 3722 my $res = $facedata->{resource};
3477 3723
3478 while (my ($name, $info) = each %$res) { 3724 while (my ($name, $info) = each %$res) {
3479 if (defined $info->{type}) { 3725 if (defined (my $type = $info->{type})) {
3726 # TODO: different hash - must free and use new index, or cache ixface data queue
3480 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3727 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3481 3728
3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3483 cf::face::set_type $idx, $info->{type}; 3729 cf::face::set_type $idx, $type;
3730 cf::face::set_csum $idx, 0, $info->{hash};
3731 $cf::face::SIZE[0][$idx] = $info->{size};
3732 $cf::face::FOFS[0][$idx] = $info->{fofs};
3733 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3734 $cf::face::HASH{$info->{hash}} = $idx;
3484 } else { 3735 } else {
3485 $RESOURCE{$name} = $info; # unused 3736# $RESOURCE{$name} = $info; # unused
3486 } 3737 }
3487
3488 cf::cede_to_tick;
3489 } 3738 }
3490 } 3739 }
3740
3741 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3742
3743 # HACK to clear player env face cache, we need some signal framework
3744 # for this (global event?)
3745 %ext::player_env::MUSIC_FACE_CACHE = ();
3746
3747 # END ATOMIC
3748
3749 cf::debug "facedata atomic update time ", EV::time - $t1;
3491 3750
3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3751 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3752
3753 aio_close $fh if $fh; # close old facedata
3493 3754
3494 1 3755 1
3495} 3756}
3496 3757
3497register_exticmd fx_want => sub { 3758register_exticmd fx_want => sub {
… …
3508 my $status = load_resource_file_ $_[0]; 3769 my $status = load_resource_file_ $_[0];
3509 get_slot 0.1, 100; 3770 get_slot 0.1, 100;
3510 cf::arch::commit_load; 3771 cf::arch::commit_load;
3511 3772
3512 $status 3773 $status
3774}
3775
3776sub reload_exp_table {
3777 _reload_exp_table;
3778
3779 cf::face::set
3780 "res/exp_table" => FT_RSRC,
3781 JSON::XS->new->utf8->canonical->encode (
3782 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3783 );
3784}
3785
3786sub reload_materials {
3787 _reload_materials;
3513} 3788}
3514 3789
3515sub reload_regions { 3790sub reload_regions {
3516 # HACK to clear player env face cache, we need some signal framework 3791 # HACK to clear player env face cache, we need some signal framework
3517 # for this (global event?) 3792 # for this (global event?)
… …
3525 if exists $_->{match}; 3800 if exists $_->{match};
3526 } 3801 }
3527} 3802}
3528 3803
3529sub reload_facedata { 3804sub reload_facedata {
3530 load_facedata "$DATADIR/facedata" 3805 load_facedata $DATADIR
3531 or die "unable to load facedata\n"; 3806 or die "unable to load facedata\n";
3532} 3807}
3533 3808
3534sub reload_archetypes { 3809sub reload_archetypes {
3535 load_resource_file "$DATADIR/archetypes" 3810 load_resource_file "$DATADIR/archetypes"
3536 or die "unable to load archetypes\n"; 3811 or die "unable to load archetypes\n";
3812
3813 cf::face::set
3814 "res/skill_info" => FT_RSRC,
3815 JSON::XS->new->utf8->canonical->encode (
3816 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3817 );
3818
3819 cf::face::set
3820 "res/spell_paths" => FT_RSRC,
3821 JSON::XS->new->utf8->canonical->encode (
3822 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3823 );
3824
3825 # command completion
3826 my @commands;
3827
3828 for (0..cf::arch::skillvec_size - 1) {
3829 my $skill = cf::arch::skillvec $_;
3830 my $name = $skill->name;
3831 my $flags = cf::skill_flags $skill->subtype;
3832
3833 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3834 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3835 }
3836
3837 cf::client::set_command_face skill => \@commands;
3537} 3838}
3538 3839
3539sub reload_treasures { 3840sub reload_treasures {
3540 load_resource_file "$DATADIR/treasures" 3841 load_resource_file "$DATADIR/treasures"
3541 or die "unable to load treasurelists\n"; 3842 or die "unable to load treasurelists\n";
3542} 3843}
3543 3844
3544sub reload_sound { 3845sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n"; 3846 trace "loading sound config from $DATADIR/sound\n";
3546 3847
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3848 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3551 3849
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3850 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_] 3851 my $sound = $soundconf->{compat}[$_]
3554 or next; 3852 or next;
3555 3853
… …
3565} 3863}
3566 3864
3567sub reload_resources { 3865sub reload_resources {
3568 trace "reloading resource files...\n"; 3866 trace "reloading resource files...\n";
3569 3867
3868 reload_materials;
3570 reload_facedata; 3869 reload_facedata;
3870 reload_exp_table;
3571 reload_sound; 3871 reload_sound;
3572 reload_archetypes; 3872 reload_archetypes;
3573 reload_regions; 3873 reload_regions;
3574 reload_treasures; 3874 reload_treasures;
3575 3875
… …
3577} 3877}
3578 3878
3579sub reload_config { 3879sub reload_config {
3580 trace "reloading config file...\n"; 3880 trace "reloading config file...\n";
3581 3881
3582 open my $fh, "<:utf8", "$CONFDIR/config" 3882 my $config = load_file "$CONFDIR/config";
3583 or return; 3883 utf8::decode $config;
3584 3884 *CFG = decode_yaml $config;
3585 local $/;
3586 *CFG = YAML::XS::Load scalar <$fh>;
3587 3885
3588 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3886 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3589 3887
3590 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3888 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3591 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3889 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3595 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3893 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3596 and die "WARNING: m(un)lockall failed: $!\n"; 3894 and die "WARNING: m(un)lockall failed: $!\n";
3597 }; 3895 };
3598 warn $@ if $@; 3896 warn $@ if $@;
3599 } 3897 }
3600
3601 trace "finished reloading resource files\n";
3602} 3898}
3603 3899
3604sub pidfile() { 3900sub pidfile() {
3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3901 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3606 or die "$PIDFILE: $!"; 3902 or die "$PIDFILE: $!";
… …
3619 seek $fh, 0, 0; 3915 seek $fh, 0, 0;
3620 print $fh $$; 3916 print $fh $$;
3621} 3917}
3622 3918
3623sub main_loop { 3919sub main_loop {
3624 trace "EV::loop starting\n"; 3920 trace "EV::run starting\n";
3625 if (1) { 3921 if (1) {
3626 EV::loop; 3922 EV::run;
3627 } 3923 }
3628 trace "EV::loop returned\n"; 3924 trace "EV::run returned\n";
3629 goto &main_loop unless $REALLY_UNLOOP; 3925 goto &main_loop unless $REALLY_UNLOOP;
3630} 3926}
3631 3927
3632sub main { 3928sub main {
3633 cf::init_globals; # initialise logging 3929 cf::init_globals; # initialise logging
3634 3930
3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3931 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3932 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3933 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3934 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3639 3935
3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3936 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3641 3937
3642 # we must not ever block the main coroutine 3938 # we must not ever block the main coroutine
3643 local $Coro::idle = sub { 3939 $Coro::idle = sub {
3644 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3940 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3645 (async { 3941 (async {
3646 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3942 $Coro::current->{desc} = "IDLE BUG HANDLER";
3647 EV::loop EV::LOOP_ONESHOT; 3943 EV::run EV::RUN_ONCE;
3648 })->prio (Coro::PRIO_MAX); 3944 })->prio (Coro::PRIO_MAX);
3649 }; 3945 };
3650 3946
3651 evthread_start IO::AIO::poll_fileno; 3947 evthread_start IO::AIO::poll_fileno;
3652 3948
3653 cf::sync_job { 3949 cf::sync_job {
3950 cf::incloader::init ();
3951
3654 init_inc; 3952 db_init;
3655 3953
3656 cf::init_experience;
3657 cf::init_anim; 3954 cf::init_anim;
3658 cf::init_attackmess; 3955 cf::init_attackmess;
3659 cf::init_dynamic; 3956 cf::init_dynamic;
3660 3957
3661 cf::load_settings; 3958 cf::load_settings;
3662 cf::load_materials;
3663 3959
3664 reload_resources; 3960 reload_resources;
3665 reload_config; 3961 reload_config;
3666 db_init;
3667 3962
3668 cf::init_uuid; 3963 cf::init_uuid;
3669 cf::init_signals; 3964 cf::init_signals;
3670 cf::init_skills; 3965 cf::init_skills;
3671 3966
… …
3679 3974
3680 # no (long-running) fork's whatsoever before this point(!) 3975 # no (long-running) fork's whatsoever before this point(!)
3681 use POSIX (); 3976 use POSIX ();
3682 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3977 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3683 3978
3684 (pop @POST_INIT)->(0) while @POST_INIT; 3979 cf::_post_init 0;
3685 }; 3980 };
3686 3981
3687 cf::object::thawer::errors_are_fatal 0; 3982 cf::object::thawer::errors_are_fatal 0;
3688 info "parse errors in files are no longer fatal from this point on.\n"; 3983 info "parse errors in files are no longer fatal from this point on.\n";
3689 3984
3690 my $free_main; $free_main = EV::idle sub { 3985 AE::postpone {
3691 undef $free_main;
3692 undef &main; # free gobs of memory :) 3986 undef &main; # free gobs of memory :)
3693 }; 3987 };
3694 3988
3695 goto &main_loop; 3989 goto &main_loop;
3696} 3990}
… …
3853 4147
3854 cf::write_runtime_sync; # external watchdog should not bark 4148 cf::write_runtime_sync; # external watchdog should not bark
3855 4149
3856 trace "emergency_perl_save: flushing outstanding aio requests"; 4150 trace "emergency_perl_save: flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) { 4151 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 4152 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3859 } 4153 }
3860 4154
3861 cf::write_runtime_sync; # external watchdog should not bark 4155 cf::write_runtime_sync; # external watchdog should not bark
3862 }; 4156 };
3863 4157
… …
3901 } 4195 }
3902} 4196}
3903 4197
3904sub do_reload_perl() { 4198sub do_reload_perl() {
3905 # can/must only be called in main 4199 # can/must only be called in main
3906 if (in_main) { 4200 unless (in_main) {
3907 error "can only reload from main coroutine"; 4201 error "can only reload from main coroutine";
3908 return; 4202 return;
3909 } 4203 }
3910 4204
3911 return if $RELOAD++; 4205 return if $RELOAD++;
3912 4206
3913 my $t1 = AE::time; 4207 my $t1 = AE::time;
3914 4208
3915 while ($RELOAD) { 4209 while ($RELOAD) {
4210 cf::get_slot 0.1, -1, "reload_perl";
3916 info "reloading..."; 4211 info "perl_reload: reloading...";
3917 4212
3918 trace "entering sync_job"; 4213 trace "perl_reload: entering sync_job";
3919 4214
3920 cf::sync_job { 4215 cf::sync_job {
3921 cf::emergency_save; 4216 #cf::emergency_save;
3922 4217
3923 trace "cancelling all extension coros"; 4218 trace "perl_reload: cancelling all extension coros";
3924 $_->cancel for values %EXT_CORO; 4219 $_->cancel for values %EXT_CORO;
3925 %EXT_CORO = (); 4220 %EXT_CORO = ();
3926 4221
3927 trace "removing commands"; 4222 trace "perl_reload: removing commands";
3928 %COMMAND = (); 4223 %COMMAND = ();
3929 4224
3930 trace "removing ext/exti commands"; 4225 trace "perl_reload: removing ext/exti commands";
3931 %EXTCMD = (); 4226 %EXTCMD = ();
3932 %EXTICMD = (); 4227 %EXTICMD = ();
3933 4228
3934 trace "unloading/nuking all extensions"; 4229 trace "perl_reload: unloading/nuking all extensions";
3935 for my $pkg (@EXTS) { 4230 for my $pkg (@EXTS) {
3936 trace "... unloading $pkg"; 4231 trace "... unloading $pkg";
3937 4232
3938 if (my $cb = $pkg->can ("unload")) { 4233 if (my $cb = $pkg->can ("unload")) {
3939 eval { 4234 eval {
… …
3944 4239
3945 trace "... clearing $pkg"; 4240 trace "... clearing $pkg";
3946 clear_package $pkg; 4241 clear_package $pkg;
3947 } 4242 }
3948 4243
3949 trace "unloading all perl modules loaded from $LIBDIR"; 4244 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3950 while (my ($k, $v) = each %INC) { 4245 while (my ($k, $v) = each %INC) {
3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4246 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3952 4247
3953 trace "... unloading $k"; 4248 trace "... unloading $k";
3954 delete $INC{$k}; 4249 delete $INC{$k};
… …
3961 } 4256 }
3962 4257
3963 clear_package $k; 4258 clear_package $k;
3964 } 4259 }
3965 4260
3966 trace "getting rid of safe::, as good as possible"; 4261 trace "perl_reload: getting rid of safe::, as good as possible";
3967 clear_package "safe::$_" 4262 clear_package "safe::$_"
3968 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4263 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3969 4264
3970 trace "unloading cf.pm \"a bit\""; 4265 trace "perl_reload: unloading cf.pm \"a bit\"";
3971 delete $INC{"cf.pm"}; 4266 delete $INC{"cf.pm"};
3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4267 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3973 4268
3974 # don't, removes xs symbols, too, 4269 # don't, removes xs symbols, too,
3975 # and global variables created in xs 4270 # and global variables created in xs
3976 #clear_package __PACKAGE__; 4271 #clear_package __PACKAGE__;
3977 4272
3978 info "unload completed, starting to reload now"; 4273 info "perl_reload: unload completed, starting to reload now";
3979 4274
3980 trace "reloading cf.pm"; 4275 trace "perl_reload: reloading cf.pm";
3981 require cf; 4276 require cf;
3982 cf::_connect_to_perl_1; 4277 cf::_connect_to_perl_1;
3983 4278
3984 trace "loading config and database again"; 4279 trace "perl_reload: loading config and database again";
3985 cf::reload_config; 4280 cf::reload_config;
3986 4281
3987 trace "loading extensions"; 4282 trace "perl_reload: loading extensions";
3988 cf::load_extensions; 4283 cf::load_extensions;
3989 4284
3990 if ($REATTACH_ON_RELOAD) { 4285 if ($REATTACH_ON_RELOAD) {
3991 trace "reattaching attachments to objects/players"; 4286 trace "perl_reload: reattaching attachments to objects/players";
3992 _global_reattach; # objects, sockets 4287 _global_reattach; # objects, sockets
3993 trace "reattaching attachments to maps"; 4288 trace "perl_reload: reattaching attachments to maps";
3994 reattach $_ for values %MAP; 4289 reattach $_ for values %MAP;
3995 trace "reattaching attachments to players"; 4290 trace "perl_reload: reattaching attachments to players";
3996 reattach $_ for values %PLAYER; 4291 reattach $_ for values %PLAYER;
3997 } 4292 }
3998 4293
3999 trace "running post_init jobs"; 4294 cf::_post_init 1;
4000 (pop @POST_INIT)->(1) while @POST_INIT;
4001 4295
4002 trace "leaving sync_job"; 4296 trace "perl_reload: leaving sync_job";
4003 4297
4004 1 4298 1
4005 } or do { 4299 } or do {
4006 error $@; 4300 error $@;
4007 cf::cleanup "error while reloading, exiting."; 4301 cf::cleanup "perl_reload: error, exiting.";
4008 }; 4302 };
4009 4303
4010 info "reloaded";
4011 --$RELOAD; 4304 --$RELOAD;
4012 } 4305 }
4013 4306
4014 $t1 = AE::time - $t1; 4307 $t1 = AE::time - $t1;
4015 info "reload completed in ${t1}s\n"; 4308 info "perl_reload: completed in ${t1}s\n";
4016}; 4309};
4017 4310
4018our $RELOAD_WATCHER; # used only during reload 4311our $RELOAD_WATCHER; # used only during reload
4019 4312
4020sub reload_perl() { 4313sub reload_perl() {
… …
4045 4338
4046############################################################################# 4339#############################################################################
4047 4340
4048my $bug_warning = 0; 4341my $bug_warning = 0;
4049 4342
4050our @WAIT_FOR_TICK;
4051our @WAIT_FOR_TICK_BEGIN;
4052
4053sub wait_for_tick { 4343sub wait_for_tick() {
4054 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4344 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4055 4345
4056 my $signal = new Coro::Signal; 4346 $WAIT_FOR_TICK->wait;
4057 push @WAIT_FOR_TICK, $signal;
4058 $signal->wait;
4059} 4347}
4060 4348
4061sub wait_for_tick_begin { 4349sub wait_for_tick_begin() {
4062 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4350 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4063 4351
4064 my $signal = new Coro::Signal; 4352 my $signal = new Coro::Signal;
4065 push @WAIT_FOR_TICK_BEGIN, $signal; 4353 push @WAIT_FOR_TICK_BEGIN, $signal;
4066 $signal->wait; 4354 $signal->wait;
4067} 4355}
… …
4071 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4359 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4072 unless ++$bug_warning > 10; 4360 unless ++$bug_warning > 10;
4073 return; 4361 return;
4074 } 4362 }
4075 4363
4076 cf::server_tick; # one server iteration 4364 cf::one_tick; # one server iteration
4077 4365
4078 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4366 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4079 4367
4080 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4368 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4081 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4369 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4087 } 4375 }
4088 4376
4089 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4377 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4090 $sig->send; 4378 $sig->send;
4091 } 4379 }
4092 while (my $sig = shift @WAIT_FOR_TICK) { 4380 $WAIT_FOR_TICK->broadcast;
4093 $sig->send;
4094 }
4095 4381
4096 $LOAD = ($NOW - $TICK_START) / $TICK; 4382 $LOAD = ($NOW - $TICK_START) / $TICK;
4097 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4383 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4098 4384
4099 if (0) { 4385 if (0) {
… …
4105 } 4391 }
4106} 4392}
4107 4393
4108{ 4394{
4109 # configure BDB 4395 # configure BDB
4396 info "initialising database";
4110 4397
4111 BDB::min_parallel 16; 4398 BDB::min_parallel 16;
4112 BDB::max_poll_reqs $TICK * 0.1; 4399 BDB::max_poll_reqs $TICK * 0.1;
4113 $AnyEvent::BDB::WATCHER->priority (1); 4400 #$AnyEvent::BDB::WATCHER->priority (1);
4114 4401
4115 unless ($DB_ENV) { 4402 unless ($DB_ENV) {
4116 $DB_ENV = BDB::db_env_create; 4403 $DB_ENV = BDB::db_env_create;
4117 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4404 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4118 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4405 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4143 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4430 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4144 }; 4431 };
4145 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4432 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4146 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4433 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4147 }; 4434 };
4435
4436 info "database initialised";
4148} 4437}
4149 4438
4150{ 4439{
4151 # configure IO::AIO 4440 # configure IO::AIO
4152 4441
4442 info "initialising aio";
4153 IO::AIO::min_parallel 8; 4443 IO::AIO::min_parallel 8;
4154 IO::AIO::max_poll_time $TICK * 0.1; 4444 IO::AIO::max_poll_time $TICK * 0.1;
4155 undef $AnyEvent::AIO::WATCHER; 4445 undef $AnyEvent::AIO::WATCHER;
4446 info "aio initialised";
4156} 4447}
4157 4448
4158my $_log_backtrace; 4449our $_log_backtrace;
4450our $_log_backtrace_last;
4159 4451
4160sub _log_backtrace { 4452sub _log_backtrace {
4161 my ($msg, @addr) = @_; 4453 my ($msg, @addr) = @_;
4162 4454
4163 $msg =~ s/\n//; 4455 $msg =~ s/\n$//;
4164 4456
4457 if ($_log_backtrace_last eq $msg) {
4458 LOG llevInfo, "[ABT] $msg\n";
4459 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4165 # limit the # of concurrent backtraces 4460 # limit the # of concurrent backtraces
4166 if ($_log_backtrace < 2) { 4461 } elsif ($_log_backtrace < 2) {
4462 $_log_backtrace_last = $msg;
4167 ++$_log_backtrace; 4463 ++$_log_backtrace;
4168 my $perl_bt = Carp::longmess $msg; 4464 my $perl_bt = Carp::longmess $msg;
4169 async { 4465 async {
4170 $Coro::current->{desc} = "abt $msg"; 4466 $Coro::current->{desc} = "abt $msg";
4171 4467
… …
4191 LOG llevInfo, "[ABT] $_\n" for @bt; 4487 LOG llevInfo, "[ABT] $_\n" for @bt;
4192 --$_log_backtrace; 4488 --$_log_backtrace;
4193 }; 4489 };
4194 } else { 4490 } else {
4195 LOG llevInfo, "[ABT] $msg\n"; 4491 LOG llevInfo, "[ABT] $msg\n";
4196 LOG llevInfo, "[ABT] [suppressed]\n"; 4492 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4197 } 4493 }
4198} 4494}
4199 4495
4200# load additional modules 4496# load additional modules
4201require "cf/$_.pm" for @EXTRA_MODULES; 4497require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines