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.494 by root, Mon Oct 26 05:18:00 2009 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 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;
… …
53use Coro::Util (); 51use Coro::Util ();
54 52
55use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
56use BDB (); 54use BDB ();
57use Data::Dumper; 55use Data::Dumper;
58use Digest::MD5;
59use Fcntl; 56use Fcntl;
60use YAML::XS (); 57use YAML::XS ();
61use IO::AIO (); 58use IO::AIO ();
62use Time::HiRes; 59use Time::HiRes;
63use Compress::LZF; 60use Compress::LZF;
… …
79# strictly for debugging 76# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
81 78
82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
83 80
81our @ORIG_INC;
82
84our %COMMAND = (); 83our %COMMAND = ();
85our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
86 85
87our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
88our %EXTCMD = (); 87our %EXTCMD = ();
… …
94our @EVENT; 93our @EVENT;
95our @REFLECT; # set by XS 94our @REFLECT; # set by XS
96our %REFLECT; # set by us 95our %REFLECT; # set by us
97 96
98our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
99our $DATADIR = datadir; 99our $DATADIR = datadir;
100our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
101our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
102our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
103our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
104our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
105our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
106our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
107our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
108our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
111 112
112our %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;
113 120
114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
116our $NEXT_TICK; 123our $NEXT_TICK;
117our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
119our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
120our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
121our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
122our $DB_ENV; 129our $DB_ENV;
123 130
124our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
125 132
126our %CFG; 133our %CFG;
127 134
128our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
129our $RUNTIME; 136our $RUNTIME;
… …
163 170
164our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
165 172
166sub cf::map::normalise; 173sub cf::map::normalise;
167 174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
168############################################################################# 179#############################################################################
169 180
170%REFLECT = (); 181%REFLECT = ();
171for (@REFLECT) { 182for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_; 183 my $reflect = JSON::XS::decode_json $_;
… …
224from wherever your confdir points to. 235from wherever your confdir points to.
225 236
226=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
227 238
228These 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
229returns 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
230per 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();
231 247
232=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
233 249
234This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
235C<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
… …
243 259
244=back 260=back
245 261
246=cut 262=cut
247 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
248$Coro::State::WARNHOOK = sub { 270$Coro::State::WARNHOOK = sub {
249 my $msg = join "", @_; 271 my $msg = join "", @_;
250 272
251 $msg .= "\n" 273 $msg .= "\n"
252 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
253 275
254 $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;
255 277
256 LOG llevError, $msg; 278 LOG llevWarn, $msg;
257}; 279};
258 280
259$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
260 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
261 283
262 warn Carp::longmess $_[0]; 284 error Carp::longmess $_[0];
263 285
264 if ($Coro::current == $Coro::main) {#d# 286 if (in_main) {#d#
265 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
266 return;#d# 288 return;#d#
267 }#d# 289 }#d#
268 290
269 # kill coroutine otherwise 291 # kill coroutine otherwise
270 Coro::terminate 292 Coro::terminate
… …
337our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 359our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
338 360
339sub encode_json($) { $json_coder->encode ($_[0]) } 361sub encode_json($) { $json_coder->encode ($_[0]) }
340sub decode_json($) { $json_coder->decode ($_[0]) } 362sub decode_json($) { $json_coder->decode ($_[0]) }
341 363
364=item $ref = cf::yaml_load $scalar
365
366Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
367
368=cut
369
370sub fork_call(&@);
371
372sub yaml_load($) {
373 fork_call { YAML::XS::Load $_[0] } @_
374}
375
342=item cf::post_init { BLOCK } 376=item cf::post_init { BLOCK }
343 377
344Execute the given codeblock, I<after> all extensions have been (re-)loaded, 378Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345but I<before> the server starts ticking again. 379but I<before> the server starts ticking again.
346 380
347The cdoeblock will have a single boolean argument to indicate whether this 381The codeblock will have a single boolean argument to indicate whether this
348is a reload or not. 382is a reload or not.
349 383
350=cut 384=cut
351 385
352sub post_init(&) { 386sub post_init(&) {
353 push @POST_INIT, shift; 387 push @POST_INIT, shift;
388}
389
390sub _post_init {
391 trace "running post_init jobs";
392
393 # run them in parallel...
394
395 my @join;
396
397 while () {
398 push @join, map &Coro::async ($_, 0), @POST_INIT;
399 @POST_INIT = ();
400
401 @join or last;
402
403 (pop @join)->join;
404 }
354} 405}
355 406
356=item cf::lock_wait $string 407=item cf::lock_wait $string
357 408
358Wait until the given lock is available. See cf::lock_acquire. 409Wait until the given lock is available. See cf::lock_acquire.
… …
397} 448}
398 449
399=item cf::periodic $interval, $cb 450=item cf::periodic $interval, $cb
400 451
401Like EV::periodic, but randomly selects a starting point so that the actions 452Like EV::periodic, but randomly selects a starting point so that the actions
402get spread over timer. 453get spread over time.
403 454
404=cut 455=cut
405 456
406sub periodic($$) { 457sub periodic($$) {
407 my ($interval, $cb) = @_; 458 my ($interval, $cb) = @_;
… …
424 475
425=cut 476=cut
426 477
427our @SLOT_QUEUE; 478our @SLOT_QUEUE;
428our $SLOT_QUEUE; 479our $SLOT_QUEUE;
480our $SLOT_DECAY = 0.9;
429 481
430$SLOT_QUEUE->cancel if $SLOT_QUEUE; 482$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async { 483$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager"); 484 $Coro::current->desc ("timeslot manager");
433 485
434 my $signal = new Coro::Signal; 486 my $signal = new Coro::Signal;
487 my $busy;
435 488
436 while () { 489 while () {
437 next_job: 490 next_job:
491
438 my $avail = cf::till_tick; 492 my $avail = cf::till_tick;
439 if ($avail > 0.01) { 493
440 for (0 .. $#SLOT_QUEUE) { 494 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) { 495 if ($SLOT_QUEUE[$_][0] <= $avail) {
496 $busy = 0;
442 my $job = splice @SLOT_QUEUE, $_, 1, (); 497 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send; 498 $job->[2]->send;
444 Coro::cede; 499 Coro::cede;
445 goto next_job; 500 goto next_job;
446 } 501 } else {
502 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447 } 503 }
448 } 504 }
449 505
450 if (@SLOT_QUEUE) { 506 if (@SLOT_QUEUE) {
451 # we do not use wait_for_tick() as it returns immediately when tick is inactive 507 # we do not use wait_for_tick() as it returns immediately when tick is inactive
452 push @cf::WAIT_FOR_TICK, $signal; 508 push @cf::WAIT_FOR_TICK, $signal;
453 $signal->wait; 509 $signal->wait;
454 } else { 510 } else {
511 $busy = 0;
455 Coro::schedule; 512 Coro::schedule;
456 } 513 }
457 } 514 }
458}; 515};
459 516
460sub get_slot($;$$) { 517sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main; 518 return if tick_inhibit || $Coro::current == $Coro::main;
462 519
463 my ($time, $pri, $name) = @_; 520 my ($time, $pri, $name) = @_;
464 521
465 $time = $TICK * .6 if $time > $TICK * .6; 522 $time = clamp $time, 0.01, $TICK * .6;
523
466 my $sig = new Coro::Signal; 524 my $sig = new Coro::Signal;
467 525
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 526 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 527 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready; 528 $SLOT_QUEUE->ready;
… …
496=cut 554=cut
497 555
498sub sync_job(&) { 556sub sync_job(&) {
499 my ($job) = @_; 557 my ($job) = @_;
500 558
501 if ($Coro::current == $Coro::main) { 559 if (in_main) {
502 my $time = EV::time; 560 my $time = AE::time;
503 561
504 # this is the main coro, too bad, we have to block 562 # this is the main coro, too bad, we have to block
505 # till the operation succeeds, freezing the server :/ 563 # till the operation succeeds, freezing the server :/
506 564
507 LOG llevError, Carp::longmess "sync job";#d# 565 #LOG llevError, Carp::longmess "sync job";#d#
508 566
509 my $freeze_guard = freeze_mainloop; 567 my $freeze_guard = freeze_mainloop;
510 568
511 my $busy = 1; 569 my $busy = 1;
512 my @res; 570 my @res;
513 571
514 (async { 572 (async {
515 $Coro::current->desc ("sync job coro"); 573 $Coro::current->desc ("sync job coro");
516 @res = eval { $job->() }; 574 @res = eval { $job->() };
517 warn $@ if $@; 575 error $@ if $@;
518 undef $busy; 576 undef $busy;
519 })->prio (Coro::PRIO_MAX); 577 })->prio (Coro::PRIO_MAX);
520 578
521 while ($busy) { 579 while ($busy) {
522 if (Coro::nready) { 580 if (Coro::nready) {
… …
524 } else { 582 } else {
525 EV::loop EV::LOOP_ONESHOT; 583 EV::loop EV::LOOP_ONESHOT;
526 } 584 }
527 } 585 }
528 586
529 my $time = EV::time - $time; 587 my $time = AE::time - $time;
530 588
531 $TICK_START += $time; # do not account sync jobs to server load 589 $TICK_START += $time; # do not account sync jobs to server load
532 590
533 wantarray ? @res : $res[0] 591 wantarray ? @res : $res[0]
534 } else { 592 } else {
… …
556 $EXT_CORO{$coro+0} = $coro; 614 $EXT_CORO{$coro+0} = $coro;
557 615
558 $coro 616 $coro
559} 617}
560 618
561=item fork_call { }, $args 619=item fork_call { }, @args
562 620
563Executes the given code block with the given arguments in a seperate 621Executes the given code block with the given arguments in a seperate
564process, returning the results. Everything must be serialisable with 622process, returning the results. Everything must be serialisable with
565Coro::Storable. May, of course, block. Note that the executed sub may 623Coro::Storable. May, of course, block. Note that the executed sub may
566never block itself or use any form of event handling. 624never block itself or use any form of event handling.
567 625
568=cut 626=cut
569 627
628sub post_fork {
629 reset_signals;
630}
631
570sub fork_call(&@) { 632sub fork_call(&@) {
571 my ($cb, @args) = @_; 633 my ($cb, @args) = @_;
572 634
573 # we seemingly have to make a local copy of the whole thing, 635 # we seemingly have to make a local copy of the whole thing,
574 # otherwise perl prematurely frees the stuff :/ 636 # otherwise perl prematurely frees the stuff :/
575 # TODO: investigate and fix (likely this will be rather laborious) 637 # TODO: investigate and fix (likely this will be rather laborious)
576 638
577 my @res = Coro::Util::fork_eval { 639 my @res = Coro::Util::fork_eval {
578 reset_signals; 640 cf::post_fork;
579 &$cb 641 &$cb
580 }, @args; 642 } @args;
581 643
582 wantarray ? @res : $res[-1] 644 wantarray ? @res : $res[-1]
645}
646
647sub objinfo {
648 (
649 "counter value" => cf::object::object_count,
650 "objects created" => cf::object::create_count,
651 "objects destroyed" => cf::object::destroy_count,
652 "freelist size" => cf::object::free_count,
653 "allocated objects" => cf::object::objects_size,
654 "active objects" => cf::object::actives_size,
655 )
583} 656}
584 657
585=item $coin = coin_from_name $name 658=item $coin = coin_from_name $name
586 659
587=cut 660=cut
… …
624within each server. 697within each server.
625 698
626=cut 699=cut
627 700
628sub db_table($) { 701sub db_table($) {
702 cf::error "db_get called from main context"
703 if $Coro::current == $Coro::main;
704
629 my ($name) = @_; 705 my ($name) = @_;
630 my $db = BDB::db_create $DB_ENV; 706 my $db = BDB::db_create $DB_ENV;
631 707
632 eval { 708 eval {
633 $db->set_flags (BDB::CHKSUM); 709 $db->set_flags (BDB::CHKSUM);
… …
643} 719}
644 720
645our $DB; 721our $DB;
646 722
647sub db_init { 723sub db_init {
648 cf::sync_job {
649 $DB ||= db_table "db"; 724 $DB ||= db_table "db";
650 };
651} 725}
652 726
653sub db_get($$) { 727sub db_get($$) {
654 my $key = "$_[0]/$_[1]"; 728 my $key = "$_[0]/$_[1]";
655 729
656 cf::sync_job { 730 cf::error "db_get called from main context"
731 if $Coro::current == $Coro::main;
732
657 BDB::db_get $DB, undef, $key, my $data; 733 BDB::db_get $DB, undef, $key, my $data;
658 734
659 $! ? () 735 $! ? ()
660 : $data 736 : $data
661 }
662} 737}
663 738
664sub db_put($$$) { 739sub db_put($$$) {
665 BDB::dbreq_pri 4; 740 BDB::dbreq_pri 4;
666 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 741 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
722 797
723 my $t1 = Time::HiRes::time; 798 my $t1 = Time::HiRes::time;
724 my $data = $process->(\@data); 799 my $data = $process->(\@data);
725 my $t2 = Time::HiRes::time; 800 my $t2 = Time::HiRes::time;
726 801
727 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 802 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
728 803
729 db_put cache => "$id/data", $data; 804 db_put cache => "$id/data", $data;
730 db_put cache => "$id/md5" , $md5; 805 db_put cache => "$id/md5" , $md5;
731 db_put cache => "$id/meta", $meta; 806 db_put cache => "$id/meta", $meta;
732 807
… …
742 817
743=cut 818=cut
744 819
745sub datalog($@) { 820sub datalog($@) {
746 my ($type, %kv) = @_; 821 my ($type, %kv) = @_;
747 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 822 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
748} 823}
749 824
750=back 825=back
751 826
752=cut 827=cut
… …
947 1022
948 } elsif (exists $cb_id{$type}) { 1023 } elsif (exists $cb_id{$type}) {
949 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1024 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
950 1025
951 } elsif (ref $type) { 1026 } elsif (ref $type) {
952 warn "attaching objects not supported, ignoring.\n"; 1027 error "attaching objects not supported, ignoring.\n";
953 1028
954 } else { 1029 } else {
955 shift @arg; 1030 shift @arg;
956 warn "attach argument '$type' not supported, ignoring.\n"; 1031 error "attach argument '$type' not supported, ignoring.\n";
957 } 1032 }
958 } 1033 }
959} 1034}
960 1035
961sub _object_attach { 1036sub _object_attach {
… …
971 _attach $registry, $klass, @attach; 1046 _attach $registry, $klass, @attach;
972 } 1047 }
973 1048
974 $obj->{$name} = \%arg; 1049 $obj->{$name} = \%arg;
975 } else { 1050 } else {
976 warn "object uses attachment '$name' which is not available, postponing.\n"; 1051 info "object uses attachment '$name' which is not available, postponing.\n";
977 } 1052 }
978 1053
979 $obj->{_attachment}{$name} = undef; 1054 $obj->{_attachment}{$name} = undef;
980} 1055}
981 1056
… …
1040 1115
1041 for (@$callbacks) { 1116 for (@$callbacks) {
1042 eval { &{$_->[1]} }; 1117 eval { &{$_->[1]} };
1043 1118
1044 if ($@) { 1119 if ($@) {
1045 warn "$@";
1046 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1120 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1047 override; 1121 override;
1048 } 1122 }
1049 1123
1050 return 1 if $override; 1124 return 1 if $override;
1051 } 1125 }
… …
1130 for (@$attach) { 1204 for (@$attach) {
1131 my ($klass, @attach) = @$_; 1205 my ($klass, @attach) = @$_;
1132 _attach $registry, $klass, @attach; 1206 _attach $registry, $klass, @attach;
1133 } 1207 }
1134 } else { 1208 } else {
1135 warn "object uses attachment '$name' that is not available, postponing.\n"; 1209 info "object uses attachment '$name' that is not available, postponing.\n";
1136 } 1210 }
1137 } 1211 }
1138} 1212}
1139 1213
1140cf::attachable->attach ( 1214cf::attachable->attach (
… …
1167 my ($filename, $rdata, $objs) = @_; 1241 my ($filename, $rdata, $objs) = @_;
1168 1242
1169 sync_job { 1243 sync_job {
1170 if (length $$rdata) { 1244 if (length $$rdata) {
1171 utf8::decode (my $decname = $filename); 1245 utf8::decode (my $decname = $filename);
1172 warn sprintf "saving %s (%d,%d)\n", 1246 trace sprintf "saving %s (%d,%d)\n",
1173 $decname, length $$rdata, scalar @$objs; 1247 $decname, length $$rdata, scalar @$objs
1248 if $VERBOSE_IO;
1174 1249
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1250 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1251 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1252 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 if ($cf::USE_FSYNC) { 1253 if ($cf::USE_FSYNC) {
… …
1200 aio_rename "$filename~", $filename; 1275 aio_rename "$filename~", $filename;
1201 1276
1202 $filename =~ s%/[^/]+$%%; 1277 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC; 1278 aio_pathsync $filename if $cf::USE_FSYNC;
1204 } else { 1279 } else {
1205 warn "unable to save objects: $filename~: $!\n"; 1280 error "unable to save objects: $filename~: $!\n";
1206 } 1281 }
1207 } else { 1282 } else {
1208 aio_unlink $filename; 1283 aio_unlink $filename;
1209 aio_unlink "$filename.pst"; 1284 aio_unlink "$filename.pst";
1210 } 1285 }
… …
1234 my $st = eval { Coro::Storable::thaw $av }; 1309 my $st = eval { Coro::Storable::thaw $av };
1235 $av = $st->{objs}; 1310 $av = $st->{objs};
1236 } 1311 }
1237 1312
1238 utf8::decode (my $decname = $filename); 1313 utf8::decode (my $decname = $filename);
1239 warn sprintf "loading %s (%d,%d)\n", 1314 trace sprintf "loading %s (%d,%d)\n",
1240 $decname, length $data, scalar @{$av || []}; 1315 $decname, length $data, scalar @{$av || []}
1316 if $VERBOSE_IO;
1241 1317
1242 ($data, $av) 1318 ($data, $av)
1243} 1319}
1244 1320
1245=head2 COMMAND CALLBACKS 1321=head2 COMMAND CALLBACKS
… …
1304} 1380}
1305 1381
1306use File::Glob (); 1382use File::Glob ();
1307 1383
1308cf::player->attach ( 1384cf::player->attach (
1309 on_command => sub { 1385 on_unknown_command => sub {
1310 my ($pl, $name, $params) = @_; 1386 my ($pl, $name, $params) = @_;
1311 1387
1312 my $cb = $COMMAND{$name} 1388 my $cb = $COMMAND{$name}
1313 or return; 1389 or return;
1314 1390
… …
1337 1413
1338 $pl->ext_reply ($reply, @reply) 1414 $pl->ext_reply ($reply, @reply)
1339 if $reply; 1415 if $reply;
1340 1416
1341 } else { 1417 } else {
1342 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1418 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1343 } 1419 }
1344 1420
1345 cf::override; 1421 cf::override;
1346 }, 1422 },
1347); 1423);
… …
1358 1434
1359 $grp 1435 $grp
1360} 1436}
1361 1437
1362sub load_extensions { 1438sub load_extensions {
1439 info "loading extensions...";
1440
1363 cf::sync_job { 1441 cf::sync_job {
1364 my %todo; 1442 my %todo;
1365 1443
1366 for my $path (<$LIBDIR/*.ext>) { 1444 for my $path (<$LIBDIR/*.ext>) {
1367 next unless -r $path; 1445 next unless -r $path;
… …
1385 1463
1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1464 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1465 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1388 1466
1389 $ext{source} = 1467 $ext{source} =
1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1468 "package $pkg; use common::sense;\n"
1391 . "#line 1 \"$path\"\n{\n" 1469 . "#line 1 \"$path\"\n{\n"
1392 . $source 1470 . $source
1393 . "\n};\n1"; 1471 . "\n};\n1";
1394 1472
1395 $todo{$base} = \%ext; 1473 $todo{$base} = \%ext;
1396 } 1474 }
1397 1475
1476 my $pass = 0;
1398 my %done; 1477 my %done;
1399 while (%todo) { 1478 while (%todo) {
1400 my $progress; 1479 my $progress;
1401 1480
1481 ++$pass;
1482
1483 ext:
1402 while (my ($k, $v) = each %todo) { 1484 while (my ($k, $v) = each %todo) {
1403 for (split /,\s*/, $v->{meta}{depends}) { 1485 for (split /,\s*/, $v->{meta}{depends}) {
1404 goto skip 1486 next ext
1405 unless exists $done{$_}; 1487 unless exists $done{$_};
1406 } 1488 }
1407 1489
1408 warn "... loading '$k' into '$v->{pkg}'\n"; 1490 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1409 1491
1410 unless (eval $v->{source}) { 1492 my $active = eval $v->{source};
1493
1494 if (length $@) {
1411 my $msg = $@ ? "$v->{path}: $@\n" 1495 error "$v->{path}: $@\n";
1412 : "$v->{base}: extension inactive.\n";
1413 1496
1414 if (exists $v->{meta}{mandatory}) {
1415 warn $msg;
1416 cf::cleanup "mandatory extension failed to load, exiting."; 1497 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1417 } 1498 if exists $v->{meta}{mandatory};
1418 1499
1419 warn $msg; 1500 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1501 delete $todo{$k};
1502 } else {
1503 $done{$k} = delete $todo{$k};
1504 push @EXTS, $v->{pkg};
1505 $progress = 1;
1506
1507 info "$v->{base}: extension inactive.\n"
1508 unless $active;
1420 } 1509 }
1421
1422 $done{$k} = delete $todo{$k};
1423 push @EXTS, $v->{pkg};
1424 $progress = 1;
1425 } 1510 }
1426 1511
1427 skip: 1512 unless ($progress) {
1428 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1513 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1429 unless $progress; 1514
1515 while (my ($k, $v) = each %todo) {
1516 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1517 if exists $v->{meta}{mandatory};
1518 }
1519 }
1430 } 1520 }
1431 }; 1521 };
1432} 1522}
1433 1523
1434############################################################################# 1524#############################################################################
… …
1518 $cf::PLAYER{$login} = $pl 1608 $cf::PLAYER{$login} = $pl
1519 } 1609 }
1520 } 1610 }
1521} 1611}
1522 1612
1613cf::player->attach (
1614 on_load => sub {
1615 my ($pl, $path) = @_;
1616
1617 # restore slots saved in save, below
1618 my $slots = delete $pl->{_slots};
1619
1620 $pl->ob->current_weapon ($slots->[0]);
1621 $pl->combat_ob ($slots->[1]);
1622 $pl->ranged_ob ($slots->[2]);
1623 },
1624);
1625
1523sub save($) { 1626sub save($) {
1524 my ($pl) = @_; 1627 my ($pl) = @_;
1525 1628
1526 return if $pl->{deny_save}; 1629 return if $pl->{deny_save};
1527 1630
… …
1532 1635
1533 aio_mkdir playerdir $pl, 0770; 1636 aio_mkdir playerdir $pl, 0770;
1534 $pl->{last_save} = $cf::RUNTIME; 1637 $pl->{last_save} = $cf::RUNTIME;
1535 1638
1536 cf::get_slot 0.01; 1639 cf::get_slot 0.01;
1640
1641 # save slots, to be restored later
1642 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1537 1643
1538 $pl->save_pl ($path); 1644 $pl->save_pl ($path);
1539 cf::cede_to_tick; 1645 cf::cede_to_tick;
1540} 1646}
1541 1647
… …
1575 my $name = $pl->ob->name; 1681 my $name = $pl->ob->name;
1576 1682
1577 $pl->{deny_save} = 1; 1683 $pl->{deny_save} = 1;
1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1684 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1579 1685
1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1686 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1581 $pl->deactivate; 1687 $pl->deactivate;
1688
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1689 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1584 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1690 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1691 ext::highscore::check ($pl->ob);
1692
1585 $pl->ns->destroy if $pl->ns; 1693 $pl->ns->destroy if $pl->ns;
1586 1694
1587 my $path = playerdir $pl; 1695 my $path = playerdir $pl;
1588 my $temp = "$path~$cf::RUNTIME~deleting~"; 1696 my $temp = "$path~$cf::RUNTIME~deleting~";
1589 aio_rename $path, $temp; 1697 aio_rename $path, $temp;
… …
1643 \@logins 1751 \@logins
1644} 1752}
1645 1753
1646=item $player->maps 1754=item $player->maps
1647 1755
1756=item cf::player::maps $login
1757
1648Returns an arrayref of map paths that are private for this 1758Returns an arrayref of map paths that are private for this
1649player. May block. 1759player. May block.
1650 1760
1651=cut 1761=cut
1652 1762
… …
1714=cut 1824=cut
1715 1825
1716sub find_by_path($) { 1826sub find_by_path($) {
1717 my ($path) = @_; 1827 my ($path) = @_;
1718 1828
1829 $path =~ s/^~[^\/]*//; # skip ~login
1830
1719 my ($match, $specificity); 1831 my ($match, $specificity);
1720 1832
1721 for my $region (list) { 1833 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1834 if ($region->{match} && $path =~ $region->{match}) {
1723 ($match, $specificity) = ($region, $region->specificity) 1835 ($match, $specificity) = ($region, $region->specificity)
… …
1751sub generate_random_map { 1863sub generate_random_map {
1752 my ($self, $rmp) = @_; 1864 my ($self, $rmp) = @_;
1753 1865
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1866 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755 1867
1756 # mit "rum" bekleckern, nicht
1757 $self->_create_random_map ( 1868 $self->_create_random_map ($rmp);
1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 $rmp->{exit_on_final_map},
1762 $rmp->{xsize}, $rmp->{ysize},
1763 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1764 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1765 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1766 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1767 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1768 (cf::region::find $rmp->{region}), $rmp->{custom}
1769 )
1770} 1869}
1771 1870
1772=item cf::map->register ($regex, $prio) 1871=item cf::map->register ($regex, $prio)
1773 1872
1774Register a handler for the map path matching the given regex at the 1873Register a handler for the map path matching the given regex at the
… …
1779 1878
1780sub register { 1879sub register {
1781 my (undef, $regex, $prio) = @_; 1880 my (undef, $regex, $prio) = @_;
1782 my $pkg = caller; 1881 my $pkg = caller;
1783 1882
1784 no strict;
1785 push @{"$pkg\::ISA"}, __PACKAGE__; 1883 push @{"$pkg\::ISA"}, __PACKAGE__;
1786 1884
1787 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1885 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1788} 1886}
1789 1887
1790# also paths starting with '/' 1888# also paths starting with '/'
1791$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1889$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1792 1890
1793sub thawer_merge { 1891sub thawer_merge {
1794 my ($self, $merge) = @_; 1892 my ($self, $merge) = @_;
1795 1893
1796 # we have to keep some variables in memory intact 1894 # we have to keep some variables in memory intact
… …
1801} 1899}
1802 1900
1803sub normalise { 1901sub normalise {
1804 my ($path, $base) = @_; 1902 my ($path, $base) = @_;
1805 1903
1806 $path = "$path"; # make sure its a string 1904 $path = "$path"; # make sure it's a string
1807 1905
1808 $path =~ s/\.map$//; 1906 $path =~ s/\.map$//;
1809 1907
1810 # map plan: 1908 # map plan:
1811 # 1909 #
… …
1826 $base =~ s{[^/]+/?$}{}; 1924 $base =~ s{[^/]+/?$}{};
1827 $path = "$base/$path"; 1925 $path = "$base/$path";
1828 } 1926 }
1829 1927
1830 for ($path) { 1928 for ($path) {
1831 redo if s{//}{/};
1832 redo if s{/\.?/}{/}; 1929 redo if s{/\.?/}{/};
1833 redo if s{/[^/]+/\.\./}{/}; 1930 redo if s{/[^/]+/\.\./}{/};
1834 } 1931 }
1835 1932
1836 $path 1933 $path
… …
1850 $self->init; # pass $1 etc. 1947 $self->init; # pass $1 etc.
1851 return $self; 1948 return $self;
1852 } 1949 }
1853 } 1950 }
1854 1951
1855 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1952 Carp::cluck "unable to resolve path '$path' (base '$base')";
1856 () 1953 ()
1857} 1954}
1858 1955
1859sub init { 1956sub init {
1860 my ($self) = @_; 1957 my ($self) = @_;
… …
1982} 2079}
1983 2080
1984sub find; 2081sub find;
1985sub find { 2082sub find {
1986 my ($path, $origin) = @_; 2083 my ($path, $origin) = @_;
2084
2085 cf::cede_to_tick;
1987 2086
1988 $path = normalise $path, $origin && $origin->path; 2087 $path = normalise $path, $origin && $origin->path;
1989 2088
1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1991 my $guard2 = cf::lock_acquire "map_find:$path"; 2090 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2010 2109
2011 $cf::MAP{$path} = $map 2110 $cf::MAP{$path} = $map
2012 } 2111 }
2013} 2112}
2014 2113
2015sub pre_load { } 2114sub pre_load { }
2016sub post_load { } 2115#sub post_load { } # XS
2017 2116
2018sub load { 2117sub load {
2019 my ($self) = @_; 2118 my ($self) = @_;
2020 2119
2021 local $self->{deny_reset} = 1; # loading can take a long time 2120 local $self->{deny_reset} = 1; # loading can take a long time
… …
2076 2175
2077 $self->in_memory (cf::MAP_ACTIVE); 2176 $self->in_memory (cf::MAP_ACTIVE);
2078 } 2177 }
2079 2178
2080 $self->post_load; 2179 $self->post_load;
2081}
2082 2180
2181 1
2182}
2183
2184# customize the map for a given player, i.e.
2185# return the _real_ map. used by e.g. per-player
2186# maps to change the path to ~playername/mappath
2083sub customise_for { 2187sub customise_for {
2084 my ($self, $ob) = @_; 2188 my ($self, $ob) = @_;
2085 2189
2086 return find "~" . $ob->name . "/" . $self->{path} 2190 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2191 if $self->per_player;
… …
2103 or next; 2207 or next;
2104 $neigh = find $neigh, $map 2208 $neigh = find $neigh, $map
2105 or next; 2209 or next;
2106 $neigh->load; 2210 $neigh->load;
2107 2211
2212 # now find the diagonal neighbours
2108 push @neigh, 2213 push @neigh,
2109 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2214 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2110 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2215 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2111 } 2216 }
2112 2217
… …
2119} 2224}
2120 2225
2121sub find_sync { 2226sub find_sync {
2122 my ($path, $origin) = @_; 2227 my ($path, $origin) = @_;
2123 2228
2124 cf::sync_job { find $path, $origin } 2229 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2230 if $Coro::current == $Coro::main;
2231
2232 find $path, $origin
2125} 2233}
2126 2234
2127sub do_load_sync { 2235sub do_load_sync {
2128 my ($map) = @_; 2236 my ($map) = @_;
2129 2237
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main; 2239 if $Coro::current == $Coro::main;
2132 2240
2133 cf::sync_job { $map->load }; 2241 $map->load;
2134} 2242}
2135 2243
2136our %MAP_PREFETCH; 2244our %MAP_PREFETCH;
2137our $MAP_PREFETCHER = undef; 2245our $MAP_PREFETCHER = undef;
2138 2246
… …
2164 $MAP_PREFETCHER->prio (6); 2272 $MAP_PREFETCHER->prio (6);
2165 2273
2166 () 2274 ()
2167} 2275}
2168 2276
2277# common code, used by both ->save and ->swapout
2169sub save { 2278sub _save {
2170 my ($self) = @_; 2279 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2280
2174 $self->{last_save} = $cf::RUNTIME; 2281 $self->{last_save} = $cf::RUNTIME;
2175 2282
2176 return unless $self->dirty; 2283 return unless $self->dirty;
2177 2284
… …
2197 } else { 2304 } else {
2198 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2305 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2199 } 2306 }
2200} 2307}
2201 2308
2309sub save {
2310 my ($self) = @_;
2311
2312 my $lock = cf::lock_acquire "map_data:$self->{path}";
2313
2314 $self->_save;
2315}
2316
2202sub swap_out { 2317sub swap_out {
2203 my ($self) = @_; 2318 my ($self) = @_;
2204 2319
2205 # save first because save cedes
2206 $self->save;
2207
2208 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2320 my $lock = cf::lock_acquire "map_data:$self->{path}";
2209 2321
2210 return if $self->players;
2211 return if $self->in_memory != cf::MAP_ACTIVE; 2322 return if $self->in_memory != cf::MAP_ACTIVE;
2212 return if $self->{deny_save}; 2323 return if $self->{deny_save};
2324 return if $self->players;
2213 2325
2326 # first deactivate the map and "unlink" it from the core
2327 $self->deactivate;
2328 $_->clear_links_to ($self) for values %cf::MAP;
2214 $self->in_memory (cf::MAP_SWAPPED); 2329 $self->in_memory (cf::MAP_SWAPPED);
2330
2331 # then atomically save
2332 $self->_save;
2333
2334 # then free the map
2335 $self->clear;
2336}
2337
2338sub reset_at {
2339 my ($self) = @_;
2340
2341 # TODO: safety, remove and allow resettable per-player maps
2342 return 1e99 if $self->{deny_reset};
2343
2344 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2345 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2346
2347 $time + $to
2348}
2349
2350sub should_reset {
2351 my ($self) = @_;
2352
2353 $self->reset_at <= $cf::RUNTIME
2354}
2355
2356sub reset {
2357 my ($self) = @_;
2358
2359 my $lock = cf::lock_acquire "map_data:$self->{path}";
2360
2361 return if $self->players;
2362
2363 cf::trace "resetting map ", $self->path, "\n";
2364
2365 $self->in_memory (cf::MAP_SWAPPED);
2366
2367 # need to save uniques path
2368 unless ($self->{deny_save}) {
2369 my $uniq = $self->uniq_path; utf8::encode $uniq;
2370
2371 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2372 if $uniq;
2373 }
2374
2375 delete $cf::MAP{$self->path};
2215 2376
2216 $self->deactivate; 2377 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP; 2378 $_->clear_links_to ($self) for values %cf::MAP;
2218 $self->clear; 2379 $self->clear;
2219}
2220
2221sub reset_at {
2222 my ($self) = @_;
2223
2224 # TODO: safety, remove and allow resettable per-player maps
2225 return 1e99 if $self->{deny_reset};
2226
2227 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2228 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2229
2230 $time + $to
2231}
2232
2233sub should_reset {
2234 my ($self) = @_;
2235
2236 $self->reset_at <= $cf::RUNTIME
2237}
2238
2239sub reset {
2240 my ($self) = @_;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2244 return if $self->players;
2245
2246 warn "resetting map ", $self->path, "\n";
2247
2248 $self->in_memory (cf::MAP_SWAPPED);
2249
2250 # need to save uniques path
2251 unless ($self->{deny_save}) {
2252 my $uniq = $self->uniq_path; utf8::encode $uniq;
2253
2254 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2255 if $uniq;
2256 }
2257
2258 delete $cf::MAP{$self->path};
2259
2260 $self->deactivate;
2261 $_->clear_links_to ($self) for values %cf::MAP;
2262 $self->clear;
2263 2380
2264 $self->unlink_save; 2381 $self->unlink_save;
2265 $self->destroy; 2382 $self->destroy;
2266} 2383}
2267 2384
… …
2275 2392
2276 delete $cf::MAP{$self->path}; 2393 delete $cf::MAP{$self->path};
2277 2394
2278 $self->unlink_save; 2395 $self->unlink_save;
2279 2396
2280 bless $self, "cf::map"; 2397 bless $self, "cf::map::wrap";
2281 delete $self->{deny_reset}; 2398 delete $self->{deny_reset};
2282 $self->{deny_save} = 1; 2399 $self->{deny_save} = 1;
2283 $self->reset_timeout (1); 2400 $self->reset_timeout (1);
2284 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2401 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2285 2402
… …
2515 2632
2516Freezes the player and moves him/her to a special map (C<{link}>). 2633Freezes the player and moves him/her to a special map (C<{link}>).
2517 2634
2518The player should be reasonably safe there for short amounts of time (e.g. 2635The player should be reasonably safe there for short amounts of time (e.g.
2519for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2636for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link 2637though, as the player cannot control the character while it is on the link
2521map. 2638map.
2522 2639
2523Will never block. 2640Will never block.
2524 2641
2525=item $player_object->leave_link ($map, $x, $y) 2642=item $player_object->leave_link ($map, $x, $y)
… …
2546sub cf::object::player::enter_link { 2663sub cf::object::player::enter_link {
2547 my ($self) = @_; 2664 my ($self) = @_;
2548 2665
2549 $self->deactivate_recursive; 2666 $self->deactivate_recursive;
2550 2667
2668 ++$self->{_link_recursion};
2669
2551 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2670 return if UNIVERSAL::isa $self->map, "ext::map_link";
2552 2671
2553 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2672 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2554 if $self->map && $self->map->{path} ne "{link}"; 2673 if $self->map && $self->map->{path} ne "{link}";
2555 2674
2556 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2675 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2557} 2676}
2558 2677
2559sub cf::object::player::leave_link { 2678sub cf::object::player::leave_link {
2560 my ($self, $map, $x, $y) = @_; 2679 my ($self, $map, $x, $y) = @_;
2561 2680
… …
2586 $map->load_neighbours; 2705 $map->load_neighbours;
2587 2706
2588 return unless $self->contr->active; 2707 return unless $self->contr->active;
2589 2708
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2709 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2710 if ($self->enter_map ($map, $x, $y)) {
2592 2711 # entering was successful
2712 delete $self->{_link_recursion};
2593 # only activate afterwards, to support waiting in hooks 2713 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive; 2714 $self->activate_recursive;
2595} 2715 }
2596 2716
2717}
2718
2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2719=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2598 2720
2599Moves the player to the given map-path and coordinates by first freezing 2721Moves the player to the given map-path and coordinates by first freezing
2600her, loading and preparing them map, calling the provided $check callback 2722her, loading and preparing them map, calling the provided $check callback
2601that has to return the map if sucecssful, and then unfreezes the player on 2723that has to return the map if sucecssful, and then unfreezes the player on
2602the new (success) or old (failed) map position. In either case, $done will 2724the new (success) or old (failed) map position. In either case, $done will
… …
2609 2731
2610our $GOTOGEN; 2732our $GOTOGEN;
2611 2733
2612sub cf::object::player::goto { 2734sub cf::object::player::goto {
2613 my ($self, $path, $x, $y, $check, $done) = @_; 2735 my ($self, $path, $x, $y, $check, $done) = @_;
2736
2737 if ($self->{_link_recursion} >= $MAX_LINKS) {
2738 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2739 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2740 ($path, $x, $y) = @$EMERGENCY_POSITION;
2741 }
2614 2742
2615 # do generation counting so two concurrent goto's will be executed in-order 2743 # do generation counting so two concurrent goto's will be executed in-order
2616 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2744 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2617 2745
2618 $self->enter_link; 2746 $self->enter_link;
… …
2642 my $map = eval { 2770 my $map = eval {
2643 my $map = defined $path ? cf::map::find $path : undef; 2771 my $map = defined $path ? cf::map::find $path : undef;
2644 2772
2645 if ($map) { 2773 if ($map) {
2646 $map = $map->customise_for ($self); 2774 $map = $map->customise_for ($self);
2647 $map = $check->($map) if $check && $map; 2775 $map = $check->($map, $x, $y, $self) if $check && $map;
2648 } else { 2776 } else {
2649 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2777 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2650 } 2778 }
2651 2779
2652 $map 2780 $map
… …
2660 if ($gen == $self->{_goto_generation}) { 2788 if ($gen == $self->{_goto_generation}) {
2661 delete $self->{_goto_generation}; 2789 delete $self->{_goto_generation};
2662 $self->leave_link ($map, $x, $y); 2790 $self->leave_link ($map, $x, $y);
2663 } 2791 }
2664 2792
2665 $done->() if $done; 2793 $done->($self) if $done;
2666 })->prio (1); 2794 })->prio (1);
2667} 2795}
2668 2796
2669=item $player_object->enter_exit ($exit_object) 2797=item $player_object->enter_exit ($exit_object)
2670 2798
… …
2763 $self->message ("Something went wrong deep within the deliantra server. " 2891 $self->message ("Something went wrong deep within the deliantra server. "
2764 . "I'll try to bring you back to the map you were before. " 2892 . "I'll try to bring you back to the map you were before. "
2765 . "Please report this to the dungeon master!", 2893 . "Please report this to the dungeon master!",
2766 cf::NDI_UNIQUE | cf::NDI_RED); 2894 cf::NDI_UNIQUE | cf::NDI_RED);
2767 2895
2768 warn "ERROR in enter_exit: $@"; 2896 error "ERROR in enter_exit: $@";
2769 $self->leave_link; 2897 $self->leave_link;
2770 } 2898 }
2771 })->prio (1); 2899 })->prio (1);
2772} 2900}
2773 2901
… …
3086 3214
3087 $ns->ext_reply ($reply, @reply) 3215 $ns->ext_reply ($reply, @reply)
3088 if $reply; 3216 if $reply;
3089 3217
3090 } else { 3218 } else {
3091 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3219 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3092 } 3220 }
3093 3221
3094 cf::override; 3222 cf::override;
3095 }, 3223 },
3096); 3224);
… …
3116 3244
3117 $coro 3245 $coro
3118} 3246}
3119 3247
3120cf::client->attach ( 3248cf::client->attach (
3121 on_destroy => sub { 3249 on_client_destroy => sub {
3122 my ($ns) = @_; 3250 my ($ns) = @_;
3123 3251
3124 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3252 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3125 }, 3253 },
3126); 3254);
… …
3142our $safe_hole = new Safe::Hole; 3270our $safe_hole = new Safe::Hole;
3143 3271
3144$SIG{FPE} = 'IGNORE'; 3272$SIG{FPE} = 'IGNORE';
3145 3273
3146$safe->permit_only (Opcode::opset qw( 3274$safe->permit_only (Opcode::opset qw(
3147 :base_core :base_mem :base_orig :base_math 3275 :base_core :base_mem :base_orig :base_math :base_loop
3148 grepstart grepwhile mapstart mapwhile 3276 grepstart grepwhile mapstart mapwhile
3149 sort time 3277 sort time
3150)); 3278));
3151 3279
3152# here we export the classes and methods available to script code 3280# here we export the classes and methods available to script code
… …
3177 decrease split destroy change_exp value msg lore send_msg)], 3305 decrease split destroy change_exp value msg lore send_msg)],
3178 ["cf::object::player" => qw(player)], 3306 ["cf::object::player" => qw(player)],
3179 ["cf::player" => qw(peaceful send_msg)], 3307 ["cf::player" => qw(peaceful send_msg)],
3180 ["cf::map" => qw(trigger)], 3308 ["cf::map" => qw(trigger)],
3181) { 3309) {
3182 no strict 'refs';
3183 my ($pkg, @funs) = @$_; 3310 my ($pkg, @funs) = @$_;
3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3311 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3185 for @funs; 3312 for @funs;
3186} 3313}
3187 3314
… …
3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3331 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3205 $qcode =~ s/\n/\\n/g; 3332 $qcode =~ s/\n/\\n/g;
3206 3333
3207 %vars = (_dummy => 0) unless %vars; 3334 %vars = (_dummy => 0) unless %vars;
3208 3335
3336 my @res;
3209 local $_; 3337 local $_;
3210 local @safe::cf::_safe_eval_args = values %vars;
3211 3338
3212 my $eval = 3339 my $eval =
3213 "do {\n" 3340 "do {\n"
3214 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3341 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3215 . "#line 0 \"{$qcode}\"\n" 3342 . "#line 0 \"{$qcode}\"\n"
3216 . $code 3343 . $code
3217 . "\n}" 3344 . "\n}"
3218 ; 3345 ;
3219 3346
3347 if ($CFG{safe_eval}) {
3220 sub_generation_inc; 3348 sub_generation_inc;
3349 local @safe::cf::_safe_eval_args = values %vars;
3221 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3350 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3222 sub_generation_inc; 3351 sub_generation_inc;
3352 } else {
3353 local @cf::_safe_eval_args = values %vars;
3354 @res = wantarray ? eval eval : scalar eval $eval;
3355 }
3223 3356
3224 if ($@) { 3357 if ($@) {
3225 warn "$@"; 3358 warn "$@",
3226 warn "while executing safe code '$code'\n"; 3359 "while executing safe code '$code'\n",
3227 warn "with arguments " . (join " ", %vars) . "\n"; 3360 "with arguments " . (join " ", %vars) . "\n";
3228 } 3361 }
3229 3362
3230 wantarray ? @res : $res[0] 3363 wantarray ? @res : $res[0]
3231} 3364}
3232 3365
… …
3246=cut 3379=cut
3247 3380
3248sub register_script_function { 3381sub register_script_function {
3249 my ($fun, $cb) = @_; 3382 my ($fun, $cb) = @_;
3250 3383
3251 no strict 'refs'; 3384 $fun = "safe::$fun" if $CFG{safe_eval};
3252 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3385 *$fun = $safe_hole->wrap ($cb);
3253} 3386}
3254 3387
3255=back 3388=back
3256 3389
3257=cut 3390=cut
… …
3266 # for this (global event?) 3399 # for this (global event?)
3267 %ext::player_env::MUSIC_FACE_CACHE = (); 3400 %ext::player_env::MUSIC_FACE_CACHE = ();
3268 3401
3269 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3402 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3270 3403
3271 warn "loading facedata from $path\n"; 3404 trace "loading facedata from $path\n";
3272 3405
3273 my $facedata;
3274 0 < aio_load $path, $facedata 3406 0 < aio_load $path, my $facedata
3275 or die "$path: $!"; 3407 or die "$path: $!";
3276 3408
3277 $facedata = Coro::Storable::thaw $facedata; 3409 $facedata = Coro::Storable::thaw $facedata;
3278 3410
3279 $facedata->{version} == 2 3411 $facedata->{version} == 2
3280 or cf::cleanup "$path: version mismatch, cannot proceed."; 3412 or cf::cleanup "$path: version mismatch, cannot proceed.";
3281 3413
3282 # patch in the exptable 3414 # patch in the exptable
3415 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3283 $facedata->{resource}{"res/exp_table"} = { 3416 $facedata->{resource}{"res/exp_table"} = {
3284 type => FT_RSRC, 3417 type => FT_RSRC,
3285 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3418 data => $exp_table,
3419 hash => (Digest::MD5::md5 $exp_table),
3286 }; 3420 };
3287 cf::cede_to_tick; 3421 cf::cede_to_tick;
3288 3422
3289 { 3423 {
3290 my $faces = $facedata->{faceinfo}; 3424 my $faces = $facedata->{faceinfo};
… …
3292 while (my ($face, $info) = each %$faces) { 3426 while (my ($face, $info) = each %$faces) {
3293 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3427 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294 3428
3295 cf::face::set_visibility $idx, $info->{visibility}; 3429 cf::face::set_visibility $idx, $info->{visibility};
3296 cf::face::set_magicmap $idx, $info->{magicmap}; 3430 cf::face::set_magicmap $idx, $info->{magicmap};
3297 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3431 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3432 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3433 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3299 3434
3300 cf::cede_to_tick; 3435 cf::cede_to_tick;
3301 } 3436 }
3302 3437
3303 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
… …
3308 3443
3309 if (my $smooth = cf::face::find $info->{smooth}) { 3444 if (my $smooth = cf::face::find $info->{smooth}) {
3310 cf::face::set_smooth $idx, $smooth; 3445 cf::face::set_smooth $idx, $smooth;
3311 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3446 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3312 } else { 3447 } else {
3313 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3448 error "smooth face '$info->{smooth}' not found for face '$face'";
3314 } 3449 }
3315 3450
3316 cf::cede_to_tick; 3451 cf::cede_to_tick;
3317 } 3452 }
3318 } 3453 }
… …
3327 3462
3328 cf::anim::invalidate_all; # d'oh 3463 cf::anim::invalidate_all; # d'oh
3329 } 3464 }
3330 3465
3331 { 3466 {
3332 # TODO: for gcfclient pleasure, we should give resources
3333 # that gcfclient doesn't grok a >10000 face index.
3334 my $res = $facedata->{resource}; 3467 my $res = $facedata->{resource};
3335 3468
3336 while (my ($name, $info) = each %$res) { 3469 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) { 3470 if (defined $info->{type}) {
3338 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3471 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3339 my $data;
3340 3472
3341 if ($info->{type} & 1) { 3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3342 # prepend meta info
3343
3344 my $meta = $enc->encode ({
3345 name => $name,
3346 %{ $info->{meta} || {} },
3347 });
3348
3349 $data = pack "(w/a*)*", $meta, $info->{data};
3350 } else {
3351 $data = $info->{data};
3352 }
3353
3354 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3355 cf::face::set_type $idx, $info->{type}; 3474 cf::face::set_type $idx, $info->{type};
3356 } else { 3475 } else {
3357 $RESOURCE{$name} = $info; 3476 $RESOURCE{$name} = $info; # unused
3358 } 3477 }
3359 3478
3360 cf::cede_to_tick; 3479 cf::cede_to_tick;
3361 } 3480 }
3362 } 3481 }
3363 3482
3364 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3483 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3365 3484
3366 1 3485 1
3367} 3486}
3368
3369cf::global->attach (on_resource_update => sub {
3370 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3371 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3372
3373 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3374 my $sound = $soundconf->{compat}[$_]
3375 or next;
3376
3377 my $face = cf::face::find "sound/$sound->[1]";
3378 cf::sound::set $sound->[0] => $face;
3379 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3380 }
3381
3382 while (my ($k, $v) = each %{$soundconf->{event}}) {
3383 my $face = cf::face::find "sound/$v";
3384 cf::sound::set $k => $face;
3385 }
3386 }
3387});
3388 3487
3389register_exticmd fx_want => sub { 3488register_exticmd fx_want => sub {
3390 my ($ns, $want) = @_; 3489 my ($ns, $want) = @_;
3391 3490
3392 while (my ($k, $v) = each %$want) { 3491 while (my ($k, $v) = each %$want) {
… …
3431sub reload_treasures { 3530sub reload_treasures {
3432 load_resource_file "$DATADIR/treasures" 3531 load_resource_file "$DATADIR/treasures"
3433 or die "unable to load treasurelists\n"; 3532 or die "unable to load treasurelists\n";
3434} 3533}
3435 3534
3535sub reload_sound {
3536 trace "loading sound config from $DATADIR/sound\n";
3537
3538 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3539 or die "$DATADIR/sound $!";
3540
3541 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3542
3543 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3544 my $sound = $soundconf->{compat}[$_]
3545 or next;
3546
3547 my $face = cf::face::find "sound/$sound->[1]";
3548 cf::sound::set $sound->[0] => $face;
3549 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3550 }
3551
3552 while (my ($k, $v) = each %{$soundconf->{event}}) {
3553 my $face = cf::face::find "sound/$v";
3554 cf::sound::set $k => $face;
3555 }
3556}
3557
3436sub reload_resources { 3558sub reload_resources {
3437 warn "reloading resource files...\n"; 3559 trace "reloading resource files...\n";
3438 3560
3561 reload_exp_table;
3562 reload_materials;
3439 reload_facedata; 3563 reload_facedata;
3564 reload_sound;
3440 reload_archetypes; 3565 reload_archetypes;
3441 reload_regions; 3566 reload_regions;
3442 reload_treasures; 3567 reload_treasures;
3443 3568
3444 warn "finished reloading resource files\n"; 3569 trace "finished reloading resource files\n";
3445} 3570}
3446 3571
3447sub reload_config { 3572sub reload_config {
3448 warn "reloading config file...\n"; 3573 trace "reloading config file...\n";
3449 3574
3450 open my $fh, "<:utf8", "$CONFDIR/config" 3575 0 < aio_load "$CONFDIR/config", my $config
3451 or return; 3576 or die "$CONFDIR/config: $!";
3452 3577
3453 local $/; 3578 utf8::decode $config;
3454 *CFG = YAML::XS::Load scalar <$fh>; 3579 *CFG = yaml_load $config;
3455 3580
3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3457 3582
3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3583 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3584 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3460 3585
3461 if (exists $CFG{mlockall}) { 3586 if (exists $CFG{mlockall}) {
… …
3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3588 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3464 and die "WARNING: m(un)lockall failed: $!\n"; 3589 and die "WARNING: m(un)lockall failed: $!\n";
3465 }; 3590 };
3466 warn $@ if $@; 3591 warn $@ if $@;
3467 } 3592 }
3468
3469 warn "finished reloading resource files\n";
3470} 3593}
3471 3594
3472sub pidfile() { 3595sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3596 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!"; 3597 or die "$PIDFILE: $!";
… …
3487 seek $fh, 0, 0; 3610 seek $fh, 0, 0;
3488 print $fh $$; 3611 print $fh $$;
3489} 3612}
3490 3613
3491sub main_loop { 3614sub main_loop {
3492 warn "EV::loop starting\n"; 3615 trace "EV::loop starting\n";
3493 if (1) { 3616 if (1) {
3494 EV::loop; 3617 EV::loop;
3495 } 3618 }
3496 warn "EV::loop returned\n"; 3619 trace "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP; 3620 goto &main_loop unless $REALLY_UNLOOP;
3498} 3621}
3499 3622
3500sub main { 3623sub main {
3501 cf::init_globals; # initialise logging 3624 cf::init_globals; # initialise logging
3502 3625
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3626 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3627 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3628 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3629 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507
3508 cf::init_experience;
3509 cf::init_anim;
3510 cf::init_attackmess;
3511 cf::init_dynamic;
3512 3630
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3631 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514 3632
3515 # we must not ever block the main coroutine 3633 # we must not ever block the main coroutine
3516 local $Coro::idle = sub { 3634 local $Coro::idle = sub {
… …
3522 }; 3640 };
3523 3641
3524 evthread_start IO::AIO::poll_fileno; 3642 evthread_start IO::AIO::poll_fileno;
3525 3643
3526 cf::sync_job { 3644 cf::sync_job {
3645 cf::incloader::init ();
3646
3647 cf::init_anim;
3648 cf::init_attackmess;
3649 cf::init_dynamic;
3650
3651 cf::load_settings;
3652
3527 reload_resources; 3653 reload_resources;
3528 reload_config; 3654 reload_config;
3529 db_init; 3655 db_init;
3530 3656
3531 cf::load_settings;
3532 cf::load_materials;
3533 cf::init_uuid; 3657 cf::init_uuid;
3534 cf::init_signals; 3658 cf::init_signals;
3535 cf::init_commands;
3536 cf::init_skills; 3659 cf::init_skills;
3537 3660
3538 cf::init_beforeplay; 3661 cf::init_beforeplay;
3539 3662
3540 atomic; 3663 atomic;
… …
3545 3668
3546 # no (long-running) fork's whatsoever before this point(!) 3669 # no (long-running) fork's whatsoever before this point(!)
3547 use POSIX (); 3670 use POSIX ();
3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3671 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3549 3672
3550 (pop @POST_INIT)->(0) while @POST_INIT; 3673 cf::_post_init 0;
3551 }; 3674 };
3552 3675
3676 cf::object::thawer::errors_are_fatal 0;
3677 info "parse errors in files are no longer fatal from this point on.\n";
3678
3679 my $free_main; $free_main = EV::idle sub {
3680 undef $free_main;
3681 undef &main; # free gobs of memory :)
3682 };
3683
3553 main_loop; 3684 goto &main_loop;
3554} 3685}
3555 3686
3556############################################################################# 3687#############################################################################
3557# initialisation and cleanup 3688# initialisation and cleanup
3558 3689
3559# install some emergency cleanup handlers 3690# install some emergency cleanup handlers
3560BEGIN { 3691BEGIN {
3561 our %SIGWATCHER = (); 3692 our %SIGWATCHER = ();
3562 for my $signal (qw(INT HUP TERM)) { 3693 for my $signal (qw(INT HUP TERM)) {
3563 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3694 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3564 cf::cleanup "SIG$signal"; 3695 cf::cleanup "SIG$signal";
3565 }; 3696 };
3566 } 3697 }
3567} 3698}
3568 3699
3569sub write_runtime_sync { 3700sub write_runtime_sync {
3701 my $t0 = AE::time;
3702
3570 # first touch the runtime file to show we are still running: 3703 # first touch the runtime file to show we are still running:
3571 # the fsync below can take a very very long time. 3704 # the fsync below can take a very very long time.
3572 3705
3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3706 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3574 3707
3575 my $guard = cf::lock_acquire "write_runtime"; 3708 my $guard = cf::lock_acquire "write_runtime";
3576 3709
3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3710 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3578 or return; 3711 or return;
3579 3712
3580 my $value = $cf::RUNTIME + 90 + 10; 3713 my $value = $cf::RUNTIME + 90 + 10;
3581 # 10 is the runtime save interval, for a monotonic clock 3714 # 10 is the runtime save interval, for a monotonic clock
3582 # 60 allows for the watchdog to kill the server. 3715 # 60 allows for the watchdog to kill the server.
… …
3595 or return; 3728 or return;
3596 3729
3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3730 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3598 and return; 3731 and return;
3599 3732
3600 warn "runtime file written.\n"; 3733 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3601 3734
3602 1 3735 1
3603} 3736}
3604 3737
3605our $uuid_lock; 3738our $uuid_lock;
… …
3617 or return; 3750 or return;
3618 3751
3619 my $value = uuid_seq uuid_cur; 3752 my $value = uuid_seq uuid_cur;
3620 3753
3621 unless ($value) { 3754 unless ($value) {
3622 warn "cowardly refusing to write zero uuid value!\n"; 3755 info "cowardly refusing to write zero uuid value!\n";
3623 return; 3756 return;
3624 } 3757 }
3625 3758
3626 my $value = uuid_str $value + $uuid_skip; 3759 my $value = uuid_str $value + $uuid_skip;
3627 $uuid_skip = 0; 3760 $uuid_skip = 0;
… …
3637 or return; 3770 or return;
3638 3771
3639 aio_rename "$uuid~", $uuid 3772 aio_rename "$uuid~", $uuid
3640 and return; 3773 and return;
3641 3774
3642 warn "uuid file written ($value).\n"; 3775 trace "uuid file written ($value).\n";
3643 3776
3644 1 3777 1
3645 3778
3646} 3779}
3647 3780
… …
3653} 3786}
3654 3787
3655sub emergency_save() { 3788sub emergency_save() {
3656 my $freeze_guard = cf::freeze_mainloop; 3789 my $freeze_guard = cf::freeze_mainloop;
3657 3790
3658 warn "emergency_perl_save: enter\n"; 3791 info "emergency_perl_save: enter\n";
3792
3793 # this is a trade-off: we want to be very quick here, so
3794 # save all maps without fsync, and later call a global sync
3795 # (which in turn might be very very slow)
3796 local $USE_FSYNC = 0;
3659 3797
3660 cf::sync_job { 3798 cf::sync_job {
3661 # this is a trade-off: we want to be very quick here, so 3799 cf::write_runtime_sync; # external watchdog should not bark
3662 # save all maps without fsync, and later call a global sync
3663 # (which in turn might be very very slow)
3664 local $USE_FSYNC = 0;
3665 3800
3666 # use a peculiar iteration method to avoid tripping on perl 3801 # use a peculiar iteration method to avoid tripping on perl
3667 # refcount bugs in for. also avoids problems with players 3802 # refcount bugs in for. also avoids problems with players
3668 # and maps saved/destroyed asynchronously. 3803 # and maps saved/destroyed asynchronously.
3669 warn "emergency_perl_save: begin player save\n"; 3804 info "emergency_perl_save: begin player save\n";
3670 for my $login (keys %cf::PLAYER) { 3805 for my $login (keys %cf::PLAYER) {
3671 my $pl = $cf::PLAYER{$login} or next; 3806 my $pl = $cf::PLAYER{$login} or next;
3672 $pl->valid or next; 3807 $pl->valid or next;
3673 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3808 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3674 $pl->save; 3809 $pl->save;
3675 } 3810 }
3676 warn "emergency_perl_save: end player save\n"; 3811 info "emergency_perl_save: end player save\n";
3677 3812
3813 cf::write_runtime_sync; # external watchdog should not bark
3814
3678 warn "emergency_perl_save: begin map save\n"; 3815 info "emergency_perl_save: begin map save\n";
3679 for my $path (keys %cf::MAP) { 3816 for my $path (keys %cf::MAP) {
3680 my $map = $cf::MAP{$path} or next; 3817 my $map = $cf::MAP{$path} or next;
3681 $map->valid or next; 3818 $map->valid or next;
3682 $map->save; 3819 $map->save;
3683 } 3820 }
3684 warn "emergency_perl_save: end map save\n"; 3821 info "emergency_perl_save: end map save\n";
3685 3822
3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3686 warn "emergency_perl_save: begin database checkpoint\n"; 3825 info "emergency_perl_save: begin database checkpoint\n";
3687 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3688 warn "emergency_perl_save: end database checkpoint\n"; 3827 info "emergency_perl_save: end database checkpoint\n";
3689 3828
3690 warn "emergency_perl_save: begin write uuid\n"; 3829 info "emergency_perl_save: begin write uuid\n";
3691 write_uuid_sync 1; 3830 write_uuid_sync 1;
3692 warn "emergency_perl_save: end write uuid\n"; 3831 info "emergency_perl_save: end write uuid\n";
3832
3833 cf::write_runtime_sync; # external watchdog should not bark
3834
3835 trace "emergency_perl_save: syncing database to disk";
3836 BDB::db_env_txn_checkpoint $DB_ENV;
3837
3838 info "emergency_perl_save: starting sync\n";
3839 IO::AIO::aio_sync sub {
3840 info "emergency_perl_save: finished sync\n";
3841 };
3842
3843 cf::write_runtime_sync; # external watchdog should not bark
3844
3845 trace "emergency_perl_save: flushing outstanding aio requests";
3846 while (IO::AIO::nreqs || BDB::nreqs) {
3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3848 }
3849
3850 cf::write_runtime_sync; # external watchdog should not bark
3693 }; 3851 };
3694 3852
3695 warn "emergency_perl_save: starting sync()\n";
3696 IO::AIO::aio_sync sub {
3697 warn "emergency_perl_save: finished sync()\n";
3698 };
3699
3700 warn "emergency_perl_save: leave\n"; 3853 info "emergency_perl_save: leave\n";
3701} 3854}
3702 3855
3703sub post_cleanup { 3856sub post_cleanup {
3704 my ($make_core) = @_; 3857 my ($make_core) = @_;
3705 3858
3859 IO::AIO::flush;
3860
3706 warn Carp::longmess "post_cleanup backtrace" 3861 error Carp::longmess "post_cleanup backtrace"
3707 if $make_core; 3862 if $make_core;
3708 3863
3709 my $fh = pidfile; 3864 my $fh = pidfile;
3710 unlink $PIDFILE if <$fh> == $$; 3865 unlink $PIDFILE if <$fh> == $$;
3711} 3866}
… …
3731 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3886 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3732 for my $name (keys %$leaf_symtab) { 3887 for my $name (keys %$leaf_symtab) {
3733 _gv_clear *{"$pkg$name"}; 3888 _gv_clear *{"$pkg$name"};
3734# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3889# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3735 } 3890 }
3736 warn "cleared package $pkg\n";#d#
3737} 3891}
3738 3892
3739sub do_reload_perl() { 3893sub do_reload_perl() {
3740 # can/must only be called in main 3894 # can/must only be called in main
3741 if ($Coro::current != $Coro::main) { 3895 unless (in_main) {
3742 warn "can only reload from main coroutine"; 3896 error "can only reload from main coroutine";
3743 return; 3897 return;
3744 } 3898 }
3745 3899
3746 return if $RELOAD++; 3900 return if $RELOAD++;
3747 3901
3748 my $t1 = EV::time; 3902 my $t1 = AE::time;
3749 3903
3750 while ($RELOAD) { 3904 while ($RELOAD) {
3751 warn "reloading..."; 3905 cf::get_slot 0.1, -1, "reload_perl";
3906 info "perl_reload: reloading...";
3752 3907
3753 warn "entering sync_job"; 3908 trace "perl_reload: entering sync_job";
3754 3909
3755 cf::sync_job { 3910 cf::sync_job {
3756 cf::write_runtime_sync; # external watchdog should not bark
3757 cf::emergency_save; 3911 #cf::emergency_save;
3758 cf::write_runtime_sync; # external watchdog should not bark
3759 3912
3760 warn "syncing database to disk";
3761 BDB::db_env_txn_checkpoint $DB_ENV;
3762
3763 # if anything goes wrong in here, we should simply crash as we already saved
3764
3765 warn "flushing outstanding aio requests";
3766 while (IO::AIO::nreqs || BDB::nreqs) {
3767 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3768 }
3769
3770 warn "cancelling all extension coros"; 3913 trace "perl_reload: cancelling all extension coros";
3771 $_->cancel for values %EXT_CORO; 3914 $_->cancel for values %EXT_CORO;
3772 %EXT_CORO = (); 3915 %EXT_CORO = ();
3773 3916
3774 warn "removing commands"; 3917 trace "perl_reload: removing commands";
3775 %COMMAND = (); 3918 %COMMAND = ();
3776 3919
3777 warn "removing ext/exti commands"; 3920 trace "perl_reload: removing ext/exti commands";
3778 %EXTCMD = (); 3921 %EXTCMD = ();
3779 %EXTICMD = (); 3922 %EXTICMD = ();
3780 3923
3781 warn "unloading/nuking all extensions"; 3924 trace "perl_reload: unloading/nuking all extensions";
3782 for my $pkg (@EXTS) { 3925 for my $pkg (@EXTS) {
3783 warn "... unloading $pkg"; 3926 trace "... unloading $pkg";
3784 3927
3785 if (my $cb = $pkg->can ("unload")) { 3928 if (my $cb = $pkg->can ("unload")) {
3786 eval { 3929 eval {
3787 $cb->($pkg); 3930 $cb->($pkg);
3788 1 3931 1
3789 } or warn "$pkg unloaded, but with errors: $@"; 3932 } or error "$pkg unloaded, but with errors: $@";
3790 } 3933 }
3791 3934
3792 warn "... clearing $pkg"; 3935 trace "... clearing $pkg";
3793 clear_package $pkg; 3936 clear_package $pkg;
3794 } 3937 }
3795 3938
3796 warn "unloading all perl modules loaded from $LIBDIR"; 3939 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3797 while (my ($k, $v) = each %INC) { 3940 while (my ($k, $v) = each %INC) {
3798 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3941 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3799 3942
3800 warn "... unloading $k"; 3943 trace "... unloading $k";
3801 delete $INC{$k}; 3944 delete $INC{$k};
3802 3945
3803 $k =~ s/\.pm$//; 3946 $k =~ s/\.pm$//;
3804 $k =~ s/\//::/g; 3947 $k =~ s/\//::/g;
3805 3948
… …
3808 } 3951 }
3809 3952
3810 clear_package $k; 3953 clear_package $k;
3811 } 3954 }
3812 3955
3813 warn "getting rid of safe::, as good as possible"; 3956 trace "perl_reload: getting rid of safe::, as good as possible";
3814 clear_package "safe::$_" 3957 clear_package "safe::$_"
3815 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3958 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3816 3959
3817 warn "unloading cf.pm \"a bit\""; 3960 trace "perl_reload: unloading cf.pm \"a bit\"";
3818 delete $INC{"cf.pm"}; 3961 delete $INC{"cf.pm"};
3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3962 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3820 3963
3821 # don't, removes xs symbols, too, 3964 # don't, removes xs symbols, too,
3822 # and global variables created in xs 3965 # and global variables created in xs
3823 #clear_package __PACKAGE__; 3966 #clear_package __PACKAGE__;
3824 3967
3825 warn "unload completed, starting to reload now"; 3968 info "perl_reload: unload completed, starting to reload now";
3826 3969
3827 warn "reloading cf.pm"; 3970 trace "perl_reload: reloading cf.pm";
3828 require cf; 3971 require cf;
3829 cf::_connect_to_perl_1; 3972 cf::_connect_to_perl_1;
3830 3973
3831 warn "loading config and database again"; 3974 trace "perl_reload: loading config and database again";
3832 cf::reload_config; 3975 cf::reload_config;
3833 3976
3834 warn "loading extensions"; 3977 trace "perl_reload: loading extensions";
3835 cf::load_extensions; 3978 cf::load_extensions;
3836 3979
3837 if ($REATTACH_ON_RELOAD) { 3980 if ($REATTACH_ON_RELOAD) {
3838 warn "reattaching attachments to objects/players"; 3981 trace "perl_reload: reattaching attachments to objects/players";
3839 _global_reattach; # objects, sockets 3982 _global_reattach; # objects, sockets
3840 warn "reattaching attachments to maps"; 3983 trace "perl_reload: reattaching attachments to maps";
3841 reattach $_ for values %MAP; 3984 reattach $_ for values %MAP;
3842 warn "reattaching attachments to players"; 3985 trace "perl_reload: reattaching attachments to players";
3843 reattach $_ for values %PLAYER; 3986 reattach $_ for values %PLAYER;
3844 } 3987 }
3845 3988
3846 warn "running post_init jobs"; 3989 cf::_post_init 1;
3847 (pop @POST_INIT)->(1) while @POST_INIT;
3848 3990
3849 warn "leaving sync_job"; 3991 trace "perl_reload: leaving sync_job";
3850 3992
3851 1 3993 1
3852 } or do { 3994 } or do {
3853 warn $@; 3995 error $@;
3854 cf::cleanup "error while reloading, exiting."; 3996 cf::cleanup "perl_reload: error, exiting.";
3855 }; 3997 };
3856 3998
3857 warn "reloaded";
3858 --$RELOAD; 3999 --$RELOAD;
3859 } 4000 }
3860 4001
3861 $t1 = EV::time - $t1; 4002 $t1 = AE::time - $t1;
3862 warn "reload completed in ${t1}s\n"; 4003 info "perl_reload: completed in ${t1}s\n";
3863}; 4004};
3864 4005
3865our $RELOAD_WATCHER; # used only during reload 4006our $RELOAD_WATCHER; # used only during reload
3866 4007
3867sub reload_perl() { 4008sub reload_perl() {
… …
3869 # coro crashes during coro_state_free->destroy here. 4010 # coro crashes during coro_state_free->destroy here.
3870 4011
3871 $RELOAD_WATCHER ||= cf::async { 4012 $RELOAD_WATCHER ||= cf::async {
3872 Coro::AIO::aio_wait cache_extensions; 4013 Coro::AIO::aio_wait cache_extensions;
3873 4014
3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4015 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3875 do_reload_perl; 4016 do_reload_perl;
3876 undef $RELOAD_WATCHER; 4017 undef $RELOAD_WATCHER;
3877 }; 4018 };
3878 }; 4019 };
3879} 4020}
… …
3888 reload_perl; 4029 reload_perl;
3889 }; 4030 };
3890 } 4031 }
3891}; 4032};
3892 4033
3893unshift @INC, $LIBDIR; 4034#############################################################################
3894 4035
3895my $bug_warning = 0; 4036my $bug_warning = 0;
3896 4037
3897our @WAIT_FOR_TICK; 4038our @WAIT_FOR_TICK;
3898our @WAIT_FOR_TICK_BEGIN; 4039our @WAIT_FOR_TICK_BEGIN;
3899 4040
3900sub wait_for_tick { 4041sub wait_for_tick() {
3901 return if tick_inhibit || $Coro::current == $Coro::main; 4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3902 4043
3903 my $signal = new Coro::Signal; 4044 my $signal = new Coro::Signal;
3904 push @WAIT_FOR_TICK, $signal; 4045 push @WAIT_FOR_TICK, $signal;
3905 $signal->wait; 4046 $signal->wait;
3906} 4047}
3907 4048
3908sub wait_for_tick_begin { 4049sub wait_for_tick_begin() {
3909 return if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3910 4051
3911 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3912 push @WAIT_FOR_TICK_BEGIN, $signal; 4053 push @WAIT_FOR_TICK_BEGIN, $signal;
3913 $signal->wait; 4054 $signal->wait;
3914} 4055}
… …
3920 return; 4061 return;
3921 } 4062 }
3922 4063
3923 cf::server_tick; # one server iteration 4064 cf::server_tick; # one server iteration
3924 4065
4066 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4067
3925 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4068 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3926 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4069 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3927 Coro::async_pool { 4070 Coro::async_pool {
3928 $Coro::current->{desc} = "runtime saver"; 4071 $Coro::current->{desc} = "runtime saver";
3929 write_runtime_sync 4072 write_runtime_sync
3930 or warn "ERROR: unable to write runtime file: $!"; 4073 or error "ERROR: unable to write runtime file: $!";
3931 }; 4074 };
3932 } 4075 }
3933 4076
3934 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3935 $sig->send; 4078 $sig->send;
… …
3943 4086
3944 if (0) { 4087 if (0) {
3945 if ($NEXT_TICK) { 4088 if ($NEXT_TICK) {
3946 my $jitter = $TICK_START - $NEXT_TICK; 4089 my $jitter = $TICK_START - $NEXT_TICK;
3947 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4090 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3948 warn "jitter $JITTER\n";#d# 4091 debug "jitter $JITTER\n";#d#
3949 } 4092 }
3950 } 4093 }
3951} 4094}
3952 4095
3953{ 4096{
3954 # configure BDB 4097 # configure BDB
3955 4098
3956 BDB::min_parallel 8; 4099 BDB::min_parallel 16;
3957 BDB::max_poll_reqs $TICK * 0.1; 4100 BDB::max_poll_reqs $TICK * 0.1;
3958 $AnyEvent::BDB::WATCHER->priority (1); 4101 $AnyEvent::BDB::WATCHER->priority (1);
3959 4102
3960 unless ($DB_ENV) { 4103 unless ($DB_ENV) {
3961 $DB_ENV = BDB::db_env_create; 4104 $DB_ENV = BDB::db_env_create;
… …
3998 IO::AIO::min_parallel 8; 4141 IO::AIO::min_parallel 8;
3999 IO::AIO::max_poll_time $TICK * 0.1; 4142 IO::AIO::max_poll_time $TICK * 0.1;
4000 undef $AnyEvent::AIO::WATCHER; 4143 undef $AnyEvent::AIO::WATCHER;
4001} 4144}
4002 4145
4003my $_log_backtrace; 4146our $_log_backtrace;
4147our $_log_backtrace_last;
4004 4148
4005sub _log_backtrace { 4149sub _log_backtrace {
4006 my ($msg, @addr) = @_; 4150 my ($msg, @addr) = @_;
4007 4151
4008 $msg =~ s/\n//; 4152 $msg =~ s/\n$//;
4009 4153
4154 if ($_log_backtrace_last eq $msg) {
4155 LOG llevInfo, "[ABT] $msg\n";
4156 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4010 # limit the # of concurrent backtraces 4157 # limit the # of concurrent backtraces
4011 if ($_log_backtrace < 2) { 4158 } elsif ($_log_backtrace < 2) {
4159 $_log_backtrace_last = $msg;
4012 ++$_log_backtrace; 4160 ++$_log_backtrace;
4013 my $perl_bt = Carp::longmess $msg; 4161 my $perl_bt = Carp::longmess $msg;
4014 async { 4162 async {
4015 $Coro::current->{desc} = "abt $msg"; 4163 $Coro::current->{desc} = "abt $msg";
4016 4164
… …
4036 LOG llevInfo, "[ABT] $_\n" for @bt; 4184 LOG llevInfo, "[ABT] $_\n" for @bt;
4037 --$_log_backtrace; 4185 --$_log_backtrace;
4038 }; 4186 };
4039 } else { 4187 } else {
4040 LOG llevInfo, "[ABT] $msg\n"; 4188 LOG llevInfo, "[ABT] $msg\n";
4041 LOG llevInfo, "[ABT] [suppressed]\n"; 4189 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4042 } 4190 }
4043} 4191}
4044 4192
4045# load additional modules 4193# load additional modules
4046require "cf/$_.pm" for @EXTRA_MODULES; 4194require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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