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.497 by root, Fri Dec 18 03:49:46 2009 UTC vs.
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 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 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;
… …
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; 113our %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;
… …
162 170
163our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
164 172
165sub cf::map::normalise; 173sub cf::map::normalise;
166 174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
167############################################################################# 179#############################################################################
168 180
169%REFLECT = (); 181%REFLECT = ();
170for (@REFLECT) { 182for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 183 my $reflect = JSON::XS::decode_json $_;
… …
223from wherever your confdir points to. 235from wherever your confdir points to.
224 236
225=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
226 238
227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These 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 240returns 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. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
230 247
231=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
232 249
233This array contains the results of the last C<invoke ()> call. When 250This 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 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
242 259
243=back 260=back
244 261
245=cut 262=cut
246 263
264sub error(@) { LOG llevError, join "", @_ }
265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
247$Coro::State::WARNHOOK = sub { 270$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 271 my $msg = join "", @_;
249 272
250 $msg .= "\n" 273 $msg .= "\n"
251 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
252 275
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 277
255 LOG llevError, $msg; 278 LOG llevWarn, $msg;
256}; 279};
257 280
258$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
260 283
261 warn Carp::longmess $_[0]; 284 error Carp::longmess $_[0];
262 285
263 if ($Coro::current == $Coro::main) {#d# 286 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 288 return;#d#
266 }#d# 289 }#d#
267 290
268 # kill coroutine otherwise 291 # kill coroutine otherwise
269 Coro::terminate 292 Coro::terminate
… …
291} 314}
292 315
293$EV::DIED = sub { 316$EV::DIED = sub {
294 Carp::cluck "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
295}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
296 324
297############################################################################# 325#############################################################################
298 326
299=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
300 328
… …
321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
322 $d 350 $d
323 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
324} 352}
325 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
326=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
327 369
328Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
329 371
330=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337 379
338sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
340 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
341=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
342 415
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
345 418
346The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 420is a reload or not.
348 421
349=cut 422=cut
350 423
351sub post_init(&) { 424sub post_init(&) {
352 push @POST_INIT, shift; 425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
353} 443}
354 444
355=item cf::lock_wait $string 445=item cf::lock_wait $string
356 446
357Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
… …
396} 486}
397 487
398=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
399 489
400Like EV::periodic, but randomly selects a starting point so that the actions 490Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 491get spread over time.
402 492
403=cut 493=cut
404 494
405sub periodic($$) { 495sub periodic($$) {
406 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
… …
410 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
411} 501}
412 502
413=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
414 504
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
416This call blocks and returns only when you have at least C<$time> seconds 506(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. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
418 512
419The optional C<$name> can be used to identify the job to run. It might be 513The 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. 514used for statistical purposes and should identify the same time-class.
421 515
422Useful for short background jobs. 516Useful for short background jobs.
423 517
424=cut 518=cut
425 519
426our @SLOT_QUEUE; 520our @SLOT_QUEUE;
427our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
428 523
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
432 527
433 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
434 530
435 while () { 531 while () {
436 next_job: 532 next_job:
533
437 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 535
439 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 540 $job->[2]->send;
443 Coro::cede; 541 Coro::cede;
444 goto next_job; 542 goto next_job;
445 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 545 }
447 } 546 }
448 547
449 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 551 $signal->wait;
453 } else { 552 } else {
553 $busy = 0;
454 Coro::schedule; 554 Coro::schedule;
455 } 555 }
456 } 556 }
457}; 557};
458 558
459sub get_slot($;$$) { 559sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
461 561
462 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
463 563
464 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
465 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
466 567
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
… …
495=cut 596=cut
496 597
497sub sync_job(&) { 598sub sync_job(&) {
498 my ($job) = @_; 599 my ($job) = @_;
499 600
500 if ($Coro::current == $Coro::main) { 601 if (in_main) {
501 my $time = EV::time; 602 my $time = AE::time;
502 603
503 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
505 606
506 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
507 608
508 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
509 610
510 my $busy = 1; 611 my $busy = 1;
511 my @res; 612 my @res;
512 613
513 (async { 614 (async {
514 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
515 @res = eval { $job->() }; 616 @res = eval { $job->() };
516 warn $@ if $@; 617 error $@ if $@;
517 undef $busy; 618 undef $busy;
518 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
519 620
520 while ($busy) { 621 while ($busy) {
521 if (Coro::nready) { 622 if (Coro::nready) {
… …
523 } else { 624 } else {
524 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
525 } 626 }
526 } 627 }
527 628
528 my $time = EV::time - $time; 629 my $time = AE::time - $time;
529 630
530 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
531 632
532 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
533 } else { 634 } else {
… …
555 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
556 657
557 $coro 658 $coro
558} 659}
559 660
560=item fork_call { }, $args 661=item fork_call { }, @args
561 662
562Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
563process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
564Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
565never block itself or use any form of event handling. 666never block itself or use any form of event handling.
566 667
567=cut 668=cut
568 669
670sub post_fork {
671 reset_signals;
672}
673
569sub fork_call(&@) { 674sub fork_call(&@) {
570 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
571 676
572 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
573 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
574 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
575 680
576 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
577 reset_signals; 682 cf::post_fork;
578 &$cb 683 &$cb
579 }, @args; 684 } @args;
580 685
581 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
687}
688
689sub objinfo {
690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
582} 698}
583 699
584=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
585 701
586=cut 702=cut
… …
623within each server. 739within each server.
624 740
625=cut 741=cut
626 742
627sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
628 my ($name) = @_; 747 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
630 749
631 eval { 750 eval {
632 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
642} 761}
643 762
644our $DB; 763our $DB;
645 764
646sub db_init { 765sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
649 };
650} 767}
651 768
652sub db_get($$) { 769sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
654 771
655 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
656 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
657 776
658 $! ? () 777 $! ? ()
659 : $data 778 : $data
660 }
661} 779}
662 780
663sub db_put($$$) { 781sub db_put($$$) {
664 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
693 811
694 my @data; 812 my @data;
695 my $md5; 813 my $md5;
696 814
697 for (0 .. $#$src) { 815 for (0 .. $#$src) {
698 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
699 or Carp::croak "$src->[$_]: $!";
700 } 817 }
701 818
702 # if processing is expensive, check 819 # if processing is expensive, check
703 # checksum first 820 # checksum first
704 if (1) { 821 if (1) {
… …
721 838
722 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
723 my $data = $process->(\@data); 840 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
725 842
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 844
728 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
731 848
… …
741 858
742=cut 859=cut
743 860
744sub datalog($@) { 861sub datalog($@) {
745 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 864}
748 865
749=back 866=back
750 867
751=cut 868=cut
… …
946 1063
947 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 1066
950 } elsif (ref $type) { 1067 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
952 1069
953 } else { 1070 } else {
954 shift @arg; 1071 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
956 } 1073 }
957 } 1074 }
958} 1075}
959 1076
960sub _object_attach { 1077sub _object_attach {
… …
970 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
971 } 1088 }
972 1089
973 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
974 } else { 1091 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1093 }
977 1094
978 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
979} 1096}
980 1097
… …
1039 1156
1040 for (@$callbacks) { 1157 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1042 1159
1043 if ($@) { 1160 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1162 override;
1047 } 1163 }
1048 1164
1049 return 1 if $override; 1165 return 1 if $override;
1050 } 1166 }
… …
1129 for (@$attach) { 1245 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1132 } 1248 }
1133 } else { 1249 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1251 }
1136 } 1252 }
1137} 1253}
1138 1254
1139cf::attachable->attach ( 1255cf::attachable->attach (
… …
1166 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1167 1283
1168 sync_job { 1284 sync_job {
1169 if (length $$rdata) { 1285 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1173 1290
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 if ($cf::USE_FSYNC) { 1294 if ($cf::USE_FSYNC) {
… …
1199 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1200 1317
1201 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1203 } else { 1320 } else {
1204 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1205 } 1322 }
1206 } else { 1323 } else {
1207 aio_unlink $filename; 1324 aio_unlink $filename;
1208 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1209 } 1326 }
… …
1233 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs}; 1351 $av = $st->{objs};
1235 } 1352 }
1236 1353
1237 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1238 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1239 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1240 1358
1241 ($data, $av) 1359 ($data, $av)
1242} 1360}
1243 1361
1244=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
… …
1303} 1421}
1304 1422
1305use File::Glob (); 1423use File::Glob ();
1306 1424
1307cf::player->attach ( 1425cf::player->attach (
1308 on_command => sub { 1426 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1310 1428
1311 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1312 or return; 1430 or return;
1313 1431
… …
1336 1454
1337 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1338 if $reply; 1456 if $reply;
1339 1457
1340 } else { 1458 } else {
1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342 } 1460 }
1343 1461
1344 cf::override; 1462 cf::override;
1345 }, 1463 },
1346); 1464);
… …
1357 1475
1358 $grp 1476 $grp
1359} 1477}
1360 1478
1361sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1362 cf::sync_job { 1482 cf::sync_job {
1363 my %todo; 1483 my %todo;
1364 1484
1365 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1366 next unless -r $path; 1486 next unless -r $path;
… …
1384 1504
1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1387 1507
1388 $ext{source} = 1508 $ext{source} =
1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1390 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1391 . $source 1511 . $source
1392 . "\n};\n1"; 1512 . "\n};\n1";
1393 1513
1394 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1395 } 1515 }
1396 1516
1517 my $pass = 0;
1397 my %done; 1518 my %done;
1398 while (%todo) { 1519 while (%todo) {
1399 my $progress; 1520 my $progress;
1400 1521
1522 ++$pass;
1523
1524 ext:
1401 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1527 next ext
1404 unless exists $done{$_}; 1528 unless exists $done{$_};
1405 } 1529 }
1406 1530
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1532
1409 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1537
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1539 if exists $v->{meta}{mandatory};
1417 1540
1418 warn $msg; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1543 } else {
1544 $done{$k} = delete $todo{$k};
1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1419 } 1550 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1551 }
1425 1552
1426 skip: 1553 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560 }
1429 } 1561 }
1430 }; 1562 };
1431} 1563}
1432 1564
1433############################################################################# 1565#############################################################################
… …
1517 $cf::PLAYER{$login} = $pl 1649 $cf::PLAYER{$login} = $pl
1518 } 1650 }
1519 } 1651 }
1520} 1652}
1521 1653
1654cf::player->attach (
1655 on_load => sub {
1656 my ($pl, $path) = @_;
1657
1658 # restore slots saved in save, below
1659 my $slots = delete $pl->{_slots};
1660
1661 $pl->ob->current_weapon ($slots->[0]);
1662 $pl->combat_ob ($slots->[1]);
1663 $pl->ranged_ob ($slots->[2]);
1664 },
1665);
1666
1522sub save($) { 1667sub save($) {
1523 my ($pl) = @_; 1668 my ($pl) = @_;
1524 1669
1525 return if $pl->{deny_save}; 1670 return if $pl->{deny_save};
1526 1671
… …
1531 1676
1532 aio_mkdir playerdir $pl, 0770; 1677 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1678 $pl->{last_save} = $cf::RUNTIME;
1534 1679
1535 cf::get_slot 0.01; 1680 cf::get_slot 0.01;
1681
1682 # save slots, to be restored later
1683 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536 1684
1537 $pl->save_pl ($path); 1685 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1686 cf::cede_to_tick;
1539} 1687}
1540 1688
… …
1574 my $name = $pl->ob->name; 1722 my $name = $pl->ob->name;
1575 1723
1576 $pl->{deny_save} = 1; 1724 $pl->{deny_save} = 1;
1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1725 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1578 1726
1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1727 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1580 $pl->deactivate; 1728 $pl->deactivate;
1729
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1730 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1583 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1731 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1732 ext::highscore::check ($pl->ob);
1733
1584 $pl->ns->destroy if $pl->ns; 1734 $pl->ns->destroy if $pl->ns;
1585 1735
1586 my $path = playerdir $pl; 1736 my $path = playerdir $pl;
1587 my $temp = "$path~$cf::RUNTIME~deleting~"; 1737 my $temp = "$path~$cf::RUNTIME~deleting~";
1588 aio_rename $path, $temp; 1738 aio_rename $path, $temp;
… …
1642 \@logins 1792 \@logins
1643} 1793}
1644 1794
1645=item $player->maps 1795=item $player->maps
1646 1796
1797=item cf::player::maps $login
1798
1647Returns an arrayref of map paths that are private for this 1799Returns an arrayref of map paths that are private for this
1648player. May block. 1800player. May block.
1649 1801
1650=cut 1802=cut
1651 1803
… …
1713=cut 1865=cut
1714 1866
1715sub find_by_path($) { 1867sub find_by_path($) {
1716 my ($path) = @_; 1868 my ($path) = @_;
1717 1869
1870 $path =~ s/^~[^\/]*//; # skip ~login
1871
1718 my ($match, $specificity); 1872 my ($match, $specificity);
1719 1873
1720 for my $region (list) { 1874 for my $region (list) {
1721 if ($region->{match} && $path =~ $region->{match}) { 1875 if ($region->{match} && $path =~ $region->{match}) {
1722 ($match, $specificity) = ($region, $region->specificity) 1876 ($match, $specificity) = ($region, $region->specificity)
… …
1750sub generate_random_map { 1904sub generate_random_map {
1751 my ($self, $rmp) = @_; 1905 my ($self, $rmp) = @_;
1752 1906
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1907 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 1908
1755 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1909 $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} 1910}
1770 1911
1771=item cf::map->register ($regex, $prio) 1912=item cf::map->register ($regex, $prio)
1772 1913
1773Register a handler for the map path matching the given regex at the 1914Register a handler for the map path matching the given regex at the
… …
1778 1919
1779sub register { 1920sub register {
1780 my (undef, $regex, $prio) = @_; 1921 my (undef, $regex, $prio) = @_;
1781 my $pkg = caller; 1922 my $pkg = caller;
1782 1923
1783 no strict;
1784 push @{"$pkg\::ISA"}, __PACKAGE__; 1924 push @{"$pkg\::ISA"}, __PACKAGE__;
1785 1925
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1926 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 1927}
1788 1928
1789# also paths starting with '/' 1929# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1930$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 1931
1792sub thawer_merge { 1932sub thawer_merge {
1793 my ($self, $merge) = @_; 1933 my ($self, $merge) = @_;
1794 1934
1795 # we have to keep some variables in memory intact 1935 # we have to keep some variables in memory intact
… …
1800} 1940}
1801 1941
1802sub normalise { 1942sub normalise {
1803 my ($path, $base) = @_; 1943 my ($path, $base) = @_;
1804 1944
1805 $path = "$path"; # make sure its a string 1945 $path = "$path"; # make sure it's a string
1806 1946
1807 $path =~ s/\.map$//; 1947 $path =~ s/\.map$//;
1808 1948
1809 # map plan: 1949 # map plan:
1810 # 1950 #
… …
1825 $base =~ s{[^/]+/?$}{}; 1965 $base =~ s{[^/]+/?$}{};
1826 $path = "$base/$path"; 1966 $path = "$base/$path";
1827 } 1967 }
1828 1968
1829 for ($path) { 1969 for ($path) {
1830 redo if s{//}{/};
1831 redo if s{/\.?/}{/}; 1970 redo if s{/\.?/}{/};
1832 redo if s{/[^/]+/\.\./}{/}; 1971 redo if s{/[^/]+/\.\./}{/};
1833 } 1972 }
1834 1973
1835 $path 1974 $path
… …
1849 $self->init; # pass $1 etc. 1988 $self->init; # pass $1 etc.
1850 return $self; 1989 return $self;
1851 } 1990 }
1852 } 1991 }
1853 1992
1854 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1993 Carp::cluck "unable to resolve path '$path' (base '$base')";
1855 () 1994 ()
1856} 1995}
1857 1996
1858sub init { 1997sub init {
1859 my ($self) = @_; 1998 my ($self) = @_;
… …
1981} 2120}
1982 2121
1983sub find; 2122sub find;
1984sub find { 2123sub find {
1985 my ($path, $origin) = @_; 2124 my ($path, $origin) = @_;
2125
2126 cf::cede_to_tick;
1986 2127
1987 $path = normalise $path, $origin && $origin->path; 2128 $path = normalise $path, $origin && $origin->path;
1988 2129
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990 my $guard2 = cf::lock_acquire "map_find:$path"; 2131 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2009 2150
2010 $cf::MAP{$path} = $map 2151 $cf::MAP{$path} = $map
2011 } 2152 }
2012} 2153}
2013 2154
2014sub pre_load { } 2155sub pre_load { }
2015sub post_load { } 2156#sub post_load { } # XS
2016 2157
2017sub load { 2158sub load {
2018 my ($self) = @_; 2159 my ($self) = @_;
2019 2160
2020 local $self->{deny_reset} = 1; # loading can take a long time 2161 local $self->{deny_reset} = 1; # loading can take a long time
… …
2075 2216
2076 $self->in_memory (cf::MAP_ACTIVE); 2217 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2218 }
2078 2219
2079 $self->post_load; 2220 $self->post_load;
2080}
2081 2221
2222 1
2223}
2224
2225# customize the map for a given player, i.e.
2226# return the _real_ map. used by e.g. per-player
2227# maps to change the path to ~playername/mappath
2082sub customise_for { 2228sub customise_for {
2083 my ($self, $ob) = @_; 2229 my ($self, $ob) = @_;
2084 2230
2085 return find "~" . $ob->name . "/" . $self->{path} 2231 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2232 if $self->per_player;
… …
2102 or next; 2248 or next;
2103 $neigh = find $neigh, $map 2249 $neigh = find $neigh, $map
2104 or next; 2250 or next;
2105 $neigh->load; 2251 $neigh->load;
2106 2252
2253 # now find the diagonal neighbours
2107 push @neigh, 2254 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2255 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2256 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 } 2257 }
2111 2258
… …
2118} 2265}
2119 2266
2120sub find_sync { 2267sub find_sync {
2121 my ($path, $origin) = @_; 2268 my ($path, $origin) = @_;
2122 2269
2123 cf::sync_job { find $path, $origin } 2270 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2271 if $Coro::current == $Coro::main;
2272
2273 find $path, $origin
2124} 2274}
2125 2275
2126sub do_load_sync { 2276sub do_load_sync {
2127 my ($map) = @_; 2277 my ($map) = @_;
2128 2278
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2280 if $Coro::current == $Coro::main;
2131 2281
2132 cf::sync_job { $map->load }; 2282 $map->load;
2133} 2283}
2134 2284
2135our %MAP_PREFETCH; 2285our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2286our $MAP_PREFETCHER = undef;
2137 2287
… …
2163 $MAP_PREFETCHER->prio (6); 2313 $MAP_PREFETCHER->prio (6);
2164 2314
2165 () 2315 ()
2166} 2316}
2167 2317
2318# common code, used by both ->save and ->swapout
2168sub save { 2319sub _save {
2169 my ($self) = @_; 2320 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2321
2173 $self->{last_save} = $cf::RUNTIME; 2322 $self->{last_save} = $cf::RUNTIME;
2174 2323
2175 return unless $self->dirty; 2324 return unless $self->dirty;
2176 2325
… …
2196 } else { 2345 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2346 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2347 }
2199} 2348}
2200 2349
2350sub save {
2351 my ($self) = @_;
2352
2353 my $lock = cf::lock_acquire "map_data:$self->{path}";
2354
2355 $self->_save;
2356}
2357
2201sub swap_out { 2358sub swap_out {
2202 my ($self) = @_; 2359 my ($self) = @_;
2203 2360
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2361 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2362
2209 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2363 return if $self->in_memory != cf::MAP_ACTIVE;
2211 return if $self->{deny_save}; 2364 return if $self->{deny_save};
2365 return if $self->players;
2212 2366
2367 # first deactivate the map and "unlink" it from the core
2368 $self->deactivate;
2369 $_->clear_links_to ($self) for values %cf::MAP;
2213 $self->in_memory (cf::MAP_SWAPPED); 2370 $self->in_memory (cf::MAP_SWAPPED);
2371
2372 # then atomically save
2373 $self->_save;
2374
2375 # then free the map
2376 $self->clear;
2377}
2378
2379sub reset_at {
2380 my ($self) = @_;
2381
2382 # TODO: safety, remove and allow resettable per-player maps
2383 return 1e99 if $self->{deny_reset};
2384
2385 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2386 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2387
2388 $time + $to
2389}
2390
2391sub should_reset {
2392 my ($self) = @_;
2393
2394 $self->reset_at <= $cf::RUNTIME
2395}
2396
2397sub reset {
2398 my ($self) = @_;
2399
2400 my $lock = cf::lock_acquire "map_data:$self->{path}";
2401
2402 return if $self->players;
2403
2404 cf::trace "resetting map ", $self->path, "\n";
2405
2406 $self->in_memory (cf::MAP_SWAPPED);
2407
2408 # need to save uniques path
2409 unless ($self->{deny_save}) {
2410 my $uniq = $self->uniq_path; utf8::encode $uniq;
2411
2412 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2413 if $uniq;
2414 }
2415
2416 delete $cf::MAP{$self->path};
2214 2417
2215 $self->deactivate; 2418 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2419 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2420 $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 2421
2263 $self->unlink_save; 2422 $self->unlink_save;
2264 $self->destroy; 2423 $self->destroy;
2265} 2424}
2266 2425
… …
2274 2433
2275 delete $cf::MAP{$self->path}; 2434 delete $cf::MAP{$self->path};
2276 2435
2277 $self->unlink_save; 2436 $self->unlink_save;
2278 2437
2279 bless $self, "cf::map"; 2438 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2439 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2440 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2441 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2442 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2443
… …
2514 2673
2515Freezes the player and moves him/her to a special map (C<{link}>). 2674Freezes the player and moves him/her to a special map (C<{link}>).
2516 2675
2517The player should be reasonably safe there for short amounts of time (e.g. 2676The player should be reasonably safe there for short amounts of time (e.g.
2518for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2677for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link 2678though, as the player cannot control the character while it is on the link
2520map. 2679map.
2521 2680
2522Will never block. 2681Will never block.
2523 2682
2524=item $player_object->leave_link ($map, $x, $y) 2683=item $player_object->leave_link ($map, $x, $y)
… …
2545sub cf::object::player::enter_link { 2704sub cf::object::player::enter_link {
2546 my ($self) = @_; 2705 my ($self) = @_;
2547 2706
2548 $self->deactivate_recursive; 2707 $self->deactivate_recursive;
2549 2708
2709 ++$self->{_link_recursion};
2710
2550 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2711 return if UNIVERSAL::isa $self->map, "ext::map_link";
2551 2712
2552 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2713 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553 if $self->map && $self->map->{path} ne "{link}"; 2714 if $self->map && $self->map->{path} ne "{link}";
2554 2715
2555 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2716 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2556} 2717}
2557 2718
2558sub cf::object::player::leave_link { 2719sub cf::object::player::leave_link {
2559 my ($self, $map, $x, $y) = @_; 2720 my ($self, $map, $x, $y) = @_;
2560 2721
… …
2585 $map->load_neighbours; 2746 $map->load_neighbours;
2586 2747
2587 return unless $self->contr->active; 2748 return unless $self->contr->active;
2588 2749
2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2750 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2590 $self->enter_map ($map, $x, $y); 2751 if ($self->enter_map ($map, $x, $y)) {
2591 2752 # entering was successful
2753 delete $self->{_link_recursion};
2592 # only activate afterwards, to support waiting in hooks 2754 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive; 2755 $self->activate_recursive;
2594} 2756 }
2595 2757
2758}
2759
2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2760=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2597 2761
2598Moves the player to the given map-path and coordinates by first freezing 2762Moves the player to the given map-path and coordinates by first freezing
2599her, loading and preparing them map, calling the provided $check callback 2763her, loading and preparing them map, calling the provided $check callback
2600that has to return the map if sucecssful, and then unfreezes the player on 2764that has to return the map if sucecssful, and then unfreezes the player on
2601the new (success) or old (failed) map position. In either case, $done will 2765the new (success) or old (failed) map position. In either case, $done will
… …
2608 2772
2609our $GOTOGEN; 2773our $GOTOGEN;
2610 2774
2611sub cf::object::player::goto { 2775sub cf::object::player::goto {
2612 my ($self, $path, $x, $y, $check, $done) = @_; 2776 my ($self, $path, $x, $y, $check, $done) = @_;
2777
2778 if ($self->{_link_recursion} >= $MAX_LINKS) {
2779 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2780 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2781 ($path, $x, $y) = @$EMERGENCY_POSITION;
2782 }
2613 2783
2614 # do generation counting so two concurrent goto's will be executed in-order 2784 # do generation counting so two concurrent goto's will be executed in-order
2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2785 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2616 2786
2617 $self->enter_link; 2787 $self->enter_link;
… …
2641 my $map = eval { 2811 my $map = eval {
2642 my $map = defined $path ? cf::map::find $path : undef; 2812 my $map = defined $path ? cf::map::find $path : undef;
2643 2813
2644 if ($map) { 2814 if ($map) {
2645 $map = $map->customise_for ($self); 2815 $map = $map->customise_for ($self);
2646 $map = $check->($map) if $check && $map; 2816 $map = $check->($map, $x, $y, $self) if $check && $map;
2647 } else { 2817 } else {
2648 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2818 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2649 } 2819 }
2650 2820
2651 $map 2821 $map
… …
2659 if ($gen == $self->{_goto_generation}) { 2829 if ($gen == $self->{_goto_generation}) {
2660 delete $self->{_goto_generation}; 2830 delete $self->{_goto_generation};
2661 $self->leave_link ($map, $x, $y); 2831 $self->leave_link ($map, $x, $y);
2662 } 2832 }
2663 2833
2664 $done->() if $done; 2834 $done->($self) if $done;
2665 })->prio (1); 2835 })->prio (1);
2666} 2836}
2667 2837
2668=item $player_object->enter_exit ($exit_object) 2838=item $player_object->enter_exit ($exit_object)
2669 2839
… …
2762 $self->message ("Something went wrong deep within the deliantra server. " 2932 $self->message ("Something went wrong deep within the deliantra server. "
2763 . "I'll try to bring you back to the map you were before. " 2933 . "I'll try to bring you back to the map you were before. "
2764 . "Please report this to the dungeon master!", 2934 . "Please report this to the dungeon master!",
2765 cf::NDI_UNIQUE | cf::NDI_RED); 2935 cf::NDI_UNIQUE | cf::NDI_RED);
2766 2936
2767 warn "ERROR in enter_exit: $@"; 2937 error "ERROR in enter_exit: $@";
2768 $self->leave_link; 2938 $self->leave_link;
2769 } 2939 }
2770 })->prio (1); 2940 })->prio (1);
2771} 2941}
2772 2942
… …
3085 3255
3086 $ns->ext_reply ($reply, @reply) 3256 $ns->ext_reply ($reply, @reply)
3087 if $reply; 3257 if $reply;
3088 3258
3089 } else { 3259 } else {
3090 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3260 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3091 } 3261 }
3092 3262
3093 cf::override; 3263 cf::override;
3094 }, 3264 },
3095); 3265);
… …
3115 3285
3116 $coro 3286 $coro
3117} 3287}
3118 3288
3119cf::client->attach ( 3289cf::client->attach (
3120 on_destroy => sub { 3290 on_client_destroy => sub {
3121 my ($ns) = @_; 3291 my ($ns) = @_;
3122 3292
3123 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3293 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124 }, 3294 },
3125); 3295);
… …
3141our $safe_hole = new Safe::Hole; 3311our $safe_hole = new Safe::Hole;
3142 3312
3143$SIG{FPE} = 'IGNORE'; 3313$SIG{FPE} = 'IGNORE';
3144 3314
3145$safe->permit_only (Opcode::opset qw( 3315$safe->permit_only (Opcode::opset qw(
3146 :base_core :base_mem :base_orig :base_math 3316 :base_core :base_mem :base_orig :base_math :base_loop
3147 grepstart grepwhile mapstart mapwhile 3317 grepstart grepwhile mapstart mapwhile
3148 sort time 3318 sort time
3149)); 3319));
3150 3320
3151# here we export the classes and methods available to script code 3321# here we export the classes and methods available to script code
… …
3176 decrease split destroy change_exp value msg lore send_msg)], 3346 decrease split destroy change_exp value msg lore send_msg)],
3177 ["cf::object::player" => qw(player)], 3347 ["cf::object::player" => qw(player)],
3178 ["cf::player" => qw(peaceful send_msg)], 3348 ["cf::player" => qw(peaceful send_msg)],
3179 ["cf::map" => qw(trigger)], 3349 ["cf::map" => qw(trigger)],
3180) { 3350) {
3181 no strict 'refs';
3182 my ($pkg, @funs) = @$_; 3351 my ($pkg, @funs) = @$_;
3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3352 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3184 for @funs; 3353 for @funs;
3185} 3354}
3186 3355
… …
3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3372 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3204 $qcode =~ s/\n/\\n/g; 3373 $qcode =~ s/\n/\\n/g;
3205 3374
3206 %vars = (_dummy => 0) unless %vars; 3375 %vars = (_dummy => 0) unless %vars;
3207 3376
3377 my @res;
3208 local $_; 3378 local $_;
3209 local @safe::cf::_safe_eval_args = values %vars;
3210 3379
3211 my $eval = 3380 my $eval =
3212 "do {\n" 3381 "do {\n"
3213 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3382 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3214 . "#line 0 \"{$qcode}\"\n" 3383 . "#line 0 \"{$qcode}\"\n"
3215 . $code 3384 . $code
3216 . "\n}" 3385 . "\n}"
3217 ; 3386 ;
3218 3387
3388 if ($CFG{safe_eval}) {
3219 sub_generation_inc; 3389 sub_generation_inc;
3390 local @safe::cf::_safe_eval_args = values %vars;
3220 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3391 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3221 sub_generation_inc; 3392 sub_generation_inc;
3393 } else {
3394 local @cf::_safe_eval_args = values %vars;
3395 @res = wantarray ? eval eval : scalar eval $eval;
3396 }
3222 3397
3223 if ($@) { 3398 if ($@) {
3224 warn "$@"; 3399 warn "$@",
3225 warn "while executing safe code '$code'\n"; 3400 "while executing safe code '$code'\n",
3226 warn "with arguments " . (join " ", %vars) . "\n"; 3401 "with arguments " . (join " ", %vars) . "\n";
3227 } 3402 }
3228 3403
3229 wantarray ? @res : $res[0] 3404 wantarray ? @res : $res[0]
3230} 3405}
3231 3406
… …
3245=cut 3420=cut
3246 3421
3247sub register_script_function { 3422sub register_script_function {
3248 my ($fun, $cb) = @_; 3423 my ($fun, $cb) = @_;
3249 3424
3250 no strict 'refs'; 3425 $fun = "safe::$fun" if $CFG{safe_eval};
3251 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3426 *$fun = $safe_hole->wrap ($cb);
3252} 3427}
3253 3428
3254=back 3429=back
3255 3430
3256=cut 3431=cut
… …
3265 # for this (global event?) 3440 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = (); 3441 %ext::player_env::MUSIC_FACE_CACHE = ();
3267 3442
3268 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3443 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3269 3444
3270 warn "loading facedata from $path\n"; 3445 trace "loading facedata from $path\n";
3271 3446
3272 my $facedata; 3447 my $facedata = decode_storable load_file $path;
3273 0 < aio_load $path, $facedata
3274 or die "$path: $!";
3275
3276 $facedata = Coro::Storable::thaw $facedata;
3277 3448
3278 $facedata->{version} == 2 3449 $facedata->{version} == 2
3279 or cf::cleanup "$path: version mismatch, cannot proceed."; 3450 or cf::cleanup "$path: version mismatch, cannot proceed.";
3280 3451
3281 # patch in the exptable 3452 # patch in the exptable
3453 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3282 $facedata->{resource}{"res/exp_table"} = { 3454 $facedata->{resource}{"res/exp_table"} = {
3283 type => FT_RSRC, 3455 type => FT_RSRC,
3284 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3456 data => $exp_table,
3457 hash => (Digest::MD5::md5 $exp_table),
3285 }; 3458 };
3286 cf::cede_to_tick; 3459 cf::cede_to_tick;
3287 3460
3288 { 3461 {
3289 my $faces = $facedata->{faceinfo}; 3462 my $faces = $facedata->{faceinfo};
… …
3293 3466
3294 cf::face::set_visibility $idx, $info->{visibility}; 3467 cf::face::set_visibility $idx, $info->{visibility};
3295 cf::face::set_magicmap $idx, $info->{magicmap}; 3468 cf::face::set_magicmap $idx, $info->{magicmap};
3296 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3469 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3297 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3470 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3471 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3298 3472
3299 cf::cede_to_tick; 3473 cf::cede_to_tick;
3300 } 3474 }
3301 3475
3302 while (my ($face, $info) = each %$faces) { 3476 while (my ($face, $info) = each %$faces) {
… …
3307 3481
3308 if (my $smooth = cf::face::find $info->{smooth}) { 3482 if (my $smooth = cf::face::find $info->{smooth}) {
3309 cf::face::set_smooth $idx, $smooth; 3483 cf::face::set_smooth $idx, $smooth;
3310 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3484 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3311 } else { 3485 } else {
3312 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3486 error "smooth face '$info->{smooth}' not found for face '$face'";
3313 } 3487 }
3314 3488
3315 cf::cede_to_tick; 3489 cf::cede_to_tick;
3316 } 3490 }
3317 } 3491 }
… …
3335 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3509 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3336 3510
3337 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3511 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3338 cf::face::set_type $idx, $info->{type}; 3512 cf::face::set_type $idx, $info->{type};
3339 } else { 3513 } else {
3340 $RESOURCE{$name} = $info; 3514 $RESOURCE{$name} = $info; # unused
3341 } 3515 }
3342 3516
3343 cf::cede_to_tick; 3517 cf::cede_to_tick;
3344 } 3518 }
3345 } 3519 }
3346 3520
3347 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3521 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3348 3522
3349 1 3523 1
3350} 3524}
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 3525
3372register_exticmd fx_want => sub { 3526register_exticmd fx_want => sub {
3373 my ($ns, $want) = @_; 3527 my ($ns, $want) = @_;
3374 3528
3375 while (my ($k, $v) = each %$want) { 3529 while (my ($k, $v) = each %$want) {
… …
3414sub reload_treasures { 3568sub reload_treasures {
3415 load_resource_file "$DATADIR/treasures" 3569 load_resource_file "$DATADIR/treasures"
3416 or die "unable to load treasurelists\n"; 3570 or die "unable to load treasurelists\n";
3417} 3571}
3418 3572
3573sub reload_sound {
3574 trace "loading sound config from $DATADIR/sound\n";
3575
3576 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3577
3578 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3579 my $sound = $soundconf->{compat}[$_]
3580 or next;
3581
3582 my $face = cf::face::find "sound/$sound->[1]";
3583 cf::sound::set $sound->[0] => $face;
3584 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3585 }
3586
3587 while (my ($k, $v) = each %{$soundconf->{event}}) {
3588 my $face = cf::face::find "sound/$v";
3589 cf::sound::set $k => $face;
3590 }
3591}
3592
3419sub reload_resources { 3593sub reload_resources {
3420 warn "reloading resource files...\n"; 3594 trace "reloading resource files...\n";
3421 3595
3596 reload_exp_table;
3597 reload_materials;
3422 reload_facedata; 3598 reload_facedata;
3599 reload_sound;
3423 reload_archetypes; 3600 reload_archetypes;
3424 reload_regions; 3601 reload_regions;
3425 reload_treasures; 3602 reload_treasures;
3426 3603
3427 warn "finished reloading resource files\n"; 3604 trace "finished reloading resource files\n";
3428} 3605}
3429 3606
3430sub reload_config { 3607sub reload_config {
3431 warn "reloading config file...\n"; 3608 trace "reloading config file...\n";
3432 3609
3433 open my $fh, "<:utf8", "$CONFDIR/config" 3610 my $config = load_file "$CONFDIR/config";
3434 or return; 3611 utf8::decode $config;
3612 *CFG = decode_yaml $config;
3435 3613
3436 local $/;
3437 *CFG = YAML::XS::Load scalar <$fh>;
3438
3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3614 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3440 3615
3441 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3616 $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}; 3617 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3443 3618
3444 if (exists $CFG{mlockall}) { 3619 if (exists $CFG{mlockall}) {
… …
3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3621 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3447 and die "WARNING: m(un)lockall failed: $!\n"; 3622 and die "WARNING: m(un)lockall failed: $!\n";
3448 }; 3623 };
3449 warn $@ if $@; 3624 warn $@ if $@;
3450 } 3625 }
3451
3452 warn "finished reloading resource files\n";
3453} 3626}
3454 3627
3455sub pidfile() { 3628sub pidfile() {
3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3629 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3457 or die "$PIDFILE: $!"; 3630 or die "$PIDFILE: $!";
… …
3470 seek $fh, 0, 0; 3643 seek $fh, 0, 0;
3471 print $fh $$; 3644 print $fh $$;
3472} 3645}
3473 3646
3474sub main_loop { 3647sub main_loop {
3475 warn "EV::loop starting\n"; 3648 trace "EV::loop starting\n";
3476 if (1) { 3649 if (1) {
3477 EV::loop; 3650 EV::loop;
3478 } 3651 }
3479 warn "EV::loop returned\n"; 3652 trace "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP; 3653 goto &main_loop unless $REALLY_UNLOOP;
3481} 3654}
3482 3655
3483sub main { 3656sub main {
3484 cf::init_globals; # initialise logging 3657 cf::init_globals; # initialise logging
3485 3658
3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3659 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3660 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3488 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3661 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3662 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 3663
3496 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3664 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3497 3665
3498 # we must not ever block the main coroutine 3666 # we must not ever block the main coroutine
3499 local $Coro::idle = sub { 3667 local $Coro::idle = sub {
… …
3505 }; 3673 };
3506 3674
3507 evthread_start IO::AIO::poll_fileno; 3675 evthread_start IO::AIO::poll_fileno;
3508 3676
3509 cf::sync_job { 3677 cf::sync_job {
3678 cf::incloader::init ();
3679
3680 cf::init_anim;
3681 cf::init_attackmess;
3682 cf::init_dynamic;
3683
3510 cf::load_settings; 3684 cf::load_settings;
3511 cf::load_materials;
3512 3685
3513 reload_resources; 3686 reload_resources;
3514 reload_config; 3687 reload_config;
3515 db_init; 3688 db_init;
3516 3689
3517 cf::init_uuid; 3690 cf::init_uuid;
3518 cf::init_signals; 3691 cf::init_signals;
3519 cf::init_commands;
3520 cf::init_skills; 3692 cf::init_skills;
3521 3693
3522 cf::init_beforeplay; 3694 cf::init_beforeplay;
3523 3695
3524 atomic; 3696 atomic;
… …
3529 3701
3530 # no (long-running) fork's whatsoever before this point(!) 3702 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX (); 3703 use POSIX ();
3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3704 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3533 3705
3534 (pop @POST_INIT)->(0) while @POST_INIT; 3706 cf::_post_init 0;
3535 }; 3707 };
3536 3708
3709 cf::object::thawer::errors_are_fatal 0;
3710 info "parse errors in files are no longer fatal from this point on.\n";
3711
3712 my $free_main; $free_main = EV::idle sub {
3713 undef $free_main;
3714 undef &main; # free gobs of memory :)
3715 };
3716
3537 main_loop; 3717 goto &main_loop;
3538} 3718}
3539 3719
3540############################################################################# 3720#############################################################################
3541# initialisation and cleanup 3721# initialisation and cleanup
3542 3722
3543# install some emergency cleanup handlers 3723# install some emergency cleanup handlers
3544BEGIN { 3724BEGIN {
3545 our %SIGWATCHER = (); 3725 our %SIGWATCHER = ();
3546 for my $signal (qw(INT HUP TERM)) { 3726 for my $signal (qw(INT HUP TERM)) {
3547 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3727 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3548 cf::cleanup "SIG$signal"; 3728 cf::cleanup "SIG$signal";
3549 }; 3729 };
3550 } 3730 }
3551} 3731}
3552 3732
3553sub write_runtime_sync { 3733sub write_runtime_sync {
3734 my $t0 = AE::time;
3735
3554 # first touch the runtime file to show we are still running: 3736 # first touch the runtime file to show we are still running:
3555 # the fsync below can take a very very long time. 3737 # the fsync below can take a very very long time.
3556 3738
3557 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3739 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3558 3740
3559 my $guard = cf::lock_acquire "write_runtime"; 3741 my $guard = cf::lock_acquire "write_runtime";
3560 3742
3561 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3743 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3562 or return; 3744 or return;
3563 3745
3564 my $value = $cf::RUNTIME + 90 + 10; 3746 my $value = $cf::RUNTIME + 90 + 10;
3565 # 10 is the runtime save interval, for a monotonic clock 3747 # 10 is the runtime save interval, for a monotonic clock
3566 # 60 allows for the watchdog to kill the server. 3748 # 60 allows for the watchdog to kill the server.
… …
3579 or return; 3761 or return;
3580 3762
3581 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3763 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3582 and return; 3764 and return;
3583 3765
3584 warn "runtime file written.\n"; 3766 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3585 3767
3586 1 3768 1
3587} 3769}
3588 3770
3589our $uuid_lock; 3771our $uuid_lock;
… …
3601 or return; 3783 or return;
3602 3784
3603 my $value = uuid_seq uuid_cur; 3785 my $value = uuid_seq uuid_cur;
3604 3786
3605 unless ($value) { 3787 unless ($value) {
3606 warn "cowardly refusing to write zero uuid value!\n"; 3788 info "cowardly refusing to write zero uuid value!\n";
3607 return; 3789 return;
3608 } 3790 }
3609 3791
3610 my $value = uuid_str $value + $uuid_skip; 3792 my $value = uuid_str $value + $uuid_skip;
3611 $uuid_skip = 0; 3793 $uuid_skip = 0;
… …
3621 or return; 3803 or return;
3622 3804
3623 aio_rename "$uuid~", $uuid 3805 aio_rename "$uuid~", $uuid
3624 and return; 3806 and return;
3625 3807
3626 warn "uuid file written ($value).\n"; 3808 trace "uuid file written ($value).\n";
3627 3809
3628 1 3810 1
3629 3811
3630} 3812}
3631 3813
… …
3637} 3819}
3638 3820
3639sub emergency_save() { 3821sub emergency_save() {
3640 my $freeze_guard = cf::freeze_mainloop; 3822 my $freeze_guard = cf::freeze_mainloop;
3641 3823
3642 warn "emergency_perl_save: enter\n"; 3824 info "emergency_perl_save: enter\n";
3825
3826 # this is a trade-off: we want to be very quick here, so
3827 # save all maps without fsync, and later call a global sync
3828 # (which in turn might be very very slow)
3829 local $USE_FSYNC = 0;
3643 3830
3644 cf::sync_job { 3831 cf::sync_job {
3645 # this is a trade-off: we want to be very quick here, so 3832 cf::write_runtime_sync; # external watchdog should not bark
3646 # save all maps without fsync, and later call a global sync
3647 # (which in turn might be very very slow)
3648 local $USE_FSYNC = 0;
3649 3833
3650 # use a peculiar iteration method to avoid tripping on perl 3834 # use a peculiar iteration method to avoid tripping on perl
3651 # refcount bugs in for. also avoids problems with players 3835 # refcount bugs in for. also avoids problems with players
3652 # and maps saved/destroyed asynchronously. 3836 # and maps saved/destroyed asynchronously.
3653 warn "emergency_perl_save: begin player save\n"; 3837 info "emergency_perl_save: begin player save\n";
3654 for my $login (keys %cf::PLAYER) { 3838 for my $login (keys %cf::PLAYER) {
3655 my $pl = $cf::PLAYER{$login} or next; 3839 my $pl = $cf::PLAYER{$login} or next;
3656 $pl->valid or next; 3840 $pl->valid or next;
3657 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3841 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3658 $pl->save; 3842 $pl->save;
3659 } 3843 }
3660 warn "emergency_perl_save: end player save\n"; 3844 info "emergency_perl_save: end player save\n";
3661 3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3662 warn "emergency_perl_save: begin map save\n"; 3848 info "emergency_perl_save: begin map save\n";
3663 for my $path (keys %cf::MAP) { 3849 for my $path (keys %cf::MAP) {
3664 my $map = $cf::MAP{$path} or next; 3850 my $map = $cf::MAP{$path} or next;
3665 $map->valid or next; 3851 $map->valid or next;
3666 $map->save; 3852 $map->save;
3667 } 3853 }
3668 warn "emergency_perl_save: end map save\n"; 3854 info "emergency_perl_save: end map save\n";
3669 3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3670 warn "emergency_perl_save: begin database checkpoint\n"; 3858 info "emergency_perl_save: begin database checkpoint\n";
3671 BDB::db_env_txn_checkpoint $DB_ENV; 3859 BDB::db_env_txn_checkpoint $DB_ENV;
3672 warn "emergency_perl_save: end database checkpoint\n"; 3860 info "emergency_perl_save: end database checkpoint\n";
3673 3861
3674 warn "emergency_perl_save: begin write uuid\n"; 3862 info "emergency_perl_save: begin write uuid\n";
3675 write_uuid_sync 1; 3863 write_uuid_sync 1;
3676 warn "emergency_perl_save: end write uuid\n"; 3864 info "emergency_perl_save: end write uuid\n";
3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 trace "emergency_perl_save: syncing database to disk";
3869 BDB::db_env_txn_checkpoint $DB_ENV;
3870
3871 info "emergency_perl_save: starting sync\n";
3872 IO::AIO::aio_sync sub {
3873 info "emergency_perl_save: finished sync\n";
3874 };
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: flushing outstanding aio requests";
3879 while (IO::AIO::nreqs || BDB::nreqs) {
3880 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3881 }
3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3677 }; 3884 };
3678 3885
3679 warn "emergency_perl_save: starting sync()\n";
3680 IO::AIO::aio_sync sub {
3681 warn "emergency_perl_save: finished sync()\n";
3682 };
3683
3684 warn "emergency_perl_save: leave\n"; 3886 info "emergency_perl_save: leave\n";
3685} 3887}
3686 3888
3687sub post_cleanup { 3889sub post_cleanup {
3688 my ($make_core) = @_; 3890 my ($make_core) = @_;
3689 3891
3892 IO::AIO::flush;
3893
3690 warn Carp::longmess "post_cleanup backtrace" 3894 error Carp::longmess "post_cleanup backtrace"
3691 if $make_core; 3895 if $make_core;
3692 3896
3693 my $fh = pidfile; 3897 my $fh = pidfile;
3694 unlink $PIDFILE if <$fh> == $$; 3898 unlink $PIDFILE if <$fh> == $$;
3695} 3899}
… …
3715 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3919 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3716 for my $name (keys %$leaf_symtab) { 3920 for my $name (keys %$leaf_symtab) {
3717 _gv_clear *{"$pkg$name"}; 3921 _gv_clear *{"$pkg$name"};
3718# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3922# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3719 } 3923 }
3720 warn "cleared package $pkg\n";#d#
3721} 3924}
3722 3925
3723sub do_reload_perl() { 3926sub do_reload_perl() {
3724 # can/must only be called in main 3927 # can/must only be called in main
3725 if ($Coro::current != $Coro::main) { 3928 unless (in_main) {
3726 warn "can only reload from main coroutine"; 3929 error "can only reload from main coroutine";
3727 return; 3930 return;
3728 } 3931 }
3729 3932
3730 return if $RELOAD++; 3933 return if $RELOAD++;
3731 3934
3732 my $t1 = EV::time; 3935 my $t1 = AE::time;
3733 3936
3734 while ($RELOAD) { 3937 while ($RELOAD) {
3735 warn "reloading..."; 3938 cf::get_slot 0.1, -1, "reload_perl";
3939 info "perl_reload: reloading...";
3736 3940
3737 warn "entering sync_job"; 3941 trace "perl_reload: entering sync_job";
3738 3942
3739 cf::sync_job { 3943 cf::sync_job {
3740 cf::write_runtime_sync; # external watchdog should not bark
3741 cf::emergency_save; 3944 #cf::emergency_save;
3742 cf::write_runtime_sync; # external watchdog should not bark
3743 3945
3744 warn "syncing database to disk";
3745 BDB::db_env_txn_checkpoint $DB_ENV;
3746
3747 # if anything goes wrong in here, we should simply crash as we already saved
3748
3749 warn "flushing outstanding aio requests";
3750 while (IO::AIO::nreqs || BDB::nreqs) {
3751 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3752 }
3753
3754 warn "cancelling all extension coros"; 3946 trace "perl_reload: cancelling all extension coros";
3755 $_->cancel for values %EXT_CORO; 3947 $_->cancel for values %EXT_CORO;
3756 %EXT_CORO = (); 3948 %EXT_CORO = ();
3757 3949
3758 warn "removing commands"; 3950 trace "perl_reload: removing commands";
3759 %COMMAND = (); 3951 %COMMAND = ();
3760 3952
3761 warn "removing ext/exti commands"; 3953 trace "perl_reload: removing ext/exti commands";
3762 %EXTCMD = (); 3954 %EXTCMD = ();
3763 %EXTICMD = (); 3955 %EXTICMD = ();
3764 3956
3765 warn "unloading/nuking all extensions"; 3957 trace "perl_reload: unloading/nuking all extensions";
3766 for my $pkg (@EXTS) { 3958 for my $pkg (@EXTS) {
3767 warn "... unloading $pkg"; 3959 trace "... unloading $pkg";
3768 3960
3769 if (my $cb = $pkg->can ("unload")) { 3961 if (my $cb = $pkg->can ("unload")) {
3770 eval { 3962 eval {
3771 $cb->($pkg); 3963 $cb->($pkg);
3772 1 3964 1
3773 } or warn "$pkg unloaded, but with errors: $@"; 3965 } or error "$pkg unloaded, but with errors: $@";
3774 } 3966 }
3775 3967
3776 warn "... clearing $pkg"; 3968 trace "... clearing $pkg";
3777 clear_package $pkg; 3969 clear_package $pkg;
3778 } 3970 }
3779 3971
3780 warn "unloading all perl modules loaded from $LIBDIR"; 3972 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3781 while (my ($k, $v) = each %INC) { 3973 while (my ($k, $v) = each %INC) {
3782 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3974 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3783 3975
3784 warn "... unloading $k"; 3976 trace "... unloading $k";
3785 delete $INC{$k}; 3977 delete $INC{$k};
3786 3978
3787 $k =~ s/\.pm$//; 3979 $k =~ s/\.pm$//;
3788 $k =~ s/\//::/g; 3980 $k =~ s/\//::/g;
3789 3981
… …
3792 } 3984 }
3793 3985
3794 clear_package $k; 3986 clear_package $k;
3795 } 3987 }
3796 3988
3797 warn "getting rid of safe::, as good as possible"; 3989 trace "perl_reload: getting rid of safe::, as good as possible";
3798 clear_package "safe::$_" 3990 clear_package "safe::$_"
3799 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3991 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3800 3992
3801 warn "unloading cf.pm \"a bit\""; 3993 trace "perl_reload: unloading cf.pm \"a bit\"";
3802 delete $INC{"cf.pm"}; 3994 delete $INC{"cf.pm"};
3803 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3995 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3804 3996
3805 # don't, removes xs symbols, too, 3997 # don't, removes xs symbols, too,
3806 # and global variables created in xs 3998 # and global variables created in xs
3807 #clear_package __PACKAGE__; 3999 #clear_package __PACKAGE__;
3808 4000
3809 warn "unload completed, starting to reload now"; 4001 info "perl_reload: unload completed, starting to reload now";
3810 4002
3811 warn "reloading cf.pm"; 4003 trace "perl_reload: reloading cf.pm";
3812 require cf; 4004 require cf;
3813 cf::_connect_to_perl_1; 4005 cf::_connect_to_perl_1;
3814 4006
3815 warn "loading config and database again"; 4007 trace "perl_reload: loading config and database again";
3816 cf::reload_config; 4008 cf::reload_config;
3817 4009
3818 warn "loading extensions"; 4010 trace "perl_reload: loading extensions";
3819 cf::load_extensions; 4011 cf::load_extensions;
3820 4012
3821 if ($REATTACH_ON_RELOAD) { 4013 if ($REATTACH_ON_RELOAD) {
3822 warn "reattaching attachments to objects/players"; 4014 trace "perl_reload: reattaching attachments to objects/players";
3823 _global_reattach; # objects, sockets 4015 _global_reattach; # objects, sockets
3824 warn "reattaching attachments to maps"; 4016 trace "perl_reload: reattaching attachments to maps";
3825 reattach $_ for values %MAP; 4017 reattach $_ for values %MAP;
3826 warn "reattaching attachments to players"; 4018 trace "perl_reload: reattaching attachments to players";
3827 reattach $_ for values %PLAYER; 4019 reattach $_ for values %PLAYER;
3828 } 4020 }
3829 4021
3830 warn "running post_init jobs"; 4022 cf::_post_init 1;
3831 (pop @POST_INIT)->(1) while @POST_INIT;
3832 4023
3833 warn "leaving sync_job"; 4024 trace "perl_reload: leaving sync_job";
3834 4025
3835 1 4026 1
3836 } or do { 4027 } or do {
3837 warn $@; 4028 error $@;
3838 cf::cleanup "error while reloading, exiting."; 4029 cf::cleanup "perl_reload: error, exiting.";
3839 }; 4030 };
3840 4031
3841 warn "reloaded";
3842 --$RELOAD; 4032 --$RELOAD;
3843 } 4033 }
3844 4034
3845 $t1 = EV::time - $t1; 4035 $t1 = AE::time - $t1;
3846 warn "reload completed in ${t1}s\n"; 4036 info "perl_reload: completed in ${t1}s\n";
3847}; 4037};
3848 4038
3849our $RELOAD_WATCHER; # used only during reload 4039our $RELOAD_WATCHER; # used only during reload
3850 4040
3851sub reload_perl() { 4041sub reload_perl() {
… …
3853 # coro crashes during coro_state_free->destroy here. 4043 # coro crashes during coro_state_free->destroy here.
3854 4044
3855 $RELOAD_WATCHER ||= cf::async { 4045 $RELOAD_WATCHER ||= cf::async {
3856 Coro::AIO::aio_wait cache_extensions; 4046 Coro::AIO::aio_wait cache_extensions;
3857 4047
3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4048 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3859 do_reload_perl; 4049 do_reload_perl;
3860 undef $RELOAD_WATCHER; 4050 undef $RELOAD_WATCHER;
3861 }; 4051 };
3862 }; 4052 };
3863} 4053}
… …
3872 reload_perl; 4062 reload_perl;
3873 }; 4063 };
3874 } 4064 }
3875}; 4065};
3876 4066
3877unshift @INC, $LIBDIR; 4067#############################################################################
3878 4068
3879my $bug_warning = 0; 4069my $bug_warning = 0;
3880 4070
3881our @WAIT_FOR_TICK; 4071our @WAIT_FOR_TICK;
3882our @WAIT_FOR_TICK_BEGIN; 4072our @WAIT_FOR_TICK_BEGIN;
3883 4073
3884sub wait_for_tick { 4074sub wait_for_tick() {
3885 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3886 4076
3887 my $signal = new Coro::Signal; 4077 my $signal = new Coro::Signal;
3888 push @WAIT_FOR_TICK, $signal; 4078 push @WAIT_FOR_TICK, $signal;
3889 $signal->wait; 4079 $signal->wait;
3890} 4080}
3891 4081
3892sub wait_for_tick_begin { 4082sub wait_for_tick_begin() {
3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3894 4084
3895 my $signal = new Coro::Signal; 4085 my $signal = new Coro::Signal;
3896 push @WAIT_FOR_TICK_BEGIN, $signal; 4086 push @WAIT_FOR_TICK_BEGIN, $signal;
3897 $signal->wait; 4087 $signal->wait;
… …
3904 return; 4094 return;
3905 } 4095 }
3906 4096
3907 cf::server_tick; # one server iteration 4097 cf::server_tick; # one server iteration
3908 4098
4099 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4100
3909 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3910 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4102 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3911 Coro::async_pool { 4103 Coro::async_pool {
3912 $Coro::current->{desc} = "runtime saver"; 4104 $Coro::current->{desc} = "runtime saver";
3913 write_runtime_sync 4105 write_runtime_sync
3914 or warn "ERROR: unable to write runtime file: $!"; 4106 or error "ERROR: unable to write runtime file: $!";
3915 }; 4107 };
3916 } 4108 }
3917 4109
3918 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4110 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3919 $sig->send; 4111 $sig->send;
… …
3927 4119
3928 if (0) { 4120 if (0) {
3929 if ($NEXT_TICK) { 4121 if ($NEXT_TICK) {
3930 my $jitter = $TICK_START - $NEXT_TICK; 4122 my $jitter = $TICK_START - $NEXT_TICK;
3931 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4123 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3932 warn "jitter $JITTER\n";#d# 4124 debug "jitter $JITTER\n";#d#
3933 } 4125 }
3934 } 4126 }
3935} 4127}
3936 4128
3937{ 4129{
3938 # configure BDB 4130 # configure BDB
3939 4131
3940 BDB::min_parallel 8; 4132 BDB::min_parallel 16;
3941 BDB::max_poll_reqs $TICK * 0.1; 4133 BDB::max_poll_reqs $TICK * 0.1;
3942 $AnyEvent::BDB::WATCHER->priority (1); 4134 $AnyEvent::BDB::WATCHER->priority (1);
3943 4135
3944 unless ($DB_ENV) { 4136 unless ($DB_ENV) {
3945 $DB_ENV = BDB::db_env_create; 4137 $DB_ENV = BDB::db_env_create;
… …
3982 IO::AIO::min_parallel 8; 4174 IO::AIO::min_parallel 8;
3983 IO::AIO::max_poll_time $TICK * 0.1; 4175 IO::AIO::max_poll_time $TICK * 0.1;
3984 undef $AnyEvent::AIO::WATCHER; 4176 undef $AnyEvent::AIO::WATCHER;
3985} 4177}
3986 4178
3987my $_log_backtrace; 4179our $_log_backtrace;
4180our $_log_backtrace_last;
3988 4181
3989sub _log_backtrace { 4182sub _log_backtrace {
3990 my ($msg, @addr) = @_; 4183 my ($msg, @addr) = @_;
3991 4184
3992 $msg =~ s/\n//; 4185 $msg =~ s/\n$//;
3993 4186
4187 if ($_log_backtrace_last eq $msg) {
4188 LOG llevInfo, "[ABT] $msg\n";
4189 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3994 # limit the # of concurrent backtraces 4190 # limit the # of concurrent backtraces
3995 if ($_log_backtrace < 2) { 4191 } elsif ($_log_backtrace < 2) {
4192 $_log_backtrace_last = $msg;
3996 ++$_log_backtrace; 4193 ++$_log_backtrace;
3997 my $perl_bt = Carp::longmess $msg; 4194 my $perl_bt = Carp::longmess $msg;
3998 async { 4195 async {
3999 $Coro::current->{desc} = "abt $msg"; 4196 $Coro::current->{desc} = "abt $msg";
4000 4197
… …
4020 LOG llevInfo, "[ABT] $_\n" for @bt; 4217 LOG llevInfo, "[ABT] $_\n" for @bt;
4021 --$_log_backtrace; 4218 --$_log_backtrace;
4022 }; 4219 };
4023 } else { 4220 } else {
4024 LOG llevInfo, "[ABT] $msg\n"; 4221 LOG llevInfo, "[ABT] $msg\n";
4025 LOG llevInfo, "[ABT] [suppressed]\n"; 4222 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4026 } 4223 }
4027} 4224}
4028 4225
4029# load additional modules 4226# load additional modules
4030require "cf/$_.pm" for @EXTRA_MODULES; 4227require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines