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.490 by root, Sat Oct 24 06:16:40 2009 UTC vs.
Revision 1.580 by root, Wed Jan 4 03:22:48 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 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.
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;
33use Opcode; 31use Opcode;
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
35use Carp ();
37 36
38use Guard (); 37use Guard ();
39use Coro (); 38use Coro ();
40use Coro::State; 39use Coro::State;
41use Coro::Handle; 40use Coro::Handle;
52use Coro::Util (); 51use Coro::Util ();
53 52
54use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
55use BDB (); 54use BDB ();
56use Data::Dumper; 55use Data::Dumper;
57use Digest::MD5;
58use Fcntl; 56use Fcntl;
59use YAML::XS (); 57use YAML::XS ();
60use IO::AIO (); 58use IO::AIO ();
61use Time::HiRes; 59use Time::HiRes;
62use Compress::LZF; 60use Compress::LZF;
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; 113#our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
112 120
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 123our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
118our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 129our $DB_ENV;
122 130
123our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 132
125our %CFG; 133our %CFG;
126 134
127our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
129our $NOW; 138our $NOW;
130 139
131our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
132our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
133our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
142 151
143our @POST_INIT; 152our @POST_INIT;
144 153
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :) 155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
147 159
148binmode STDOUT; 160binmode STDOUT;
149binmode STDERR; 161binmode STDERR;
150 162
151# read virtual server time, if available 163# read virtual server time, if available
162 174
163our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
164 176
165sub cf::map::normalise; 177sub cf::map::normalise;
166 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
167############################################################################# 183#############################################################################
168 184
169%REFLECT = (); 185%REFLECT = ();
170for (@REFLECT) { 186for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 187 my $reflect = JSON::XS::decode_json $_;
181 197
182=over 4 198=over 4
183 199
184=item $cf::UPTIME 200=item $cf::UPTIME
185 201
186The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
187 218
188=item $cf::RUNTIME 219=item $cf::RUNTIME
189 220
190The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
191every server tick. 222every server tick.
197Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
198directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
200database environment. 231database environment.
201 232
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 233=item $cf::LOADAVG
211 234
212The current CPU load on the server (alpha-smoothed), as a value between 0 235The 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 236(none) and 1 (overloaded), indicating how much time is spent on processing
214objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
223from wherever your confdir points to. 246from wherever your confdir points to.
224 247
225=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
226 249
227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
228returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
229per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
230 270
231=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
232 272
233This array contains the results of the last C<invoke ()> call. When 273This 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 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
242 282
243=back 283=back
244 284
245=cut 285=cut
246 286
287sub error(@) { LOG llevError, join "", @_ }
288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
247$Coro::State::WARNHOOK = sub { 293$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 294 my $msg = join "", @_;
249 295
250 $msg .= "\n" 296 $msg .= "\n"
251 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
252 298
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 300
255 LOG llevError, $msg; 301 LOG llevWarn, $msg;
256}; 302};
257 303
258$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
260 306
261 warn Carp::longmess $_[0]; 307 error Carp::longmess $_[0];
262 308
263 if ($Coro::current == $Coro::main) {#d# 309 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 311 return;#d#
266 }#d# 312 }#d#
267 313
268 # kill coroutine otherwise 314 # kill coroutine otherwise
269 Coro::terminate 315 Coro::terminate
289)) { 335)) {
290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291} 337}
292 338
293$EV::DIED = sub { 339$EV::DIED = sub {
294 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
295}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
296 347
297############################################################################# 348#############################################################################
298 349
299=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
300 351
321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
322 $d 373 $d
323 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
324} 375}
325 376
377=item $scalar = load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
326=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
327 392
328Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
329 394
330=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337 402
338sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
340 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
341=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
342 438
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
345 441
346The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 443is a reload or not.
348 444
349=cut 445=cut
350 446
351sub post_init(&) { 447sub post_init(&) {
352 push @POST_INIT, shift; 448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
353} 466}
354 467
355=item cf::lock_wait $string 468=item cf::lock_wait $string
356 469
357Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
396} 509}
397 510
398=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
399 512
400Like EV::periodic, but randomly selects a starting point so that the actions 513Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 514get spread over time.
402 515
403=cut 516=cut
404 517
405sub periodic($$) { 518sub periodic($$) {
406 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
410 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
411} 524}
412 525
413=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
414 527
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
416This call blocks and returns only when you have at least C<$time> seconds 529(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. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
418 535
419The optional C<$name> can be used to identify the job to run. It might be 536The 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. 537used for statistical purposes and should identify the same time-class.
421 538
422Useful for short background jobs. 539Useful for short background jobs.
423 540
424=cut 541=cut
425 542
426our @SLOT_QUEUE; 543our @SLOT_QUEUE;
427our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
428 546
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
432 550
433 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
434 553
435 while () { 554 while () {
436 next_job: 555 next_job:
556
437 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 558
439 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 563 $job->[2]->send;
443 Coro::cede; 564 Coro::cede;
444 goto next_job; 565 goto next_job;
445 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 568 }
447 } 569 }
448 570
449 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
452 $signal->wait;
453 } else { 574 } else {
575 $busy = 0;
454 Coro::schedule; 576 Coro::schedule;
455 } 577 }
456 } 578 }
457}; 579};
458 580
459sub get_slot($;$$) { 581sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
461 583
462 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
463 585
464 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
465 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
466 589
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
495=cut 618=cut
496 619
497sub sync_job(&) { 620sub sync_job(&) {
498 my ($job) = @_; 621 my ($job) = @_;
499 622
500 if ($Coro::current == $Coro::main) { 623 if (in_main) {
501 my $time = EV::time; 624 my $time = AE::time;
502 625
503 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
505 628
506 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
507 630
508 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
509 632
510 my $busy = 1; 633 my $busy = 1;
511 my @res; 634 my @res;
512 635
513 (async { 636 (async {
514 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
515 @res = eval { $job->() }; 638 @res = eval { $job->() };
516 warn $@ if $@; 639 error $@ if $@;
517 undef $busy; 640 undef $busy;
518 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
519 642
520 while ($busy) { 643 while ($busy) {
521 if (Coro::nready) { 644 if (Coro::nready) {
523 } else { 646 } else {
524 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
525 } 648 }
526 } 649 }
527 650
528 my $time = EV::time - $time; 651 my $time = AE::time - $time;
529 652
530 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
531 654
532 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
533 } else { 656 } else {
555 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
556 679
557 $coro 680 $coro
558} 681}
559 682
560=item fork_call { }, $args 683=item fork_call { }, @args
561 684
562Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
563process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
564Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
565never block itself or use any form of event handling. 688never block itself or use any form of event handling.
566 689
567=cut 690=cut
568 691
692sub post_fork {
693 reset_signals;
694}
695
569sub fork_call(&@) { 696sub fork_call(&@) {
570 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
571 698
572 # we seemingly have to make a local copy of the whole thing, 699 # we seemingly have to make a local copy of the whole thing,
573 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
574 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
575 702
576 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
577 reset_signals; 704 cf::post_fork;
578 &$cb 705 &$cb
579 }, @args; 706 } @args;
580 707
581 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
709}
710
711sub objinfo {
712 (
713 "counter value" => cf::object::object_count,
714 "objects created" => cf::object::create_count,
715 "objects destroyed" => cf::object::destroy_count,
716 "freelist size" => cf::object::free_count,
717 "allocated objects" => cf::object::objects_size,
718 "active objects" => cf::object::actives_size,
719 )
582} 720}
583 721
584=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
585 723
586=cut 724=cut
623within each server. 761within each server.
624 762
625=cut 763=cut
626 764
627sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
628 my ($name) = @_; 769 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
630 771
631 eval { 772 eval {
632 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
642} 783}
643 784
644our $DB; 785our $DB;
645 786
646sub db_init { 787sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
649 };
650} 789}
651 790
652sub db_get($$) { 791sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
654 793
655 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
656 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
657 798
658 $! ? () 799 $! ? ()
659 : $data 800 : $data
660 }
661} 801}
662 802
663sub db_put($$$) { 803sub db_put($$$) {
664 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
693 833
694 my @data; 834 my @data;
695 my $md5; 835 my $md5;
696 836
697 for (0 .. $#$src) { 837 for (0 .. $#$src) {
698 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
699 or Carp::croak "$src->[$_]: $!";
700 } 839 }
701 840
702 # if processing is expensive, check 841 # if processing is expensive, check
703 # checksum first 842 # checksum first
704 if (1) { 843 if (1) {
721 860
722 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
723 my $data = $process->(\@data); 862 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
725 864
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 866
728 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
731 870
741 880
742=cut 881=cut
743 882
744sub datalog($@) { 883sub datalog($@) {
745 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 886}
748 887
749=back 888=back
750 889
751=cut 890=cut
946 1085
947 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 1088
950 } elsif (ref $type) { 1089 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
952 1091
953 } else { 1092 } else {
954 shift @arg; 1093 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
956 } 1095 }
957 } 1096 }
958} 1097}
959 1098
960sub _object_attach { 1099sub _object_attach {
970 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
971 } 1110 }
972 1111
973 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
974 } else { 1113 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1115 }
977 1116
978 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
979} 1118}
980 1119
1039 1178
1040 for (@$callbacks) { 1179 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1042 1181
1043 if ($@) { 1182 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1184 override;
1047 } 1185 }
1048 1186
1049 return 1 if $override; 1187 return 1 if $override;
1050 } 1188 }
1129 for (@$attach) { 1267 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1132 } 1270 }
1133 } else { 1271 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1273 }
1136 } 1274 }
1137} 1275}
1138 1276
1139cf::attachable->attach ( 1277cf::attachable->attach (
1166 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1167 1305
1168 sync_job { 1306 sync_job {
1169 if (length $$rdata) { 1307 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1173 1312
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 if ($cf::USE_FSYNC) { 1316 if ($cf::USE_FSYNC) {
1199 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1200 1339
1201 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1203 } else { 1342 } else {
1204 warn "unable to save objects: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1205 } 1344 }
1206 } else { 1345 } else {
1207 aio_unlink $filename; 1346 aio_unlink $filename;
1208 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1209 } 1348 }
1233 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs}; 1373 $av = $st->{objs};
1235 } 1374 }
1236 1375
1237 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1238 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1239 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1240 1380
1241 ($data, $av) 1381 ($data, $av)
1242} 1382}
1243 1383
1244=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1303} 1443}
1304 1444
1305use File::Glob (); 1445use File::Glob ();
1306 1446
1307cf::player->attach ( 1447cf::player->attach (
1308 on_command => sub { 1448 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1310 1450
1311 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1312 or return; 1452 or return;
1313 1453
1321 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1322 1462
1323 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1324 1464
1325 if (ref $msg) { 1465 if (ref $msg) {
1326 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1327 "ARRAY" eq ref $msg
1328 ? @$msg
1329 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1330 1467
1331 my @reply; 1468 my @reply;
1332 1469
1333 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1334 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
1336 1473
1337 $pl->ext_reply ($reply, @reply) 1474 $pl->ext_reply ($reply, @reply)
1338 if $reply; 1475 if $reply;
1339 1476
1340 } else { 1477 } else {
1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342 } 1479 }
1343 1480
1344 cf::override; 1481 cf::override;
1345 }, 1482 },
1346); 1483);
1357 1494
1358 $grp 1495 $grp
1359} 1496}
1360 1497
1361sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1362 cf::sync_job { 1501 cf::sync_job {
1363 my %todo; 1502 my %todo;
1364 1503
1365 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1366 next unless -r $path; 1505 next unless -r $path;
1384 1523
1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1387 1526
1388 $ext{source} = 1527 $ext{source} =
1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1390 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1391 . $source 1530 . $source
1392 . "\n};\n1"; 1531 . "\n};\n1";
1393 1532
1394 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
1395 } 1534 }
1396 1535
1536 my $pass = 0;
1397 my %done; 1537 my %done;
1398 while (%todo) { 1538 while (%todo) {
1399 my $progress; 1539 my $progress;
1400 1540
1541 ++$pass;
1542
1543 ext:
1401 while (my ($k, $v) = each %todo) { 1544 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1546 next ext
1404 unless exists $done{$_}; 1547 unless exists $done{$_};
1405 } 1548 }
1406 1549
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1551
1409 unless (eval $v->{source}) { 1552 my $active = eval $v->{source};
1553
1554 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1555 error "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1556
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1558 if exists $v->{meta}{mandatory};
1417 1559
1418 warn $msg; 1560 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1561 delete $todo{$k};
1562 } else {
1563 $done{$k} = delete $todo{$k};
1564 push @EXTS, $v->{pkg};
1565 $progress = 1;
1566
1567 info "$v->{base}: extension inactive.\n"
1568 unless $active;
1419 } 1569 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1570 }
1425 1571
1426 skip: 1572 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1573 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 unless $progress; 1574
1575 while (my ($k, $v) = each %todo) {
1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1577 if exists $v->{meta}{mandatory};
1578 }
1579
1580 last;
1581 }
1429 } 1582 }
1430 }; 1583 };
1431} 1584}
1432 1585
1433############################################################################# 1586#############################################################################
1517 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1518 } 1671 }
1519 } 1672 }
1520} 1673}
1521 1674
1675cf::player->attach (
1676 on_load => sub {
1677 my ($pl, $path) = @_;
1678
1679 # restore slots saved in save, below
1680 my $slots = delete $pl->{_slots};
1681
1682 $pl->ob->current_weapon ($slots->[0]);
1683 $pl->combat_ob ($slots->[1]);
1684 $pl->ranged_ob ($slots->[2]);
1685 },
1686);
1687
1522sub save($) { 1688sub save($) {
1523 my ($pl) = @_; 1689 my ($pl) = @_;
1524 1690
1525 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1526 1692
1531 1697
1532 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1699 $pl->{last_save} = $cf::RUNTIME;
1534 1700
1535 cf::get_slot 0.01; 1701 cf::get_slot 0.01;
1702
1703 # save slots, to be restored later
1704 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536 1705
1537 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1707 cf::cede_to_tick;
1539} 1708}
1540 1709
1574 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1575 1744
1576 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1746 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1578 1747
1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1580 $pl->deactivate; 1749 $pl->deactivate;
1750
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1583 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1584 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1585 1756
1586 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1587 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1588 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1642 \@logins 1813 \@logins
1643} 1814}
1644 1815
1645=item $player->maps 1816=item $player->maps
1646 1817
1818=item cf::player::maps $login
1819
1647Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1648player. May block. 1821player. May block.
1649 1822
1650=cut 1823=cut
1651 1824
1713=cut 1886=cut
1714 1887
1715sub find_by_path($) { 1888sub find_by_path($) {
1716 my ($path) = @_; 1889 my ($path) = @_;
1717 1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1892
1718 my ($match, $specificity); 1893 my ($match, $specificity);
1719 1894
1720 for my $region (list) { 1895 for my $region (list) {
1721 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1722 ($match, $specificity) = ($region, $region->specificity) 1897 ($match, $specificity) = ($region, $region->specificity)
1750sub generate_random_map { 1925sub generate_random_map {
1751 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1752 1927
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 1929
1755 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1764 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1765 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1766 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1767 (cf::region::find $rmp->{region}), $rmp->{custom}
1768 )
1769} 1931}
1770 1932
1771=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1772 1934
1773Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
1778 1940
1779sub register { 1941sub register {
1780 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1781 my $pkg = caller; 1943 my $pkg = caller;
1782 1944
1783 no strict;
1784 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1785 1946
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 1948}
1788 1949
1789# also paths starting with '/' 1950# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 1952
1792sub thawer_merge { 1953sub thawer_merge {
1793 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1794 1955
1795 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1800} 1961}
1801 1962
1802sub normalise { 1963sub normalise {
1803 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1804 1965
1805 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1806 1967
1807 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1808 1969
1809 # map plan: 1970 # map plan:
1810 # 1971 #
1825 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1826 $path = "$base/$path"; 1987 $path = "$base/$path";
1827 } 1988 }
1828 1989
1829 for ($path) { 1990 for ($path) {
1830 redo if s{//}{/};
1831 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1832 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1833 } 1993 }
1834 1994
1835 $path 1995 $path
1849 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1850 return $self; 2010 return $self;
1851 } 2011 }
1852 } 2012 }
1853 2013
1854 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1855 () 2015 ()
1856} 2016}
1857 2017
2018# may re-bless or do other evil things
1858sub init { 2019sub init {
1859 my ($self) = @_; 2020 my ($self) = @_;
1860 2021
1861 $self 2022 $self
1862} 2023}
1927 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1928 2089
1929 1 2090 1
1930} 2091}
1931 2092
2093# used to laod the header of an original map
1932sub load_header_orig { 2094sub load_header_orig {
1933 my ($self) = @_; 2095 my ($self) = @_;
1934 2096
1935 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1936} 2098}
1937 2099
2100# used to laod the header of an instantiated map
1938sub load_header_temp { 2101sub load_header_temp {
1939 my ($self) = @_; 2102 my ($self) = @_;
1940 2103
1941 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1942} 2105}
1943 2106
2107# called after loading the header from an instantiated map
1944sub prepare_temp { 2108sub prepare_temp {
1945 my ($self) = @_; 2109 my ($self) = @_;
1946 2110
1947 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1948 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1949 # safety 2113 # safety
1950 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1951 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1952} 2116}
1953 2117
2118# called after loading the header from an original map
1954sub prepare_orig { 2119sub prepare_orig {
1955 my ($self) = @_; 2120 my ($self) = @_;
1956 2121
1957 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1958 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1982 2147
1983sub find; 2148sub find;
1984sub find { 2149sub find {
1985 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1986 2151
2152 cf::cede_to_tick;
2153
1987 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1988 2155
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1991 2158
1992 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
2009 2176
2010 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
2011 } 2178 }
2012} 2179}
2013 2180
2014sub pre_load { } 2181sub pre_load { }
2015sub post_load { } 2182#sub post_load { } # XS
2016 2183
2017sub load { 2184sub load {
2018 my ($self) = @_; 2185 my ($self) = @_;
2019 2186
2020 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
2023 2190
2024 { 2191 {
2025 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2026 2193
2027 return unless $self->valid; 2194 return unless $self->valid;
2028 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2029
2030 $self->in_memory (cf::MAP_LOADING);
2031 2196
2032 $self->alloc; 2197 $self->alloc;
2033 2198
2034 $self->pre_load; 2199 $self->pre_load;
2035 cf::cede_to_tick; 2200 cf::cede_to_tick;
2036 2201
2202 if (exists $self->{load_path}) {
2037 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2038 $f->skip_block; 2204 $f->skip_block;
2039 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2040 or return; 2206 or return;
2041 2207
2042 $self->post_load_original 2208 $self->post_load_original
2043 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2044 2210
2045 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2046 utf8::encode $uniq; 2212 utf8::encode $uniq;
2047 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2048 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2049 $self->clear_unique_items; 2215 $self->clear_unique_items;
2050 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2051 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2052 } 2219 }
2053 } 2220 }
2054 }
2055 2221
2056 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2057 2229
2058 cf::cede_to_tick; 2230 cf::cede_to_tick;
2059 # now do the right thing for maps 2231 # now do the right thing for maps
2060 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2061 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
2065 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2066 $self->decay_objects; 2238 $self->decay_objects;
2067 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2068 $self->update_buttons; 2240 $self->update_buttons;
2069 cf::cede_to_tick; 2241 cf::cede_to_tick;
2070 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2071 } 2243 }
2072 2244
2073 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2075
2076 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2247 }
2078 2248
2079 $self->post_load; 2249 $self->post_load;
2080}
2081 2250
2251 1
2252}
2253
2254# customize the map for a given player, i.e.
2255# return the _real_ map. used by e.g. per-player
2256# maps to change the path to ~playername/mappath
2082sub customise_for { 2257sub customise_for {
2083 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
2084 2259
2085 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2261 if $self->per_player;
2089# if $self->per_party; 2264# if $self->per_party;
2090 2265
2091 $self 2266 $self
2092} 2267}
2093 2268
2094# find and load all maps in the 3x3 area around a map
2095sub load_neighbours {
2096 my ($map) = @_;
2097
2098 my @neigh; # diagonal neighbours
2099
2100 for (0 .. 3) {
2101 my $neigh = $map->tile_path ($_)
2102 or next;
2103 $neigh = find $neigh, $map
2104 or next;
2105 $neigh->load;
2106
2107 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 }
2111
2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
2114 my $neigh = find $path, $origin
2115 or next;
2116 $neigh->load;
2117 }
2118}
2119
2120sub find_sync { 2269sub find_sync {
2121 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2122 2271
2123 cf::sync_job { find $path, $origin } 2272 # it's a bug to call this from the main context
2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
2124} 2277}
2125 2278
2126sub do_load_sync { 2279sub do_load_sync {
2127 my ($map) = @_; 2280 my ($map) = @_;
2128 2281
2282 # it's a bug to call this from the main context
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2131 2285
2132 cf::sync_job { $map->load }; 2286 $map->load;
2133} 2287}
2134 2288
2135our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2137 2291
2138sub find_async { 2292sub find_async {
2139 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2140 2294
2141 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2142 2296
2143 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2145 } 2299 }
2146 2300
2147 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2148 2302
2149 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2163 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
2164 2318
2165 () 2319 ()
2166} 2320}
2167 2321
2322# common code, used by both ->save and ->swapout
2168sub save { 2323sub _save {
2169 my ($self) = @_; 2324 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2325
2173 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
2174 2327
2175 return unless $self->dirty; 2328 return unless $self->dirty;
2176 2329
2196 } else { 2349 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2350 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2351 }
2199} 2352}
2200 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2201sub swap_out { 2362sub swap_out {
2202 my ($self) = @_; 2363 my ($self) = @_;
2203 2364
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2209 return if $self->players; 2369 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2370
2371 # first deactivate the map and "unlink" it from the core
2372 $self->deactivate;
2373 $_->clear_links_to ($self) for values %cf::MAP;
2374 $self->state (cf::MAP_SWAPPED);
2375
2376 # then atomically save
2377 $self->_save;
2378
2379 # then free the map
2380 $self->clear;
2381}
2382
2383sub reset_at {
2384 my ($self) = @_;
2385
2386 # TODO: safety, remove and allow resettable per-player maps
2211 return if $self->{deny_save}; 2387 return 1e99 if $self->{deny_reset};
2212 2388
2389 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2390 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2391
2392 $time + $to
2393}
2394
2395sub should_reset {
2396 my ($self) = @_;
2397
2398 $self->reset_at <= $cf::RUNTIME
2399}
2400
2401sub reset {
2402 my ($self) = @_;
2403
2404 my $lock = cf::lock_acquire "map_data:$self->{path}";
2405
2406 return if $self->players;
2407
2408 cf::trace "resetting map ", $self->path, "\n";
2409
2213 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2411
2412 # need to save uniques path
2413 unless ($self->{deny_save}) {
2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2415
2416 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2417 if $uniq;
2418 }
2419
2420 delete $cf::MAP{$self->path};
2214 2421
2215 $self->deactivate; 2422 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2423 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2424 $self->clear;
2218}
2219
2220sub reset_at {
2221 my ($self) = @_;
2222
2223 # TODO: safety, remove and allow resettable per-player maps
2224 return 1e99 if $self->{deny_reset};
2225
2226 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2227 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2228
2229 $time + $to
2230}
2231
2232sub should_reset {
2233 my ($self) = @_;
2234
2235 $self->reset_at <= $cf::RUNTIME
2236}
2237
2238sub reset {
2239 my ($self) = @_;
2240
2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2242
2243 return if $self->players;
2244
2245 warn "resetting map ", $self->path, "\n";
2246
2247 $self->in_memory (cf::MAP_SWAPPED);
2248
2249 # need to save uniques path
2250 unless ($self->{deny_save}) {
2251 my $uniq = $self->uniq_path; utf8::encode $uniq;
2252
2253 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2254 if $uniq;
2255 }
2256
2257 delete $cf::MAP{$self->path};
2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
2261 $self->clear;
2262 2425
2263 $self->unlink_save; 2426 $self->unlink_save;
2264 $self->destroy; 2427 $self->destroy;
2265} 2428}
2266 2429
2274 2437
2275 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2276 2439
2277 $self->unlink_save; 2440 $self->unlink_save;
2278 2441
2279 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2447
2344} 2507}
2345 2508
2346=item cf::map::static_maps 2509=item cf::map::static_maps
2347 2510
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map> 2511Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles>). May block. 2512file in the shared directory excluding F</styles> and F</editor>). May
2513block.
2350 2514
2351=cut 2515=cut
2352 2516
2353sub static_maps() { 2517sub static_maps() {
2354 my @dirs = ""; 2518 my @dirs = "";
2355 my @maps; 2519 my @maps;
2356 2520
2357 while (@dirs) { 2521 while (@dirs) {
2358 my $dir = shift @dirs; 2522 my $dir = shift @dirs;
2359 2523
2360 next if $dir eq "/styles"; 2524 next if $dir eq "/styles" || $dir eq "/editor";
2361 2525
2362 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2 2526 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2363 or return; 2527 or return;
2364 2528
2365 for (@$files) { 2529 for (@$files) {
2513 2677
2514Freezes the player and moves him/her to a special map (C<{link}>). 2678Freezes the player and moves him/her to a special map (C<{link}>).
2515 2679
2516The player should be reasonably safe there for short amounts of time (e.g. 2680The player should be reasonably safe there for short amounts of time (e.g.
2517for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2681for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2518though, as the palyer cannot control the character while it is on the link 2682though, as the player cannot control the character while it is on the link
2519map. 2683map.
2520 2684
2521Will never block. 2685Will never block.
2522 2686
2523=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2544sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2545 my ($self) = @_; 2709 my ($self) = @_;
2546 2710
2547 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2548 2712
2713 ++$self->{_link_recursion};
2714
2549 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2550 2716
2551 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2552 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2553 2719
2554 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2555} 2721}
2556 2722
2557sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2558 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2559 2725
2576 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2577 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2578 2744
2579 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2580 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2581 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2582 2748
2583 $map->load; 2749 $map->load;
2584 $map->load_neighbours;
2585 2750
2586 return unless $self->contr->active; 2751 return unless $self->contr->active;
2587 2752
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2590 2755 # entering was successful
2756 delete $self->{_link_recursion};
2591 # only activate afterwards, to support waiting in hooks 2757 # only activate afterwards, to support waiting in hooks
2592 $self->activate_recursive; 2758 $self->activate_recursive;
2593} 2759 }
2594 2760
2761}
2762
2595=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2596 2764
2597Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2598her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2599that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2600the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
2607 2775
2608our $GOTOGEN; 2776our $GOTOGEN;
2609 2777
2610sub cf::object::player::goto { 2778sub cf::object::player::goto {
2611 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2612 2786
2613 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2614 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2615 2789
2616 $self->enter_link; 2790 $self->enter_link;
2636 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2637 } 2811 }
2638 } 2812 }
2639 2813
2640 my $map = eval { 2814 my $map = eval {
2641 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2642 2816
2643 if ($map) { 2817 if ($map) {
2644 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2645 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2646 } else { 2820 } else {
2647 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2648 } 2822 }
2649 2823
2650 $map 2824 $map
2658 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2659 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2660 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2661 } 2835 }
2662 2836
2663 $done->() if $done; 2837 $done->($self) if $done;
2664 })->prio (1); 2838 })->prio (1);
2665} 2839}
2666 2840
2667=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2668 2842
2736 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2737 2911
2738 unless (eval { 2912 unless (eval {
2739 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2740 2914
2741 # random map handling
2742 {
2743 my $guard = cf::lock_acquire "exit_prepare:$exit";
2744
2745 prepare_random_map $exit
2746 if $exit->slaying eq "/!";
2747 }
2748
2749 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2750 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2751 my $y = $exit->stats->sp; 2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2752 2941
2753 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2754 2943
2755 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2756 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
2761 $self->message ("Something went wrong deep within the deliantra server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2762 . "I'll try to bring you back to the map you were before. " 2951 . "I'll try to bring you back to the map you were before. "
2763 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2764 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2765 2954
2766 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2767 $self->leave_link; 2956 $self->leave_link;
2768 } 2957 }
2769 })->prio (1); 2958 })->prio (1);
2770} 2959}
2771 2960
2783sub cf::client::send_drawinfo { 2972sub cf::client::send_drawinfo {
2784 my ($self, $text, $flags) = @_; 2973 my ($self, $text, $flags) = @_;
2785 2974
2786 utf8::encode $text; 2975 utf8::encode $text;
2787 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2976 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2977}
2978
2979=item $client->send_big_packet ($pkt)
2980
2981Like C<send_packet>, but tries to compress large packets, and fragments
2982them as required.
2983
2984=cut
2985
2986our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2987
2988sub cf::client::send_big_packet {
2989 my ($self, $pkt) = @_;
2990
2991 # try lzf for large packets
2992 $pkt = "lzf " . Compress::LZF::compress $pkt
2993 if 1024 <= length $pkt and $self->{can_lzf};
2994
2995 # split very large packets
2996 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2997 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2998 $pkt = "frag";
2999 }
3000
3001 $self->send_packet ($pkt);
2788} 3002}
2789 3003
2790=item $client->send_msg ($channel, $msg, $color, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2791 3005
2792Send a drawinfo or msg packet to the client, formatting the msg for the 3006Send a drawinfo or msg packet to the client, formatting the msg for the
2944 my $pkt = "msg " 3158 my $pkt = "msg "
2945 . $self->{json_coder}->encode ( 3159 . $self->{json_coder}->encode (
2946 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2947 ); 3161 );
2948 3162
2949 # try lzf for large packets
2950 $pkt = "lzf " . Compress::LZF::compress $pkt
2951 if 1024 <= length $pkt and $self->{can_lzf};
2952
2953 # split very large packets
2954 if (8192 < length $pkt and $self->{can_lzf}) {
2955 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2956 $pkt = "frag";
2957 }
2958
2959 $self->send_packet ($pkt); 3163 $self->send_big_packet ($pkt);
2960} 3164}
2961 3165
2962=item $client->ext_msg ($type, @msg) 3166=item $client->ext_msg ($type, @msg)
2963 3167
2964Sends an ext event to the client. 3168Sends an ext event to the client.
2967 3171
2968sub cf::client::ext_msg($$@) { 3172sub cf::client::ext_msg($$@) {
2969 my ($self, $type, @msg) = @_; 3173 my ($self, $type, @msg) = @_;
2970 3174
2971 if ($self->extcmd == 2) { 3175 if ($self->extcmd == 2) {
2972 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2973 } elsif ($self->extcmd == 1) { # TODO: remove 3177 } elsif ($self->extcmd == 1) { # TODO: remove
2974 push @msg, msgtype => "event_$type"; 3178 push @msg, msgtype => "event_$type";
2975 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2976 } 3180 }
2977} 3181}
2978 3182
2979=item $client->ext_reply ($msgid, @msg) 3183=item $client->ext_reply ($msgid, @msg)
2980 3184
2983=cut 3187=cut
2984 3188
2985sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
2986 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
2987 3191
2988 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
2989 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2990 } elsif ($self->extcmd == 1) {
2991 #TODO: version 1, remove
2992 unshift @msg, msgtype => "reply", msgid => $id;
2993 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2994 }
2995} 3195}
2996 3196
2997=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2998 3198
2999Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
3054 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3055 3255
3056 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3057 3257
3058 if (ref $msg) { 3258 if (ref $msg) {
3059 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3060 "ARRAY" eq ref $msg
3061 ? @$msg
3062 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3063 3260
3064 my @reply; 3261 my @reply;
3065 3262
3066 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3067 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
3069 3266
3070 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
3071 if $reply; 3268 if $reply;
3072 3269
3073 } else { 3270 } else {
3074 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3271 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3075 } 3272 }
3076 3273
3077 cf::override; 3274 cf::override;
3078 }, 3275 },
3079); 3276);
3099 3296
3100 $coro 3297 $coro
3101} 3298}
3102 3299
3103cf::client->attach ( 3300cf::client->attach (
3104 on_destroy => sub { 3301 on_client_destroy => sub {
3105 my ($ns) = @_; 3302 my ($ns) = @_;
3106 3303
3107 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3108 }, 3305 },
3109); 3306);
3125our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
3126 3323
3127$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
3128 3325
3129$safe->permit_only (Opcode::opset qw( 3326$safe->permit_only (Opcode::opset qw(
3130 :base_core :base_mem :base_orig :base_math 3327 :base_core :base_mem :base_orig :base_math :base_loop
3131 grepstart grepwhile mapstart mapwhile 3328 grepstart grepwhile mapstart mapwhile
3132 sort time 3329 sort time
3133)); 3330));
3134 3331
3135# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
3160 decrease split destroy change_exp value msg lore send_msg)], 3357 decrease split destroy change_exp value msg lore send_msg)],
3161 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
3162 ["cf::player" => qw(peaceful send_msg)], 3359 ["cf::player" => qw(peaceful send_msg)],
3163 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
3164) { 3361) {
3165 no strict 'refs';
3166 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
3167 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3168 for @funs; 3364 for @funs;
3169} 3365}
3170 3366
3187 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3188 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
3189 3385
3190 %vars = (_dummy => 0) unless %vars; 3386 %vars = (_dummy => 0) unless %vars;
3191 3387
3388 my @res;
3192 local $_; 3389 local $_;
3193 local @safe::cf::_safe_eval_args = values %vars;
3194 3390
3195 my $eval = 3391 my $eval =
3196 "do {\n" 3392 "do {\n"
3197 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3198 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
3199 . $code 3395 . $code
3200 . "\n}" 3396 . "\n}"
3201 ; 3397 ;
3202 3398
3399 if ($CFG{safe_eval}) {
3203 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
3204 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3205 sub_generation_inc; 3403 sub_generation_inc;
3404 } else {
3405 local @cf::_safe_eval_args = values %vars;
3406 @res = wantarray ? eval eval : scalar eval $eval;
3407 }
3206 3408
3207 if ($@) { 3409 if ($@) {
3208 warn "$@"; 3410 warn "$@",
3209 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
3210 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
3211 } 3413 }
3212 3414
3213 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
3214} 3416}
3215 3417
3229=cut 3431=cut
3230 3432
3231sub register_script_function { 3433sub register_script_function {
3232 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
3233 3435
3234 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
3235 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
3236} 3438}
3237 3439
3238=back 3440=back
3239 3441
3240=cut 3442=cut
3249 # for this (global event?) 3451 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3251 3453
3252 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3253 3455
3254 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3255 3457
3256 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3257 0 < aio_load $path, $facedata
3258 or die "$path: $!";
3259
3260 $facedata = Coro::Storable::thaw $facedata;
3261 3459
3262 $facedata->{version} == 2 3460 $facedata->{version} == 2
3263 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3264 3462
3265 # patch in the exptable 3463 # patch in the exptable
3464 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3266 $facedata->{resource}{"res/exp_table"} = { 3465 $facedata->{resource}{"res/exp_table"} = {
3267 type => FT_RSRC, 3466 type => FT_RSRC,
3268 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3467 data => $exp_table,
3468 hash => (Digest::MD5::md5 $exp_table),
3269 }; 3469 };
3270 cf::cede_to_tick; 3470 cf::cede_to_tick;
3271 3471
3272 { 3472 {
3273 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
3275 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
3276 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3277 3477
3278 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3279 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3280 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3281 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3282 3483
3283 cf::cede_to_tick; 3484 cf::cede_to_tick;
3284 } 3485 }
3285 3486
3286 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
3291 3492
3292 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3293 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
3294 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3295 } else { 3496 } else {
3296 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3297 } 3498 }
3298 3499
3299 cf::cede_to_tick; 3500 cf::cede_to_tick;
3300 } 3501 }
3301 } 3502 }
3310 3511
3311 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
3312 } 3513 }
3313 3514
3314 { 3515 {
3315 # TODO: for gcfclient pleasure, we should give resources
3316 # that gcfclient doesn't grok a >10000 face index.
3317 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3318 3517
3319 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3320 if (defined $info->{type}) { 3519 if (defined (my $type = $info->{type})) {
3520 # TODO: different hash - must free and use new index, or cache ixface data queue
3321 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3322 my $data;
3323 3522
3324 if ($info->{type} & 1) { 3523 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3325 # prepend meta info
3326
3327 my $meta = $enc->encode ({
3328 name => $name,
3329 %{ $info->{meta} || {} },
3330 });
3331
3332 $data = pack "(w/a*)*", $meta, $info->{data};
3333 } else {
3334 $data = $info->{data};
3335 }
3336
3337 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3338 cf::face::set_type $idx, $info->{type}; 3524 cf::face::set_type $idx, $type;
3525 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3339 } else { 3526 } else {
3340 $RESOURCE{$name} = $info; 3527# $RESOURCE{$name} = $info; # unused
3341 } 3528 }
3342 3529
3343 cf::cede_to_tick; 3530 cf::cede_to_tick;
3344 } 3531 }
3345 } 3532 }
3346 3533
3347 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3534 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3348 3535
3349 1 3536 1
3350} 3537}
3351
3352cf::global->attach (on_resource_update => sub {
3353 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3354 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3355
3356 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3357 my $sound = $soundconf->{compat}[$_]
3358 or next;
3359
3360 my $face = cf::face::find "sound/$sound->[1]";
3361 cf::sound::set $sound->[0] => $face;
3362 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3363 }
3364
3365 while (my ($k, $v) = each %{$soundconf->{event}}) {
3366 my $face = cf::face::find "sound/$v";
3367 cf::sound::set $k => $face;
3368 }
3369 }
3370});
3371 3538
3372register_exticmd fx_want => sub { 3539register_exticmd fx_want => sub {
3373 my ($ns, $want) = @_; 3540 my ($ns, $want) = @_;
3374 3541
3375 while (my ($k, $v) = each %$want) { 3542 while (my ($k, $v) = each %$want) {
3414sub reload_treasures { 3581sub reload_treasures {
3415 load_resource_file "$DATADIR/treasures" 3582 load_resource_file "$DATADIR/treasures"
3416 or die "unable to load treasurelists\n"; 3583 or die "unable to load treasurelists\n";
3417} 3584}
3418 3585
3586sub reload_sound {
3587 trace "loading sound config from $DATADIR/sound\n";
3588
3589 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3590
3591 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3592 my $sound = $soundconf->{compat}[$_]
3593 or next;
3594
3595 my $face = cf::face::find "sound/$sound->[1]";
3596 cf::sound::set $sound->[0] => $face;
3597 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3598 }
3599
3600 while (my ($k, $v) = each %{$soundconf->{event}}) {
3601 my $face = cf::face::find "sound/$v";
3602 cf::sound::set $k => $face;
3603 }
3604}
3605
3419sub reload_resources { 3606sub reload_resources {
3420 warn "reloading resource files...\n"; 3607 trace "reloading resource files...\n";
3421 3608
3609 reload_exp_table;
3610 reload_materials;
3422 reload_facedata; 3611 reload_facedata;
3612 reload_sound;
3423 reload_archetypes; 3613 reload_archetypes;
3424 reload_regions; 3614 reload_regions;
3425 reload_treasures; 3615 reload_treasures;
3426 3616
3427 warn "finished reloading resource files\n"; 3617 trace "finished reloading resource files\n";
3428} 3618}
3429 3619
3430sub reload_config { 3620sub reload_config {
3431 warn "reloading config file...\n"; 3621 trace "reloading config file...\n";
3432 3622
3433 open my $fh, "<:utf8", "$CONFDIR/config" 3623 my $config = load_file "$CONFDIR/config";
3434 or return; 3624 utf8::decode $config;
3625 *CFG = decode_yaml $config;
3435 3626
3436 local $/;
3437 *CFG = YAML::XS::Load scalar <$fh>;
3438
3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3627 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3440 3628
3441 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3629 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3630 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3443 3631
3444 if (exists $CFG{mlockall}) { 3632 if (exists $CFG{mlockall}) {
3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3634 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3447 and die "WARNING: m(un)lockall failed: $!\n"; 3635 and die "WARNING: m(un)lockall failed: $!\n";
3448 }; 3636 };
3449 warn $@ if $@; 3637 warn $@ if $@;
3450 } 3638 }
3451
3452 warn "finished reloading resource files\n";
3453} 3639}
3454 3640
3455sub pidfile() { 3641sub pidfile() {
3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3642 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3457 or die "$PIDFILE: $!"; 3643 or die "$PIDFILE: $!";
3470 seek $fh, 0, 0; 3656 seek $fh, 0, 0;
3471 print $fh $$; 3657 print $fh $$;
3472} 3658}
3473 3659
3474sub main_loop { 3660sub main_loop {
3475 warn "EV::loop starting\n"; 3661 trace "EV::loop starting\n";
3476 if (1) { 3662 if (1) {
3477 EV::loop; 3663 EV::loop;
3478 } 3664 }
3479 warn "EV::loop returned\n"; 3665 trace "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP; 3666 goto &main_loop unless $REALLY_UNLOOP;
3481} 3667}
3482 3668
3483sub main { 3669sub main {
3484 cf::init_globals; # initialise logging 3670 cf::init_globals; # initialise logging
3485 3671
3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3673 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3488 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3490
3491 cf::init_experience;
3492 cf::init_anim;
3493 cf::init_attackmess;
3494 cf::init_dynamic;
3495 3676
3496 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3677 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3497 3678
3498 # we must not ever block the main coroutine 3679 # we must not ever block the main coroutine
3499 local $Coro::idle = sub { 3680 local $Coro::idle = sub {
3505 }; 3686 };
3506 3687
3507 evthread_start IO::AIO::poll_fileno; 3688 evthread_start IO::AIO::poll_fileno;
3508 3689
3509 cf::sync_job { 3690 cf::sync_job {
3691 cf::incloader::init ();
3692
3693 cf::init_anim;
3694 cf::init_attackmess;
3695 cf::init_dynamic;
3696
3697 cf::load_settings;
3698
3510 reload_resources; 3699 reload_resources;
3511 reload_config; 3700 reload_config;
3512 db_init; 3701 db_init;
3513 3702
3514 cf::load_settings;
3515 cf::load_materials;
3516 cf::init_uuid; 3703 cf::init_uuid;
3517 cf::init_signals; 3704 cf::init_signals;
3518 cf::init_commands;
3519 cf::init_skills; 3705 cf::init_skills;
3520 3706
3521 cf::init_beforeplay; 3707 cf::init_beforeplay;
3522 3708
3523 atomic; 3709 atomic;
3528 3714
3529 # no (long-running) fork's whatsoever before this point(!) 3715 # no (long-running) fork's whatsoever before this point(!)
3530 use POSIX (); 3716 use POSIX ();
3531 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3717 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3532 3718
3533 (pop @POST_INIT)->(0) while @POST_INIT; 3719 cf::_post_init 0;
3534 }; 3720 };
3535 3721
3722 cf::object::thawer::errors_are_fatal 0;
3723 info "parse errors in files are no longer fatal from this point on.\n";
3724
3725 AE::postpone {
3726 undef &main; # free gobs of memory :)
3727 };
3728
3536 main_loop; 3729 goto &main_loop;
3537} 3730}
3538 3731
3539############################################################################# 3732#############################################################################
3540# initialisation and cleanup 3733# initialisation and cleanup
3541 3734
3542# install some emergency cleanup handlers 3735# install some emergency cleanup handlers
3543BEGIN { 3736BEGIN {
3544 our %SIGWATCHER = (); 3737 our %SIGWATCHER = ();
3545 for my $signal (qw(INT HUP TERM)) { 3738 for my $signal (qw(INT HUP TERM)) {
3546 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3739 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3547 cf::cleanup "SIG$signal"; 3740 cf::cleanup "SIG$signal";
3548 }; 3741 };
3549 } 3742 }
3550} 3743}
3551 3744
3552sub write_runtime_sync { 3745sub write_runtime_sync {
3746 my $t0 = AE::time;
3747
3553 # first touch the runtime file to show we are still running: 3748 # first touch the runtime file to show we are still running:
3554 # the fsync below can take a very very long time. 3749 # the fsync below can take a very very long time.
3555 3750
3556 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3751 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3557 3752
3558 my $guard = cf::lock_acquire "write_runtime"; 3753 my $guard = cf::lock_acquire "write_runtime";
3559 3754
3560 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3755 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3561 or return; 3756 or return;
3562 3757
3563 my $value = $cf::RUNTIME + 90 + 10; 3758 my $value = $cf::RUNTIME + 90 + 10;
3564 # 10 is the runtime save interval, for a monotonic clock 3759 # 10 is the runtime save interval, for a monotonic clock
3565 # 60 allows for the watchdog to kill the server. 3760 # 60 allows for the watchdog to kill the server.
3578 or return; 3773 or return;
3579 3774
3580 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3775 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3581 and return; 3776 and return;
3582 3777
3583 warn "runtime file written.\n"; 3778 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3584 3779
3585 1 3780 1
3586} 3781}
3587 3782
3588our $uuid_lock; 3783our $uuid_lock;
3600 or return; 3795 or return;
3601 3796
3602 my $value = uuid_seq uuid_cur; 3797 my $value = uuid_seq uuid_cur;
3603 3798
3604 unless ($value) { 3799 unless ($value) {
3605 warn "cowardly refusing to write zero uuid value!\n"; 3800 info "cowardly refusing to write zero uuid value!\n";
3606 return; 3801 return;
3607 } 3802 }
3608 3803
3609 my $value = uuid_str $value + $uuid_skip; 3804 my $value = uuid_str $value + $uuid_skip;
3610 $uuid_skip = 0; 3805 $uuid_skip = 0;
3620 or return; 3815 or return;
3621 3816
3622 aio_rename "$uuid~", $uuid 3817 aio_rename "$uuid~", $uuid
3623 and return; 3818 and return;
3624 3819
3625 warn "uuid file written ($value).\n"; 3820 trace "uuid file written ($value).\n";
3626 3821
3627 1 3822 1
3628 3823
3629} 3824}
3630 3825
3636} 3831}
3637 3832
3638sub emergency_save() { 3833sub emergency_save() {
3639 my $freeze_guard = cf::freeze_mainloop; 3834 my $freeze_guard = cf::freeze_mainloop;
3640 3835
3641 warn "emergency_perl_save: enter\n"; 3836 info "emergency_perl_save: enter\n";
3837
3838 # this is a trade-off: we want to be very quick here, so
3839 # save all maps without fsync, and later call a global sync
3840 # (which in turn might be very very slow)
3841 local $USE_FSYNC = 0;
3642 3842
3643 cf::sync_job { 3843 cf::sync_job {
3644 # this is a trade-off: we want to be very quick here, so 3844 cf::write_runtime_sync; # external watchdog should not bark
3645 # save all maps without fsync, and later call a global sync
3646 # (which in turn might be very very slow)
3647 local $USE_FSYNC = 0;
3648 3845
3649 # use a peculiar iteration method to avoid tripping on perl 3846 # use a peculiar iteration method to avoid tripping on perl
3650 # refcount bugs in for. also avoids problems with players 3847 # refcount bugs in for. also avoids problems with players
3651 # and maps saved/destroyed asynchronously. 3848 # and maps saved/destroyed asynchronously.
3652 warn "emergency_perl_save: begin player save\n"; 3849 info "emergency_perl_save: begin player save\n";
3653 for my $login (keys %cf::PLAYER) { 3850 for my $login (keys %cf::PLAYER) {
3654 my $pl = $cf::PLAYER{$login} or next; 3851 my $pl = $cf::PLAYER{$login} or next;
3655 $pl->valid or next; 3852 $pl->valid or next;
3656 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3853 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3657 $pl->save; 3854 $pl->save;
3658 } 3855 }
3659 warn "emergency_perl_save: end player save\n"; 3856 info "emergency_perl_save: end player save\n";
3660 3857
3858 cf::write_runtime_sync; # external watchdog should not bark
3859
3661 warn "emergency_perl_save: begin map save\n"; 3860 info "emergency_perl_save: begin map save\n";
3662 for my $path (keys %cf::MAP) { 3861 for my $path (keys %cf::MAP) {
3663 my $map = $cf::MAP{$path} or next; 3862 my $map = $cf::MAP{$path} or next;
3664 $map->valid or next; 3863 $map->valid or next;
3665 $map->save; 3864 $map->save;
3666 } 3865 }
3667 warn "emergency_perl_save: end map save\n"; 3866 info "emergency_perl_save: end map save\n";
3668 3867
3868 cf::write_runtime_sync; # external watchdog should not bark
3869
3669 warn "emergency_perl_save: begin database checkpoint\n"; 3870 info "emergency_perl_save: begin database checkpoint\n";
3670 BDB::db_env_txn_checkpoint $DB_ENV; 3871 BDB::db_env_txn_checkpoint $DB_ENV;
3671 warn "emergency_perl_save: end database checkpoint\n"; 3872 info "emergency_perl_save: end database checkpoint\n";
3672 3873
3673 warn "emergency_perl_save: begin write uuid\n"; 3874 info "emergency_perl_save: begin write uuid\n";
3674 write_uuid_sync 1; 3875 write_uuid_sync 1;
3675 warn "emergency_perl_save: end write uuid\n"; 3876 info "emergency_perl_save: end write uuid\n";
3877
3878 cf::write_runtime_sync; # external watchdog should not bark
3879
3880 trace "emergency_perl_save: syncing database to disk";
3881 BDB::db_env_txn_checkpoint $DB_ENV;
3882
3883 info "emergency_perl_save: starting sync\n";
3884 IO::AIO::aio_sync sub {
3885 info "emergency_perl_save: finished sync\n";
3886 };
3887
3888 cf::write_runtime_sync; # external watchdog should not bark
3889
3890 trace "emergency_perl_save: flushing outstanding aio requests";
3891 while (IO::AIO::nreqs || BDB::nreqs) {
3892 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3893 }
3894
3895 cf::write_runtime_sync; # external watchdog should not bark
3676 }; 3896 };
3677 3897
3678 warn "emergency_perl_save: starting sync()\n";
3679 IO::AIO::aio_sync sub {
3680 warn "emergency_perl_save: finished sync()\n";
3681 };
3682
3683 warn "emergency_perl_save: leave\n"; 3898 info "emergency_perl_save: leave\n";
3684} 3899}
3685 3900
3686sub post_cleanup { 3901sub post_cleanup {
3687 my ($make_core) = @_; 3902 my ($make_core) = @_;
3688 3903
3904 IO::AIO::flush;
3905
3689 warn Carp::longmess "post_cleanup backtrace" 3906 error Carp::longmess "post_cleanup backtrace"
3690 if $make_core; 3907 if $make_core;
3691 3908
3692 my $fh = pidfile; 3909 my $fh = pidfile;
3693 unlink $PIDFILE if <$fh> == $$; 3910 unlink $PIDFILE if <$fh> == $$;
3694} 3911}
3714 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3931 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3715 for my $name (keys %$leaf_symtab) { 3932 for my $name (keys %$leaf_symtab) {
3716 _gv_clear *{"$pkg$name"}; 3933 _gv_clear *{"$pkg$name"};
3717# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3934# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3718 } 3935 }
3719 warn "cleared package $pkg\n";#d#
3720} 3936}
3721 3937
3722sub do_reload_perl() { 3938sub do_reload_perl() {
3723 # can/must only be called in main 3939 # can/must only be called in main
3724 if ($Coro::current != $Coro::main) { 3940 unless (in_main) {
3725 warn "can only reload from main coroutine"; 3941 error "can only reload from main coroutine";
3726 return; 3942 return;
3727 } 3943 }
3728 3944
3729 return if $RELOAD++; 3945 return if $RELOAD++;
3730 3946
3731 my $t1 = EV::time; 3947 my $t1 = AE::time;
3732 3948
3733 while ($RELOAD) { 3949 while ($RELOAD) {
3734 warn "reloading..."; 3950 cf::get_slot 0.1, -1, "reload_perl";
3951 info "perl_reload: reloading...";
3735 3952
3736 warn "entering sync_job"; 3953 trace "perl_reload: entering sync_job";
3737 3954
3738 cf::sync_job { 3955 cf::sync_job {
3739 cf::write_runtime_sync; # external watchdog should not bark
3740 cf::emergency_save; 3956 #cf::emergency_save;
3741 cf::write_runtime_sync; # external watchdog should not bark
3742 3957
3743 warn "syncing database to disk";
3744 BDB::db_env_txn_checkpoint $DB_ENV;
3745
3746 # if anything goes wrong in here, we should simply crash as we already saved
3747
3748 warn "flushing outstanding aio requests";
3749 while (IO::AIO::nreqs || BDB::nreqs) {
3750 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3751 }
3752
3753 warn "cancelling all extension coros"; 3958 trace "perl_reload: cancelling all extension coros";
3754 $_->cancel for values %EXT_CORO; 3959 $_->cancel for values %EXT_CORO;
3755 %EXT_CORO = (); 3960 %EXT_CORO = ();
3756 3961
3757 warn "removing commands"; 3962 trace "perl_reload: removing commands";
3758 %COMMAND = (); 3963 %COMMAND = ();
3759 3964
3760 warn "removing ext/exti commands"; 3965 trace "perl_reload: removing ext/exti commands";
3761 %EXTCMD = (); 3966 %EXTCMD = ();
3762 %EXTICMD = (); 3967 %EXTICMD = ();
3763 3968
3764 warn "unloading/nuking all extensions"; 3969 trace "perl_reload: unloading/nuking all extensions";
3765 for my $pkg (@EXTS) { 3970 for my $pkg (@EXTS) {
3766 warn "... unloading $pkg"; 3971 trace "... unloading $pkg";
3767 3972
3768 if (my $cb = $pkg->can ("unload")) { 3973 if (my $cb = $pkg->can ("unload")) {
3769 eval { 3974 eval {
3770 $cb->($pkg); 3975 $cb->($pkg);
3771 1 3976 1
3772 } or warn "$pkg unloaded, but with errors: $@"; 3977 } or error "$pkg unloaded, but with errors: $@";
3773 } 3978 }
3774 3979
3775 warn "... clearing $pkg"; 3980 trace "... clearing $pkg";
3776 clear_package $pkg; 3981 clear_package $pkg;
3777 } 3982 }
3778 3983
3779 warn "unloading all perl modules loaded from $LIBDIR"; 3984 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3780 while (my ($k, $v) = each %INC) { 3985 while (my ($k, $v) = each %INC) {
3781 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3986 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3782 3987
3783 warn "... unloading $k"; 3988 trace "... unloading $k";
3784 delete $INC{$k}; 3989 delete $INC{$k};
3785 3990
3786 $k =~ s/\.pm$//; 3991 $k =~ s/\.pm$//;
3787 $k =~ s/\//::/g; 3992 $k =~ s/\//::/g;
3788 3993
3791 } 3996 }
3792 3997
3793 clear_package $k; 3998 clear_package $k;
3794 } 3999 }
3795 4000
3796 warn "getting rid of safe::, as good as possible"; 4001 trace "perl_reload: getting rid of safe::, as good as possible";
3797 clear_package "safe::$_" 4002 clear_package "safe::$_"
3798 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4003 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3799 4004
3800 warn "unloading cf.pm \"a bit\""; 4005 trace "perl_reload: unloading cf.pm \"a bit\"";
3801 delete $INC{"cf.pm"}; 4006 delete $INC{"cf.pm"};
3802 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4007 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3803 4008
3804 # don't, removes xs symbols, too, 4009 # don't, removes xs symbols, too,
3805 # and global variables created in xs 4010 # and global variables created in xs
3806 #clear_package __PACKAGE__; 4011 #clear_package __PACKAGE__;
3807 4012
3808 warn "unload completed, starting to reload now"; 4013 info "perl_reload: unload completed, starting to reload now";
3809 4014
3810 warn "reloading cf.pm"; 4015 trace "perl_reload: reloading cf.pm";
3811 require cf; 4016 require cf;
3812 cf::_connect_to_perl_1; 4017 cf::_connect_to_perl_1;
3813 4018
3814 warn "loading config and database again"; 4019 trace "perl_reload: loading config and database again";
3815 cf::reload_config; 4020 cf::reload_config;
3816 4021
3817 warn "loading extensions"; 4022 trace "perl_reload: loading extensions";
3818 cf::load_extensions; 4023 cf::load_extensions;
3819 4024
3820 if ($REATTACH_ON_RELOAD) { 4025 if ($REATTACH_ON_RELOAD) {
3821 warn "reattaching attachments to objects/players"; 4026 trace "perl_reload: reattaching attachments to objects/players";
3822 _global_reattach; # objects, sockets 4027 _global_reattach; # objects, sockets
3823 warn "reattaching attachments to maps"; 4028 trace "perl_reload: reattaching attachments to maps";
3824 reattach $_ for values %MAP; 4029 reattach $_ for values %MAP;
3825 warn "reattaching attachments to players"; 4030 trace "perl_reload: reattaching attachments to players";
3826 reattach $_ for values %PLAYER; 4031 reattach $_ for values %PLAYER;
3827 } 4032 }
3828 4033
3829 warn "running post_init jobs"; 4034 cf::_post_init 1;
3830 (pop @POST_INIT)->(1) while @POST_INIT;
3831 4035
3832 warn "leaving sync_job"; 4036 trace "perl_reload: leaving sync_job";
3833 4037
3834 1 4038 1
3835 } or do { 4039 } or do {
3836 warn $@; 4040 error $@;
3837 cf::cleanup "error while reloading, exiting."; 4041 cf::cleanup "perl_reload: error, exiting.";
3838 }; 4042 };
3839 4043
3840 warn "reloaded";
3841 --$RELOAD; 4044 --$RELOAD;
3842 } 4045 }
3843 4046
3844 $t1 = EV::time - $t1; 4047 $t1 = AE::time - $t1;
3845 warn "reload completed in ${t1}s\n"; 4048 info "perl_reload: completed in ${t1}s\n";
3846}; 4049};
3847 4050
3848our $RELOAD_WATCHER; # used only during reload 4051our $RELOAD_WATCHER; # used only during reload
3849 4052
3850sub reload_perl() { 4053sub reload_perl() {
3852 # coro crashes during coro_state_free->destroy here. 4055 # coro crashes during coro_state_free->destroy here.
3853 4056
3854 $RELOAD_WATCHER ||= cf::async { 4057 $RELOAD_WATCHER ||= cf::async {
3855 Coro::AIO::aio_wait cache_extensions; 4058 Coro::AIO::aio_wait cache_extensions;
3856 4059
3857 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4060 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3858 do_reload_perl; 4061 do_reload_perl;
3859 undef $RELOAD_WATCHER; 4062 undef $RELOAD_WATCHER;
3860 }; 4063 };
3861 }; 4064 };
3862} 4065}
3871 reload_perl; 4074 reload_perl;
3872 }; 4075 };
3873 } 4076 }
3874}; 4077};
3875 4078
3876unshift @INC, $LIBDIR; 4079#############################################################################
3877 4080
3878my $bug_warning = 0; 4081my $bug_warning = 0;
3879 4082
3880our @WAIT_FOR_TICK;
3881our @WAIT_FOR_TICK_BEGIN;
3882
3883sub wait_for_tick { 4083sub wait_for_tick() {
3884 return if tick_inhibit || $Coro::current == $Coro::main; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3885 4085
3886 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
3887 push @WAIT_FOR_TICK, $signal;
3888 $signal->wait;
3889} 4087}
3890 4088
3891sub wait_for_tick_begin { 4089sub wait_for_tick_begin() {
3892 return if tick_inhibit || $Coro::current == $Coro::main; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3893 4091
3894 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
3895 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
3896 $signal->wait; 4094 $signal->wait;
3897} 4095}
3901 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4099 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3902 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
3903 return; 4101 return;
3904 } 4102 }
3905 4103
3906 cf::server_tick; # one server iteration 4104 cf::one_tick; # one server iteration
4105
4106 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3907 4107
3908 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3909 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4109 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3910 Coro::async_pool { 4110 Coro::async_pool {
3911 $Coro::current->{desc} = "runtime saver"; 4111 $Coro::current->{desc} = "runtime saver";
3912 write_runtime_sync 4112 write_runtime_sync
3913 or warn "ERROR: unable to write runtime file: $!"; 4113 or error "ERROR: unable to write runtime file: $!";
3914 }; 4114 };
3915 } 4115 }
3916 4116
3917 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3918 $sig->send; 4118 $sig->send;
3919 } 4119 }
3920 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
3921 $sig->send;
3922 }
3923 4121
3924 $LOAD = ($NOW - $TICK_START) / $TICK; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
3925 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3926 4124
3927 if (0) { 4125 if (0) {
3928 if ($NEXT_TICK) { 4126 if ($NEXT_TICK) {
3929 my $jitter = $TICK_START - $NEXT_TICK; 4127 my $jitter = $TICK_START - $NEXT_TICK;
3930 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4128 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3931 warn "jitter $JITTER\n";#d# 4129 debug "jitter $JITTER\n";#d#
3932 } 4130 }
3933 } 4131 }
3934} 4132}
3935 4133
3936{ 4134{
3937 # configure BDB 4135 # configure BDB
3938 4136
3939 BDB::min_parallel 8; 4137 BDB::min_parallel 16;
3940 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
3941 $AnyEvent::BDB::WATCHER->priority (1); 4139 #$AnyEvent::BDB::WATCHER->priority (1);
3942 4140
3943 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
3944 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
3945 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3946 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4144 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3981 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
3982 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
3983 undef $AnyEvent::AIO::WATCHER; 4181 undef $AnyEvent::AIO::WATCHER;
3984} 4182}
3985 4183
3986my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
3987 4186
3988sub _log_backtrace { 4187sub _log_backtrace {
3989 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
3990 4189
3991 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
3992 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3993 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
3994 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
3995 ++$_log_backtrace; 4198 ++$_log_backtrace;
3996 my $perl_bt = Carp::longmess $msg; 4199 my $perl_bt = Carp::longmess $msg;
3997 async { 4200 async {
3998 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
3999 4202
4019 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
4020 --$_log_backtrace; 4223 --$_log_backtrace;
4021 }; 4224 };
4022 } else { 4225 } else {
4023 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
4024 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4025 } 4228 }
4026} 4229}
4027 4230
4028# load additional modules 4231# load additional modules
4029require "cf/$_.pm" for @EXTRA_MODULES; 4232require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines