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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines