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.512 by root, Sun Apr 11 04:52:07 2010 UTC vs.
Revision 1.598 by root, Sun Nov 11 02:38:10 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; 118#our %RESOURCE; # unused
119
120our $OUTPUT_RATE_MIN = 3000;
121our $OUTPUT_RATE_MAX = 1000000;
122
123our $MAX_LINKS = 32; # how many chained exits to follow
124our $VERBOSE_IO = 1;
112 125
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 128our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 129our $USE_FSYNC = 1; # use fsync to write maps - default on
118our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 134our $DB_ENV;
122 135
123our @EXTRA_MODULES = qw(pod match mapscript); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 137
125our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
126 140
127our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
129our $NOW; 144our $NOW;
130 145
131our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
132our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
133our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
142 157
143our @POST_INIT; 158our @POST_INIT;
144 159
145our $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)
146our $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;
147 165
148binmode STDOUT; 166binmode STDOUT;
149binmode STDERR; 167binmode STDERR;
150 168
151# read virtual server time, if available 169# read virtual server time, if available
162 180
163our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
164 182
165sub cf::map::normalise; 183sub cf::map::normalise;
166 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
167############################################################################# 189#############################################################################
168 190
169%REFLECT = (); 191%REFLECT = ();
170for (@REFLECT) { 192for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 193 my $reflect = JSON::XS::decode_json $_;
181 203
182=over 4 204=over 4
183 205
184=item $cf::UPTIME 206=item $cf::UPTIME
185 207
186The 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.
187 224
188=item $cf::RUNTIME 225=item $cf::RUNTIME
189 226
190The 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
191every server tick. 228every server tick.
192 229
193=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
194$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
195$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
196 233
197Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
198directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
200database environment. 237database environment.
201 238
202=item $cf::NOW
203
204The time of the last (current) server tick.
205
206=item $cf::TICK
207
208The interval between server ticks, in seconds.
209
210=item $cf::LOADAVG 239=item $cf::LOADAVG
211 240
212The 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
213(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
214objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
223from wherever your confdir points to. 252from wherever your confdir points to.
224 253
225=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
226 255
227These 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. cf::wait_for_tick_begin only
228returns directly I<after> the tick processing (and consequently, can only wake one process 257returns directly I<after> the tick processing (and consequently, can only wake one thread
229per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 258per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
259
260Note that cf::Wait_for_tick will immediately return when the server is not
261ticking, making it suitable for small pauses in threads that need to run
262when the server is paused. If that is not applicable (i.e. you I<really>
263want to wait, use C<$cf::WAIT_FOR_TICK>).
264
265=item $cf::WAIT_FOR_TICK
266
267Note that C<cf::wait_for_tick> is probably the correct thing to use. This
268variable contains a L<Coro::Signal> that is broadcats after every server
269tick. Calling C<< ->wait >> on it will suspend the caller until after the
270next server tick.
271
272=cut
273
274sub wait_for_tick();
275sub wait_for_tick_begin();
230 276
231=item @cf::INVOKE_RESULTS 277=item @cf::INVOKE_RESULTS
232 278
233This array contains the results of the last C<invoke ()> call. When 279This array contains the results of the last C<invoke ()> call. When
234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 280C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
242 288
243=back 289=back
244 290
245=cut 291=cut
246 292
293sub error(@) { LOG llevError, join "", @_ }
294sub warn (@) { LOG llevWarn , join "", @_ }
295sub info (@) { LOG llevInfo , join "", @_ }
296sub debug(@) { LOG llevDebug, join "", @_ }
297sub trace(@) { LOG llevTrace, join "", @_ }
298
247$Coro::State::WARNHOOK = sub { 299$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 300 my $msg = join "", @_;
249 301
250 $msg .= "\n" 302 $msg .= "\n"
251 unless $msg =~ /\n$/; 303 unless $msg =~ /\n$/;
252 304
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 305 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 306
255 LOG llevError, $msg; 307 LOG llevWarn, $msg;
256}; 308};
257 309
258$Coro::State::DIEHOOK = sub { 310$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 311 return unless $^S eq 0; # "eq", not "=="
260 312
261 warn Carp::longmess $_[0]; 313 error Carp::longmess $_[0];
262 314
263 if ($Coro::current == $Coro::main) {#d# 315 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 316 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 317 return;#d#
266 }#d# 318 }#d#
267 319
268 # kill coroutine otherwise 320 # kill coroutine otherwise
269 Coro::terminate 321 Coro::terminate
289)) { 341)) {
290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 342 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291} 343}
292 344
293$EV::DIED = sub { 345$EV::DIED = sub {
294 Carp::cluck "error in event callback: @_"; 346 warn "error in event callback: $@";
295}; 347};
348
349#############################################################################
350
351sub fork_call(&@);
352sub get_slot($;$$);
296 353
297############################################################################# 354#############################################################################
298 355
299=head2 UTILITY FUNCTIONS 356=head2 UTILITY FUNCTIONS
300 357
321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 378 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
322 $d 379 $d
323 } || "[unable to dump $_[0]: '$@']"; 380 } || "[unable to dump $_[0]: '$@']";
324} 381}
325 382
383=item $scalar = cf::load_file $path
384
385Loads the given file from path and returns its contents. Croaks on error
386and can block.
387
388=cut
389
390sub load_file($) {
391 0 <= aio_load $_[0], my $data
392 or Carp::croak "$_[0]: $!";
393
394 $data
395}
396
397=item $success = cf::replace_file $path, $data, $sync
398
399Atomically replaces the file at the given $path with new $data, and
400optionally $sync the data to disk before replacing the file.
401
402=cut
403
404sub replace_file($$;$) {
405 my ($path, $data, $sync) = @_;
406
407 my $lock = cf::lock_acquire ("replace_file:$path");
408
409 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
410 or return;
411
412 $data = $data->() if ref $data;
413
414 length $data == aio_write $fh, 0, (length $data), $data, 0
415 or return;
416
417 !$sync
418 or !aio_fsync $fh
419 or return;
420
421 aio_close $fh
422 and return;
423
424 aio_rename "$path~", $path
425 and return;
426
427 if ($sync) {
428 $path =~ s%/[^/]*$%%;
429 aio_pathsync $path;
430 }
431
432 1
433}
434
326=item $ref = cf::decode_json $json 435=item $ref = cf::decode_json $json
327 436
328Converts a JSON string into the corresponding perl data structure. 437Converts a JSON string into the corresponding perl data structure.
329 438
330=item $json = cf::encode_json $ref 439=item $json = cf::encode_json $ref
336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 445our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337 446
338sub encode_json($) { $json_coder->encode ($_[0]) } 447sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 448sub decode_json($) { $json_coder->decode ($_[0]) }
340 449
450=item $ref = cf::decode_storable $scalar
451
452Same as Coro::Storable::thaw, so blocks.
453
454=cut
455
456BEGIN { *decode_storable = \&Coro::Storable::thaw }
457
458=item $ref = cf::decode_yaml $scalar
459
460Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
461
462=cut
463
464sub decode_yaml($) {
465 fork_call { YAML::XS::Load $_[0] } @_
466}
467
468=item $scalar = cf::unlzf $scalar
469
470Same as Compress::LZF::compress, but takes server ticks into account, so
471blocks.
472
473=cut
474
475sub unlzf($) {
476 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
477 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
478 Compress::LZF::decompress $_[0]
479}
480
341=item cf::post_init { BLOCK } 481=item cf::post_init { BLOCK }
342 482
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 483Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 484but I<before> the server starts ticking again.
345 485
346The cdoeblock will have a single boolean argument to indicate whether this 486The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 487is a reload or not.
348 488
349=cut 489=cut
350 490
351sub post_init(&) { 491sub post_init(&) {
352 push @POST_INIT, shift; 492 push @POST_INIT, shift;
493}
494
495sub _post_init {
496 trace "running post_init jobs";
497
498 # run them in parallel...
499
500 my @join;
501
502 while () {
503 push @join, map &Coro::async ($_, 0), @POST_INIT;
504 @POST_INIT = ();
505
506 @join or last;
507
508 (pop @join)->join;
509 }
353} 510}
354 511
355=item cf::lock_wait $string 512=item cf::lock_wait $string
356 513
357Wait until the given lock is available. See cf::lock_acquire. 514Wait until the given lock is available. See cf::lock_acquire.
396} 553}
397 554
398=item cf::periodic $interval, $cb 555=item cf::periodic $interval, $cb
399 556
400Like EV::periodic, but randomly selects a starting point so that the actions 557Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 558get spread over time.
402 559
403=cut 560=cut
404 561
405sub periodic($$) { 562sub periodic($$) {
406 my ($interval, $cb) = @_; 563 my ($interval, $cb) = @_;
410 EV::periodic $start, $interval, 0, $cb 567 EV::periodic $start, $interval, 0, $cb
411} 568}
412 569
413=item cf::get_slot $time[, $priority[, $name]] 570=item cf::get_slot $time[, $priority[, $name]]
414 571
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 572Allocate $time seconds of blocking CPU time at priority C<$priority>
416This call blocks and returns only when you have at least C<$time> seconds 573(default: 0): This call blocks and returns only when you have at least
417of cpu time till the next tick. The slot is only valid till the next cede. 574C<$time> seconds of cpu time till the next tick. The slot is only valid
575till the next cede.
576
577Background jobs should use a priority les than zero, interactive jobs
578should use 100 or more.
418 579
419The optional C<$name> can be used to identify the job to run. It might be 580The optional C<$name> can be used to identify the job to run. It might be
420used for statistical purposes and should identify the same time-class. 581used for statistical purposes and should identify the same time-class.
421 582
422Useful for short background jobs. 583Useful for short background jobs.
451 } 612 }
452 } 613 }
453 614
454 if (@SLOT_QUEUE) { 615 if (@SLOT_QUEUE) {
455 # we do not use wait_for_tick() as it returns immediately when tick is inactive 616 # we do not use wait_for_tick() as it returns immediately when tick is inactive
456 push @cf::WAIT_FOR_TICK, $signal; 617 $WAIT_FOR_TICK->wait;
457 $signal->wait;
458 } else { 618 } else {
459 $busy = 0; 619 $busy = 0;
460 Coro::schedule; 620 Coro::schedule;
461 } 621 }
462 } 622 }
502=cut 662=cut
503 663
504sub sync_job(&) { 664sub sync_job(&) {
505 my ($job) = @_; 665 my ($job) = @_;
506 666
507 if ($Coro::current == $Coro::main) { 667 if (in_main) {
508 my $time = AE::time; 668 my $time = AE::time;
509 669
510 # this is the main coro, too bad, we have to block 670 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 671 # till the operation succeeds, freezing the server :/
512 672
513 LOG llevError, Carp::longmess "sync job";#d# 673 #LOG llevError, Carp::longmess "sync job";#d#
514 674
515 my $freeze_guard = freeze_mainloop; 675 my $freeze_guard = freeze_mainloop;
516 676
517 my $busy = 1; 677 my $busy = 1;
518 my @res; 678 my @res;
519 679
520 (async { 680 (async {
521 $Coro::current->desc ("sync job coro"); 681 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 682 @res = eval { $job->() };
523 warn $@ if $@; 683 error $@ if $@;
524 undef $busy; 684 undef $busy;
525 })->prio (Coro::PRIO_MAX); 685 })->prio (Coro::PRIO_MAX);
526 686
527 while ($busy) { 687 while ($busy) {
528 if (Coro::nready) { 688 if (Coro::nready) {
562 $EXT_CORO{$coro+0} = $coro; 722 $EXT_CORO{$coro+0} = $coro;
563 723
564 $coro 724 $coro
565} 725}
566 726
567=item fork_call { }, $args 727=item fork_call { }, @args
568 728
569Executes the given code block with the given arguments in a seperate 729Executes the given code block with the given arguments in a seperate
570process, returning the results. Everything must be serialisable with 730process, returning the results. Everything must be serialisable with
571Coro::Storable. May, of course, block. Note that the executed sub may 731Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling. 732never block itself or use any form of event handling.
573 733
574=cut 734=cut
575 735
736sub post_fork {
737 reset_signals;
738}
739
576sub fork_call(&@) { 740sub fork_call(&@) {
577 my ($cb, @args) = @_; 741 my ($cb, @args) = @_;
578 742
579 # we seemingly have to make a local copy of the whole thing, 743 # we seemingly have to make a local copy of the whole thing,
580 # otherwise perl prematurely frees the stuff :/ 744 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious) 745 # TODO: investigate and fix (likely this will be rather laborious)
582 746
583 my @res = Coro::Util::fork_eval { 747 my @res = Coro::Util::fork_eval {
584 reset_signals; 748 cf::post_fork;
585 &$cb 749 &$cb
586 }, @args; 750 } @args;
587 751
588 wantarray ? @res : $res[-1] 752 wantarray ? @res : $res[-1]
753}
754
755sub objinfo {
756 (
757 "counter value" => cf::object::object_count,
758 "objects created" => cf::object::create_count,
759 "objects destroyed" => cf::object::destroy_count,
760 "freelist size" => cf::object::free_count,
761 "allocated objects" => cf::object::objects_size,
762 "active objects" => cf::object::actives_size,
763 )
589} 764}
590 765
591=item $coin = coin_from_name $name 766=item $coin = coin_from_name $name
592 767
593=cut 768=cut
630within each server. 805within each server.
631 806
632=cut 807=cut
633 808
634sub db_table($) { 809sub db_table($) {
810 cf::error "db_get called from main context"
811 if $Coro::current == $Coro::main;
812
635 my ($name) = @_; 813 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 814 my $db = BDB::db_create $DB_ENV;
637 815
638 eval { 816 eval {
639 $db->set_flags (BDB::CHKSUM); 817 $db->set_flags (BDB::CHKSUM);
649} 827}
650 828
651our $DB; 829our $DB;
652 830
653sub db_init { 831sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 832 $DB ||= db_table "db";
656 };
657} 833}
658 834
659sub db_get($$) { 835sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 836 my $key = "$_[0]/$_[1]";
661 837
662 cf::sync_job { 838 cf::error "db_get called from main context"
839 if $Coro::current == $Coro::main;
840
663 BDB::db_get $DB, undef, $key, my $data; 841 BDB::db_get $DB, undef, $key, my $data;
664 842
665 $! ? () 843 $! ? ()
666 : $data 844 : $data
667 }
668} 845}
669 846
670sub db_put($$$) { 847sub db_put($$$) {
671 BDB::dbreq_pri 4; 848 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 849 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
700 877
701 my @data; 878 my @data;
702 my $md5; 879 my $md5;
703 880
704 for (0 .. $#$src) { 881 for (0 .. $#$src) {
705 0 <= aio_load $src->[$_], $data[$_] 882 $data[$_] = load_file $src->[$_];
706 or Carp::croak "$src->[$_]: $!";
707 } 883 }
708 884
709 # if processing is expensive, check 885 # if processing is expensive, check
710 # checksum first 886 # checksum first
711 if (1) { 887 if (1) {
724 900
725 return db_get cache => "$id/data"; 901 return db_get cache => "$id/data";
726 } 902 }
727 } 903 }
728 904
729 my $t1 = Time::HiRes::time; 905 my $t1 = EV::time;
730 my $data = $process->(\@data); 906 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 907 my $t2 = EV::time;
732 908
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 909 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 910
735 db_put cache => "$id/data", $data; 911 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 912 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 913 db_put cache => "$id/meta", $meta;
738 914
748 924
749=cut 925=cut
750 926
751sub datalog($@) { 927sub datalog($@) {
752 my ($type, %kv) = @_; 928 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 929 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 930}
755 931
756=back 932=back
757 933
758=cut 934=cut
953 1129
954 } elsif (exists $cb_id{$type}) { 1130 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1131 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 1132
957 } elsif (ref $type) { 1133 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 1134 error "attaching objects not supported, ignoring.\n";
959 1135
960 } else { 1136 } else {
961 shift @arg; 1137 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 1138 error "attach argument '$type' not supported, ignoring.\n";
963 } 1139 }
964 } 1140 }
965} 1141}
966 1142
967sub _object_attach { 1143sub _object_attach {
977 _attach $registry, $klass, @attach; 1153 _attach $registry, $klass, @attach;
978 } 1154 }
979 1155
980 $obj->{$name} = \%arg; 1156 $obj->{$name} = \%arg;
981 } else { 1157 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1158 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1159 }
984 1160
985 $obj->{_attachment}{$name} = undef; 1161 $obj->{_attachment}{$name} = undef;
986} 1162}
987 1163
1046 1222
1047 for (@$callbacks) { 1223 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1224 eval { &{$_->[1]} };
1049 1225
1050 if ($@) { 1226 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1227 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1228 override;
1054 } 1229 }
1055 1230
1056 return 1 if $override; 1231 return 1 if $override;
1057 } 1232 }
1136 for (@$attach) { 1311 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1312 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1313 _attach $registry, $klass, @attach;
1139 } 1314 }
1140 } else { 1315 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1316 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1317 }
1143 } 1318 }
1144} 1319}
1145 1320
1146cf::attachable->attach ( 1321cf::attachable->attach (
1173 my ($filename, $rdata, $objs) = @_; 1348 my ($filename, $rdata, $objs) = @_;
1174 1349
1175 sync_job { 1350 sync_job {
1176 if (length $$rdata) { 1351 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1352 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1353 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1354 $decname, length $$rdata, scalar @$objs
1355 if $VERBOSE_IO;
1180 1356
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1357 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1358 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1359 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1360 if ($cf::USE_FSYNC) {
1206 aio_rename "$filename~", $filename; 1382 aio_rename "$filename~", $filename;
1207 1383
1208 $filename =~ s%/[^/]+$%%; 1384 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1385 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1386 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1387 error "unable to save objects: $filename~: $!\n";
1212 } 1388 }
1213 } else { 1389 } else {
1214 aio_unlink $filename; 1390 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1391 aio_unlink "$filename.pst";
1216 } 1392 }
1240 my $st = eval { Coro::Storable::thaw $av }; 1416 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1417 $av = $st->{objs};
1242 } 1418 }
1243 1419
1244 utf8::decode (my $decname = $filename); 1420 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1421 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1422 $decname, length $data, scalar @{$av || []}
1423 if $VERBOSE_IO;
1247 1424
1248 ($data, $av) 1425 ($data, $av)
1249} 1426}
1250 1427
1251=head2 COMMAND CALLBACKS 1428=head2 COMMAND CALLBACKS
1255=cut 1432=cut
1256 1433
1257############################################################################# 1434#############################################################################
1258# command handling &c 1435# command handling &c
1259 1436
1260=item cf::register_command $name => \&callback($ob,$args); 1437=item cf::register_command $name => \&callback($ob,$args)
1261 1438
1262Register a callback for execution when the client sends the user command 1439Register a callback for execution when the client sends the user command
1263$name. 1440$name.
1264 1441
1265=cut 1442=cut
1271 #warn "registering command '$name/$time' to '$caller'"; 1448 #warn "registering command '$name/$time' to '$caller'";
1272 1449
1273 push @{ $COMMAND{$name} }, [$caller, $cb]; 1450 push @{ $COMMAND{$name} }, [$caller, $cb];
1274} 1451}
1275 1452
1276=item cf::register_extcmd $name => \&callback($pl,$packet); 1453=item cf::register_extcmd $name => \&callback($pl,@args)
1277 1454
1278Register a callback for execution when the client sends an (synchronous) 1455Register a callback for execution when the client sends an (synchronous)
1279extcmd packet. Ext commands will be processed in the order they are 1456extcmd packet. Ext commands will be processed in the order they are
1280received by the server, like other user commands. The first argument is 1457received by the server, like other user commands. The first argument is
1281the logged-in player. Ext commands can only be processed after a player 1458the logged-in player. Ext commands can only be processed after a player
1282has logged in successfully. 1459has logged in successfully.
1283 1460
1284If the callback returns something, it is sent back as if reply was being 1461The values will be sent back to the client.
1285called.
1286 1462
1463=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1464
1465Same as C<cf::register_extcmd>, but instead of returning values, the
1466callback needs to clal the C<$reply> function.
1467
1287=item cf::register_exticmd $name => \&callback($ns,$packet); 1468=item cf::register_exticmd $name => \&callback($ns,@args)
1288 1469
1289Register a callback for execution when the client sends an (asynchronous) 1470Register a callback for execution when the client sends an (asynchronous)
1290exticmd packet. Exti commands are processed by the server as soon as they 1471exticmd packet. Exti commands are processed by the server as soon as they
1291are received, i.e. out of order w.r.t. other commands. The first argument 1472are received, i.e. out of order w.r.t. other commands. The first argument
1292is a client socket. Exti commands can be received anytime, even before 1473is a client socket. Exti commands can be received anytime, even before
1293log-in. 1474log-in.
1294 1475
1295If the callback returns something, it is sent back as if reply was being 1476The values will be sent back to the client.
1296called.
1297 1477
1298=cut 1478=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1299 1479
1480Same as C<cf::register_extcmd>, but instead of returning values, the
1481callback needs to clal the C<$reply> function.
1482
1483=cut
1484
1300sub register_extcmd { 1485sub register_extcmd($$) {
1301 my ($name, $cb) = @_; 1486 my ($name, $cb) = @_;
1302 1487
1303 $EXTCMD{$name} = $cb; 1488 $EXTCMD{$name} = $cb;
1304} 1489}
1305 1490
1306sub register_exticmd { 1491sub register_async_extcmd($$) {
1307 my ($name, $cb) = @_; 1492 my ($name, $cb) = @_;
1308 1493
1494 $EXTACMD{$name} = $cb;
1495}
1496
1497sub register_exticmd($$) {
1498 my ($name, $cb) = @_;
1499
1309 $EXTICMD{$name} = $cb; 1500 $EXTICMD{$name} = $cb;
1501}
1502
1503sub register_async_exticmd($$) {
1504 my ($name, $cb) = @_;
1505
1506 $EXTIACMD{$name} = $cb;
1310} 1507}
1311 1508
1312use File::Glob (); 1509use File::Glob ();
1313 1510
1314cf::player->attach ( 1511cf::player->attach (
1328 my ($pl, $buf) = @_; 1525 my ($pl, $buf) = @_;
1329 1526
1330 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1527 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1331 1528
1332 if (ref $msg) { 1529 if (ref $msg) {
1333 my ($type, $reply, @payload) = 1530 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1334 "ARRAY" eq ref $msg
1335 ? @$msg
1336 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1337 1531
1338 my @reply;
1339
1340 if (my $cb = $EXTCMD{$type}) { 1532 if (my $cb = $EXTACMD{$type}) {
1533 $cb->(
1534 $pl,
1535 sub {
1536 $pl->ext_msg ("reply-$reply", @_)
1537 if $reply;
1538 },
1539 @payload
1540 );
1541 } else {
1542 my @reply;
1543
1544 if (my $cb = $EXTCMD{$type}) {
1341 @reply = $cb->($pl, @payload); 1545 @reply = $cb->($pl, @payload);
1546 }
1547
1548 $pl->ext_msg ("reply-$reply", @reply)
1549 if $reply;
1342 } 1550 }
1343 1551
1344 $pl->ext_reply ($reply, @reply)
1345 if $reply;
1346
1347 } else { 1552 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1553 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1554 }
1350 1555
1351 cf::override; 1556 cf::override;
1352 }, 1557 },
1353); 1558);
1363 }; 1568 };
1364 1569
1365 $grp 1570 $grp
1366} 1571}
1367 1572
1573sub _ext_cfg_reg($$$$) {
1574 my ($rvar, $varname, $cfgname, $default) = @_;
1575
1576 $cfgname = lc $varname
1577 unless length $cfgname;
1578
1579 $EXT_CFG{$cfgname} = [$rvar, $default];
1580
1581 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1582}
1583
1368sub load_extensions { 1584sub load_extensions {
1585 info "loading extensions...";
1586
1587 %EXT_CFG = ();
1588
1369 cf::sync_job { 1589 cf::sync_job {
1370 my %todo; 1590 my %todo;
1371 1591
1372 for my $path (<$LIBDIR/*.ext>) { 1592 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1593 next unless -r $path;
1391 1611
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1612 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1613 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1614
1395 $ext{source} = 1615 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1616 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1617 . "#line 1 \"$path\"\n{\n"
1398 . $source 1618 . $source
1399 . "\n};\n1"; 1619 . "\n};\n1";
1400 1620
1401 $todo{$base} = \%ext; 1621 $todo{$base} = \%ext;
1413 for (split /,\s*/, $v->{meta}{depends}) { 1633 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1634 next ext
1415 unless exists $done{$_}; 1635 unless exists $done{$_};
1416 } 1636 }
1417 1637
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1638 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1639
1640 my $source = $v->{source};
1641
1642 # support "CONF varname :confname = default" pseudo-statements
1643 $source =~ s{
1644 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1645 }{
1646 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1647 }gmxe;
1648
1420 my $active = eval $v->{source}; 1649 my $active = eval $source;
1421 1650
1422 if (length $@) { 1651 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1652 error "$v->{path}: $@\n";
1424 1653
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1654 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1655 if exists $v->{meta}{mandatory};
1656
1657 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1658 delete $todo{$k};
1427 } else { 1659 } else {
1428 $done{$k} = delete $todo{$k}; 1660 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1661 push @EXTS, $v->{pkg};
1430 $progress = 1; 1662 $progress = 1;
1431 1663
1432 warn "$v->{base}: extension inactive.\n" 1664 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1665 unless $active;
1434 } 1666 }
1435 } 1667 }
1436 1668
1437 unless ($progress) { 1669 unless ($progress) {
1439 1671
1440 while (my ($k, $v) = each %todo) { 1672 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1673 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory}; 1674 if exists $v->{meta}{mandatory};
1443 } 1675 }
1676
1677 last;
1444 } 1678 }
1445 } 1679 }
1446 }; 1680 };
1447} 1681}
1448 1682
1606 my $name = $pl->ob->name; 1840 my $name = $pl->ob->name;
1607 1841
1608 $pl->{deny_save} = 1; 1842 $pl->{deny_save} = 1;
1609 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1843 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1610 1844
1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1845 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1612 $pl->deactivate; 1846 $pl->deactivate;
1847
1613 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1848 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1614 $pl->ob->check_score;
1615 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1849 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1850 ext::highscore::check ($pl->ob);
1851
1616 $pl->ns->destroy if $pl->ns; 1852 $pl->ns->destroy if $pl->ns;
1617 1853
1618 my $path = playerdir $pl; 1854 my $path = playerdir $pl;
1619 my $temp = "$path~$cf::RUNTIME~deleting~"; 1855 my $temp = "$path~$cf::RUNTIME~deleting~";
1620 aio_rename $path, $temp; 1856 aio_rename $path, $temp;
1674 \@logins 1910 \@logins
1675} 1911}
1676 1912
1677=item $player->maps 1913=item $player->maps
1678 1914
1915=item cf::player::maps $login
1916
1679Returns an arrayref of map paths that are private for this 1917Returns an arrayref of map paths that are private for this
1680player. May block. 1918player. May block.
1681 1919
1682=cut 1920=cut
1683 1921
1704 1942
1705=item $protocol_xml = $player->expand_cfpod ($cfpod) 1943=item $protocol_xml = $player->expand_cfpod ($cfpod)
1706 1944
1707Expand deliantra pod fragments into protocol xml. 1945Expand deliantra pod fragments into protocol xml.
1708 1946
1709=item $player->ext_reply ($msgid, @msg)
1710
1711Sends an ext reply to the player.
1712
1713=cut
1714
1715sub ext_reply($$@) {
1716 my ($self, $id, @msg) = @_;
1717
1718 $self->ns->ext_reply ($id, @msg)
1719}
1720
1721=item $player->ext_msg ($type, @msg) 1947=item $player->ext_msg ($type, @msg)
1722 1948
1723Sends an ext event to the client. 1949Sends an ext event to the client.
1724 1950
1725=cut 1951=cut
1744 1970
1745=cut 1971=cut
1746 1972
1747sub find_by_path($) { 1973sub find_by_path($) {
1748 my ($path) = @_; 1974 my ($path) = @_;
1975
1976 $path =~ s/^~[^\/]*//; # skip ~login
1749 1977
1750 my ($match, $specificity); 1978 my ($match, $specificity);
1751 1979
1752 for my $region (list) { 1980 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1981 if ($region->{match} && $path =~ $region->{match}) {
1782sub generate_random_map { 2010sub generate_random_map {
1783 my ($self, $rmp) = @_; 2011 my ($self, $rmp) = @_;
1784 2012
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2013 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786 2014
1787 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 2015 $self->_create_random_map ($rmp);
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1796 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1797 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1798 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1799 (cf::region::find $rmp->{region}), $rmp->{custom}
1800 )
1801} 2016}
1802 2017
1803=item cf::map->register ($regex, $prio) 2018=item cf::map->register ($regex, $prio)
1804 2019
1805Register a handler for the map path matching the given regex at the 2020Register a handler for the map path matching the given regex at the
1810 2025
1811sub register { 2026sub register {
1812 my (undef, $regex, $prio) = @_; 2027 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 2028 my $pkg = caller;
1814 2029
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 2030 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 2031
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2032 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 2033}
1820 2034
1821# also paths starting with '/' 2035# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2036$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 2037
1824sub thawer_merge { 2038sub thawer_merge {
1825 my ($self, $merge) = @_; 2039 my ($self, $merge) = @_;
1826 2040
1827 # we have to keep some variables in memory intact 2041 # we have to keep some variables in memory intact
1832} 2046}
1833 2047
1834sub normalise { 2048sub normalise {
1835 my ($path, $base) = @_; 2049 my ($path, $base) = @_;
1836 2050
1837 $path = "$path"; # make sure its a string 2051 $path = "$path"; # make sure it's a string
1838 2052
1839 $path =~ s/\.map$//; 2053 $path =~ s/\.map$//;
1840 2054
1841 # map plan: 2055 # map plan:
1842 # 2056 #
1857 $base =~ s{[^/]+/?$}{}; 2071 $base =~ s{[^/]+/?$}{};
1858 $path = "$base/$path"; 2072 $path = "$base/$path";
1859 } 2073 }
1860 2074
1861 for ($path) { 2075 for ($path) {
1862 redo if s{//}{/};
1863 redo if s{/\.?/}{/}; 2076 redo if s{/\.?/}{/};
1864 redo if s{/[^/]+/\.\./}{/}; 2077 redo if s{/[^/]+/\.\./}{/};
1865 } 2078 }
1866 2079
1867 $path 2080 $path
1881 $self->init; # pass $1 etc. 2094 $self->init; # pass $1 etc.
1882 return $self; 2095 return $self;
1883 } 2096 }
1884 } 2097 }
1885 2098
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2099 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 2100 ()
1888} 2101}
1889 2102
2103# may re-bless or do other evil things
1890sub init { 2104sub init {
1891 my ($self) = @_; 2105 my ($self) = @_;
1892 2106
1893 $self 2107 $self
1894} 2108}
1959 $self->{load_path} = $path; 2173 $self->{load_path} = $path;
1960 2174
1961 1 2175 1
1962} 2176}
1963 2177
2178# used to laod the header of an original map
1964sub load_header_orig { 2179sub load_header_orig {
1965 my ($self) = @_; 2180 my ($self) = @_;
1966 2181
1967 $self->load_header_from ($self->load_path) 2182 $self->load_header_from ($self->load_path)
1968} 2183}
1969 2184
2185# used to laod the header of an instantiated map
1970sub load_header_temp { 2186sub load_header_temp {
1971 my ($self) = @_; 2187 my ($self) = @_;
1972 2188
1973 $self->load_header_from ($self->save_path) 2189 $self->load_header_from ($self->save_path)
1974} 2190}
1975 2191
2192# called after loading the header from an instantiated map
1976sub prepare_temp { 2193sub prepare_temp {
1977 my ($self) = @_; 2194 my ($self) = @_;
1978 2195
1979 $self->last_access ((delete $self->{last_access}) 2196 $self->last_access ((delete $self->{last_access})
1980 || $cf::RUNTIME); #d# 2197 || $cf::RUNTIME); #d#
1981 # safety 2198 # safety
1982 $self->{instantiate_time} = $cf::RUNTIME 2199 $self->{instantiate_time} = $cf::RUNTIME
1983 if $self->{instantiate_time} > $cf::RUNTIME; 2200 if $self->{instantiate_time} > $cf::RUNTIME;
1984} 2201}
1985 2202
2203# called after loading the header from an original map
1986sub prepare_orig { 2204sub prepare_orig {
1987 my ($self) = @_; 2205 my ($self) = @_;
1988 2206
1989 $self->{load_original} = 1; 2207 $self->{load_original} = 1;
1990 $self->{instantiate_time} = $cf::RUNTIME; 2208 $self->{instantiate_time} = $cf::RUNTIME;
2014 2232
2015sub find; 2233sub find;
2016sub find { 2234sub find {
2017 my ($path, $origin) = @_; 2235 my ($path, $origin) = @_;
2018 2236
2237 cf::cede_to_tick;
2238
2019 $path = normalise $path, $origin && $origin->path; 2239 $path = normalise $path, $origin;
2020 2240
2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2241 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2022 my $guard2 = cf::lock_acquire "map_find:$path"; 2242 my $guard2 = cf::lock_acquire "map_find:$path";
2023 2243
2024 $cf::MAP{$path} || do { 2244 $cf::MAP{$path} || do {
2055 2275
2056 { 2276 {
2057 my $guard = cf::lock_acquire "map_data:$path"; 2277 my $guard = cf::lock_acquire "map_data:$path";
2058 2278
2059 return unless $self->valid; 2279 return unless $self->valid;
2060 return unless $self->in_memory == cf::MAP_SWAPPED; 2280 return unless $self->state == cf::MAP_SWAPPED;
2061
2062 $self->in_memory (cf::MAP_LOADING);
2063 2281
2064 $self->alloc; 2282 $self->alloc;
2065 2283
2066 $self->pre_load; 2284 $self->pre_load;
2067 cf::cede_to_tick; 2285 cf::cede_to_tick;
2068 2286
2287 if (exists $self->{load_path}) {
2069 my $f = new_from_file cf::object::thawer $self->{load_path}; 2288 my $f = new_from_file cf::object::thawer $self->{load_path};
2070 $f->skip_block; 2289 $f->skip_block;
2071 $self->_load_objects ($f) 2290 $self->_load_objects ($f)
2072 or return; 2291 or return;
2073 2292
2074 $self->post_load_original 2293 $self->post_load_original
2075 if delete $self->{load_original}; 2294 if delete $self->{load_original};
2076 2295
2077 if (my $uniq = $self->uniq_path) { 2296 if (my $uniq = $self->uniq_path) {
2078 utf8::encode $uniq; 2297 utf8::encode $uniq;
2079 unless (aio_stat $uniq) { 2298 unless (aio_stat $uniq) {
2080 if (my $f = new_from_file cf::object::thawer $uniq) { 2299 if (my $f = new_from_file cf::object::thawer $uniq) {
2081 $self->clear_unique_items; 2300 $self->clear_unique_items;
2082 $self->_load_objects ($f); 2301 $self->_load_objects ($f);
2083 $f->resolve_delayed_derefs; 2302 $f->resolve_delayed_derefs;
2303 }
2084 } 2304 }
2085 } 2305 }
2086 }
2087 2306
2088 $f->resolve_delayed_derefs; 2307 $f->resolve_delayed_derefs;
2308 } else {
2309 $self->post_load_original
2310 if delete $self->{load_original};
2311 }
2312
2313 $self->state (cf::MAP_INACTIVE);
2089 2314
2090 cf::cede_to_tick; 2315 cf::cede_to_tick;
2091 # now do the right thing for maps 2316 # now do the right thing for maps
2092 $self->link_multipart_objects; 2317 $self->link_multipart_objects;
2093 $self->difficulty ($self->estimate_difficulty) 2318 $self->difficulty ($self->estimate_difficulty)
2097 unless ($self->{deny_activate}) { 2322 unless ($self->{deny_activate}) {
2098 $self->decay_objects; 2323 $self->decay_objects;
2099 $self->fix_auto_apply; 2324 $self->fix_auto_apply;
2100 $self->update_buttons; 2325 $self->update_buttons;
2101 cf::cede_to_tick; 2326 cf::cede_to_tick;
2102 $self->activate; 2327 #$self->activate; # no longer activate maps automatically
2103 } 2328 }
2104 2329
2105 $self->{last_save} = $cf::RUNTIME; 2330 $self->{last_save} = $cf::RUNTIME;
2106 $self->last_access ($cf::RUNTIME); 2331 $self->last_access ($cf::RUNTIME);
2107
2108 $self->in_memory (cf::MAP_ACTIVE);
2109 } 2332 }
2110 2333
2111 $self->post_load; 2334 $self->post_load;
2335
2336 1
2112} 2337}
2113 2338
2114# customize the map for a given player, i.e. 2339# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player 2340# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath 2341# maps to change the path to ~playername/mappath
2124# if $self->per_party; 2349# if $self->per_party;
2125 2350
2126 $self 2351 $self
2127} 2352}
2128 2353
2129# find and load all maps in the 3x3 area around a map
2130sub load_neighbours {
2131 my ($map) = @_;
2132
2133 my @neigh; # diagonal neighbours
2134
2135 for (0 .. 3) {
2136 my $neigh = $map->tile_path ($_)
2137 or next;
2138 $neigh = find $neigh, $map
2139 or next;
2140 $neigh->load;
2141
2142 push @neigh,
2143 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2144 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2145 }
2146
2147 for (grep defined $_->[0], @neigh) {
2148 my ($path, $origin) = @$_;
2149 my $neigh = find $path, $origin
2150 or next;
2151 $neigh->load;
2152 }
2153}
2154
2155sub find_sync { 2354sub find_sync {
2156 my ($path, $origin) = @_; 2355 my ($path, $origin) = @_;
2157 2356
2158 cf::sync_job { find $path, $origin } 2357 # it's a bug to call this from the main context
2358 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2359 if $Coro::current == $Coro::main;
2360
2361 find $path, $origin
2159} 2362}
2160 2363
2161sub do_load_sync { 2364sub do_load_sync {
2162 my ($map) = @_; 2365 my ($map) = @_;
2163 2366
2367 # it's a bug to call this from the main context
2164 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2368 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2165 if $Coro::current == $Coro::main; 2369 if $Coro::current == $Coro::main;
2166 2370
2167 cf::sync_job { $map->load }; 2371 $map->load;
2168} 2372}
2169 2373
2170our %MAP_PREFETCH; 2374our %MAP_PREFETCH;
2171our $MAP_PREFETCHER = undef; 2375our $MAP_PREFETCHER = undef;
2172 2376
2173sub find_async { 2377sub find_async {
2174 my ($path, $origin, $load) = @_; 2378 my ($path, $origin, $load) = @_;
2175 2379
2176 $path = normalise $path, $origin && $origin->{path}; 2380 $path = normalise $path, $origin;
2177 2381
2178 if (my $map = $cf::MAP{$path}) { 2382 if (my $map = $cf::MAP{$path}) {
2179 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2383 return $map if !$load || $map->linkable;
2180 } 2384 }
2181 2385
2182 $MAP_PREFETCH{$path} |= $load; 2386 $MAP_PREFETCH{$path} |= $load;
2183 2387
2184 $MAP_PREFETCHER ||= cf::async { 2388 $MAP_PREFETCHER ||= cf::async {
2198 $MAP_PREFETCHER->prio (6); 2402 $MAP_PREFETCHER->prio (6);
2199 2403
2200 () 2404 ()
2201} 2405}
2202 2406
2407# common code, used by both ->save and ->swapout
2203sub save { 2408sub _save {
2204 my ($self) = @_; 2409 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2410
2208 $self->{last_save} = $cf::RUNTIME; 2411 $self->{last_save} = $cf::RUNTIME;
2209 2412
2210 return unless $self->dirty; 2413 return unless $self->dirty;
2211 2414
2231 } else { 2434 } else {
2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2435 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233 } 2436 }
2234} 2437}
2235 2438
2439sub save {
2440 my ($self) = @_;
2441
2442 my $lock = cf::lock_acquire "map_data:$self->{path}";
2443
2444 $self->_save;
2445}
2446
2236sub swap_out { 2447sub swap_out {
2237 my ($self) = @_; 2448 my ($self) = @_;
2238 2449
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2450 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2451
2452 return if !$self->linkable;
2453 return if $self->{deny_save};
2244 return if $self->players; 2454 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2455
2456 # first deactivate the map and "unlink" it from the core
2457 $self->deactivate;
2458 $_->clear_links_to ($self) for values %cf::MAP;
2459 $self->state (cf::MAP_SWAPPED);
2460
2461 # then atomically save
2462 $self->_save;
2463
2464 # then free the map
2465 $self->clear;
2466}
2467
2468sub reset_at {
2469 my ($self) = @_;
2470
2471 # TODO: safety, remove and allow resettable per-player maps
2246 return if $self->{deny_save}; 2472 return 1e99 if $self->{deny_reset};
2247 2473
2474 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2475 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2476
2477 $time + $to
2478}
2479
2480sub should_reset {
2481 my ($self) = @_;
2482
2483 $self->reset_at <= $cf::RUNTIME
2484}
2485
2486sub reset {
2487 my ($self) = @_;
2488
2489 my $lock = cf::lock_acquire "map_data:$self->{path}";
2490
2491 return if $self->players;
2492
2493 cf::trace "resetting map ", $self->path, "\n";
2494
2248 $self->in_memory (cf::MAP_SWAPPED); 2495 $self->state (cf::MAP_SWAPPED);
2496
2497 # need to save uniques path
2498 unless ($self->{deny_save}) {
2499 my $uniq = $self->uniq_path; utf8::encode $uniq;
2500
2501 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2502 if $uniq;
2503 }
2504
2505 delete $cf::MAP{$self->path};
2249 2506
2250 $self->deactivate; 2507 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2508 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear; 2509 $self->clear;
2253}
2254
2255sub reset_at {
2256 my ($self) = @_;
2257
2258 # TODO: safety, remove and allow resettable per-player maps
2259 return 1e99 if $self->{deny_reset};
2260
2261 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2262 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2263
2264 $time + $to
2265}
2266
2267sub should_reset {
2268 my ($self) = @_;
2269
2270 $self->reset_at <= $cf::RUNTIME
2271}
2272
2273sub reset {
2274 my ($self) = @_;
2275
2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2277
2278 return if $self->players;
2279
2280 warn "resetting map ", $self->path, "\n";
2281
2282 $self->in_memory (cf::MAP_SWAPPED);
2283
2284 # need to save uniques path
2285 unless ($self->{deny_save}) {
2286 my $uniq = $self->uniq_path; utf8::encode $uniq;
2287
2288 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2289 if $uniq;
2290 }
2291
2292 delete $cf::MAP{$self->path};
2293
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2296 $self->clear;
2297 2510
2298 $self->unlink_save; 2511 $self->unlink_save;
2299 $self->destroy; 2512 $self->destroy;
2300} 2513}
2301 2514
2309 2522
2310 delete $cf::MAP{$self->path}; 2523 delete $cf::MAP{$self->path};
2311 2524
2312 $self->unlink_save; 2525 $self->unlink_save;
2313 2526
2314 bless $self, "cf::map"; 2527 bless $self, "cf::map::wrap";
2315 delete $self->{deny_reset}; 2528 delete $self->{deny_reset};
2316 $self->{deny_save} = 1; 2529 $self->{deny_save} = 1;
2317 $self->reset_timeout (1); 2530 $self->reset_timeout (1);
2318 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2531 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319 2532
2549 2762
2550Freezes the player and moves him/her to a special map (C<{link}>). 2763Freezes the player and moves him/her to a special map (C<{link}>).
2551 2764
2552The player should be reasonably safe there for short amounts of time (e.g. 2765The player should be reasonably safe there for short amounts of time (e.g.
2553for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2766for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link 2767though, as the player cannot control the character while it is on the link
2555map. 2768map.
2556 2769
2557Will never block. 2770Will never block.
2558 2771
2559=item $player_object->leave_link ($map, $x, $y) 2772=item $player_object->leave_link ($map, $x, $y)
2580sub cf::object::player::enter_link { 2793sub cf::object::player::enter_link {
2581 my ($self) = @_; 2794 my ($self) = @_;
2582 2795
2583 $self->deactivate_recursive; 2796 $self->deactivate_recursive;
2584 2797
2798 ++$self->{_link_recursion};
2799
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2800 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2801
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2802 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2803 if $self->map && $self->map->{path} ne "{link}";
2589 2804
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2805 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2806}
2592 2807
2593sub cf::object::player::leave_link { 2808sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2809 my ($self, $map, $x, $y) = @_;
2595 2810
2615 # use -1 or undef as default coordinates, not 0, 0 2830 # use -1 or undef as default coordinates, not 0, 0
2616 ($x, $y) = ($map->enter_x, $map->enter_y) 2831 ($x, $y) = ($map->enter_x, $map->enter_y)
2617 if $x <= 0 && $y <= 0; 2832 if $x <= 0 && $y <= 0;
2618 2833
2619 $map->load; 2834 $map->load;
2620 $map->load_neighbours;
2621 2835
2622 return unless $self->contr->active; 2836 return unless $self->contr->active;
2623 2837
2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2838 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625 $self->enter_map ($map, $x, $y); 2839 if ($self->enter_map ($map, $x, $y)) {
2626 2840 # entering was successful
2841 delete $self->{_link_recursion};
2627 # only activate afterwards, to support waiting in hooks 2842 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive; 2843 $self->activate_recursive;
2629} 2844 }
2630 2845
2846}
2847
2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2848=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2632 2849
2633Moves the player to the given map-path and coordinates by first freezing 2850Moves the player to the given map-path and coordinates by first freezing
2634her, loading and preparing them map, calling the provided $check callback 2851her, loading and preparing them map, calling the provided $check callback
2635that has to return the map if sucecssful, and then unfreezes the player on 2852that has to return the map if sucecssful, and then unfreezes the player on
2636the new (success) or old (failed) map position. In either case, $done will 2853the new (success) or old (failed) map position. In either case, $done will
2643 2860
2644our $GOTOGEN; 2861our $GOTOGEN;
2645 2862
2646sub cf::object::player::goto { 2863sub cf::object::player::goto {
2647 my ($self, $path, $x, $y, $check, $done) = @_; 2864 my ($self, $path, $x, $y, $check, $done) = @_;
2865
2866 if ($self->{_link_recursion} >= $MAX_LINKS) {
2867 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2868 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2869 ($path, $x, $y) = @$EMERGENCY_POSITION;
2870 }
2648 2871
2649 # do generation counting so two concurrent goto's will be executed in-order 2872 # do generation counting so two concurrent goto's will be executed in-order
2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2873 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651 2874
2652 $self->enter_link; 2875 $self->enter_link;
2672 ($path, $x, $y) = (undef, undef, undef); 2895 ($path, $x, $y) = (undef, undef, undef);
2673 } 2896 }
2674 } 2897 }
2675 2898
2676 my $map = eval { 2899 my $map = eval {
2677 my $map = defined $path ? cf::map::find $path : undef; 2900 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2678 2901
2679 if ($map) { 2902 if ($map) {
2680 $map = $map->customise_for ($self); 2903 $map = $map->customise_for ($self);
2681 $map = $check->($map) if $check && $map; 2904 $map = $check->($map, $x, $y, $self) if $check && $map;
2682 } else { 2905 } else {
2683 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2906 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2684 } 2907 }
2685 2908
2686 $map 2909 $map
2694 if ($gen == $self->{_goto_generation}) { 2917 if ($gen == $self->{_goto_generation}) {
2695 delete $self->{_goto_generation}; 2918 delete $self->{_goto_generation};
2696 $self->leave_link ($map, $x, $y); 2919 $self->leave_link ($map, $x, $y);
2697 } 2920 }
2698 2921
2699 $done->() if $done; 2922 $done->($self) if $done;
2700 })->prio (1); 2923 })->prio (1);
2701} 2924}
2702 2925
2703=item $player_object->enter_exit ($exit_object) 2926=item $player_object->enter_exit ($exit_object)
2704 2927
2772 $Coro::current->{desc} = "enter_exit"; 2995 $Coro::current->{desc} = "enter_exit";
2773 2996
2774 unless (eval { 2997 unless (eval {
2775 $self->deactivate_recursive; # just to be sure 2998 $self->deactivate_recursive; # just to be sure
2776 2999
2777 # random map handling
2778 {
2779 my $guard = cf::lock_acquire "exit_prepare:$exit";
2780
2781 prepare_random_map $exit
2782 if $exit->slaying eq "/!";
2783 }
2784
2785 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3000 my $map = cf::map::normalise $exit->slaying, $exit->map;
2786 my $x = $exit->stats->hp; 3001 my $x = $exit->stats->hp;
2787 my $y = $exit->stats->sp; 3002 my $y = $exit->stats->sp;
3003
3004 # special map handling
3005 my $slaying = $exit->slaying;
3006
3007 # special map handling
3008 if ($slaying eq "/!") {
3009 my $guard = cf::lock_acquire "exit_prepare:$exit";
3010
3011 prepare_random_map $exit
3012 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3013
3014 $map = $exit->slaying;
3015
3016 } elsif ($slaying eq '!up') {
3017 $map = $exit->map->tile_path (cf::TILE_UP);
3018 $x = $exit->x;
3019 $y = $exit->y;
3020
3021 } elsif ($slaying eq '!down') {
3022 $map = $exit->map->tile_path (cf::TILE_DOWN);
3023 $x = $exit->x;
3024 $y = $exit->y;
3025 }
2788 3026
2789 $self->goto ($map, $x, $y); 3027 $self->goto ($map, $x, $y);
2790 3028
2791 # if exit is damned, update players death & WoR home-position 3029 # if exit is damned, update players death & WoR home-position
2792 $self->contr->savebed ($map, $x, $y) 3030 $self->contr->savebed ($map, $x, $y)
2797 $self->message ("Something went wrong deep within the deliantra server. " 3035 $self->message ("Something went wrong deep within the deliantra server. "
2798 . "I'll try to bring you back to the map you were before. " 3036 . "I'll try to bring you back to the map you were before. "
2799 . "Please report this to the dungeon master!", 3037 . "Please report this to the dungeon master!",
2800 cf::NDI_UNIQUE | cf::NDI_RED); 3038 cf::NDI_UNIQUE | cf::NDI_RED);
2801 3039
2802 warn "ERROR in enter_exit: $@"; 3040 error "ERROR in enter_exit: $@";
2803 $self->leave_link; 3041 $self->leave_link;
2804 } 3042 }
2805 })->prio (1); 3043 })->prio (1);
2806} 3044}
2807 3045
3017=cut 3255=cut
3018 3256
3019sub cf::client::ext_msg($$@) { 3257sub cf::client::ext_msg($$@) {
3020 my ($self, $type, @msg) = @_; 3258 my ($self, $type, @msg) = @_;
3021 3259
3022 if ($self->extcmd == 2) {
3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3260 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3024 } elsif ($self->extcmd == 1) { # TODO: remove
3025 push @msg, msgtype => "event_$type";
3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3027 }
3028}
3029
3030=item $client->ext_reply ($msgid, @msg)
3031
3032Sends an ext reply to the client.
3033
3034=cut
3035
3036sub cf::client::ext_reply($$@) {
3037 my ($self, $id, @msg) = @_;
3038
3039 if ($self->extcmd == 2) {
3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3041 } elsif ($self->extcmd == 1) {
3042 #TODO: version 1, remove
3043 unshift @msg, msgtype => "reply", msgid => $id;
3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3045 }
3046} 3261}
3047 3262
3048=item $success = $client->query ($flags, "text", \&cb) 3263=item $success = $client->query ($flags, "text", \&cb)
3049 3264
3050Queues a query to the client, calling the given callback with 3265Queues a query to the client, calling the given callback with
3105 my ($ns, $buf) = @_; 3320 my ($ns, $buf) = @_;
3106 3321
3107 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3322 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3108 3323
3109 if (ref $msg) { 3324 if (ref $msg) {
3110 my ($type, $reply, @payload) = 3325 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3111 "ARRAY" eq ref $msg
3112 ? @$msg
3113 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3114 3326
3115 my @reply;
3116
3117 if (my $cb = $EXTICMD{$type}) { 3327 if (my $cb = $EXTIACMD{$type}) {
3328 $cb->(
3329 $ns,
3330 sub {
3331 $ns->ext_msg ("reply-$reply", @_)
3332 if $reply;
3333 },
3334 @payload
3335 );
3336 } else {
3337 my @reply;
3338
3339 if (my $cb = $EXTICMD{$type}) {
3118 @reply = $cb->($ns, @payload); 3340 @reply = $cb->($ns, @payload);
3341 }
3342
3343 $ns->ext_msg ("reply-$reply", @reply)
3344 if $reply;
3119 } 3345 }
3120
3121 $ns->ext_reply ($reply, @reply)
3122 if $reply;
3123
3124 } else { 3346 } else {
3125 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3347 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3126 } 3348 }
3127 3349
3128 cf::override; 3350 cf::override;
3129 }, 3351 },
3130); 3352);
3211 decrease split destroy change_exp value msg lore send_msg)], 3433 decrease split destroy change_exp value msg lore send_msg)],
3212 ["cf::object::player" => qw(player)], 3434 ["cf::object::player" => qw(player)],
3213 ["cf::player" => qw(peaceful send_msg)], 3435 ["cf::player" => qw(peaceful send_msg)],
3214 ["cf::map" => qw(trigger)], 3436 ["cf::map" => qw(trigger)],
3215) { 3437) {
3216 no strict 'refs';
3217 my ($pkg, @funs) = @$_; 3438 my ($pkg, @funs) = @$_;
3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3439 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3219 for @funs; 3440 for @funs;
3220} 3441}
3221 3442
3260 local @cf::_safe_eval_args = values %vars; 3481 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval; 3482 @res = wantarray ? eval eval : scalar eval $eval;
3262 } 3483 }
3263 3484
3264 if ($@) { 3485 if ($@) {
3265 warn "$@"; 3486 warn "$@",
3266 warn "while executing safe code '$code'\n"; 3487 "while executing safe code '$code'\n",
3267 warn "with arguments " . (join " ", %vars) . "\n"; 3488 "with arguments " . (join " ", %vars) . "\n";
3268 } 3489 }
3269 3490
3270 wantarray ? @res : $res[0] 3491 wantarray ? @res : $res[0]
3271} 3492}
3272 3493
3297=cut 3518=cut
3298 3519
3299############################################################################# 3520#############################################################################
3300# the server's init and main functions 3521# the server's init and main functions
3301 3522
3523our %FACEHASH; # hash => idx, #d# HACK for http server
3524
3525# internal api, not fianlised
3526sub set_face {
3527 my ($name, $type, $data) = @_;
3528
3529 my $idx = cf::face::find $name;
3530
3531 if ($idx) {
3532 delete $FACEHASH{cf::face::get_chksum $idx};
3533 } else {
3534 $idx = cf::face::alloc $name;
3535 }
3536
3537 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3538
3539 cf::face::set_type $idx, $type;
3540 cf::face::set_data $idx, 0, $data, $hash;
3541 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3542 $FACEHASH{$hash} = $idx;#d#
3543
3544 $idx
3545}
3546
3302sub load_facedata($) { 3547sub load_facedata($) {
3303 my ($path) = @_; 3548 my ($path) = @_;
3304 3549
3305 # HACK to clear player env face cache, we need some signal framework 3550 # HACK to clear player env face cache, we need some signal framework
3306 # for this (global event?) 3551 # for this (global event?)
3307 %ext::player_env::MUSIC_FACE_CACHE = (); 3552 %ext::player_env::MUSIC_FACE_CACHE = ();
3308 3553
3309 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3554 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3310 3555
3311 warn "loading facedata from $path\n"; 3556 trace "loading facedata from $path\n";
3312 3557
3313 my $facedata; 3558 my $facedata = decode_storable load_file $path;
3314 0 < aio_load $path, $facedata
3315 or die "$path: $!";
3316
3317 $facedata = Coro::Storable::thaw $facedata;
3318 3559
3319 $facedata->{version} == 2 3560 $facedata->{version} == 2
3320 or cf::cleanup "$path: version mismatch, cannot proceed."; 3561 or cf::cleanup "$path: version mismatch, cannot proceed.";
3321 3562
3322 # patch in the exptable
3323 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3324 $facedata->{resource}{"res/exp_table"} = {
3325 type => FT_RSRC,
3326 data => $exp_table,
3327 hash => (Digest::MD5::md5 $exp_table),
3328 };
3329 cf::cede_to_tick; 3563 cf::cede_to_tick;
3330 3564
3331 { 3565 {
3332 my $faces = $facedata->{faceinfo}; 3566 my $faces = delete $facedata->{faceinfo};
3333 3567
3334 while (my ($face, $info) = each %$faces) { 3568 for my $face (sort keys %$faces) {
3569 my $info = $faces->{$face};
3335 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3570 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3336 3571
3337 cf::face::set_visibility $idx, $info->{visibility}; 3572 cf::face::set_visibility $idx, $info->{visibility};
3338 cf::face::set_magicmap $idx, $info->{magicmap}; 3573 cf::face::set_magicmap $idx, $info->{magicmap};
3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3574 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3575 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3341 3576 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3577 $FACEHASH{$info->{hash64}} = $idx;#d#
3578
3342 cf::cede_to_tick; 3579 cf::cede_to_tick;
3343 } 3580 }
3344 3581
3345 while (my ($face, $info) = each %$faces) { 3582 while (my ($face, $info) = each %$faces) {
3346 next unless $info->{smooth}; 3583 next unless $info->{smooth};
3350 3587
3351 if (my $smooth = cf::face::find $info->{smooth}) { 3588 if (my $smooth = cf::face::find $info->{smooth}) {
3352 cf::face::set_smooth $idx, $smooth; 3589 cf::face::set_smooth $idx, $smooth;
3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3590 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3354 } else { 3591 } else {
3355 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3592 error "smooth face '$info->{smooth}' not found for face '$face'";
3356 } 3593 }
3357 3594
3358 cf::cede_to_tick; 3595 cf::cede_to_tick;
3359 } 3596 }
3360 } 3597 }
3361 3598
3362 { 3599 {
3363 my $anims = $facedata->{animinfo}; 3600 my $anims = delete $facedata->{animinfo};
3364 3601
3365 while (my ($anim, $info) = each %$anims) { 3602 while (my ($anim, $info) = each %$anims) {
3366 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3603 cf::anim::set $anim, $info->{frames}, $info->{facings};
3367 cf::cede_to_tick; 3604 cf::cede_to_tick;
3368 } 3605 }
3369 3606
3370 cf::anim::invalidate_all; # d'oh 3607 cf::anim::invalidate_all; # d'oh
3371 } 3608 }
3372 3609
3373 { 3610 {
3374 my $res = $facedata->{resource}; 3611 my $res = delete $facedata->{resource};
3375 3612
3376 while (my ($name, $info) = each %$res) { 3613 while (my ($name, $info) = each %$res) {
3377 if (defined $info->{type}) { 3614 if (defined (my $type = $info->{type})) {
3615 # TODO: different hash - must free and use new index, or cache ixface data queue
3378 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3616 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3379 3617
3618 cf::face::set_type $idx, $type;
3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3619 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3381 cf::face::set_type $idx, $info->{type}; 3620 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3621 $FACEHASH{$info->{hash}} = $idx;#d#
3382 } else { 3622 } else {
3383 $RESOURCE{$name} = $info; 3623# $RESOURCE{$name} = $info; # unused
3384 } 3624 }
3385 3625
3386 cf::cede_to_tick; 3626 cf::cede_to_tick;
3387 } 3627 }
3388 } 3628 }
3389 3629
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3630 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3391 3631
3392 1 3632 1
3393} 3633}
3394
3395cf::global->attach (on_resource_update => sub {
3396 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400 my $sound = $soundconf->{compat}[$_]
3401 or next;
3402
3403 my $face = cf::face::find "sound/$sound->[1]";
3404 cf::sound::set $sound->[0] => $face;
3405 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406 }
3407
3408 while (my ($k, $v) = each %{$soundconf->{event}}) {
3409 my $face = cf::face::find "sound/$v";
3410 cf::sound::set $k => $face;
3411 }
3412 }
3413});
3414 3634
3415register_exticmd fx_want => sub { 3635register_exticmd fx_want => sub {
3416 my ($ns, $want) = @_; 3636 my ($ns, $want) = @_;
3417 3637
3418 while (my ($k, $v) = each %$want) { 3638 while (my ($k, $v) = each %$want) {
3426 my $status = load_resource_file_ $_[0]; 3646 my $status = load_resource_file_ $_[0];
3427 get_slot 0.1, 100; 3647 get_slot 0.1, 100;
3428 cf::arch::commit_load; 3648 cf::arch::commit_load;
3429 3649
3430 $status 3650 $status
3651}
3652
3653sub reload_exp_table {
3654 _reload_exp_table;
3655
3656 set_face "res/exp_table" => FT_RSRC,
3657 JSON::XS->new->utf8->canonical->encode (
3658 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3659 );
3660}
3661
3662sub reload_materials {
3663 _reload_materials;
3431} 3664}
3432 3665
3433sub reload_regions { 3666sub reload_regions {
3434 # HACK to clear player env face cache, we need some signal framework 3667 # HACK to clear player env face cache, we need some signal framework
3435 # for this (global event?) 3668 # for this (global event?)
3450} 3683}
3451 3684
3452sub reload_archetypes { 3685sub reload_archetypes {
3453 load_resource_file "$DATADIR/archetypes" 3686 load_resource_file "$DATADIR/archetypes"
3454 or die "unable to load archetypes\n"; 3687 or die "unable to load archetypes\n";
3688
3689 set_face "res/skill_info" => FT_RSRC,
3690 JSON::XS->new->utf8->canonical->encode (
3691 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3692 );
3693 set_face "res/spell_paths" => FT_RSRC,
3694 JSON::XS->new->utf8->canonical->encode (
3695 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3696 );
3455} 3697}
3456 3698
3457sub reload_treasures { 3699sub reload_treasures {
3458 load_resource_file "$DATADIR/treasures" 3700 load_resource_file "$DATADIR/treasures"
3459 or die "unable to load treasurelists\n"; 3701 or die "unable to load treasurelists\n";
3460} 3702}
3461 3703
3704sub reload_sound {
3705 trace "loading sound config from $DATADIR/sound\n";
3706
3707 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3708
3709 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3710 my $sound = $soundconf->{compat}[$_]
3711 or next;
3712
3713 my $face = cf::face::find "sound/$sound->[1]";
3714 cf::sound::set $sound->[0] => $face;
3715 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3716 }
3717
3718 while (my ($k, $v) = each %{$soundconf->{event}}) {
3719 my $face = cf::face::find "sound/$v";
3720 cf::sound::set $k => $face;
3721 }
3722}
3723
3462sub reload_resources { 3724sub reload_resources {
3463 warn "reloading resource files...\n"; 3725 trace "reloading resource files...\n";
3464 3726
3727 reload_materials;
3465 reload_facedata; 3728 reload_facedata;
3729 reload_exp_table;
3730 reload_sound;
3466 reload_archetypes; 3731 reload_archetypes;
3467 reload_regions; 3732 reload_regions;
3468 reload_treasures; 3733 reload_treasures;
3469 3734
3470 warn "finished reloading resource files\n"; 3735 trace "finished reloading resource files\n";
3471} 3736}
3472 3737
3473sub reload_config { 3738sub reload_config {
3474 warn "reloading config file...\n"; 3739 trace "reloading config file...\n";
3475 3740
3476 open my $fh, "<:utf8", "$CONFDIR/config" 3741 my $config = load_file "$CONFDIR/config";
3477 or return; 3742 utf8::decode $config;
3743 *CFG = decode_yaml $config;
3478 3744
3479 local $/;
3480 *CFG = YAML::XS::Load scalar <$fh>;
3481
3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3745 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483 3746
3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3747 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3748 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3486 3749
3487 if (exists $CFG{mlockall}) { 3750 if (exists $CFG{mlockall}) {
3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3752 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3490 and die "WARNING: m(un)lockall failed: $!\n"; 3753 and die "WARNING: m(un)lockall failed: $!\n";
3491 }; 3754 };
3492 warn $@ if $@; 3755 warn $@ if $@;
3493 } 3756 }
3494
3495 warn "finished reloading resource files\n";
3496} 3757}
3497 3758
3498sub pidfile() { 3759sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3760 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!"; 3761 or die "$PIDFILE: $!";
3513 seek $fh, 0, 0; 3774 seek $fh, 0, 0;
3514 print $fh $$; 3775 print $fh $$;
3515} 3776}
3516 3777
3517sub main_loop { 3778sub main_loop {
3518 warn "EV::loop starting\n"; 3779 trace "EV::loop starting\n";
3519 if (1) { 3780 if (1) {
3520 EV::loop; 3781 EV::loop;
3521 } 3782 }
3522 warn "EV::loop returned\n"; 3783 trace "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP; 3784 goto &main_loop unless $REALLY_UNLOOP;
3524} 3785}
3525 3786
3526sub main { 3787sub main {
3527 cf::init_globals; # initialise logging 3788 cf::init_globals; # initialise logging
3528 3789
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3790 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3791 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3792 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3793 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533 3794
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3795 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540 3796
3541 # we must not ever block the main coroutine 3797 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3798 $Coro::idle = sub {
3543 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3799 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3544 (async { 3800 (async {
3545 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3801 $Coro::current->{desc} = "IDLE BUG HANDLER";
3546 EV::loop EV::LOOP_ONESHOT; 3802 EV::loop EV::LOOP_ONESHOT;
3547 })->prio (Coro::PRIO_MAX); 3803 })->prio (Coro::PRIO_MAX);
3548 }; 3804 };
3549 3805
3550 evthread_start IO::AIO::poll_fileno; 3806 evthread_start IO::AIO::poll_fileno;
3551 3807
3552 cf::sync_job { 3808 cf::sync_job {
3809 cf::incloader::init ();
3810
3811 db_init;
3812
3813 cf::init_anim;
3814 cf::init_attackmess;
3815 cf::init_dynamic;
3816
3553 cf::load_settings; 3817 cf::load_settings;
3554 cf::load_materials;
3555 3818
3556 reload_resources; 3819 reload_resources;
3557 reload_config; 3820 reload_config;
3558 db_init;
3559 3821
3560 cf::init_uuid; 3822 cf::init_uuid;
3561 cf::init_signals; 3823 cf::init_signals;
3562 cf::init_skills; 3824 cf::init_skills;
3563 3825
3571 3833
3572 # no (long-running) fork's whatsoever before this point(!) 3834 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX (); 3835 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3836 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575 3837
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3838 cf::_post_init 0;
3577 }; 3839 };
3578 3840
3841 cf::object::thawer::errors_are_fatal 0;
3842 info "parse errors in files are no longer fatal from this point on.\n";
3843
3844 AE::postpone {
3845 undef &main; # free gobs of memory :)
3846 };
3847
3579 main_loop; 3848 goto &main_loop;
3580} 3849}
3581 3850
3582############################################################################# 3851#############################################################################
3583# initialisation and cleanup 3852# initialisation and cleanup
3584 3853
3623 or return; 3892 or return;
3624 3893
3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3894 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3626 and return; 3895 and return;
3627 3896
3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3897 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3629 3898
3630 1 3899 1
3631} 3900}
3632 3901
3633our $uuid_lock; 3902our $uuid_lock;
3645 or return; 3914 or return;
3646 3915
3647 my $value = uuid_seq uuid_cur; 3916 my $value = uuid_seq uuid_cur;
3648 3917
3649 unless ($value) { 3918 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n"; 3919 info "cowardly refusing to write zero uuid value!\n";
3651 return; 3920 return;
3652 } 3921 }
3653 3922
3654 my $value = uuid_str $value + $uuid_skip; 3923 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0; 3924 $uuid_skip = 0;
3665 or return; 3934 or return;
3666 3935
3667 aio_rename "$uuid~", $uuid 3936 aio_rename "$uuid~", $uuid
3668 and return; 3937 and return;
3669 3938
3670 warn "uuid file written ($value).\n"; 3939 trace "uuid file written ($value).\n";
3671 3940
3672 1 3941 1
3673 3942
3674} 3943}
3675 3944
3681} 3950}
3682 3951
3683sub emergency_save() { 3952sub emergency_save() {
3684 my $freeze_guard = cf::freeze_mainloop; 3953 my $freeze_guard = cf::freeze_mainloop;
3685 3954
3686 warn "emergency_perl_save: enter\n"; 3955 info "emergency_perl_save: enter\n";
3956
3957 # this is a trade-off: we want to be very quick here, so
3958 # save all maps without fsync, and later call a global sync
3959 # (which in turn might be very very slow)
3960 local $USE_FSYNC = 0;
3687 3961
3688 cf::sync_job { 3962 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so 3963 cf::write_runtime_sync; # external watchdog should not bark
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693 3964
3694 # use a peculiar iteration method to avoid tripping on perl 3965 # use a peculiar iteration method to avoid tripping on perl
3695 # refcount bugs in for. also avoids problems with players 3966 # refcount bugs in for. also avoids problems with players
3696 # and maps saved/destroyed asynchronously. 3967 # and maps saved/destroyed asynchronously.
3697 warn "emergency_perl_save: begin player save\n"; 3968 info "emergency_perl_save: begin player save\n";
3698 for my $login (keys %cf::PLAYER) { 3969 for my $login (keys %cf::PLAYER) {
3699 my $pl = $cf::PLAYER{$login} or next; 3970 my $pl = $cf::PLAYER{$login} or next;
3700 $pl->valid or next; 3971 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3972 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3702 $pl->save; 3973 $pl->save;
3703 } 3974 }
3704 warn "emergency_perl_save: end player save\n"; 3975 info "emergency_perl_save: end player save\n";
3705 3976
3977 cf::write_runtime_sync; # external watchdog should not bark
3978
3706 warn "emergency_perl_save: begin map save\n"; 3979 info "emergency_perl_save: begin map save\n";
3707 for my $path (keys %cf::MAP) { 3980 for my $path (keys %cf::MAP) {
3708 my $map = $cf::MAP{$path} or next; 3981 my $map = $cf::MAP{$path} or next;
3709 $map->valid or next; 3982 $map->valid or next;
3710 $map->save; 3983 $map->save;
3711 } 3984 }
3712 warn "emergency_perl_save: end map save\n"; 3985 info "emergency_perl_save: end map save\n";
3713 3986
3987 cf::write_runtime_sync; # external watchdog should not bark
3988
3714 warn "emergency_perl_save: begin database checkpoint\n"; 3989 info "emergency_perl_save: begin database checkpoint\n";
3715 BDB::db_env_txn_checkpoint $DB_ENV; 3990 BDB::db_env_txn_checkpoint $DB_ENV;
3716 warn "emergency_perl_save: end database checkpoint\n"; 3991 info "emergency_perl_save: end database checkpoint\n";
3717 3992
3718 warn "emergency_perl_save: begin write uuid\n"; 3993 info "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1; 3994 write_uuid_sync 1;
3720 warn "emergency_perl_save: end write uuid\n"; 3995 info "emergency_perl_save: end write uuid\n";
3996
3997 cf::write_runtime_sync; # external watchdog should not bark
3998
3999 trace "emergency_perl_save: syncing database to disk";
4000 BDB::db_env_txn_checkpoint $DB_ENV;
4001
4002 info "emergency_perl_save: starting sync\n";
4003 IO::AIO::aio_sync sub {
4004 info "emergency_perl_save: finished sync\n";
4005 };
4006
4007 cf::write_runtime_sync; # external watchdog should not bark
4008
4009 trace "emergency_perl_save: flushing outstanding aio requests";
4010 while (IO::AIO::nreqs || BDB::nreqs) {
4011 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4012 }
4013
4014 cf::write_runtime_sync; # external watchdog should not bark
3721 }; 4015 };
3722 4016
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3728 warn "emergency_perl_save: leave\n"; 4017 info "emergency_perl_save: leave\n";
3729} 4018}
3730 4019
3731sub post_cleanup { 4020sub post_cleanup {
3732 my ($make_core) = @_; 4021 my ($make_core) = @_;
3733 4022
4023 IO::AIO::flush;
4024
3734 warn Carp::longmess "post_cleanup backtrace" 4025 error Carp::longmess "post_cleanup backtrace"
3735 if $make_core; 4026 if $make_core;
3736 4027
3737 my $fh = pidfile; 4028 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$; 4029 unlink $PIDFILE if <$fh> == $$;
3739} 4030}
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4050 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 4051 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 4052 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4053# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 4054 }
3764 warn "cleared package $pkg\n";#d#
3765} 4055}
3766 4056
3767sub do_reload_perl() { 4057sub do_reload_perl() {
3768 # can/must only be called in main 4058 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 4059 unless (in_main) {
3770 warn "can only reload from main coroutine"; 4060 error "can only reload from main coroutine";
3771 return; 4061 return;
3772 } 4062 }
3773 4063
3774 return if $RELOAD++; 4064 return if $RELOAD++;
3775 4065
3776 my $t1 = AE::time; 4066 my $t1 = AE::time;
3777 4067
3778 while ($RELOAD) { 4068 while ($RELOAD) {
3779 warn "reloading..."; 4069 cf::get_slot 0.1, -1, "reload_perl";
4070 info "perl_reload: reloading...";
3780 4071
3781 warn "entering sync_job"; 4072 trace "perl_reload: entering sync_job";
3782 4073
3783 cf::sync_job { 4074 cf::sync_job {
3784 cf::write_runtime_sync; # external watchdog should not bark
3785 cf::emergency_save; 4075 #cf::emergency_save;
3786 cf::write_runtime_sync; # external watchdog should not bark
3787 4076
3788 warn "syncing database to disk";
3789 BDB::db_env_txn_checkpoint $DB_ENV;
3790
3791 # if anything goes wrong in here, we should simply crash as we already saved
3792
3793 warn "flushing outstanding aio requests";
3794 while (IO::AIO::nreqs || BDB::nreqs) {
3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3796 }
3797
3798 warn "cancelling all extension coros"; 4077 trace "perl_reload: cancelling all extension coros";
3799 $_->cancel for values %EXT_CORO; 4078 $_->cancel for values %EXT_CORO;
3800 %EXT_CORO = (); 4079 %EXT_CORO = ();
3801 4080
3802 warn "removing commands"; 4081 trace "perl_reload: removing commands";
3803 %COMMAND = (); 4082 %COMMAND = ();
3804 4083
3805 warn "removing ext/exti commands"; 4084 trace "perl_reload: removing ext/exti commands";
3806 %EXTCMD = (); 4085 %EXTCMD = ();
3807 %EXTICMD = (); 4086 %EXTICMD = ();
3808 4087
3809 warn "unloading/nuking all extensions"; 4088 trace "perl_reload: unloading/nuking all extensions";
3810 for my $pkg (@EXTS) { 4089 for my $pkg (@EXTS) {
3811 warn "... unloading $pkg"; 4090 trace "... unloading $pkg";
3812 4091
3813 if (my $cb = $pkg->can ("unload")) { 4092 if (my $cb = $pkg->can ("unload")) {
3814 eval { 4093 eval {
3815 $cb->($pkg); 4094 $cb->($pkg);
3816 1 4095 1
3817 } or warn "$pkg unloaded, but with errors: $@"; 4096 } or error "$pkg unloaded, but with errors: $@";
3818 } 4097 }
3819 4098
3820 warn "... clearing $pkg"; 4099 trace "... clearing $pkg";
3821 clear_package $pkg; 4100 clear_package $pkg;
3822 } 4101 }
3823 4102
3824 warn "unloading all perl modules loaded from $LIBDIR"; 4103 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) { 4104 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4105 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827 4106
3828 warn "... unloading $k"; 4107 trace "... unloading $k";
3829 delete $INC{$k}; 4108 delete $INC{$k};
3830 4109
3831 $k =~ s/\.pm$//; 4110 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g; 4111 $k =~ s/\//::/g;
3833 4112
3836 } 4115 }
3837 4116
3838 clear_package $k; 4117 clear_package $k;
3839 } 4118 }
3840 4119
3841 warn "getting rid of safe::, as good as possible"; 4120 trace "perl_reload: getting rid of safe::, as good as possible";
3842 clear_package "safe::$_" 4121 clear_package "safe::$_"
3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4122 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3844 4123
3845 warn "unloading cf.pm \"a bit\""; 4124 trace "perl_reload: unloading cf.pm \"a bit\"";
3846 delete $INC{"cf.pm"}; 4125 delete $INC{"cf.pm"};
3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4126 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3848 4127
3849 # don't, removes xs symbols, too, 4128 # don't, removes xs symbols, too,
3850 # and global variables created in xs 4129 # and global variables created in xs
3851 #clear_package __PACKAGE__; 4130 #clear_package __PACKAGE__;
3852 4131
3853 warn "unload completed, starting to reload now"; 4132 info "perl_reload: unload completed, starting to reload now";
3854 4133
3855 warn "reloading cf.pm"; 4134 trace "perl_reload: reloading cf.pm";
3856 require cf; 4135 require cf;
3857 cf::_connect_to_perl_1; 4136 cf::_connect_to_perl_1;
3858 4137
3859 warn "loading config and database again"; 4138 trace "perl_reload: loading config and database again";
3860 cf::reload_config; 4139 cf::reload_config;
3861 4140
3862 warn "loading extensions"; 4141 trace "perl_reload: loading extensions";
3863 cf::load_extensions; 4142 cf::load_extensions;
3864 4143
3865 if ($REATTACH_ON_RELOAD) { 4144 if ($REATTACH_ON_RELOAD) {
3866 warn "reattaching attachments to objects/players"; 4145 trace "perl_reload: reattaching attachments to objects/players";
3867 _global_reattach; # objects, sockets 4146 _global_reattach; # objects, sockets
3868 warn "reattaching attachments to maps"; 4147 trace "perl_reload: reattaching attachments to maps";
3869 reattach $_ for values %MAP; 4148 reattach $_ for values %MAP;
3870 warn "reattaching attachments to players"; 4149 trace "perl_reload: reattaching attachments to players";
3871 reattach $_ for values %PLAYER; 4150 reattach $_ for values %PLAYER;
3872 } 4151 }
3873 4152
3874 warn "running post_init jobs"; 4153 cf::_post_init 1;
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3876 4154
3877 warn "leaving sync_job"; 4155 trace "perl_reload: leaving sync_job";
3878 4156
3879 1 4157 1
3880 } or do { 4158 } or do {
3881 warn $@; 4159 error $@;
3882 cf::cleanup "error while reloading, exiting."; 4160 cf::cleanup "perl_reload: error, exiting.";
3883 }; 4161 };
3884 4162
3885 warn "reloaded";
3886 --$RELOAD; 4163 --$RELOAD;
3887 } 4164 }
3888 4165
3889 $t1 = AE::time - $t1; 4166 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n"; 4167 info "perl_reload: completed in ${t1}s\n";
3891}; 4168};
3892 4169
3893our $RELOAD_WATCHER; # used only during reload 4170our $RELOAD_WATCHER; # used only during reload
3894 4171
3895sub reload_perl() { 4172sub reload_perl() {
3916 reload_perl; 4193 reload_perl;
3917 }; 4194 };
3918 } 4195 }
3919}; 4196};
3920 4197
3921unshift @INC, $LIBDIR; 4198#############################################################################
3922 4199
3923my $bug_warning = 0; 4200my $bug_warning = 0;
3924 4201
3925our @WAIT_FOR_TICK;
3926our @WAIT_FOR_TICK_BEGIN;
3927
3928sub wait_for_tick { 4202sub wait_for_tick() {
3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4203 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3930 4204
3931 my $signal = new Coro::Signal; 4205 $WAIT_FOR_TICK->wait;
3932 push @WAIT_FOR_TICK, $signal;
3933 $signal->wait;
3934} 4206}
3935 4207
3936sub wait_for_tick_begin { 4208sub wait_for_tick_begin() {
3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4209 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3938 4210
3939 my $signal = new Coro::Signal; 4211 my $signal = new Coro::Signal;
3940 push @WAIT_FOR_TICK_BEGIN, $signal; 4212 push @WAIT_FOR_TICK_BEGIN, $signal;
3941 $signal->wait; 4213 $signal->wait;
3942} 4214}
3946 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4218 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3947 unless ++$bug_warning > 10; 4219 unless ++$bug_warning > 10;
3948 return; 4220 return;
3949 } 4221 }
3950 4222
3951 cf::server_tick; # one server iteration 4223 cf::one_tick; # one server iteration
3952 4224
3953 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4225 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3954 4226
3955 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4227 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4228 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3957 Coro::async_pool { 4229 Coro::async_pool {
3958 $Coro::current->{desc} = "runtime saver"; 4230 $Coro::current->{desc} = "runtime saver";
3959 write_runtime_sync 4231 write_runtime_sync
3960 or warn "ERROR: unable to write runtime file: $!"; 4232 or error "ERROR: unable to write runtime file: $!";
3961 }; 4233 };
3962 } 4234 }
3963 4235
3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4236 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3965 $sig->send; 4237 $sig->send;
3966 } 4238 }
3967 while (my $sig = shift @WAIT_FOR_TICK) { 4239 $WAIT_FOR_TICK->broadcast;
3968 $sig->send;
3969 }
3970 4240
3971 $LOAD = ($NOW - $TICK_START) / $TICK; 4241 $LOAD = ($NOW - $TICK_START) / $TICK;
3972 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4242 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3973 4243
3974 if (0) { 4244 if (0) {
3975 if ($NEXT_TICK) { 4245 if ($NEXT_TICK) {
3976 my $jitter = $TICK_START - $NEXT_TICK; 4246 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4247 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d# 4248 debug "jitter $JITTER\n";#d#
3979 } 4249 }
3980 } 4250 }
3981} 4251}
3982 4252
3983{ 4253{
3984 # configure BDB 4254 # configure BDB
4255 info "initialising database";
3985 4256
3986 BDB::min_parallel 16; 4257 BDB::min_parallel 16;
3987 BDB::max_poll_reqs $TICK * 0.1; 4258 BDB::max_poll_reqs $TICK * 0.1;
3988 $AnyEvent::BDB::WATCHER->priority (1); 4259 #$AnyEvent::BDB::WATCHER->priority (1);
3989 4260
3990 unless ($DB_ENV) { 4261 unless ($DB_ENV) {
3991 $DB_ENV = BDB::db_env_create; 4262 $DB_ENV = BDB::db_env_create;
3992 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4263 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3993 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4264 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4018 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4289 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4019 }; 4290 };
4020 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4291 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4021 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4292 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4022 }; 4293 };
4294
4295 info "database initialised";
4023} 4296}
4024 4297
4025{ 4298{
4026 # configure IO::AIO 4299 # configure IO::AIO
4027 4300
4301 info "initialising aio";
4028 IO::AIO::min_parallel 8; 4302 IO::AIO::min_parallel 8;
4029 IO::AIO::max_poll_time $TICK * 0.1; 4303 IO::AIO::max_poll_time $TICK * 0.1;
4030 undef $AnyEvent::AIO::WATCHER; 4304 undef $AnyEvent::AIO::WATCHER;
4305 info "aio initialised";
4031} 4306}
4032 4307
4033my $_log_backtrace; 4308our $_log_backtrace;
4309our $_log_backtrace_last;
4034 4310
4035sub _log_backtrace { 4311sub _log_backtrace {
4036 my ($msg, @addr) = @_; 4312 my ($msg, @addr) = @_;
4037 4313
4038 $msg =~ s/\n//; 4314 $msg =~ s/\n$//;
4039 4315
4316 if ($_log_backtrace_last eq $msg) {
4317 LOG llevInfo, "[ABT] $msg\n";
4318 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4040 # limit the # of concurrent backtraces 4319 # limit the # of concurrent backtraces
4041 if ($_log_backtrace < 2) { 4320 } elsif ($_log_backtrace < 2) {
4321 $_log_backtrace_last = $msg;
4042 ++$_log_backtrace; 4322 ++$_log_backtrace;
4043 my $perl_bt = Carp::longmess $msg; 4323 my $perl_bt = Carp::longmess $msg;
4044 async { 4324 async {
4045 $Coro::current->{desc} = "abt $msg"; 4325 $Coro::current->{desc} = "abt $msg";
4046 4326
4066 LOG llevInfo, "[ABT] $_\n" for @bt; 4346 LOG llevInfo, "[ABT] $_\n" for @bt;
4067 --$_log_backtrace; 4347 --$_log_backtrace;
4068 }; 4348 };
4069 } else { 4349 } else {
4070 LOG llevInfo, "[ABT] $msg\n"; 4350 LOG llevInfo, "[ABT] $msg\n";
4071 LOG llevInfo, "[ABT] [suppressed]\n"; 4351 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4072 } 4352 }
4073} 4353}
4074 4354
4075# load additional modules 4355# load additional modules
4076require "cf/$_.pm" for @EXTRA_MODULES; 4356require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines