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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines