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

Diff Legend

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