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.534 by root, Thu Apr 29 08:13:51 2010 UTC vs.
Revision 1.608 by root, Sun Nov 18 09:53:57 2012 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
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
37use Carp (); 35use Carp ();
38 36
39use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
40use Coro (); 41use Coro ();
41use Coro::State; 42use Coro::State;
42use Coro::Handle; 43use Coro::Handle;
43use Coro::EV; 44use Coro::EV;
44use Coro::AnyEvent; 45use Coro::AnyEvent;
50use Coro::AIO; 51use Coro::AIO;
51use Coro::BDB 1.6; 52use Coro::BDB 1.6;
52use Coro::Storable; 53use Coro::Storable;
53use Coro::Util (); 54use Coro::Util ();
54 55
56use Guard ();
55use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
56use BDB (); 58use BDB ();
57use Data::Dumper; 59use Data::Dumper;
58use Fcntl; 60use Fcntl;
59use YAML::XS (); 61use YAML::XS ();
60use IO::AIO (); 62use IO::AIO ();
61use Time::HiRes;
62use Compress::LZF; 63use Compress::LZF;
63use Digest::MD5 (); 64use Digest::MD5 ();
64 65
65AnyEvent::detect; 66AnyEvent::detect;
66 67
78# strictly for debugging 79# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 81
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 83
84our @ORIG_INC;
85
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.
467 } 613 }
468 } 614 }
469 615
470 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
471 # we do not use wait_for_tick() as it returns immediately when tick is inactive 617 # we do not use wait_for_tick() as it returns immediately when tick is inactive
472 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
473 $signal->wait;
474 } else { 619 } else {
475 $busy = 0; 620 $busy = 0;
476 Coro::schedule; 621 Coro::schedule;
477 } 622 }
478 } 623 }
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>) {
1423 1608
1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1426 1611
1427 $ext{source} = 1612 $ext{source} =
1428 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1429 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1430 . $source 1615 . $source
1431 . "\n};\n1"; 1616 . "\n};\n1";
1432 1617
1433 $todo{$base} = \%ext; 1618 $todo{$base} = \%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
1848 2022
1849sub register { 2023sub register {
1850 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1851 my $pkg = caller; 2025 my $pkg = caller;
1852 2026
1853 no strict;
1854 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1855 2028
1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1857} 2030}
1858 2031
1870} 2043}
1871 2044
1872sub normalise { 2045sub normalise {
1873 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1874 2047
1875 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1876 2049
1877 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1878 2051
1879 # map plan: 2052 # map plan:
1880 # 2053 #
1895 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1896 $path = "$base/$path"; 2069 $path = "$base/$path";
1897 } 2070 }
1898 2071
1899 for ($path) { 2072 for ($path) {
1900 redo if s{//}{/};
1901 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1902 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1903 } 2075 }
1904 2076
1905 $path 2077 $path
1919 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1920 return $self; 2092 return $self;
1921 } 2093 }
1922 } 2094 }
1923 2095
1924 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1925 () 2097 ()
1926} 2098}
1927 2099
2100# may re-bless or do other evil things
1928sub init { 2101sub init {
1929 my ($self) = @_; 2102 my ($self) = @_;
1930 2103
1931 $self 2104 $self
1932} 2105}
1997 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1998 2171
1999 1 2172 1
2000} 2173}
2001 2174
2175# used to laod the header of an original map
2002sub load_header_orig { 2176sub load_header_orig {
2003 my ($self) = @_; 2177 my ($self) = @_;
2004 2178
2005 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
2006} 2180}
2007 2181
2182# used to laod the header of an instantiated map
2008sub load_header_temp { 2183sub load_header_temp {
2009 my ($self) = @_; 2184 my ($self) = @_;
2010 2185
2011 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
2012} 2187}
2013 2188
2189# called after loading the header from an instantiated map
2014sub prepare_temp { 2190sub prepare_temp {
2015 my ($self) = @_; 2191 my ($self) = @_;
2016 2192
2017 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
2018 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
2019 # safety 2195 # safety
2020 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
2021 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
2022} 2198}
2023 2199
2200# called after loading the header from an original map
2024sub prepare_orig { 2201sub prepare_orig {
2025 my ($self) = @_; 2202 my ($self) = @_;
2026 2203
2027 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
2028 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
2052 2229
2053sub find; 2230sub find;
2054sub find { 2231sub find {
2055 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
2056 2233
2234 cf::cede_to_tick;
2235
2057 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
2058 2237
2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2060 my $guard2 = cf::lock_acquire "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
2061 2240
2062 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
2093 2272
2094 { 2273 {
2095 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2096 2275
2097 return unless $self->valid; 2276 return unless $self->valid;
2098 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2099
2100 $self->in_memory (cf::MAP_LOADING);
2101 2278
2102 $self->alloc; 2279 $self->alloc;
2103 2280
2104 $self->pre_load; 2281 $self->pre_load;
2105 cf::cede_to_tick; 2282 cf::cede_to_tick;
2106 2283
2284 if (exists $self->{load_path}) {
2107 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2108 $f->skip_block; 2286 $f->skip_block;
2109 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2110 or return; 2288 or return;
2111 2289
2112 $self->post_load_original 2290 $self->post_load_original
2113 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2114 2292
2115 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2116 utf8::encode $uniq; 2294 utf8::encode $uniq;
2117 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2118 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2119 $self->clear_unique_items; 2297 $self->clear_unique_items;
2120 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2121 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2122 } 2301 }
2123 } 2302 }
2124 }
2125 2303
2126 $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);
2127 2311
2128 cf::cede_to_tick; 2312 cf::cede_to_tick;
2129 # now do the right thing for maps 2313 # now do the right thing for maps
2130 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2131 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2135 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2136 $self->decay_objects; 2320 $self->decay_objects;
2137 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2138 $self->update_buttons; 2322 $self->update_buttons;
2139 cf::cede_to_tick; 2323 cf::cede_to_tick;
2140 $self->activate; 2324 #$self->activate; # no longer activate maps automatically
2141 } 2325 }
2142 2326
2143 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2144 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2145
2146 $self->in_memory (cf::MAP_ACTIVE);
2147 } 2329 }
2148 2330
2149 $self->post_load; 2331 $self->post_load;
2332
2333 1
2150} 2334}
2151 2335
2152# customize the map for a given player, i.e. 2336# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player 2337# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath 2338# maps to change the path to ~playername/mappath
2162# if $self->per_party; 2346# if $self->per_party;
2163 2347
2164 $self 2348 $self
2165} 2349}
2166 2350
2167# find and load all maps in the 3x3 area around a map
2168sub load_neighbours {
2169 my ($map) = @_;
2170
2171 my @neigh; # diagonal neighbours
2172
2173 for (0 .. 3) {
2174 my $neigh = $map->tile_path ($_)
2175 or next;
2176 $neigh = find $neigh, $map
2177 or next;
2178 $neigh->load;
2179
2180 # now find the diagonal neighbours
2181 push @neigh,
2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2184 }
2185
2186 for (grep defined $_->[0], @neigh) {
2187 my ($path, $origin) = @$_;
2188 my $neigh = find $path, $origin
2189 or next;
2190 $neigh->load;
2191 }
2192}
2193
2194sub find_sync { 2351sub find_sync {
2195 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2196 2353
2354 # it's a bug to call this from the main context
2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2355 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main; 2356 if $Coro::current == $Coro::main;
2199 2357
2200 find $path, $origin 2358 find $path, $origin
2201} 2359}
2202 2360
2203sub do_load_sync { 2361sub do_load_sync {
2204 my ($map) = @_; 2362 my ($map) = @_;
2205 2363
2364 # it's a bug to call this from the main context
2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2207 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2208 2367
2209 $map->load; 2368 $map->load;
2210} 2369}
2213our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2214 2373
2215sub find_async { 2374sub find_async {
2216 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2217 2376
2218 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2219 2378
2220 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2222 } 2381 }
2223 2382
2224 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2225 2384
2226 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2285sub swap_out { 2444sub swap_out {
2286 my ($self) = @_; 2445 my ($self) = @_;
2287 2446
2288 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2289 2448
2290 return if $self->in_memory != cf::MAP_ACTIVE; 2449 return if !$self->linkable;
2291 return if $self->{deny_save}; 2450 return if $self->{deny_save};
2292 return if $self->players; 2451 return if $self->players;
2293 2452
2294 # first deactivate the map and "unlink" it from the core 2453 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate; 2454 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP; 2455 $_->clear_links_to ($self) for values %cf::MAP;
2297 $self->in_memory (cf::MAP_SWAPPED); 2456 $self->state (cf::MAP_SWAPPED);
2298 2457
2299 # then atomically save 2458 # then atomically save
2300 $self->_save; 2459 $self->_save;
2301 2460
2302 # then free the map 2461 # then free the map
2328 2487
2329 return if $self->players; 2488 return if $self->players;
2330 2489
2331 cf::trace "resetting map ", $self->path, "\n"; 2490 cf::trace "resetting map ", $self->path, "\n";
2332 2491
2333 $self->in_memory (cf::MAP_SWAPPED); 2492 $self->state (cf::MAP_SWAPPED);
2334 2493
2335 # need to save uniques path 2494 # need to save uniques path
2336 unless ($self->{deny_save}) { 2495 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq; 2496 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338 2497
2491 2650
2492Creates 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.
2493 2652
2494=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2495 2654
2496returns 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,
2497even if the object actually exists. May block. 2656even if the object actually exists. May block.
2498 2657
2499=cut 2658=cut
2500 2659
2501sub deref { 2660sub deref {
2668 # use -1 or undef as default coordinates, not 0, 0 2827 # use -1 or undef as default coordinates, not 0, 0
2669 ($x, $y) = ($map->enter_x, $map->enter_y) 2828 ($x, $y) = ($map->enter_x, $map->enter_y)
2670 if $x <= 0 && $y <= 0; 2829 if $x <= 0 && $y <= 0;
2671 2830
2672 $map->load; 2831 $map->load;
2673 $map->load_neighbours;
2674 2832
2675 return unless $self->contr->active; 2833 return unless $self->contr->active;
2676 2834
2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2678 if ($self->enter_map ($map, $x, $y)) { 2836 if ($self->enter_map ($map, $x, $y)) {
2734 ($path, $x, $y) = (undef, undef, undef); 2892 ($path, $x, $y) = (undef, undef, undef);
2735 } 2893 }
2736 } 2894 }
2737 2895
2738 my $map = eval { 2896 my $map = eval {
2739 my $map = defined $path ? cf::map::find $path : undef; 2897 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2740 2898
2741 if ($map) { 2899 if ($map) {
2742 $map = $map->customise_for ($self); 2900 $map = $map->customise_for ($self);
2743 $map = $check->($map, $x, $y, $self) if $check && $map; 2901 $map = $check->($map, $x, $y, $self) if $check && $map;
2744 } else { 2902 } else {
2834 $Coro::current->{desc} = "enter_exit"; 2992 $Coro::current->{desc} = "enter_exit";
2835 2993
2836 unless (eval { 2994 unless (eval {
2837 $self->deactivate_recursive; # just to be sure 2995 $self->deactivate_recursive; # just to be sure
2838 2996
2839 # random map handling
2840 {
2841 my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843 prepare_random_map $exit
2844 if $exit->slaying eq "/!";
2845 }
2846
2847 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2997 my $map = cf::map::normalise $exit->slaying, $exit->map;
2848 my $x = $exit->stats->hp; 2998 my $x = $exit->stats->hp;
2849 my $y = $exit->stats->sp; 2999 my $y = $exit->stats->sp;
3000
3001 # special map handling
3002 my $slaying = $exit->slaying;
3003
3004 # special map handling
3005 if ($slaying eq "/!") {
3006 my $guard = cf::lock_acquire "exit_prepare:$exit";
3007
3008 prepare_random_map $exit
3009 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3010
3011 $map = $exit->slaying;
3012
3013 } elsif ($slaying eq '!up') {
3014 $map = $exit->map->tile_path (cf::TILE_UP);
3015 $x = $exit->x;
3016 $y = $exit->y;
3017
3018 } elsif ($slaying eq '!down') {
3019 $map = $exit->map->tile_path (cf::TILE_DOWN);
3020 $x = $exit->x;
3021 $y = $exit->y;
3022 }
2850 3023
2851 $self->goto ($map, $x, $y); 3024 $self->goto ($map, $x, $y);
2852 3025
2853 # if exit is damned, update players death & WoR home-position 3026 # if exit is damned, update players death & WoR home-position
2854 $self->contr->savebed ($map, $x, $y) 3027 $self->contr->savebed ($map, $x, $y)
2869 3042
2870=head3 cf::client 3043=head3 cf::client
2871 3044
2872=over 4 3045=over 4
2873 3046
2874=item $client->send_drawinfo ($text, $flags)
2875
2876Sends a drawinfo packet to the client. Circumvents output buffering so
2877should not be used under normal circumstances.
2878
2879=cut
2880
2881sub cf::client::send_drawinfo {
2882 my ($self, $text, $flags) = @_;
2883
2884 utf8::encode $text;
2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt) 3047=item $client->send_big_packet ($pkt)
2889 3048
2890Like C<send_packet>, but tries to compress large packets, and fragments 3049Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required. 3050them as required.
2892 3051
2910 $self->send_packet ($pkt); 3069 $self->send_packet ($pkt);
2911} 3070}
2912 3071
2913=item $client->send_msg ($channel, $msg, $color, [extra...]) 3072=item $client->send_msg ($channel, $msg, $color, [extra...])
2914 3073
2915Send a drawinfo or msg packet to the client, formatting the msg for the 3074Send a msg packet to the client, formatting the msg for the client if
2916client if neccessary. C<$type> should be a string identifying the type of 3075necessary. C<$type> should be a string identifying the type of the
2917the message, with C<log> being the default. If C<$color> is negative, suppress 3076message, with C<log> being the default. If C<$color> is negative, suppress
2918the message unless the client supports the msg packet. 3077the message unless the client supports the msg packet.
2919 3078
2920=cut 3079=cut
2921 3080
2922# non-persistent channels (usually the info channel) 3081# non-persistent channels (usually the info channel)
3027 id => "death", 3186 id => "death",
3028 title => "Death", 3187 title => "Death",
3029 reply => undef, 3188 reply => undef,
3030 tooltip => "Reason for and more info about your most recent death", 3189 tooltip => "Reason for and more info about your most recent death",
3031 }, 3190 },
3191 "c/fatal" => {
3192 id => "fatal",
3193 title => "Fatal Error",
3194 reply => undef,
3195 tooltip => "Reason for the server disconnect",
3196 },
3032 "c/say" => $SAY_CHANNEL, 3197 "c/say" => $SAY_CHANNEL,
3033 "c/chat" => $CHAT_CHANNEL, 3198 "c/chat" => $CHAT_CHANNEL,
3034); 3199);
3035 3200
3036sub cf::client::send_msg { 3201sub cf::client::send_msg {
3079=cut 3244=cut
3080 3245
3081sub cf::client::ext_msg($$@) { 3246sub cf::client::ext_msg($$@) {
3082 my ($self, $type, @msg) = @_; 3247 my ($self, $type, @msg) = @_;
3083 3248
3084 if ($self->extcmd == 2) {
3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3249 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3086 } elsif ($self->extcmd == 1) { # TODO: remove
3087 push @msg, msgtype => "event_$type";
3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3089 }
3090}
3091
3092=item $client->ext_reply ($msgid, @msg)
3093
3094Sends an ext reply to the client.
3095
3096=cut
3097
3098sub cf::client::ext_reply($$@) {
3099 my ($self, $id, @msg) = @_;
3100
3101 if ($self->extcmd == 2) {
3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3103 } elsif ($self->extcmd == 1) {
3104 #TODO: version 1, remove
3105 unshift @msg, msgtype => "reply", msgid => $id;
3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3107 }
3108} 3250}
3109 3251
3110=item $success = $client->query ($flags, "text", \&cb) 3252=item $success = $client->query ($flags, "text", \&cb)
3111 3253
3112Queues a query to the client, calling the given callback with 3254Queues a query to the client, calling the given callback with
3167 my ($ns, $buf) = @_; 3309 my ($ns, $buf) = @_;
3168 3310
3169 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3311 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3170 3312
3171 if (ref $msg) { 3313 if (ref $msg) {
3172 my ($type, $reply, @payload) = 3314 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3173 "ARRAY" eq ref $msg
3174 ? @$msg
3175 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3176 3315
3177 my @reply;
3178
3179 if (my $cb = $EXTICMD{$type}) { 3316 if (my $cb = $EXTIACMD{$type}) {
3317 $cb->(
3318 $ns,
3319 sub {
3320 $ns->ext_msg ("reply-$reply", @_)
3321 if $reply;
3322 },
3323 @payload
3324 );
3325 } else {
3326 my @reply;
3327
3328 if (my $cb = $EXTICMD{$type}) {
3180 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
3330 }
3331
3332 $ns->ext_msg ("reply-$reply", @reply)
3333 if $reply;
3181 } 3334 }
3182
3183 $ns->ext_reply ($reply, @reply)
3184 if $reply;
3185
3186 } else { 3335 } else {
3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3336 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3188 } 3337 }
3189 3338
3190 cf::override; 3339 cf::override;
3273 decrease split destroy change_exp value msg lore send_msg)], 3422 decrease split destroy change_exp value msg lore send_msg)],
3274 ["cf::object::player" => qw(player)], 3423 ["cf::object::player" => qw(player)],
3275 ["cf::player" => qw(peaceful send_msg)], 3424 ["cf::player" => qw(peaceful send_msg)],
3276 ["cf::map" => qw(trigger)], 3425 ["cf::map" => qw(trigger)],
3277) { 3426) {
3278 no strict 'refs';
3279 my ($pkg, @funs) = @$_; 3427 my ($pkg, @funs) = @$_;
3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3428 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3281 for @funs; 3429 for @funs;
3282} 3430}
3283 3431
3359=cut 3507=cut
3360 3508
3361############################################################################# 3509#############################################################################
3362# the server's init and main functions 3510# the server's init and main functions
3363 3511
3512{
3513 package cf::face;
3514
3515 our %HASH; # hash => idx
3516 our @DATA; # dynamically-created facedata, only faceste 0 used
3517 our @FOFS; # file offset, if > 0
3518 our @SIZE; # size of face, in octets
3519 our @META; # meta hash of face, if any
3520 our $DATAFH; # facedata filehandle
3521
3522 # internal api, not finalised
3523 sub set {
3524 my ($name, $type, $data) = @_;
3525
3526 my $idx = cf::face::find $name;
3527
3528 if ($idx) {
3529 delete $HASH{cf::face::get_csum $idx};
3530 } else {
3531 $idx = cf::face::alloc $name;
3532 }
3533
3534 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3535
3536 cf::face::set_type $idx, $type;
3537 cf::face::set_csum $idx, 0, $hash;
3538
3539 # we need to destroy the SV itself, not just modify it, as a running ix
3540 # might hold a reference to it: "delete" achieves that.
3541 delete $FOFS[0][$idx];
3542 delete $DATA[0][$idx];
3543 $DATA[0][$idx] = $data;
3544 $SIZE[0][$idx] = length $data;
3545 delete $META[$idx];
3546 $HASH{$hash} = $idx;#d#
3547
3548 $idx
3549 }
3550
3551 sub _get_data($$$) {
3552 my ($idx, $set, $cb) = @_;
3553
3554 if (defined $DATA[$set][$idx]) {
3555 $cb->($DATA[$set][$idx]);
3556 } elsif (my $fofs = $FOFS[$set][$idx]) {
3557 my $size = $SIZE[$set][$idx];
3558 my $buf;
3559 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3560 if ($_[0] == $size) {
3561 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3562 $cb->($buf);
3563 } else {
3564 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3565 }
3566 };
3567 } else {
3568 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3569 }
3570 }
3571
3572 # rather ineffient
3573 sub cf::face::get_data($;$) {
3574 my ($idx, $set) = @_;
3575
3576 _get_data $idx, $set, Coro::rouse_cb;
3577 Coro::rouse_wait
3578 }
3579
3580 sub cf::face::ix {
3581 my ($ns, $set, $idx, $pri) = @_;
3582
3583 _get_data $idx, $set, sub {
3584 $ns->ix_send ($idx, $pri, $_[0]);
3585 };
3586 }
3587}
3588
3364sub load_facedata($) { 3589sub load_facedata($) {
3365 my ($path) = @_; 3590 my ($path) = @_;
3366 3591
3367 # HACK to clear player env face cache, we need some signal framework
3368 # for this (global event?)
3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3370
3371 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3592 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3372 3593
3373 trace "loading facedata from $path\n"; 3594 trace "loading facedata from $path\n";
3374 3595
3375 my $facedata; 3596 my $facedata = decode_storable load_file "$path/faceinfo";
3376 0 < aio_load $path, $facedata
3377 or die "$path: $!";
3378
3379 $facedata = Coro::Storable::thaw $facedata;
3380 3597
3381 $facedata->{version} == 2 3598 $facedata->{version} == 2
3382 or cf::cleanup "$path: version mismatch, cannot proceed."; 3599 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3383 3600
3384 # patch in the exptable 3601 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3385 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3602 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3386 $facedata->{resource}{"res/exp_table"} = { 3603
3387 type => FT_RSRC, 3604 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3388 data => $exp_table, 3605
3389 hash => (Digest::MD5::md5 $exp_table), 3606 # BEGIN ATOMIC
3390 }; 3607 # from here on, everything must be atomic - no thread switch allowed
3391 cf::cede_to_tick; 3608 my $t1 = EV::time;
3392 3609
3393 { 3610 {
3394 my $faces = $facedata->{faceinfo}; 3611 my $faces = $facedata->{faceinfo};
3395 3612
3396 while (my ($face, $info) = each %$faces) { 3613 for my $face (sort keys %$faces) {
3614 my $info = $faces->{$face};
3397 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3615 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3398 3616
3399 cf::face::set_visibility $idx, $info->{visibility}; 3617 cf::face::set_visibility $idx, $info->{visibility};
3400 cf::face::set_magicmap $idx, $info->{magicmap}; 3618 cf::face::set_magicmap $idx, $info->{magicmap};
3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3619 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3620 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3403 3621 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3404 cf::cede_to_tick; 3622 $cf::face::HASH{$info->{hash64}} = $idx;
3623 delete $cf::face::META[$idx];
3405 } 3624 }
3406 3625
3407 while (my ($face, $info) = each %$faces) { 3626 while (my ($face, $info) = each %$faces) {
3408 next unless $info->{smooth}; 3627 next unless $info->{smooth};
3409 3628
3414 cf::face::set_smooth $idx, $smooth; 3633 cf::face::set_smooth $idx, $smooth;
3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3634 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3416 } else { 3635 } else {
3417 error "smooth face '$info->{smooth}' not found for face '$face'"; 3636 error "smooth face '$info->{smooth}' not found for face '$face'";
3418 } 3637 }
3419
3420 cf::cede_to_tick;
3421 } 3638 }
3422 } 3639 }
3423 3640
3424 { 3641 {
3425 my $anims = $facedata->{animinfo}; 3642 my $anims = $facedata->{animinfo};
3426 3643
3427 while (my ($anim, $info) = each %$anims) { 3644 while (my ($anim, $info) = each %$anims) {
3428 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3645 cf::anim::set $anim, $info->{frames}, $info->{facings};
3429 cf::cede_to_tick;
3430 } 3646 }
3431 3647
3432 cf::anim::invalidate_all; # d'oh 3648 cf::anim::invalidate_all; # d'oh
3433 } 3649 }
3434 3650
3435 { 3651 {
3436 my $res = $facedata->{resource}; 3652 my $res = $facedata->{resource};
3437 3653
3438 while (my ($name, $info) = each %$res) { 3654 while (my ($name, $info) = each %$res) {
3439 if (defined $info->{type}) { 3655 if (defined (my $type = $info->{type})) {
3656 # TODO: different hash - must free and use new index, or cache ixface data queue
3440 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3657 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3441 3658
3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3443 cf::face::set_type $idx, $info->{type}; 3659 cf::face::set_type $idx, $type;
3660 cf::face::set_csum $idx, 0, $info->{hash};
3661 $cf::face::SIZE[0][$idx] = $info->{size};
3662 $cf::face::FOFS[0][$idx] = $info->{fofs};
3663 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3664 $cf::face::HASH{$info->{hash}} = $idx;
3444 } else { 3665 } else {
3445 $RESOURCE{$name} = $info; # unused 3666# $RESOURCE{$name} = $info; # unused
3446 } 3667 }
3447
3448 cf::cede_to_tick;
3449 } 3668 }
3450 } 3669 }
3670
3671 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3672
3673 # HACK to clear player env face cache, we need some signal framework
3674 # for this (global event?)
3675 %ext::player_env::MUSIC_FACE_CACHE = ();
3676
3677 # END ATOMIC
3678
3679 cf::debug "facedata atomic update time ", EV::time - $t1;
3451 3680
3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3681 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3682
3683 aio_close $fh if $fh; # close old facedata
3453 3684
3454 1 3685 1
3455} 3686}
3456 3687
3457register_exticmd fx_want => sub { 3688register_exticmd fx_want => sub {
3468 my $status = load_resource_file_ $_[0]; 3699 my $status = load_resource_file_ $_[0];
3469 get_slot 0.1, 100; 3700 get_slot 0.1, 100;
3470 cf::arch::commit_load; 3701 cf::arch::commit_load;
3471 3702
3472 $status 3703 $status
3704}
3705
3706sub reload_exp_table {
3707 _reload_exp_table;
3708
3709 cf::face::set
3710 "res/exp_table" => FT_RSRC,
3711 JSON::XS->new->utf8->canonical->encode (
3712 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3713 );
3714}
3715
3716sub reload_materials {
3717 _reload_materials;
3473} 3718}
3474 3719
3475sub reload_regions { 3720sub reload_regions {
3476 # HACK to clear player env face cache, we need some signal framework 3721 # HACK to clear player env face cache, we need some signal framework
3477 # for this (global event?) 3722 # for this (global event?)
3485 if exists $_->{match}; 3730 if exists $_->{match};
3486 } 3731 }
3487} 3732}
3488 3733
3489sub reload_facedata { 3734sub reload_facedata {
3490 load_facedata "$DATADIR/facedata" 3735 load_facedata $DATADIR
3491 or die "unable to load facedata\n"; 3736 or die "unable to load facedata\n";
3492} 3737}
3493 3738
3494sub reload_archetypes { 3739sub reload_archetypes {
3495 load_resource_file "$DATADIR/archetypes" 3740 load_resource_file "$DATADIR/archetypes"
3496 or die "unable to load archetypes\n"; 3741 or die "unable to load archetypes\n";
3742
3743 cf::face::set
3744 "res/skill_info" => FT_RSRC,
3745 JSON::XS->new->utf8->canonical->encode (
3746 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3747 );
3748
3749 cf::face::set
3750 "res/spell_paths" => FT_RSRC,
3751 JSON::XS->new->utf8->canonical->encode (
3752 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3753 );
3497} 3754}
3498 3755
3499sub reload_treasures { 3756sub reload_treasures {
3500 load_resource_file "$DATADIR/treasures" 3757 load_resource_file "$DATADIR/treasures"
3501 or die "unable to load treasurelists\n"; 3758 or die "unable to load treasurelists\n";
3502} 3759}
3503 3760
3504sub reload_sound { 3761sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n"; 3762 trace "loading sound config from $DATADIR/sound\n";
3506 3763
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3764 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3511 3765
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3766 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_] 3767 my $sound = $soundconf->{compat}[$_]
3514 or next; 3768 or next;
3515 3769
3525} 3779}
3526 3780
3527sub reload_resources { 3781sub reload_resources {
3528 trace "reloading resource files...\n"; 3782 trace "reloading resource files...\n";
3529 3783
3784 reload_materials;
3530 reload_facedata; 3785 reload_facedata;
3786 reload_exp_table;
3531 reload_sound; 3787 reload_sound;
3532 reload_archetypes; 3788 reload_archetypes;
3533 reload_regions; 3789 reload_regions;
3534 reload_treasures; 3790 reload_treasures;
3535 3791
3537} 3793}
3538 3794
3539sub reload_config { 3795sub reload_config {
3540 trace "reloading config file...\n"; 3796 trace "reloading config file...\n";
3541 3797
3542 open my $fh, "<:utf8", "$CONFDIR/config" 3798 my $config = load_file "$CONFDIR/config";
3543 or return; 3799 utf8::decode $config;
3544 3800 *CFG = decode_yaml $config;
3545 local $/;
3546 *CFG = YAML::XS::Load scalar <$fh>;
3547 3801
3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3802 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3549 3803
3550 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3804 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3551 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3805 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3555 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3809 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3556 and die "WARNING: m(un)lockall failed: $!\n"; 3810 and die "WARNING: m(un)lockall failed: $!\n";
3557 }; 3811 };
3558 warn $@ if $@; 3812 warn $@ if $@;
3559 } 3813 }
3560
3561 trace "finished reloading resource files\n";
3562} 3814}
3563 3815
3564sub pidfile() { 3816sub pidfile() {
3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3817 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3566 or die "$PIDFILE: $!"; 3818 or die "$PIDFILE: $!";
3591 3843
3592sub main { 3844sub main {
3593 cf::init_globals; # initialise logging 3845 cf::init_globals; # initialise logging
3594 3846
3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3847 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3596 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3848 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3849 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3598 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3850 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3599 3851
3600 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3852 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3601 3853
3602 # we must not ever block the main coroutine 3854 # we must not ever block the main coroutine
3603 local $Coro::idle = sub { 3855 $Coro::idle = sub {
3604 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3856 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3605 (async { 3857 (async {
3606 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3858 $Coro::current->{desc} = "IDLE BUG HANDLER";
3607 EV::loop EV::LOOP_ONESHOT; 3859 EV::loop EV::LOOP_ONESHOT;
3608 })->prio (Coro::PRIO_MAX); 3860 })->prio (Coro::PRIO_MAX);
3609 }; 3861 };
3610 3862
3611 evthread_start IO::AIO::poll_fileno; 3863 evthread_start IO::AIO::poll_fileno;
3612 3864
3613 cf::sync_job { 3865 cf::sync_job {
3614 cf::init_experience; 3866 cf::incloader::init ();
3867
3868 db_init;
3869
3615 cf::init_anim; 3870 cf::init_anim;
3616 cf::init_attackmess; 3871 cf::init_attackmess;
3617 cf::init_dynamic; 3872 cf::init_dynamic;
3618 3873
3619 cf::load_settings; 3874 cf::load_settings;
3620 cf::load_materials;
3621 3875
3622 reload_resources; 3876 reload_resources;
3623 reload_config; 3877 reload_config;
3624 db_init;
3625 3878
3626 cf::init_uuid; 3879 cf::init_uuid;
3627 cf::init_signals; 3880 cf::init_signals;
3628 cf::init_skills; 3881 cf::init_skills;
3629 3882
3637 3890
3638 # no (long-running) fork's whatsoever before this point(!) 3891 # no (long-running) fork's whatsoever before this point(!)
3639 use POSIX (); 3892 use POSIX ();
3640 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3893 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3641 3894
3642 (pop @POST_INIT)->(0) while @POST_INIT; 3895 cf::_post_init 0;
3643 }; 3896 };
3644 3897
3645 cf::object::thawer::errors_are_fatal 0; 3898 cf::object::thawer::errors_are_fatal 0;
3646 info "parse errors in files are no longer fatal from this point on.\n"; 3899 info "parse errors in files are no longer fatal from this point on.\n";
3647 3900
3901 AE::postpone {
3902 undef &main; # free gobs of memory :)
3903 };
3904
3648 main_loop; 3905 goto &main_loop;
3649} 3906}
3650 3907
3651############################################################################# 3908#############################################################################
3652# initialisation and cleanup 3909# initialisation and cleanup
3653 3910
3758 # save all maps without fsync, and later call a global sync 4015 # save all maps without fsync, and later call a global sync
3759 # (which in turn might be very very slow) 4016 # (which in turn might be very very slow)
3760 local $USE_FSYNC = 0; 4017 local $USE_FSYNC = 0;
3761 4018
3762 cf::sync_job { 4019 cf::sync_job {
4020 cf::write_runtime_sync; # external watchdog should not bark
4021
3763 # use a peculiar iteration method to avoid tripping on perl 4022 # use a peculiar iteration method to avoid tripping on perl
3764 # refcount bugs in for. also avoids problems with players 4023 # refcount bugs in for. also avoids problems with players
3765 # and maps saved/destroyed asynchronously. 4024 # and maps saved/destroyed asynchronously.
3766 info "emergency_perl_save: begin player save\n"; 4025 info "emergency_perl_save: begin player save\n";
3767 for my $login (keys %cf::PLAYER) { 4026 for my $login (keys %cf::PLAYER) {
3770 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4029 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3771 $pl->save; 4030 $pl->save;
3772 } 4031 }
3773 info "emergency_perl_save: end player save\n"; 4032 info "emergency_perl_save: end player save\n";
3774 4033
4034 cf::write_runtime_sync; # external watchdog should not bark
4035
3775 info "emergency_perl_save: begin map save\n"; 4036 info "emergency_perl_save: begin map save\n";
3776 for my $path (keys %cf::MAP) { 4037 for my $path (keys %cf::MAP) {
3777 my $map = $cf::MAP{$path} or next; 4038 my $map = $cf::MAP{$path} or next;
3778 $map->valid or next; 4039 $map->valid or next;
3779 $map->save; 4040 $map->save;
3780 } 4041 }
3781 info "emergency_perl_save: end map save\n"; 4042 info "emergency_perl_save: end map save\n";
3782 4043
4044 cf::write_runtime_sync; # external watchdog should not bark
4045
3783 info "emergency_perl_save: begin database checkpoint\n"; 4046 info "emergency_perl_save: begin database checkpoint\n";
3784 BDB::db_env_txn_checkpoint $DB_ENV; 4047 BDB::db_env_txn_checkpoint $DB_ENV;
3785 info "emergency_perl_save: end database checkpoint\n"; 4048 info "emergency_perl_save: end database checkpoint\n";
3786 4049
3787 info "emergency_perl_save: begin write uuid\n"; 4050 info "emergency_perl_save: begin write uuid\n";
3788 write_uuid_sync 1; 4051 write_uuid_sync 1;
3789 info "emergency_perl_save: end write uuid\n"; 4052 info "emergency_perl_save: end write uuid\n";
3790 };
3791 4053
4054 cf::write_runtime_sync; # external watchdog should not bark
4055
4056 trace "emergency_perl_save: syncing database to disk";
4057 BDB::db_env_txn_checkpoint $DB_ENV;
4058
3792 info "emergency_perl_save: starting sync()\n"; 4059 info "emergency_perl_save: starting sync\n";
3793 IO::AIO::aio_sync sub { 4060 IO::AIO::aio_sync sub {
3794 info "emergency_perl_save: finished sync()\n"; 4061 info "emergency_perl_save: finished sync\n";
4062 };
4063
4064 cf::write_runtime_sync; # external watchdog should not bark
4065
4066 trace "emergency_perl_save: flushing outstanding aio requests";
4067 while (IO::AIO::nreqs || BDB::nreqs) {
4068 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4069 }
4070
4071 cf::write_runtime_sync; # external watchdog should not bark
3795 }; 4072 };
3796 4073
3797 info "emergency_perl_save: leave\n"; 4074 info "emergency_perl_save: leave\n";
3798} 4075}
3799 4076
3800sub post_cleanup { 4077sub post_cleanup {
3801 my ($make_core) = @_; 4078 my ($make_core) = @_;
4079
4080 IO::AIO::flush;
3802 4081
3803 error Carp::longmess "post_cleanup backtrace" 4082 error Carp::longmess "post_cleanup backtrace"
3804 if $make_core; 4083 if $make_core;
3805 4084
3806 my $fh = pidfile; 4085 my $fh = pidfile;
3832 } 4111 }
3833} 4112}
3834 4113
3835sub do_reload_perl() { 4114sub do_reload_perl() {
3836 # can/must only be called in main 4115 # can/must only be called in main
3837 if (in_main) { 4116 unless (in_main) {
3838 error "can only reload from main coroutine"; 4117 error "can only reload from main coroutine";
3839 return; 4118 return;
3840 } 4119 }
3841 4120
3842 return if $RELOAD++; 4121 return if $RELOAD++;
3843 4122
3844 my $t1 = AE::time; 4123 my $t1 = AE::time;
3845 4124
3846 while ($RELOAD) { 4125 while ($RELOAD) {
4126 cf::get_slot 0.1, -1, "reload_perl";
3847 info "reloading..."; 4127 info "perl_reload: reloading...";
3848 4128
3849 trace "entering sync_job"; 4129 trace "perl_reload: entering sync_job";
3850 4130
3851 cf::sync_job { 4131 cf::sync_job {
3852 cf::write_runtime_sync; # external watchdog should not bark
3853 cf::emergency_save; 4132 #cf::emergency_save;
3854 cf::write_runtime_sync; # external watchdog should not bark
3855 4133
3856 trace "syncing database to disk";
3857 BDB::db_env_txn_checkpoint $DB_ENV;
3858
3859 # if anything goes wrong in here, we should simply crash as we already saved
3860
3861 trace "flushing outstanding aio requests";
3862 while (IO::AIO::nreqs || BDB::nreqs) {
3863 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3864 }
3865
3866 trace "cancelling all extension coros"; 4134 trace "perl_reload: cancelling all extension coros";
3867 $_->cancel for values %EXT_CORO; 4135 $_->cancel for values %EXT_CORO;
3868 %EXT_CORO = (); 4136 %EXT_CORO = ();
3869 4137
3870 trace "removing commands"; 4138 trace "perl_reload: removing commands";
3871 %COMMAND = (); 4139 %COMMAND = ();
3872 4140
3873 trace "removing ext/exti commands"; 4141 trace "perl_reload: removing ext/exti commands";
3874 %EXTCMD = (); 4142 %EXTCMD = ();
3875 %EXTICMD = (); 4143 %EXTICMD = ();
3876 4144
3877 trace "unloading/nuking all extensions"; 4145 trace "perl_reload: unloading/nuking all extensions";
3878 for my $pkg (@EXTS) { 4146 for my $pkg (@EXTS) {
3879 trace "... unloading $pkg"; 4147 trace "... unloading $pkg";
3880 4148
3881 if (my $cb = $pkg->can ("unload")) { 4149 if (my $cb = $pkg->can ("unload")) {
3882 eval { 4150 eval {
3887 4155
3888 trace "... clearing $pkg"; 4156 trace "... clearing $pkg";
3889 clear_package $pkg; 4157 clear_package $pkg;
3890 } 4158 }
3891 4159
3892 trace "unloading all perl modules loaded from $LIBDIR"; 4160 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3893 while (my ($k, $v) = each %INC) { 4161 while (my ($k, $v) = each %INC) {
3894 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4162 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3895 4163
3896 trace "... unloading $k"; 4164 trace "... unloading $k";
3897 delete $INC{$k}; 4165 delete $INC{$k};
3904 } 4172 }
3905 4173
3906 clear_package $k; 4174 clear_package $k;
3907 } 4175 }
3908 4176
3909 trace "getting rid of safe::, as good as possible"; 4177 trace "perl_reload: getting rid of safe::, as good as possible";
3910 clear_package "safe::$_" 4178 clear_package "safe::$_"
3911 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4179 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3912 4180
3913 trace "unloading cf.pm \"a bit\""; 4181 trace "perl_reload: unloading cf.pm \"a bit\"";
3914 delete $INC{"cf.pm"}; 4182 delete $INC{"cf.pm"};
3915 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4183 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3916 4184
3917 # don't, removes xs symbols, too, 4185 # don't, removes xs symbols, too,
3918 # and global variables created in xs 4186 # and global variables created in xs
3919 #clear_package __PACKAGE__; 4187 #clear_package __PACKAGE__;
3920 4188
3921 info "unload completed, starting to reload now"; 4189 info "perl_reload: unload completed, starting to reload now";
3922 4190
3923 trace "reloading cf.pm"; 4191 trace "perl_reload: reloading cf.pm";
3924 require cf; 4192 require cf;
3925 cf::_connect_to_perl_1; 4193 cf::_connect_to_perl_1;
3926 4194
3927 trace "loading config and database again"; 4195 trace "perl_reload: loading config and database again";
3928 cf::reload_config; 4196 cf::reload_config;
3929 4197
3930 trace "loading extensions"; 4198 trace "perl_reload: loading extensions";
3931 cf::load_extensions; 4199 cf::load_extensions;
3932 4200
3933 if ($REATTACH_ON_RELOAD) { 4201 if ($REATTACH_ON_RELOAD) {
3934 trace "reattaching attachments to objects/players"; 4202 trace "perl_reload: reattaching attachments to objects/players";
3935 _global_reattach; # objects, sockets 4203 _global_reattach; # objects, sockets
3936 trace "reattaching attachments to maps"; 4204 trace "perl_reload: reattaching attachments to maps";
3937 reattach $_ for values %MAP; 4205 reattach $_ for values %MAP;
3938 trace "reattaching attachments to players"; 4206 trace "perl_reload: reattaching attachments to players";
3939 reattach $_ for values %PLAYER; 4207 reattach $_ for values %PLAYER;
3940 } 4208 }
3941 4209
3942 trace "running post_init jobs"; 4210 cf::_post_init 1;
3943 (pop @POST_INIT)->(1) while @POST_INIT;
3944 4211
3945 trace "leaving sync_job"; 4212 trace "perl_reload: leaving sync_job";
3946 4213
3947 1 4214 1
3948 } or do { 4215 } or do {
3949 error $@; 4216 error $@;
3950 cf::cleanup "error while reloading, exiting."; 4217 cf::cleanup "perl_reload: error, exiting.";
3951 }; 4218 };
3952 4219
3953 info "reloaded";
3954 --$RELOAD; 4220 --$RELOAD;
3955 } 4221 }
3956 4222
3957 $t1 = AE::time - $t1; 4223 $t1 = AE::time - $t1;
3958 info "reload completed in ${t1}s\n"; 4224 info "perl_reload: completed in ${t1}s\n";
3959}; 4225};
3960 4226
3961our $RELOAD_WATCHER; # used only during reload 4227our $RELOAD_WATCHER; # used only during reload
3962 4228
3963sub reload_perl() { 4229sub reload_perl() {
3984 reload_perl; 4250 reload_perl;
3985 }; 4251 };
3986 } 4252 }
3987}; 4253};
3988 4254
3989unshift @INC, $LIBDIR; 4255#############################################################################
3990 4256
3991my $bug_warning = 0; 4257my $bug_warning = 0;
3992 4258
3993our @WAIT_FOR_TICK;
3994our @WAIT_FOR_TICK_BEGIN;
3995
3996sub wait_for_tick { 4259sub wait_for_tick() {
3997 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4260 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3998 4261
3999 my $signal = new Coro::Signal; 4262 $WAIT_FOR_TICK->wait;
4000 push @WAIT_FOR_TICK, $signal;
4001 $signal->wait;
4002} 4263}
4003 4264
4004sub wait_for_tick_begin { 4265sub wait_for_tick_begin() {
4005 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4266 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4006 4267
4007 my $signal = new Coro::Signal; 4268 my $signal = new Coro::Signal;
4008 push @WAIT_FOR_TICK_BEGIN, $signal; 4269 push @WAIT_FOR_TICK_BEGIN, $signal;
4009 $signal->wait; 4270 $signal->wait;
4010} 4271}
4014 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4275 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4015 unless ++$bug_warning > 10; 4276 unless ++$bug_warning > 10;
4016 return; 4277 return;
4017 } 4278 }
4018 4279
4019 cf::server_tick; # one server iteration 4280 cf::one_tick; # one server iteration
4020 4281
4021 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4282 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4022 4283
4023 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4284 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4024 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4285 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4030 } 4291 }
4031 4292
4032 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4293 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4033 $sig->send; 4294 $sig->send;
4034 } 4295 }
4035 while (my $sig = shift @WAIT_FOR_TICK) { 4296 $WAIT_FOR_TICK->broadcast;
4036 $sig->send;
4037 }
4038 4297
4039 $LOAD = ($NOW - $TICK_START) / $TICK; 4298 $LOAD = ($NOW - $TICK_START) / $TICK;
4040 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4299 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4041 4300
4042 if (0) { 4301 if (0) {
4048 } 4307 }
4049} 4308}
4050 4309
4051{ 4310{
4052 # configure BDB 4311 # configure BDB
4312 info "initialising database";
4053 4313
4054 BDB::min_parallel 16; 4314 BDB::min_parallel 16;
4055 BDB::max_poll_reqs $TICK * 0.1; 4315 BDB::max_poll_reqs $TICK * 0.1;
4056 $AnyEvent::BDB::WATCHER->priority (1); 4316 #$AnyEvent::BDB::WATCHER->priority (1);
4057 4317
4058 unless ($DB_ENV) { 4318 unless ($DB_ENV) {
4059 $DB_ENV = BDB::db_env_create; 4319 $DB_ENV = BDB::db_env_create;
4060 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4320 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4061 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4321 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4086 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4346 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4087 }; 4347 };
4088 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4348 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4089 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4349 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4090 }; 4350 };
4351
4352 info "database initialised";
4091} 4353}
4092 4354
4093{ 4355{
4094 # configure IO::AIO 4356 # configure IO::AIO
4095 4357
4358 info "initialising aio";
4096 IO::AIO::min_parallel 8; 4359 IO::AIO::min_parallel 8;
4097 IO::AIO::max_poll_time $TICK * 0.1; 4360 IO::AIO::max_poll_time $TICK * 0.1;
4098 undef $AnyEvent::AIO::WATCHER; 4361 undef $AnyEvent::AIO::WATCHER;
4362 info "aio initialised";
4099} 4363}
4100 4364
4101my $_log_backtrace; 4365our $_log_backtrace;
4366our $_log_backtrace_last;
4102 4367
4103sub _log_backtrace { 4368sub _log_backtrace {
4104 my ($msg, @addr) = @_; 4369 my ($msg, @addr) = @_;
4105 4370
4106 $msg =~ s/\n//; 4371 $msg =~ s/\n$//;
4107 4372
4373 if ($_log_backtrace_last eq $msg) {
4374 LOG llevInfo, "[ABT] $msg\n";
4375 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4108 # limit the # of concurrent backtraces 4376 # limit the # of concurrent backtraces
4109 if ($_log_backtrace < 2) { 4377 } elsif ($_log_backtrace < 2) {
4378 $_log_backtrace_last = $msg;
4110 ++$_log_backtrace; 4379 ++$_log_backtrace;
4111 my $perl_bt = Carp::longmess $msg; 4380 my $perl_bt = Carp::longmess $msg;
4112 async { 4381 async {
4113 $Coro::current->{desc} = "abt $msg"; 4382 $Coro::current->{desc} = "abt $msg";
4114 4383
4134 LOG llevInfo, "[ABT] $_\n" for @bt; 4403 LOG llevInfo, "[ABT] $_\n" for @bt;
4135 --$_log_backtrace; 4404 --$_log_backtrace;
4136 }; 4405 };
4137 } else { 4406 } else {
4138 LOG llevInfo, "[ABT] $msg\n"; 4407 LOG llevInfo, "[ABT] $msg\n";
4139 LOG llevInfo, "[ABT] [suppressed]\n"; 4408 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4140 } 4409 }
4141} 4410}
4142 4411
4143# load additional modules 4412# load additional modules
4144require "cf/$_.pm" for @EXTRA_MODULES; 4413require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines