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.546 by root, Thu May 6 22:57:49 2010 UTC vs.
Revision 1.622 by root, Wed Nov 23 06:05:33 2016 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 ();
62use CBOR::XS ();
58use IO::AIO (); 63use IO::AIO ();
59use Time::HiRes;
60use Compress::LZF; 64use Compress::LZF;
61use Digest::MD5 (); 65use Digest::MD5 ();
62 66
63AnyEvent::detect; 67AnyEvent::detect;
64 68
83our %COMMAND = (); 87our %COMMAND = ();
84our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
85 89
86our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
88our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
91 97
92our $RELOAD; # number of reloads so far, non-zero while in reload 98our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 99our @EVENT;
94our @REFLECT; # set by XS 100our @REFLECT; # set by XS
95our %REFLECT; # set by us 101our %REFLECT; # set by us
96 102
97our $CONFDIR = confdir; 103our $CONFDIR = confdir;
104
98our $DATADIR = datadir; 105our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 106our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 107our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 108our $MAPDIR = "$DATADIR/" . mapdir;
109
102our $LOCALDIR = localdir; 110our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 111our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 112our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 113our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 116our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 117our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 118
111our %RESOURCE; # unused 119#our %RESOURCE; # unused
112 120
113our $OUTPUT_RATE_MIN = 3000; 121our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 122our $OUTPUT_RATE_MAX = 1000000;
115 123
116our $MAX_LINKS = 32; # how many chained exits to follow 124our $MAX_LINKS = 32; # how many chained exits to follow
127our $DB_ENV; 135our $DB_ENV;
128 136
129our @EXTRA_MODULES = qw(pod match mapscript incloader); 137our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 138
131our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 141
133our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
135our $NOW; 145our $NOW;
136 146
137our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
148 158
149our @POST_INIT; 159our @POST_INIT;
150 160
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 161our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 162our $REALLY_UNLOOP; # never set to true, please :)
163
164our $WAIT_FOR_TICK = new Coro::Signal;
165our @WAIT_FOR_TICK_BEGIN;
153 166
154binmode STDOUT; 167binmode STDOUT;
155binmode STDERR; 168binmode STDERR;
156 169
157# read virtual server time, if available 170# read virtual server time, if available
191 204
192=over 4 205=over 4
193 206
194=item $cf::UPTIME 207=item $cf::UPTIME
195 208
196The timestamp of the server start (so not actually an uptime). 209The timestamp of the server start (so not actually an "uptime").
210
211=item $cf::SERVER_TICK
212
213An unsigned integer that starts at zero when the server is started and is
214incremented on every tick.
215
216=item $cf::NOW
217
218The (real) time of the last (current) server tick - updated before and
219after tick processing, so this is useful only as a rough "what time is it
220now" estimate.
221
222=item $cf::TICK
223
224The interval between each server tick, in seconds.
197 225
198=item $cf::RUNTIME 226=item $cf::RUNTIME
199 227
200The time this server has run, starts at 0 and is increased by $cf::TICK on 228The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 229every server tick.
202 230
203=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206 234
207Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
210database environment. 238database environment.
211 239
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 240=item $cf::LOADAVG
221 241
222The current CPU load on the server (alpha-smoothed), as a value between 0 242The 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 243(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
232Configuration for the server, loaded from C</etc/deliantra-server/config>, or 252Configuration for the server, loaded from C</etc/deliantra-server/config>, or
233from wherever your confdir points to. 253from wherever your confdir points to.
234 254
235=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
236 256
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 257These are functions that inhibit the current coroutine one tick.
238returns directly I<after> the tick processing (and consequently, can only wake one thread 258cf::wait_for_tick_begin only returns directly I<after> the tick
259processing (and consequently, can only wake one thread per tick), while
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 260cf::wait_for_tick wakes up all waiters after tick processing.
261
262Note that cf::wait_for_tick will immediately return when the server is not
263ticking, making it suitable for small pauses in threads that need to run
264when the server is paused. If that is not applicable (i.e. you I<really>
265want to wait, use C<$cf::WAIT_FOR_TICK>).
266
267=item $cf::WAIT_FOR_TICK
268
269Note that C<cf::wait_for_tick> is probably the correct thing to use. This
270variable contains a L<Coro::Signal> that is broadcats after every server
271tick. Calling C<< ->wait >> on it will suspend the caller until after the
272next server tick.
240 273
241=cut 274=cut
242 275
243sub wait_for_tick(); 276sub wait_for_tick();
244sub wait_for_tick_begin(); 277sub wait_for_tick_begin();
310)) { 343)) {
311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 344 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
312} 345}
313 346
314$EV::DIED = sub { 347$EV::DIED = sub {
315 Carp::cluck "error in event callback: @_"; 348 warn "error in event callback: $@";
316}; 349};
350
351#############################################################################
352
353sub fork_call(&@);
354sub get_slot($;$$);
317 355
318############################################################################# 356#############################################################################
319 357
320=head2 UTILITY FUNCTIONS 358=head2 UTILITY FUNCTIONS
321 359
342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 380 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
343 $d 381 $d
344 } || "[unable to dump $_[0]: '$@']"; 382 } || "[unable to dump $_[0]: '$@']";
345} 383}
346 384
385=item $scalar = cf::load_file $path
386
387Loads the given file from path and returns its contents. Croaks on error
388and can block.
389
390=cut
391
392sub load_file($) {
393 0 <= aio_load $_[0], my $data
394 or Carp::croak "$_[0]: $!";
395
396 $data
397}
398
399=item $success = cf::replace_file $path, $data, $sync
400
401Atomically replaces the file at the given $path with new $data, and
402optionally $sync the data to disk before replacing the file.
403
404=cut
405
406sub replace_file($$;$) {
407 my ($path, $data, $sync) = @_;
408
409 my $lock = cf::lock_acquire ("replace_file:$path");
410
411 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
412 or return;
413
414 $data = $data->() if ref $data;
415
416 length $data == aio_write $fh, 0, (length $data), $data, 0
417 or return;
418
419 !$sync
420 or !aio_fsync $fh
421 or return;
422
423 aio_close $fh
424 and return;
425
426 aio_rename "$path~", $path
427 and return;
428
429 if ($sync) {
430 $path =~ s%/[^/]*$%%;
431 aio_pathsync $path;
432 }
433
434 1
435}
436
347=item $ref = cf::decode_json $json 437=item $ref = cf::decode_json $json
348 438
349Converts a JSON string into the corresponding perl data structure. 439Converts a JSON string into the corresponding perl data structure.
350 440
351=item $json = cf::encode_json $ref 441=item $json = cf::encode_json $ref
357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 447our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358 448
359sub encode_json($) { $json_coder->encode ($_[0]) } 449sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) } 450sub decode_json($) { $json_coder->decode ($_[0]) }
361 451
452=item $ref = cf::decode_storable $scalar
453
454Same as Coro::Storable::thaw, so blocks.
455
456=cut
457
458BEGIN { *decode_storable = \&Coro::Storable::thaw }
459
460=item $ref = cf::decode_yaml $scalar
461
462Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
463
464=cut
465
466sub decode_yaml($) {
467 fork_call { YAML::XS::Load $_[0] } @_
468}
469
470=item $scalar = cf::decode_cbor $scalar
471
472Same as CBOR::XS::decode_cbor, but takes server ticks into account, so
473blocks. For small amounts of data, C<CBOR::XS::decode_cbor> is the better
474alternative.
475
476=cut
477
478sub decode_cbor($) {
479 # we assume 10mb/s minimum decoding speed (on a ~2ghz machine)
480 cf::get_slot +(length $_[0]) / 10_000_000, 0, "decode_cbor";
481 CBOR::XS::decode_cbor $_[0]
482}
483
484=item $scalar = cf::unlzf $scalar
485
486Same as Compress::LZF::compress, but takes server ticks into account, so
487blocks.
488
489=cut
490
491sub unlzf($) {
492 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
493 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
494 Compress::LZF::decompress $_[0]
495}
496
362=item cf::post_init { BLOCK } 497=item cf::post_init { BLOCK }
363 498
364Execute the given codeblock, I<after> all extensions have been (re-)loaded, 499Execute the given codeblock, I<after> all extensions have been (re-)loaded,
365but I<before> the server starts ticking again. 500but I<before> the server starts ticking again.
366 501
367The cdoeblock will have a single boolean argument to indicate whether this 502The codeblock will have a single boolean argument to indicate whether this
368is a reload or not. 503is a reload or not.
369 504
370=cut 505=cut
371 506
372sub post_init(&) { 507sub post_init(&) {
373 push @POST_INIT, shift; 508 push @POST_INIT, shift;
374} 509}
375 510
511sub _post_init {
512 trace "running post_init jobs";
513
514 # run them in parallel...
515
516 my @join;
517
518 while () {
519 push @join, map &Coro::async ($_, 0), @POST_INIT;
520 @POST_INIT = ();
521
522 @join or last;
523
524 (pop @join)->join;
525 }
526}
527
376=item cf::lock_wait $string 528=item cf::lock_wait $string
377 529
378Wait until the given lock is available. See cf::lock_acquire. 530Wait until the given lock is available. See cf::lock_acquire.
379 531
380=item my $lock = cf::lock_acquire $string 532=item my $lock = cf::lock_acquire $string
381 533
382Wait until the given lock is available and then acquires it and returns 534Wait until the given lock is available and then acquires it and returns
383a L<Guard> object. If the guard object gets destroyed (goes out of scope, 535a L<Guard> object. If the guard object gets destroyed (goes out of scope,
431 EV::periodic $start, $interval, 0, $cb 583 EV::periodic $start, $interval, 0, $cb
432} 584}
433 585
434=item cf::get_slot $time[, $priority[, $name]] 586=item cf::get_slot $time[, $priority[, $name]]
435 587
436Allocate $time seconds of blocking CPU time at priority C<$priority>: 588Allocate $time seconds of blocking CPU time at priority C<$priority>
437This call blocks and returns only when you have at least C<$time> seconds 589(default: 0): This call blocks and returns only when you have at least
438of cpu time till the next tick. The slot is only valid till the next cede. 590C<$time> seconds of cpu time till the next tick. The slot is only valid
591till the next cede.
592
593Background jobs should use a priority less than zero, interactive jobs
594should use 100 or more.
439 595
440The optional C<$name> can be used to identify the job to run. It might be 596The optional C<$name> can be used to identify the job to run. It might be
441used for statistical purposes and should identify the same time-class. 597used for statistical purposes and should identify the same time-class.
442 598
443Useful for short background jobs. 599Useful for short background jobs.
455 my $signal = new Coro::Signal; 611 my $signal = new Coro::Signal;
456 my $busy; 612 my $busy;
457 613
458 while () { 614 while () {
459 next_job: 615 next_job:
616
617 Coro::cede;
460 618
461 my $avail = cf::till_tick; 619 my $avail = cf::till_tick;
462 620
463 for (0 .. $#SLOT_QUEUE) { 621 for (0 .. $#SLOT_QUEUE) {
464 if ($SLOT_QUEUE[$_][0] <= $avail) { 622 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0; 623 $busy = 0;
466 my $job = splice @SLOT_QUEUE, $_, 1, (); 624 my $job = splice @SLOT_QUEUE, $_, 1, ();
467 $job->[2]->send; 625 $job->[2]->send;
468 Coro::cede;
469 goto next_job; 626 goto next_job;
470 } else { 627 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 628 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
472 } 629 }
473 } 630 }
474 631
475 if (@SLOT_QUEUE) { 632 if (@SLOT_QUEUE) {
476 # we do not use wait_for_tick() as it returns immediately when tick is inactive 633 wait_for_tick;
477 push @cf::WAIT_FOR_TICK, $signal;
478 $signal->wait;
479 } else { 634 } else {
480 $busy = 0; 635 $busy = 0;
481 Coro::schedule; 636 Coro::schedule;
482 } 637 }
483 } 638 }
509BEGIN { *async = \&Coro::async_pool } 664BEGIN { *async = \&Coro::async_pool }
510 665
511=item cf::sync_job { BLOCK } 666=item cf::sync_job { BLOCK }
512 667
513The design of Deliantra requires that the main coroutine ($Coro::main) 668The design of Deliantra requires that the main coroutine ($Coro::main)
514is always able to handle events or runnable, as Deliantra is only 669is always able to handle events or is runnable, as Deliantra is only
515partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 670partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
516acceptable. 671acceptable.
517 672
518If it must be done, put the blocking parts into C<sync_job>. This will run 673If it must be done, put the blocking parts into C<sync_job>. This will run
519the given BLOCK in another coroutine while waiting for the result. The 674the given BLOCK in another coroutine while waiting for the result. The
547 702
548 while ($busy) { 703 while ($busy) {
549 if (Coro::nready) { 704 if (Coro::nready) {
550 Coro::cede_notself; 705 Coro::cede_notself;
551 } else { 706 } else {
552 EV::loop EV::LOOP_ONESHOT; 707 EV::run EV::RUN_ONCE;
553 } 708 }
554 } 709 }
555 710
556 my $time = AE::time - $time; 711 my $time = AE::time - $time;
557 712
583 $EXT_CORO{$coro+0} = $coro; 738 $EXT_CORO{$coro+0} = $coro;
584 739
585 $coro 740 $coro
586} 741}
587 742
588=item fork_call { }, $args 743=item fork_call { }, @args
589 744
590Executes the given code block with the given arguments in a seperate 745Executes the given code block with the given arguments in a seperate
591process, returning the results. Everything must be serialisable with 746process, returning the results. Everything must be serialisable with
592Coro::Storable. May, of course, block. Note that the executed sub may 747Coro::Storable. May, of course, block. Note that the executed sub may
593never block itself or use any form of event handling. 748never block itself or use any form of event handling.
594 749
595=cut 750=cut
596 751
752sub post_fork {
753 reset_signals;
754}
755
597sub fork_call(&@) { 756sub fork_call(&@) {
598 my ($cb, @args) = @_; 757 my ($cb, @args) = @_;
599 758
600 # we seemingly have to make a local copy of the whole thing,
601 # otherwise perl prematurely frees the stuff :/
602 # TODO: investigate and fix (likely this will be rather laborious)
603
604 my @res = Coro::Util::fork_eval { 759 my @res = Coro::Util::fork_eval {
605 reset_signals; 760 cf::post_fork;
606 &$cb 761 &$cb
607 }, @args; 762 } @args;
608 763
609 wantarray ? @res : $res[-1] 764 wantarray ? @res : $res[-1]
610} 765}
611 766
612sub objinfo { 767sub objinfo {
734 889
735 my @data; 890 my @data;
736 my $md5; 891 my $md5;
737 892
738 for (0 .. $#$src) { 893 for (0 .. $#$src) {
739 0 <= aio_load $src->[$_], $data[$_] 894 $data[$_] = load_file $src->[$_];
740 or Carp::croak "$src->[$_]: $!";
741 } 895 }
742 896
743 # if processing is expensive, check 897 # if processing is expensive, check
744 # checksum first 898 # checksum first
745 if (1) { 899 if (1) {
758 912
759 return db_get cache => "$id/data"; 913 return db_get cache => "$id/data";
760 } 914 }
761 } 915 }
762 916
763 my $t1 = Time::HiRes::time; 917 my $t1 = EV::time;
764 my $data = $process->(\@data); 918 my $data = $process->(\@data);
765 my $t2 = Time::HiRes::time; 919 my $t2 = EV::time;
766 920
767 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 921 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
768 922
769 db_put cache => "$id/data", $data; 923 db_put cache => "$id/data", $data;
770 db_put cache => "$id/md5" , $md5; 924 db_put cache => "$id/md5" , $md5;
1290=cut 1444=cut
1291 1445
1292############################################################################# 1446#############################################################################
1293# command handling &c 1447# command handling &c
1294 1448
1295=item cf::register_command $name => \&callback($ob,$args); 1449=item cf::register_command $name => \&callback($ob,$args)
1296 1450
1297Register a callback for execution when the client sends the user command 1451Register a callback for execution when the client sends the user command
1298$name. 1452$name.
1299 1453
1300=cut 1454=cut
1306 #warn "registering command '$name/$time' to '$caller'"; 1460 #warn "registering command '$name/$time' to '$caller'";
1307 1461
1308 push @{ $COMMAND{$name} }, [$caller, $cb]; 1462 push @{ $COMMAND{$name} }, [$caller, $cb];
1309} 1463}
1310 1464
1311=item cf::register_extcmd $name => \&callback($pl,$packet); 1465=item cf::register_extcmd $name => \&callback($pl,@args)
1312 1466
1313Register a callback for execution when the client sends an (synchronous) 1467Register a callback for execution when the client sends an (synchronous)
1314extcmd packet. Ext commands will be processed in the order they are 1468extcmd packet. Ext commands will be processed in the order they are
1315received by the server, like other user commands. The first argument is 1469received by the server, like other user commands. The first argument is
1316the logged-in player. Ext commands can only be processed after a player 1470the logged-in player. Ext commands can only be processed after a player
1317has logged in successfully. 1471has logged in successfully.
1318 1472
1319If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1320called.
1321 1474
1475=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1322=item cf::register_exticmd $name => \&callback($ns,$packet); 1480=item cf::register_exticmd $name => \&callback($ns,@args)
1323 1481
1324Register a callback for execution when the client sends an (asynchronous) 1482Register a callback for execution when the client sends an (asynchronous)
1325exticmd packet. Exti commands are processed by the server as soon as they 1483exticmd packet. Exti commands are processed by the server as soon as they
1326are received, i.e. out of order w.r.t. other commands. The first argument 1484are received, i.e. out of order w.r.t. other commands. The first argument
1327is a client socket. Exti commands can be received anytime, even before 1485is a client socket. Exti commands can be received anytime, even before
1328log-in. 1486log-in.
1329 1487
1330If the callback returns something, it is sent back as if reply was being 1488The values will be sent back to the client.
1331called.
1332 1489
1333=cut 1490=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1334 1491
1492Same as C<cf::register_extcmd>, but instead of returning values, the
1493callback needs to clal the C<$reply> function.
1494
1495=cut
1496
1335sub register_extcmd { 1497sub register_extcmd($$) {
1336 my ($name, $cb) = @_; 1498 my ($name, $cb) = @_;
1337 1499
1338 $EXTCMD{$name} = $cb; 1500 $EXTCMD{$name} = $cb;
1339} 1501}
1340 1502
1341sub register_exticmd { 1503sub register_async_extcmd($$) {
1342 my ($name, $cb) = @_; 1504 my ($name, $cb) = @_;
1343 1505
1506 $EXTACMD{$name} = $cb;
1507}
1508
1509sub register_exticmd($$) {
1510 my ($name, $cb) = @_;
1511
1344 $EXTICMD{$name} = $cb; 1512 $EXTICMD{$name} = $cb;
1513}
1514
1515sub register_async_exticmd($$) {
1516 my ($name, $cb) = @_;
1517
1518 $EXTIACMD{$name} = $cb;
1345} 1519}
1346 1520
1347use File::Glob (); 1521use File::Glob ();
1348 1522
1349cf::player->attach ( 1523cf::player->attach (
1363 my ($pl, $buf) = @_; 1537 my ($pl, $buf) = @_;
1364 1538
1365 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1539 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1366 1540
1367 if (ref $msg) { 1541 if (ref $msg) {
1368 my ($type, $reply, @payload) = 1542 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1369 "ARRAY" eq ref $msg
1370 ? @$msg
1371 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1372 1543
1373 my @reply;
1374
1375 if (my $cb = $EXTCMD{$type}) { 1544 if (my $cb = $EXTACMD{$type}) {
1545 $cb->(
1546 $pl,
1547 sub {
1548 $pl->ext_msg ("reply-$reply", @_)
1549 if $reply;
1550 },
1551 @payload
1552 );
1553 } else {
1554 my @reply;
1555
1556 if (my $cb = $EXTCMD{$type}) {
1376 @reply = $cb->($pl, @payload); 1557 @reply = $cb->($pl, @payload);
1558 }
1559
1560 $pl->ext_msg ("reply-$reply", @reply)
1561 if $reply;
1377 } 1562 }
1378
1379 $pl->ext_reply ($reply, @reply)
1380 if $reply;
1381 1563
1382 } else { 1564 } else {
1383 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1565 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1384 } 1566 }
1385 1567
1398 }; 1580 };
1399 1581
1400 $grp 1582 $grp
1401} 1583}
1402 1584
1585sub _ext_cfg_reg($$$$) {
1586 my ($rvar, $varname, $cfgname, $default) = @_;
1587
1588 $cfgname = lc $varname
1589 unless length $cfgname;
1590
1591 $EXT_CFG{$cfgname} = [$rvar, $default];
1592
1593 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1594}
1595
1403sub load_extensions { 1596sub load_extensions {
1404 info "loading extensions..."; 1597 info "loading extensions...";
1598
1599 %EXT_CFG = ();
1405 1600
1406 cf::sync_job { 1601 cf::sync_job {
1407 my %todo; 1602 my %todo;
1408 1603
1409 for my $path (<$LIBDIR/*.ext>) { 1604 for my $path (<$LIBDIR/*.ext>) {
1452 unless exists $done{$_}; 1647 unless exists $done{$_};
1453 } 1648 }
1454 1649
1455 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1650 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1456 1651
1652 my $source = $v->{source};
1653
1654 # support "CONF varname :confname = default" pseudo-statements
1655 $source =~ s{
1656 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1657 }{
1658 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1659 }gmxe;
1660
1457 my $active = eval $v->{source}; 1661 my $active = eval $source;
1458 1662
1459 if (length $@) { 1663 if (length $@) {
1460 error "$v->{path}: $@\n"; 1664 error "$v->{path}: $@\n";
1461 1665
1462 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1666 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1479 1683
1480 while (my ($k, $v) = each %todo) { 1684 while (my ($k, $v) = each %todo) {
1481 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1685 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1482 if exists $v->{meta}{mandatory}; 1686 if exists $v->{meta}{mandatory};
1483 } 1687 }
1688
1689 last;
1484 } 1690 }
1485 } 1691 }
1486 }; 1692 };
1487} 1693}
1488 1694
1646 my $name = $pl->ob->name; 1852 my $name = $pl->ob->name;
1647 1853
1648 $pl->{deny_save} = 1; 1854 $pl->{deny_save} = 1;
1649 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1855 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1650 1856
1651 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1857 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1652 $pl->deactivate; 1858 $pl->deactivate;
1859
1653 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1860 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1654 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1861 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1862 ext::highscore::check ($pl->ob);
1863
1655 $pl->ns->destroy if $pl->ns; 1864 $pl->ns->destroy if $pl->ns;
1656 1865
1657 my $path = playerdir $pl; 1866 my $path = playerdir $pl;
1658 my $temp = "$path~$cf::RUNTIME~deleting~"; 1867 my $temp = "$path~$cf::RUNTIME~deleting~";
1659 aio_rename $path, $temp; 1868 aio_rename $path, $temp;
1745 1954
1746=item $protocol_xml = $player->expand_cfpod ($cfpod) 1955=item $protocol_xml = $player->expand_cfpod ($cfpod)
1747 1956
1748Expand deliantra pod fragments into protocol xml. 1957Expand deliantra pod fragments into protocol xml.
1749 1958
1750=item $player->ext_reply ($msgid, @msg)
1751
1752Sends an ext reply to the player.
1753
1754=cut
1755
1756sub ext_reply($$@) {
1757 my ($self, $id, @msg) = @_;
1758
1759 $self->ns->ext_reply ($id, @msg)
1760}
1761
1762=item $player->ext_msg ($type, @msg) 1959=item $player->ext_msg ($type, @msg)
1763 1960
1764Sends an ext event to the client. 1961Sends an ext event to the client.
1765 1962
1766=cut 1963=cut
1825sub generate_random_map { 2022sub generate_random_map {
1826 my ($self, $rmp) = @_; 2023 my ($self, $rmp) = @_;
1827 2024
1828 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2025 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1829 2026
1830 # mit "rum" bekleckern, nicht
1831 $self->_create_random_map ( 2027 $self->_create_random_map ($rmp);
1832 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1833 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1834 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1835 $rmp->{exit_on_final_map},
1836 $rmp->{xsize}, $rmp->{ysize},
1837 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1838 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1839 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1840 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1841 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1842 (cf::region::find $rmp->{region}), $rmp->{custom}
1843 )
1844} 2028}
1845 2029
1846=item cf::map->register ($regex, $prio) 2030=item cf::map->register ($regex, $prio)
1847 2031
1848Register a handler for the map path matching the given regex at the 2032Register a handler for the map path matching the given regex at the
1899 $base =~ s{[^/]+/?$}{}; 2083 $base =~ s{[^/]+/?$}{};
1900 $path = "$base/$path"; 2084 $path = "$base/$path";
1901 } 2085 }
1902 2086
1903 for ($path) { 2087 for ($path) {
1904 redo if s{//}{/};
1905 redo if s{/\.?/}{/}; 2088 redo if s{/\.?/}{/};
1906 redo if s{/[^/]+/\.\./}{/}; 2089 redo if s{/[^/]+/\.\./}{/};
1907 } 2090 }
1908 2091
1909 $path 2092 $path
1927 2110
1928 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2111 Carp::cluck "unable to resolve path '$path' (base '$base')";
1929 () 2112 ()
1930} 2113}
1931 2114
2115# may re-bless or do other evil things
1932sub init { 2116sub init {
1933 my ($self) = @_; 2117 my ($self) = @_;
1934 2118
1935 $self 2119 $self
1936} 2120}
2001 $self->{load_path} = $path; 2185 $self->{load_path} = $path;
2002 2186
2003 1 2187 1
2004} 2188}
2005 2189
2190# used to laod the header of an original map
2006sub load_header_orig { 2191sub load_header_orig {
2007 my ($self) = @_; 2192 my ($self) = @_;
2008 2193
2009 $self->load_header_from ($self->load_path) 2194 $self->load_header_from ($self->load_path)
2010} 2195}
2011 2196
2197# used to laod the header of an instantiated map
2012sub load_header_temp { 2198sub load_header_temp {
2013 my ($self) = @_; 2199 my ($self) = @_;
2014 2200
2015 $self->load_header_from ($self->save_path) 2201 $self->load_header_from ($self->save_path)
2016} 2202}
2017 2203
2204# called after loading the header from an instantiated map
2018sub prepare_temp { 2205sub prepare_temp {
2019 my ($self) = @_; 2206 my ($self) = @_;
2020 2207
2021 $self->last_access ((delete $self->{last_access}) 2208 $self->last_access ((delete $self->{last_access})
2022 || $cf::RUNTIME); #d# 2209 || $cf::RUNTIME); #d#
2023 # safety 2210 # safety
2024 $self->{instantiate_time} = $cf::RUNTIME 2211 $self->{instantiate_time} = $cf::RUNTIME
2025 if $self->{instantiate_time} > $cf::RUNTIME; 2212 if $self->{instantiate_time} > $cf::RUNTIME;
2026} 2213}
2027 2214
2215# called after loading the header from an original map
2028sub prepare_orig { 2216sub prepare_orig {
2029 my ($self) = @_; 2217 my ($self) = @_;
2030 2218
2031 $self->{load_original} = 1; 2219 $self->{load_original} = 1;
2032 $self->{instantiate_time} = $cf::RUNTIME; 2220 $self->{instantiate_time} = $cf::RUNTIME;
2058sub find { 2246sub find {
2059 my ($path, $origin) = @_; 2247 my ($path, $origin) = @_;
2060 2248
2061 cf::cede_to_tick; 2249 cf::cede_to_tick;
2062 2250
2063 $path = normalise $path, $origin && $origin->path; 2251 $path = normalise $path, $origin;
2064 2252
2065 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2253 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2066 my $guard2 = cf::lock_acquire "map_find:$path"; 2254 my $guard2 = cf::lock_acquire "map_find:$path";
2067 2255
2068 $cf::MAP{$path} || do { 2256 $cf::MAP{$path} || do {
2099 2287
2100 { 2288 {
2101 my $guard = cf::lock_acquire "map_data:$path"; 2289 my $guard = cf::lock_acquire "map_data:$path";
2102 2290
2103 return unless $self->valid; 2291 return unless $self->valid;
2104 return unless $self->in_memory == cf::MAP_SWAPPED; 2292 return unless $self->state == cf::MAP_SWAPPED;
2105
2106 $self->in_memory (cf::MAP_LOADING);
2107 2293
2108 $self->alloc; 2294 $self->alloc;
2109 2295
2110 $self->pre_load; 2296 $self->pre_load;
2111 cf::cede_to_tick; 2297 cf::cede_to_tick;
2112 2298
2299 if (exists $self->{load_path}) {
2113 my $f = new_from_file cf::object::thawer $self->{load_path}; 2300 my $f = new_from_file cf::object::thawer $self->{load_path};
2114 $f->skip_block; 2301 $f->skip_block;
2115 $self->_load_objects ($f) 2302 $self->_load_objects ($f)
2116 or return; 2303 or return;
2117 2304
2118 $self->post_load_original 2305 $self->post_load_original
2119 if delete $self->{load_original}; 2306 if delete $self->{load_original};
2120 2307
2121 if (my $uniq = $self->uniq_path) { 2308 if (my $uniq = $self->uniq_path) {
2122 utf8::encode $uniq; 2309 utf8::encode $uniq;
2123 unless (aio_stat $uniq) { 2310 unless (aio_stat $uniq) {
2124 if (my $f = new_from_file cf::object::thawer $uniq) { 2311 if (my $f = new_from_file cf::object::thawer $uniq) {
2125 $self->clear_unique_items; 2312 $self->clear_unique_items;
2126 $self->_load_objects ($f); 2313 $self->_load_objects ($f);
2127 $f->resolve_delayed_derefs; 2314 $f->resolve_delayed_derefs;
2315 }
2128 } 2316 }
2129 } 2317 }
2130 }
2131 2318
2132 $f->resolve_delayed_derefs; 2319 $f->resolve_delayed_derefs;
2320 } else {
2321 $self->post_load_original
2322 if delete $self->{load_original};
2323 }
2324
2325 $self->state (cf::MAP_INACTIVE);
2133 2326
2134 cf::cede_to_tick; 2327 cf::cede_to_tick;
2135 # now do the right thing for maps 2328 # now do the right thing for maps
2136 $self->link_multipart_objects; 2329 $self->link_multipart_objects;
2137 $self->difficulty ($self->estimate_difficulty) 2330 $self->difficulty ($self->estimate_difficulty)
2141 unless ($self->{deny_activate}) { 2334 unless ($self->{deny_activate}) {
2142 $self->decay_objects; 2335 $self->decay_objects;
2143 $self->fix_auto_apply; 2336 $self->fix_auto_apply;
2144 $self->update_buttons; 2337 $self->update_buttons;
2145 cf::cede_to_tick; 2338 cf::cede_to_tick;
2146 $self->activate; 2339 #$self->activate; # no longer activate maps automatically
2147 } 2340 }
2148 2341
2149 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2150 $self->last_access ($cf::RUNTIME); 2343 $self->last_access ($cf::RUNTIME);
2151
2152 $self->in_memory (cf::MAP_ACTIVE);
2153 } 2344 }
2154 2345
2155 $self->post_load; 2346 $self->post_load;
2347
2348 1
2156} 2349}
2157 2350
2158# customize the map for a given player, i.e. 2351# customize the map for a given player, i.e.
2159# return the _real_ map. used by e.g. per-player 2352# return the _real_ map. used by e.g. per-player
2160# maps to change the path to ~playername/mappath 2353# maps to change the path to ~playername/mappath
2168# if $self->per_party; 2361# if $self->per_party;
2169 2362
2170 $self 2363 $self
2171} 2364}
2172 2365
2173# find and load all maps in the 3x3 area around a map
2174sub load_neighbours {
2175 my ($map) = @_;
2176
2177 my @neigh; # diagonal neighbours
2178
2179 for (0 .. 3) {
2180 my $neigh = $map->tile_path ($_)
2181 or next;
2182 $neigh = find $neigh, $map
2183 or next;
2184 $neigh->load;
2185
2186 # now find the diagonal neighbours
2187 push @neigh,
2188 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2189 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2190 }
2191
2192 for (grep defined $_->[0], @neigh) {
2193 my ($path, $origin) = @$_;
2194 my $neigh = find $path, $origin
2195 or next;
2196 $neigh->load;
2197 }
2198}
2199
2200sub find_sync { 2366sub find_sync {
2201 my ($path, $origin) = @_; 2367 my ($path, $origin) = @_;
2202 2368
2369 # it's a bug to call this from the main context
2203 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2370 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2204 if $Coro::current == $Coro::main; 2371 if $Coro::current == $Coro::main;
2205 2372
2206 find $path, $origin 2373 find $path, $origin
2207} 2374}
2208 2375
2209sub do_load_sync { 2376sub do_load_sync {
2210 my ($map) = @_; 2377 my ($map) = @_;
2211 2378
2379 # it's a bug to call this from the main context
2212 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2380 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2213 if $Coro::current == $Coro::main; 2381 if $Coro::current == $Coro::main;
2214 2382
2215 $map->load; 2383 $map->load;
2216} 2384}
2219our $MAP_PREFETCHER = undef; 2387our $MAP_PREFETCHER = undef;
2220 2388
2221sub find_async { 2389sub find_async {
2222 my ($path, $origin, $load) = @_; 2390 my ($path, $origin, $load) = @_;
2223 2391
2224 $path = normalise $path, $origin && $origin->{path}; 2392 $path = normalise $path, $origin;
2225 2393
2226 if (my $map = $cf::MAP{$path}) { 2394 if (my $map = $cf::MAP{$path}) {
2227 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2395 return $map if !$load || $map->linkable;
2228 } 2396 }
2229 2397
2230 $MAP_PREFETCH{$path} |= $load; 2398 $MAP_PREFETCH{$path} |= $load;
2231 2399
2232 $MAP_PREFETCHER ||= cf::async { 2400 $MAP_PREFETCHER ||= cf::async {
2233 $Coro::current->{desc} = "map prefetcher"; 2401 $Coro::current->{desc} = "map prefetcher";
2234 2402
2235 while (%MAP_PREFETCH) { 2403 while (%MAP_PREFETCH) {
2236 while (my ($k, $v) = each %MAP_PREFETCH) { 2404 for my $k (keys %MAP_PREFETCH) {
2237 if (my $map = find $k) { 2405 if (my $map = find $k) {
2238 $map->load if $v; 2406 $map->load if $MAP_PREFETCH{$k};
2239 } 2407 }
2240 2408
2241 delete $MAP_PREFETCH{$k}; 2409 delete $MAP_PREFETCH{$k};
2242 } 2410 }
2243 } 2411 }
2291sub swap_out { 2459sub swap_out {
2292 my ($self) = @_; 2460 my ($self) = @_;
2293 2461
2294 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2462 my $lock = cf::lock_acquire "map_data:$self->{path}";
2295 2463
2296 return if $self->in_memory != cf::MAP_ACTIVE; 2464 return if !$self->linkable;
2297 return if $self->{deny_save}; 2465 return if $self->{deny_save};
2298 return if $self->players; 2466 return if $self->players;
2299 2467
2300 # first deactivate the map and "unlink" it from the core 2468 # first deactivate the map and "unlink" it from the core
2301 $self->deactivate; 2469 $self->deactivate;
2302 $_->clear_links_to ($self) for values %cf::MAP; 2470 $_->clear_links_to ($self) for values %cf::MAP;
2303 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2304 2472
2305 # then atomically save 2473 # then atomically save
2306 $self->_save; 2474 $self->_save;
2307 2475
2308 # then free the map 2476 # then free the map
2334 2502
2335 return if $self->players; 2503 return if $self->players;
2336 2504
2337 cf::trace "resetting map ", $self->path, "\n"; 2505 cf::trace "resetting map ", $self->path, "\n";
2338 2506
2339 $self->in_memory (cf::MAP_SWAPPED); 2507 $self->state (cf::MAP_SWAPPED);
2340 2508
2341 # need to save uniques path 2509 # need to save uniques path
2342 unless ($self->{deny_save}) { 2510 unless ($self->{deny_save}) {
2343 my $uniq = $self->uniq_path; utf8::encode $uniq; 2511 my $uniq = $self->uniq_path; utf8::encode $uniq;
2344 2512
2497 2665
2498Creates and returns a persistent reference to an object that can be stored as a string. 2666Creates and returns a persistent reference to an object that can be stored as a string.
2499 2667
2500=item $ob = cf::object::deref ($refstring) 2668=item $ob = cf::object::deref ($refstring)
2501 2669
2502returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2670returns the objetc referenced by refstring. may return undef when it cannot find the object,
2503even if the object actually exists. May block. 2671even if the object actually exists. May block.
2504 2672
2505=cut 2673=cut
2506 2674
2507sub deref { 2675sub deref {
2589=item $player_object->may ("access") 2757=item $player_object->may ("access")
2590 2758
2591Returns wether the given player is authorized to access resource "access" 2759Returns wether the given player is authorized to access resource "access"
2592(e.g. "command_wizcast"). 2760(e.g. "command_wizcast").
2593 2761
2762This is implemented by checking a config setting of C<may_access> where
2763C<access> is replaced by the access string. The following alternatives are
2764possible (and are tested in order):
2765
2766=over 4
2767
2768=item * Player is DM
2769
2770The request will succeed.
2771
2772=item * may_access is an array reference
2773
2774If either the player nickname or UUID is in the array, the request will
2775succeed, otherwise it will fail.
2776
2777=item * may_access is a true value
2778
2779The request will succeed.
2780
2781=item * may_access is missing or false
2782
2783The request will fail.
2784
2785=back
2786
2594=cut 2787=cut
2595 2788
2596sub cf::object::player::may { 2789sub cf::object::player::may {
2597 my ($self, $access) = @_; 2790 my ($self, $access) = @_;
2598 2791
2599 $self->flag (cf::FLAG_WIZ) || 2792 $self->flag (cf::FLAG_WIZ) ||
2600 (ref $cf::CFG{"may_$access"} 2793 (ref $cf::CFG{"may_$access"}
2601 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2794 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2602 : $cf::CFG{"may_$access"}) 2795 : $cf::CFG{"may_$access"})
2603} 2796}
2604 2797
2605=item $player_object->enter_link 2798=item $player_object->enter_link
2606 2799
2609The player should be reasonably safe there for short amounts of time (e.g. 2802The player should be reasonably safe there for short amounts of time (e.g.
2610for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2803for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2611though, as the player cannot control the character while it is on the link 2804though, as the player cannot control the character while it is on the link
2612map. 2805map.
2613 2806
2614Will never block. 2807This method will never block, which is the whole reaosn for it's
2808existance: you can I<always> put a player onto the link map, which is the
2809only place to put objects that is guaranteed to exist.
2810
2811A typical usage pattern is to call C<enter_link> synchronously from the
2812server, then start a new thread, do your blocking stuff there and then
2813call C<leave_link> from that thread.
2615 2814
2616=item $player_object->leave_link ($map, $x, $y) 2815=item $player_object->leave_link ($map, $x, $y)
2617 2816
2618Moves the player out of the special C<{link}> map onto the specified 2817Moves the player out of the special C<{link}> map onto the specified
2619map. If the map is not valid (or omitted), the player will be moved back 2818map. If the map is not valid (or omitted), the player will be moved back
2674 # use -1 or undef as default coordinates, not 0, 0 2873 # use -1 or undef as default coordinates, not 0, 0
2675 ($x, $y) = ($map->enter_x, $map->enter_y) 2874 ($x, $y) = ($map->enter_x, $map->enter_y)
2676 if $x <= 0 && $y <= 0; 2875 if $x <= 0 && $y <= 0;
2677 2876
2678 $map->load; 2877 $map->load;
2679 $map->load_neighbours;
2680 2878
2681 return unless $self->contr->active; 2879 return unless $self->contr->active;
2682 2880
2683 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2881 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2684 if ($self->enter_map ($map, $x, $y)) { 2882 if ($self->enter_map ($map, $x, $y)) {
2740 ($path, $x, $y) = (undef, undef, undef); 2938 ($path, $x, $y) = (undef, undef, undef);
2741 } 2939 }
2742 } 2940 }
2743 2941
2744 my $map = eval { 2942 my $map = eval {
2745 my $map = defined $path ? cf::map::find $path : undef; 2943 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2746 2944
2747 if ($map) { 2945 if ($map) {
2748 $map = $map->customise_for ($self); 2946 $map = $map->customise_for ($self);
2749 $map = $check->($map, $x, $y, $self) if $check && $map; 2947 $map = $check->($map, $x, $y, $self) if $check && $map;
2750 } else { 2948 } else {
2840 $Coro::current->{desc} = "enter_exit"; 3038 $Coro::current->{desc} = "enter_exit";
2841 3039
2842 unless (eval { 3040 unless (eval {
2843 $self->deactivate_recursive; # just to be sure 3041 $self->deactivate_recursive; # just to be sure
2844 3042
2845 # random map handling
2846 {
2847 my $guard = cf::lock_acquire "exit_prepare:$exit";
2848
2849 prepare_random_map $exit
2850 if $exit->slaying eq "/!";
2851 }
2852
2853 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3043 my $map = cf::map::normalise $exit->slaying, $exit->map;
2854 my $x = $exit->stats->hp; 3044 my $x = $exit->stats->hp;
2855 my $y = $exit->stats->sp; 3045 my $y = $exit->stats->sp;
3046
3047 # special map handling
3048 my $slaying = $exit->slaying;
3049
3050 # special map handling
3051 if ($slaying eq "/!") {
3052 my $guard = cf::lock_acquire "exit_prepare:$exit";
3053
3054 prepare_random_map $exit
3055 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3056
3057 $map = $exit->slaying;
3058
3059 } elsif ($slaying eq '!up') {
3060 $map = $exit->map->tile_path (cf::TILE_UP);
3061 $x = $exit->x;
3062 $y = $exit->y;
3063
3064 } elsif ($slaying eq '!down') {
3065 $map = $exit->map->tile_path (cf::TILE_DOWN);
3066 $x = $exit->x;
3067 $y = $exit->y;
3068 }
2856 3069
2857 $self->goto ($map, $x, $y); 3070 $self->goto ($map, $x, $y);
2858 3071
2859 # if exit is damned, update players death & WoR home-position 3072 # if exit is damned, update players death & WoR home-position
2860 $self->contr->savebed ($map, $x, $y) 3073 $self->contr->savebed ($map, $x, $y)
2875 3088
2876=head3 cf::client 3089=head3 cf::client
2877 3090
2878=over 4 3091=over 4
2879 3092
2880=item $client->send_drawinfo ($text, $flags)
2881
2882Sends a drawinfo packet to the client. Circumvents output buffering so
2883should not be used under normal circumstances.
2884
2885=cut
2886
2887sub cf::client::send_drawinfo {
2888 my ($self, $text, $flags) = @_;
2889
2890 utf8::encode $text;
2891 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2892}
2893
2894=item $client->send_big_packet ($pkt) 3093=item $client->send_big_packet ($pkt)
2895 3094
2896Like C<send_packet>, but tries to compress large packets, and fragments 3095Like C<send_packet>, but tries to compress large packets, and fragments
2897them as required. 3096them as required.
2898 3097
2916 $self->send_packet ($pkt); 3115 $self->send_packet ($pkt);
2917} 3116}
2918 3117
2919=item $client->send_msg ($channel, $msg, $color, [extra...]) 3118=item $client->send_msg ($channel, $msg, $color, [extra...])
2920 3119
2921Send a drawinfo or msg packet to the client, formatting the msg for the 3120Send a msg packet to the client, formatting the msg for the client if
2922client if neccessary. C<$type> should be a string identifying the type of 3121necessary. C<$type> should be a string identifying the type of the
2923the message, with C<log> being the default. If C<$color> is negative, suppress 3122message, with C<log> being the default. If C<$color> is negative, suppress
2924the message unless the client supports the msg packet. 3123the message unless the client supports the msg packet.
2925 3124
2926=cut 3125=cut
2927 3126
2928# non-persistent channels (usually the info channel) 3127# non-persistent channels (usually the info channel)
3033 id => "death", 3232 id => "death",
3034 title => "Death", 3233 title => "Death",
3035 reply => undef, 3234 reply => undef,
3036 tooltip => "Reason for and more info about your most recent death", 3235 tooltip => "Reason for and more info about your most recent death",
3037 }, 3236 },
3237 "c/fatal" => {
3238 id => "fatal",
3239 title => "Fatal Error",
3240 reply => undef,
3241 tooltip => "Reason for the server disconnect",
3242 },
3038 "c/say" => $SAY_CHANNEL, 3243 "c/say" => $SAY_CHANNEL,
3039 "c/chat" => $CHAT_CHANNEL, 3244 "c/chat" => $CHAT_CHANNEL,
3040); 3245);
3041 3246
3042sub cf::client::send_msg { 3247sub cf::client::send_msg {
3085=cut 3290=cut
3086 3291
3087sub cf::client::ext_msg($$@) { 3292sub cf::client::ext_msg($$@) {
3088 my ($self, $type, @msg) = @_; 3293 my ($self, $type, @msg) = @_;
3089 3294
3090 if ($self->extcmd == 2) {
3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3295 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3092 } elsif ($self->extcmd == 1) { # TODO: remove
3093 push @msg, msgtype => "event_$type";
3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3095 }
3096}
3097
3098=item $client->ext_reply ($msgid, @msg)
3099
3100Sends an ext reply to the client.
3101
3102=cut
3103
3104sub cf::client::ext_reply($$@) {
3105 my ($self, $id, @msg) = @_;
3106
3107 if ($self->extcmd == 2) {
3108 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3109 } elsif ($self->extcmd == 1) {
3110 #TODO: version 1, remove
3111 unshift @msg, msgtype => "reply", msgid => $id;
3112 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3113 }
3114} 3296}
3115 3297
3116=item $success = $client->query ($flags, "text", \&cb) 3298=item $success = $client->query ($flags, "text", \&cb)
3117 3299
3118Queues a query to the client, calling the given callback with 3300Queues a query to the client, calling the given callback with
3138 3320
3139 $self->send_packet ($self->{query_queue}[0][0]) 3321 $self->send_packet ($self->{query_queue}[0][0])
3140 if @{ $self->{query_queue} } == 1; 3322 if @{ $self->{query_queue} } == 1;
3141 3323
3142 1 3324 1
3325}
3326
3327=item $client->update_command_faces
3328
3329=cut
3330
3331our %COMMAND_FACE;
3332
3333sub cf::client::update_command_faces {
3334 my ($self) = @_;
3335
3336 my @faces = grep $_,
3337 $COMMAND_FACE{preferred},
3338 $COMMAND_FACE{standard},
3339 $COMMAND_FACE{skill},
3340 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3341 $COMMAND_FACE{emote},
3342 ;
3343
3344 $self->send_face ($_)
3345 for @faces;
3346 $self->flush_fx;
3347
3348 $self->ext_msg (command_list => @faces);
3349}
3350
3351=item cf::client::set_command_face $type, $commands
3352
3353=cut
3354
3355sub cf::client::set_command_face {
3356 my ($type, $list) = @_;
3357
3358 my $idx = &cf::face::set ( #d# ugly forward reference
3359 "command_list/$type" => cf::FT_RSRC,
3360 JSON::XS->new->utf8->encode ([ sort @$list ])
3361 );
3362
3363 $COMMAND_FACE{$type} = $idx;
3143} 3364}
3144 3365
3145cf::client->attach ( 3366cf::client->attach (
3146 on_connect => sub { 3367 on_connect => sub {
3147 my ($ns) = @_; 3368 my ($ns) = @_;
3173 my ($ns, $buf) = @_; 3394 my ($ns, $buf) = @_;
3174 3395
3175 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3396 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3176 3397
3177 if (ref $msg) { 3398 if (ref $msg) {
3178 my ($type, $reply, @payload) = 3399 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3179 "ARRAY" eq ref $msg
3180 ? @$msg
3181 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3182 3400
3183 my @reply;
3184
3185 if (my $cb = $EXTICMD{$type}) { 3401 if (my $cb = $EXTIACMD{$type}) {
3402 $cb->(
3403 $ns,
3404 sub {
3405 $ns->ext_msg ("reply-$reply", @_)
3406 if $reply;
3407 },
3408 @payload
3409 );
3410 } else {
3411 my @reply;
3412
3413 if (my $cb = $EXTICMD{$type}) {
3186 @reply = $cb->($ns, @payload); 3414 @reply = $cb->($ns, @payload);
3415 }
3416
3417 $ns->ext_msg ("reply-$reply", @reply)
3418 if $reply;
3187 } 3419 }
3188
3189 $ns->ext_reply ($reply, @reply)
3190 if $reply;
3191
3192 } else { 3420 } else {
3193 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3421 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3194 } 3422 }
3195 3423
3196 cf::override; 3424 cf::override;
3364=cut 3592=cut
3365 3593
3366############################################################################# 3594#############################################################################
3367# the server's init and main functions 3595# the server's init and main functions
3368 3596
3597{
3598 package cf::face;
3599
3600 our %HASH; # hash => idx
3601 our @DATA; # dynamically-created facedata, only faceste 0 used
3602 our @FOFS; # file offset, if > 0
3603 our @SIZE; # size of face, in octets
3604 our @META; # meta hash of face, if any
3605 our $DATAFH; # facedata filehandle
3606
3607 # internal api, not finalised
3608 sub set {
3609 my ($name, $type, $data) = @_;
3610
3611 my $idx = cf::face::find $name;
3612
3613 if ($idx) {
3614 delete $HASH{cf::face::get_csum $idx};
3615 } else {
3616 $idx = cf::face::alloc $name;
3617 }
3618
3619 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3620
3621 cf::face::set_type $idx, $type;
3622 cf::face::set_csum $idx, 0, $hash;
3623
3624 # we need to destroy the SV itself, not just modify it, as a running ix
3625 # might hold a reference to it: "delete" achieves that.
3626 delete $FOFS[0][$idx];
3627 delete $DATA[0][$idx];
3628 $DATA[0][$idx] = $data;
3629 $SIZE[0][$idx] = length $data;
3630 delete $META[$idx];
3631 $HASH{$hash} = $idx;#d#
3632
3633 $idx
3634 }
3635
3636 sub _get_data($$$) {
3637 my ($idx, $set, $cb) = @_;
3638
3639 if (defined $DATA[$set][$idx]) {
3640 $cb->($DATA[$set][$idx]);
3641 } elsif (my $fofs = $FOFS[$set][$idx]) {
3642 my $size = $SIZE[$set][$idx];
3643 my $buf;
3644 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3645 if ($_[0] == $size) {
3646 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3647 $cb->($buf);
3648 } else {
3649 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3650 }
3651 };
3652 } else {
3653 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3654 }
3655 }
3656
3657 # rather ineffient
3658 sub cf::face::get_data($;$) {
3659 my ($idx, $set) = @_;
3660
3661 _get_data $idx, $set, Coro::rouse_cb;
3662 Coro::rouse_wait
3663 }
3664
3665 sub cf::face::ix {
3666 my ($ns, $set, $idx, $pri) = @_;
3667
3668 _get_data $idx, $set, sub {
3669 $ns->ix_send ($idx, $pri, $_[0]);
3670 };
3671 }
3672}
3673
3369sub load_facedata($) { 3674sub load_facedata($) {
3370 my ($path) = @_; 3675 my ($path) = @_;
3371 3676
3372 # HACK to clear player env face cache, we need some signal framework
3373 # for this (global event?)
3374 %ext::player_env::MUSIC_FACE_CACHE = ();
3375
3376 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3677 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3377 3678
3378 trace "loading facedata from $path\n"; 3679 trace "loading facedata from $path\n";
3379 3680
3380 0 < aio_load $path, my $facedata 3681 my $facedata = decode_storable load_file "$path/faceinfo";
3381 or die "$path: $!";
3382
3383 $facedata = Coro::Storable::thaw $facedata;
3384 3682
3385 $facedata->{version} == 2 3683 $facedata->{version} == 2
3386 or cf::cleanup "$path: version mismatch, cannot proceed."; 3684 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3387 3685
3388 # patch in the exptable 3686 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3389 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3687 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3390 $facedata->{resource}{"res/exp_table"} = { 3688
3391 type => FT_RSRC, 3689 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3392 data => $exp_table, 3690
3393 hash => (Digest::MD5::md5 $exp_table), 3691 # BEGIN ATOMIC
3394 }; 3692 # from here on, everything must be atomic - no thread switch allowed
3395 cf::cede_to_tick; 3693 my $t1 = EV::time;
3396 3694
3397 { 3695 {
3398 my $faces = $facedata->{faceinfo}; 3696 my $faces = $facedata->{faceinfo};
3399 3697
3400 while (my ($face, $info) = each %$faces) { 3698 for my $face (sort keys %$faces) {
3699 my $info = $faces->{$face};
3401 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3700 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3402 3701
3403 cf::face::set_visibility $idx, $info->{visibility}; 3702 cf::face::set_visibility $idx, $info->{visibility};
3404 cf::face::set_magicmap $idx, $info->{magicmap}; 3703 cf::face::set_magicmap $idx, $info->{magicmap};
3405 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3704 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3406 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3705 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3407 3706 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3408 cf::cede_to_tick; 3707 $cf::face::HASH{$info->{hash64}} = $idx;
3708 delete $cf::face::META[$idx];
3409 } 3709 }
3410 3710
3411 while (my ($face, $info) = each %$faces) { 3711 while (my ($face, $info) = each %$faces) {
3412 next unless $info->{smooth}; 3712 next unless $info->{smooth};
3413 3713
3418 cf::face::set_smooth $idx, $smooth; 3718 cf::face::set_smooth $idx, $smooth;
3419 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3719 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3420 } else { 3720 } else {
3421 error "smooth face '$info->{smooth}' not found for face '$face'"; 3721 error "smooth face '$info->{smooth}' not found for face '$face'";
3422 } 3722 }
3423
3424 cf::cede_to_tick;
3425 } 3723 }
3426 } 3724 }
3427 3725
3428 { 3726 {
3429 my $anims = $facedata->{animinfo}; 3727 my $anims = $facedata->{animinfo};
3430 3728
3431 while (my ($anim, $info) = each %$anims) { 3729 while (my ($anim, $info) = each %$anims) {
3432 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3730 cf::anim::set $anim, $info->{frames}, $info->{facings};
3433 cf::cede_to_tick;
3434 } 3731 }
3435 3732
3436 cf::anim::invalidate_all; # d'oh 3733 cf::anim::invalidate_all; # d'oh
3437 } 3734 }
3438 3735
3439 { 3736 {
3440 my $res = $facedata->{resource}; 3737 my $res = $facedata->{resource};
3441 3738
3442 while (my ($name, $info) = each %$res) { 3739 while (my ($name, $info) = each %$res) {
3443 if (defined $info->{type}) { 3740 if (defined (my $type = $info->{type})) {
3741 # TODO: different hash - must free and use new index, or cache ixface data queue
3444 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3742 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3445 3743
3446 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3447 cf::face::set_type $idx, $info->{type}; 3744 cf::face::set_type $idx, $type;
3745 cf::face::set_csum $idx, 0, $info->{hash};
3746 $cf::face::SIZE[0][$idx] = $info->{size};
3747 $cf::face::FOFS[0][$idx] = $info->{fofs};
3748 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3749 $cf::face::HASH{$info->{hash}} = $idx;
3448 } else { 3750 } else {
3449 $RESOURCE{$name} = $info; # unused 3751# $RESOURCE{$name} = $info; # unused
3450 } 3752 }
3451
3452 cf::cede_to_tick;
3453 } 3753 }
3454 } 3754 }
3755
3756 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3757
3758 # HACK to clear player env face cache, we need some signal framework
3759 # for this (global event?)
3760 %ext::player_env::MUSIC_FACE_CACHE = ();
3761
3762 # END ATOMIC
3763
3764 cf::debug "facedata atomic update time ", EV::time - $t1;
3455 3765
3456 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3766 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3767
3768 aio_close $fh if $fh; # close old facedata
3457 3769
3458 1 3770 1
3459} 3771}
3460 3772
3461register_exticmd fx_want => sub { 3773register_exticmd fx_want => sub {
3472 my $status = load_resource_file_ $_[0]; 3784 my $status = load_resource_file_ $_[0];
3473 get_slot 0.1, 100; 3785 get_slot 0.1, 100;
3474 cf::arch::commit_load; 3786 cf::arch::commit_load;
3475 3787
3476 $status 3788 $status
3789}
3790
3791sub reload_exp_table {
3792 _reload_exp_table;
3793
3794 cf::face::set
3795 "res/exp_table" => FT_RSRC,
3796 JSON::XS->new->utf8->canonical->encode (
3797 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3798 );
3799}
3800
3801sub reload_materials {
3802 _reload_materials;
3477} 3803}
3478 3804
3479sub reload_regions { 3805sub reload_regions {
3480 # HACK to clear player env face cache, we need some signal framework 3806 # HACK to clear player env face cache, we need some signal framework
3481 # for this (global event?) 3807 # for this (global event?)
3489 if exists $_->{match}; 3815 if exists $_->{match};
3490 } 3816 }
3491} 3817}
3492 3818
3493sub reload_facedata { 3819sub reload_facedata {
3494 load_facedata "$DATADIR/facedata" 3820 load_facedata $DATADIR
3495 or die "unable to load facedata\n"; 3821 or die "unable to load facedata\n";
3496} 3822}
3497 3823
3498sub reload_archetypes { 3824sub reload_archetypes {
3499 load_resource_file "$DATADIR/archetypes" 3825 load_resource_file "$DATADIR/archetypes"
3500 or die "unable to load archetypes\n"; 3826 or die "unable to load archetypes\n";
3827
3828 cf::face::set
3829 "res/skill_info" => FT_RSRC,
3830 JSON::XS->new->utf8->canonical->encode (
3831 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3832 );
3833
3834 cf::face::set
3835 "res/spell_paths" => FT_RSRC,
3836 JSON::XS->new->utf8->canonical->encode (
3837 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3838 );
3839
3840 # command completion
3841 my @commands;
3842
3843 for (0..cf::arch::skillvec_size - 1) {
3844 my $skill = cf::arch::skillvec $_;
3845 my $name = $skill->name;
3846 my $flags = cf::skill_flags $skill->subtype;
3847
3848 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3849 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3850 }
3851
3852 cf::client::set_command_face skill => \@commands;
3501} 3853}
3502 3854
3503sub reload_treasures { 3855sub reload_treasures {
3504 load_resource_file "$DATADIR/treasures" 3856 load_resource_file "$DATADIR/treasures"
3505 or die "unable to load treasurelists\n"; 3857 or die "unable to load treasurelists\n";
3506} 3858}
3507 3859
3508sub reload_sound { 3860sub reload_sound {
3509 trace "loading sound config from $DATADIR/sound\n"; 3861 trace "loading sound config from $DATADIR/sound\n";
3510 3862
3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512 or die "$DATADIR/sound $!";
3513
3514 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3863 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3515 3864
3516 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3865 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517 my $sound = $soundconf->{compat}[$_] 3866 my $sound = $soundconf->{compat}[$_]
3518 or next; 3867 or next;
3519 3868
3529} 3878}
3530 3879
3531sub reload_resources { 3880sub reload_resources {
3532 trace "reloading resource files...\n"; 3881 trace "reloading resource files...\n";
3533 3882
3534 reload_exp_table;
3535 reload_materials; 3883 reload_materials;
3536 reload_facedata; 3884 reload_facedata;
3885 reload_exp_table;
3537 reload_sound; 3886 reload_sound;
3538 reload_archetypes; 3887 reload_archetypes;
3539 reload_regions; 3888 reload_regions;
3540 reload_treasures; 3889 reload_treasures;
3541 3890
3543} 3892}
3544 3893
3545sub reload_config { 3894sub reload_config {
3546 trace "reloading config file...\n"; 3895 trace "reloading config file...\n";
3547 3896
3548 0 < aio_load "$CONFDIR/config", my $config 3897 my $config = load_file "$CONFDIR/config";
3549 or die "$CONFDIR/config: $!";
3550
3551 utf8::decode $config; 3898 utf8::decode $config;
3552 3899 *CFG = decode_yaml $config;
3553 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3554 *CFG = YAML::XS::Load $config;
3555 3900
3556 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3901 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3557 3902
3558 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3903 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3559 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3904 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3585 seek $fh, 0, 0; 3930 seek $fh, 0, 0;
3586 print $fh $$; 3931 print $fh $$;
3587} 3932}
3588 3933
3589sub main_loop { 3934sub main_loop {
3590 trace "EV::loop starting\n"; 3935 trace "EV::run starting\n";
3591 if (1) { 3936 if (1) {
3592 EV::loop; 3937 EV::run;
3593 } 3938 }
3594 trace "EV::loop returned\n"; 3939 trace "EV::run returned\n";
3595 goto &main_loop unless $REALLY_UNLOOP; 3940 goto &main_loop unless $REALLY_UNLOOP;
3596} 3941}
3597 3942
3598sub main { 3943sub main {
3599 cf::init_globals; # initialise logging 3944 cf::init_globals; # initialise logging
3600 3945
3601 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3946 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3602 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3947 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3603 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3948 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3604 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3949 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3605 3950
3606 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3951 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3607 3952
3608 # we must not ever block the main coroutine 3953 # we must not ever block the main coroutine
3609 local $Coro::idle = sub { 3954 $Coro::idle = sub {
3610 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3955 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3611 (async { 3956 (async {
3612 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3957 $Coro::current->{desc} = "IDLE BUG HANDLER";
3613 EV::loop EV::LOOP_ONESHOT; 3958 EV::run EV::RUN_ONCE;
3614 })->prio (Coro::PRIO_MAX); 3959 })->prio (Coro::PRIO_MAX);
3615 }; 3960 };
3616 3961
3617 evthread_start IO::AIO::poll_fileno; 3962 evthread_start IO::AIO::poll_fileno;
3618 3963
3619 cf::sync_job { 3964 cf::sync_job {
3620 cf::incloader::init (); 3965 cf::incloader::init ();
3966
3967 db_init;
3621 3968
3622 cf::init_anim; 3969 cf::init_anim;
3623 cf::init_attackmess; 3970 cf::init_attackmess;
3624 cf::init_dynamic; 3971 cf::init_dynamic;
3625 3972
3626 cf::load_settings; 3973 cf::load_settings;
3627 3974
3628 reload_resources; 3975 reload_resources;
3629 reload_config; 3976 reload_config;
3630 db_init;
3631 3977
3632 cf::init_uuid; 3978 cf::init_uuid;
3633 cf::init_signals; 3979 cf::init_signals;
3634 cf::init_skills; 3980 cf::init_skills;
3635 3981
3643 3989
3644 # no (long-running) fork's whatsoever before this point(!) 3990 # no (long-running) fork's whatsoever before this point(!)
3645 use POSIX (); 3991 use POSIX ();
3646 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3992 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3647 3993
3648 (pop @POST_INIT)->(0) while @POST_INIT; 3994 cf::_post_init 0;
3649 }; 3995 };
3650 3996
3651 cf::object::thawer::errors_are_fatal 0; 3997 cf::object::thawer::errors_are_fatal 0;
3652 info "parse errors in files are no longer fatal from this point on.\n"; 3998 info "parse errors in files are no longer fatal from this point on.\n";
3653 3999
3654 my $free_main; $free_main = EV::idle sub { 4000 AE::postpone {
3655 undef $free_main;
3656 undef &main; # free gobs of memory :) 4001 undef &main; # free gobs of memory :)
3657 }; 4002 };
3658 4003
3659 goto &main_loop; 4004 goto &main_loop;
3660} 4005}
3817 4162
3818 cf::write_runtime_sync; # external watchdog should not bark 4163 cf::write_runtime_sync; # external watchdog should not bark
3819 4164
3820 trace "emergency_perl_save: flushing outstanding aio requests"; 4165 trace "emergency_perl_save: flushing outstanding aio requests";
3821 while (IO::AIO::nreqs || BDB::nreqs) { 4166 while (IO::AIO::nreqs || BDB::nreqs) {
3822 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 4167 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3823 } 4168 }
3824 4169
3825 cf::write_runtime_sync; # external watchdog should not bark 4170 cf::write_runtime_sync; # external watchdog should not bark
3826 }; 4171 };
3827 4172
3876 4221
3877 my $t1 = AE::time; 4222 my $t1 = AE::time;
3878 4223
3879 while ($RELOAD) { 4224 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl"; 4225 cf::get_slot 0.1, -1, "reload_perl";
3881 info "reloading..."; 4226 info "perl_reload: reloading...";
3882 4227
3883 trace "entering sync_job"; 4228 trace "perl_reload: entering sync_job";
3884 4229
3885 cf::sync_job { 4230 cf::sync_job {
3886 #cf::emergency_save; 4231 #cf::emergency_save;
3887 4232
3888 trace "cancelling all extension coros"; 4233 trace "perl_reload: cancelling all extension coros";
3889 $_->cancel for values %EXT_CORO; 4234 $_->cancel for values %EXT_CORO;
3890 %EXT_CORO = (); 4235 %EXT_CORO = ();
3891 4236
3892 trace "removing commands"; 4237 trace "perl_reload: removing commands";
3893 %COMMAND = (); 4238 %COMMAND = ();
3894 4239
3895 trace "removing ext/exti commands"; 4240 trace "perl_reload: removing ext/exti commands";
3896 %EXTCMD = (); 4241 %EXTCMD = ();
3897 %EXTICMD = (); 4242 %EXTICMD = ();
3898 4243
3899 trace "unloading/nuking all extensions"; 4244 trace "perl_reload: unloading/nuking all extensions";
3900 for my $pkg (@EXTS) { 4245 for my $pkg (@EXTS) {
3901 trace "... unloading $pkg"; 4246 trace "... unloading $pkg";
3902 4247
3903 if (my $cb = $pkg->can ("unload")) { 4248 if (my $cb = $pkg->can ("unload")) {
3904 eval { 4249 eval {
3909 4254
3910 trace "... clearing $pkg"; 4255 trace "... clearing $pkg";
3911 clear_package $pkg; 4256 clear_package $pkg;
3912 } 4257 }
3913 4258
3914 trace "unloading all perl modules loaded from $LIBDIR"; 4259 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3915 while (my ($k, $v) = each %INC) { 4260 while (my ($k, $v) = each %INC) {
3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4261 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3917 4262
3918 trace "... unloading $k"; 4263 trace "... unloading $k";
3919 delete $INC{$k}; 4264 delete $INC{$k};
3926 } 4271 }
3927 4272
3928 clear_package $k; 4273 clear_package $k;
3929 } 4274 }
3930 4275
3931 trace "getting rid of safe::, as good as possible"; 4276 trace "perl_reload: getting rid of safe::, as good as possible";
3932 clear_package "safe::$_" 4277 clear_package "safe::$_"
3933 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4278 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3934 4279
3935 trace "unloading cf.pm \"a bit\""; 4280 trace "perl_reload: unloading cf.pm \"a bit\"";
3936 delete $INC{"cf.pm"}; 4281 delete $INC{"cf.pm"};
3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4282 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3938 4283
3939 # don't, removes xs symbols, too, 4284 # don't, removes xs symbols, too,
3940 # and global variables created in xs 4285 # and global variables created in xs
3941 #clear_package __PACKAGE__; 4286 #clear_package __PACKAGE__;
3942 4287
3943 info "unload completed, starting to reload now"; 4288 info "perl_reload: unload completed, starting to reload now";
3944 4289
3945 trace "reloading cf.pm"; 4290 trace "perl_reload: reloading cf.pm";
3946 require cf; 4291 require cf;
3947 cf::_connect_to_perl_1; 4292 cf::_connect_to_perl_1;
3948 4293
3949 trace "loading config and database again"; 4294 trace "perl_reload: loading config and database again";
3950 cf::reload_config; 4295 cf::reload_config;
3951 4296
3952 trace "loading extensions"; 4297 trace "perl_reload: loading extensions";
3953 cf::load_extensions; 4298 cf::load_extensions;
3954 4299
3955 if ($REATTACH_ON_RELOAD) { 4300 if ($REATTACH_ON_RELOAD) {
3956 trace "reattaching attachments to objects/players"; 4301 trace "perl_reload: reattaching attachments to objects/players";
3957 _global_reattach; # objects, sockets 4302 _global_reattach; # objects, sockets
3958 trace "reattaching attachments to maps"; 4303 trace "perl_reload: reattaching attachments to maps";
3959 reattach $_ for values %MAP; 4304 reattach $_ for values %MAP;
3960 trace "reattaching attachments to players"; 4305 trace "perl_reload: reattaching attachments to players";
3961 reattach $_ for values %PLAYER; 4306 reattach $_ for values %PLAYER;
3962 } 4307 }
3963 4308
3964 trace "running post_init jobs"; 4309 cf::_post_init 1;
3965 (pop @POST_INIT)->(1) while @POST_INIT;
3966 4310
3967 trace "leaving sync_job"; 4311 trace "perl_reload: leaving sync_job";
3968 4312
3969 1 4313 1
3970 } or do { 4314 } or do {
3971 error $@; 4315 error $@;
3972 cf::cleanup "error while reloading, exiting."; 4316 cf::cleanup "perl_reload: error, exiting.";
3973 }; 4317 };
3974 4318
3975 info "reloaded";
3976 --$RELOAD; 4319 --$RELOAD;
3977 } 4320 }
3978 4321
3979 $t1 = AE::time - $t1; 4322 $t1 = AE::time - $t1;
3980 info "reload completed in ${t1}s\n"; 4323 info "perl_reload: completed in ${t1}s\n";
3981}; 4324};
3982 4325
3983our $RELOAD_WATCHER; # used only during reload 4326our $RELOAD_WATCHER; # used only during reload
3984 4327
3985sub reload_perl() { 4328sub reload_perl() {
4010 4353
4011############################################################################# 4354#############################################################################
4012 4355
4013my $bug_warning = 0; 4356my $bug_warning = 0;
4014 4357
4015our @WAIT_FOR_TICK;
4016our @WAIT_FOR_TICK_BEGIN;
4017
4018sub wait_for_tick() { 4358sub wait_for_tick() {
4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4359 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4020 4360
4021 my $signal = new Coro::Signal; 4361 $WAIT_FOR_TICK->wait;
4022 push @WAIT_FOR_TICK, $signal;
4023 $signal->wait;
4024} 4362}
4025 4363
4026sub wait_for_tick_begin() { 4364sub wait_for_tick_begin() {
4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4365 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4028 4366
4029 my $signal = new Coro::Signal; 4367 my $signal = new Coro::Signal;
4030 push @WAIT_FOR_TICK_BEGIN, $signal; 4368 push @WAIT_FOR_TICK_BEGIN, $signal;
4031 $signal->wait; 4369 $signal->wait;
4032} 4370}
4036 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4374 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4037 unless ++$bug_warning > 10; 4375 unless ++$bug_warning > 10;
4038 return; 4376 return;
4039 } 4377 }
4040 4378
4041 cf::server_tick; # one server iteration 4379 cf::one_tick; # one server iteration
4042 4380
4043 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4381 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4044 4382
4045 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4383 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4046 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4384 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4052 } 4390 }
4053 4391
4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4392 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4055 $sig->send; 4393 $sig->send;
4056 } 4394 }
4057 while (my $sig = shift @WAIT_FOR_TICK) { 4395 $WAIT_FOR_TICK->broadcast;
4058 $sig->send;
4059 }
4060 4396
4061 $LOAD = ($NOW - $TICK_START) / $TICK; 4397 $LOAD = ($NOW - $TICK_START) / $TICK;
4062 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4063 4399
4064 if (0) { 4400 if (0) {
4070 } 4406 }
4071} 4407}
4072 4408
4073{ 4409{
4074 # configure BDB 4410 # configure BDB
4411 info "initialising database";
4075 4412
4076 BDB::min_parallel 16; 4413 BDB::min_parallel 16;
4077 BDB::max_poll_reqs $TICK * 0.1; 4414 BDB::max_poll_reqs $TICK * 0.1;
4078 $AnyEvent::BDB::WATCHER->priority (1); 4415 #$AnyEvent::BDB::WATCHER->priority (1);
4079 4416
4080 unless ($DB_ENV) { 4417 unless ($DB_ENV) {
4081 $DB_ENV = BDB::db_env_create; 4418 $DB_ENV = BDB::db_env_create;
4082 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4419 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4083 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4420 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4108 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4445 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4109 }; 4446 };
4110 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4447 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4111 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4448 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4112 }; 4449 };
4450
4451 info "database initialised";
4113} 4452}
4114 4453
4115{ 4454{
4116 # configure IO::AIO 4455 # configure IO::AIO
4117 4456
4457 info "initialising aio";
4118 IO::AIO::min_parallel 8; 4458 IO::AIO::min_parallel 8;
4119 IO::AIO::max_poll_time $TICK * 0.1; 4459 IO::AIO::max_poll_time $TICK * 0.1;
4120 undef $AnyEvent::AIO::WATCHER; 4460 undef $AnyEvent::AIO::WATCHER;
4461 info "aio initialised";
4121} 4462}
4122 4463
4123my $_log_backtrace; 4464our $_log_backtrace;
4465our $_log_backtrace_last;
4124 4466
4125sub _log_backtrace { 4467sub _log_backtrace {
4126 my ($msg, @addr) = @_; 4468 my ($msg, @addr) = @_;
4127 4469
4128 $msg =~ s/\n//; 4470 $msg =~ s/\n$//;
4129 4471
4472 if ($_log_backtrace_last eq $msg) {
4473 LOG llevInfo, "[ABT] $msg\n";
4474 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4130 # limit the # of concurrent backtraces 4475 # limit the # of concurrent backtraces
4131 if ($_log_backtrace < 2) { 4476 } elsif ($_log_backtrace < 2) {
4477 $_log_backtrace_last = $msg;
4132 ++$_log_backtrace; 4478 ++$_log_backtrace;
4133 my $perl_bt = Carp::longmess $msg; 4479 my $perl_bt = Carp::longmess $msg;
4134 async { 4480 async {
4135 $Coro::current->{desc} = "abt $msg"; 4481 $Coro::current->{desc} = "abt $msg";
4136 4482
4156 LOG llevInfo, "[ABT] $_\n" for @bt; 4502 LOG llevInfo, "[ABT] $_\n" for @bt;
4157 --$_log_backtrace; 4503 --$_log_backtrace;
4158 }; 4504 };
4159 } else { 4505 } else {
4160 LOG llevInfo, "[ABT] $msg\n"; 4506 LOG llevInfo, "[ABT] $msg\n";
4161 LOG llevInfo, "[ABT] [suppressed]\n"; 4507 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4162 } 4508 }
4163} 4509}
4164 4510
4165# load additional modules 4511# load additional modules
4166require "cf/$_.pm" for @EXTRA_MODULES; 4512require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines