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.533 by root, Thu Apr 29 07:59:17 2010 UTC vs.
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC

… …
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
… …
124our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 129our $DB_ENV;
128 130
129our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 132
131our %CFG; 133our %CFG;
132 134
133our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 136our $RUNTIME;
… …
233from wherever your confdir points to. 235from wherever your confdir points to.
234 236
235=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
236 238
237These 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
238returns 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
239per 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();
240 247
241=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
242 249
243This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
244C<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
… …
307} 314}
308 315
309$EV::DIED = sub { 316$EV::DIED = sub {
310 Carp::cluck "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
311}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
312 324
313############################################################################# 325#############################################################################
314 326
315=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
316 328
… …
337 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338 $d 350 $d
339 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
340} 352}
341 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
342=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
343 369
344Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
345 371
346=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353 379
354sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
356 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
357=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
358 415
359Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
361 418
362The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
363is a reload or not. 420is a reload or not.
364 421
365=cut 422=cut
366 423
367sub post_init(&) { 424sub post_init(&) {
368 push @POST_INIT, shift; 425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
369} 443}
370 444
371=item cf::lock_wait $string 445=item cf::lock_wait $string
372 446
373Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
… …
426 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
427} 501}
428 502
429=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
430 504
431Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
432This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
433of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
434 512
435The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
436used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
437 515
438Useful for short background jobs. 516Useful for short background jobs.
… …
518=cut 596=cut
519 597
520sub sync_job(&) { 598sub sync_job(&) {
521 my ($job) = @_; 599 my ($job) = @_;
522 600
523 if ($Coro::current == $Coro::main) { 601 if (in_main) {
524 my $time = AE::time; 602 my $time = AE::time;
525 603
526 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
527 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
528 606
529 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
530 608
531 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
532 610
533 my $busy = 1; 611 my $busy = 1;
534 my @res; 612 my @res;
… …
578 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
579 657
580 $coro 658 $coro
581} 659}
582 660
583=item fork_call { }, $args 661=item fork_call { }, @args
584 662
585Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
586process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling. 666never block itself or use any form of event handling.
589 667
590=cut 668=cut
591 669
670sub post_fork {
671 reset_signals;
672}
673
592sub fork_call(&@) { 674sub fork_call(&@) {
593 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
594 676
595 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
596 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
597 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
598 680
599 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
600 reset_signals; 682 cf::post_fork;
601 &$cb 683 &$cb
602 }, @args; 684 } @args;
603 685
604 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
605} 687}
606 688
607sub objinfo { 689sub objinfo {
… …
657within each server. 739within each server.
658 740
659=cut 741=cut
660 742
661sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
662 my ($name) = @_; 747 my ($name) = @_;
663 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
664 749
665 eval { 750 eval {
666 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
676} 761}
677 762
678our $DB; 763our $DB;
679 764
680sub db_init { 765sub db_init {
681 cf::sync_job {
682 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
683 };
684} 767}
685 768
686sub db_get($$) { 769sub db_get($$) {
687 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
688 771
689 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
690 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
691 776
692 $! ? () 777 $! ? ()
693 : $data 778 : $data
694 }
695} 779}
696 780
697sub db_put($$$) { 781sub db_put($$$) {
698 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
699 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
727 811
728 my @data; 812 my @data;
729 my $md5; 813 my $md5;
730 814
731 for (0 .. $#$src) { 815 for (0 .. $#$src) {
732 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
733 or Carp::croak "$src->[$_]: $!";
734 } 817 }
735 818
736 # if processing is expensive, check 819 # if processing is expensive, check
737 # checksum first 820 # checksum first
738 if (1) { 821 if (1) {
… …
1421 1504
1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1424 1507
1425 $ext{source} = 1508 $ext{source} =
1426 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1427 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1428 . $source 1511 . $source
1429 . "\n};\n1"; 1512 . "\n};\n1";
1430 1513
1431 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
… …
1639 my $name = $pl->ob->name; 1722 my $name = $pl->ob->name;
1640 1723
1641 $pl->{deny_save} = 1; 1724 $pl->{deny_save} = 1;
1642 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1725 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1643 1726
1644 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1727 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1645 $pl->deactivate; 1728 $pl->deactivate;
1729
1646 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1730 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1647 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1731 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1732 ext::highscore::check ($pl->ob);
1733
1648 $pl->ns->destroy if $pl->ns; 1734 $pl->ns->destroy if $pl->ns;
1649 1735
1650 my $path = playerdir $pl; 1736 my $path = playerdir $pl;
1651 my $temp = "$path~$cf::RUNTIME~deleting~"; 1737 my $temp = "$path~$cf::RUNTIME~deleting~";
1652 aio_rename $path, $temp; 1738 aio_rename $path, $temp;
… …
1818sub generate_random_map { 1904sub generate_random_map {
1819 my ($self, $rmp) = @_; 1905 my ($self, $rmp) = @_;
1820 1906
1821 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1907 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1822 1908
1823 # mit "rum" bekleckern, nicht
1824 $self->_create_random_map ( 1909 $self->_create_random_map ($rmp);
1825 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1826 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1827 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1828 $rmp->{exit_on_final_map},
1829 $rmp->{xsize}, $rmp->{ysize},
1830 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1831 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1832 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1833 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1834 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1835 (cf::region::find $rmp->{region}), $rmp->{custom}
1836 )
1837} 1910}
1838 1911
1839=item cf::map->register ($regex, $prio) 1912=item cf::map->register ($regex, $prio)
1840 1913
1841Register a handler for the map path matching the given regex at the 1914Register a handler for the map path matching the given regex at the
… …
1846 1919
1847sub register { 1920sub register {
1848 my (undef, $regex, $prio) = @_; 1921 my (undef, $regex, $prio) = @_;
1849 my $pkg = caller; 1922 my $pkg = caller;
1850 1923
1851 no strict;
1852 push @{"$pkg\::ISA"}, __PACKAGE__; 1924 push @{"$pkg\::ISA"}, __PACKAGE__;
1853 1925
1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1926 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1855} 1927}
1856 1928
… …
1868} 1940}
1869 1941
1870sub normalise { 1942sub normalise {
1871 my ($path, $base) = @_; 1943 my ($path, $base) = @_;
1872 1944
1873 $path = "$path"; # make sure its a string 1945 $path = "$path"; # make sure it's a string
1874 1946
1875 $path =~ s/\.map$//; 1947 $path =~ s/\.map$//;
1876 1948
1877 # map plan: 1949 # map plan:
1878 # 1950 #
… …
1893 $base =~ s{[^/]+/?$}{}; 1965 $base =~ s{[^/]+/?$}{};
1894 $path = "$base/$path"; 1966 $path = "$base/$path";
1895 } 1967 }
1896 1968
1897 for ($path) { 1969 for ($path) {
1898 redo if s{//}{/};
1899 redo if s{/\.?/}{/}; 1970 redo if s{/\.?/}{/};
1900 redo if s{/[^/]+/\.\./}{/}; 1971 redo if s{/[^/]+/\.\./}{/};
1901 } 1972 }
1902 1973
1903 $path 1974 $path
… …
1917 $self->init; # pass $1 etc. 1988 $self->init; # pass $1 etc.
1918 return $self; 1989 return $self;
1919 } 1990 }
1920 } 1991 }
1921 1992
1922 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1993 Carp::cluck "unable to resolve path '$path' (base '$base')";
1923 () 1994 ()
1924} 1995}
1925 1996
1926sub init { 1997sub init {
1927 my ($self) = @_; 1998 my ($self) = @_;
… …
2049} 2120}
2050 2121
2051sub find; 2122sub find;
2052sub find { 2123sub find {
2053 my ($path, $origin) = @_; 2124 my ($path, $origin) = @_;
2125
2126 cf::cede_to_tick;
2054 2127
2055 $path = normalise $path, $origin && $origin->path; 2128 $path = normalise $path, $origin && $origin->path;
2056 2129
2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2058 my $guard2 = cf::lock_acquire "map_find:$path"; 2131 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2143 2216
2144 $self->in_memory (cf::MAP_ACTIVE); 2217 $self->in_memory (cf::MAP_ACTIVE);
2145 } 2218 }
2146 2219
2147 $self->post_load; 2220 $self->post_load;
2221
2222 1
2148} 2223}
2149 2224
2150# customize the map for a given player, i.e. 2225# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player 2226# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath 2227# maps to change the path to ~playername/mappath
… …
2190} 2265}
2191 2266
2192sub find_sync { 2267sub find_sync {
2193 my ($path, $origin) = @_; 2268 my ($path, $origin) = @_;
2194 2269
2195 cf::sync_job { find $path, $origin } 2270 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2271 if $Coro::current == $Coro::main;
2272
2273 find $path, $origin
2196} 2274}
2197 2275
2198sub do_load_sync { 2276sub do_load_sync {
2199 my ($map) = @_; 2277 my ($map) = @_;
2200 2278
2201 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2202 if $Coro::current == $Coro::main; 2280 if $Coro::current == $Coro::main;
2203 2281
2204 cf::sync_job { $map->load }; 2282 $map->load;
2205} 2283}
2206 2284
2207our %MAP_PREFETCH; 2285our %MAP_PREFETCH;
2208our $MAP_PREFETCHER = undef; 2286our $MAP_PREFETCHER = undef;
2209 2287
… …
3268 decrease split destroy change_exp value msg lore send_msg)], 3346 decrease split destroy change_exp value msg lore send_msg)],
3269 ["cf::object::player" => qw(player)], 3347 ["cf::object::player" => qw(player)],
3270 ["cf::player" => qw(peaceful send_msg)], 3348 ["cf::player" => qw(peaceful send_msg)],
3271 ["cf::map" => qw(trigger)], 3349 ["cf::map" => qw(trigger)],
3272) { 3350) {
3273 no strict 'refs';
3274 my ($pkg, @funs) = @$_; 3351 my ($pkg, @funs) = @$_;
3275 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3352 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3276 for @funs; 3353 for @funs;
3277} 3354}
3278 3355
… …
3365 3442
3366 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3443 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3367 3444
3368 trace "loading facedata from $path\n"; 3445 trace "loading facedata from $path\n";
3369 3446
3370 my $facedata; 3447 my $facedata = decode_storable load_file $path;
3371 0 < aio_load $path, $facedata
3372 or die "$path: $!";
3373
3374 $facedata = Coro::Storable::thaw $facedata;
3375 3448
3376 $facedata->{version} == 2 3449 $facedata->{version} == 2
3377 or cf::cleanup "$path: version mismatch, cannot proceed."; 3450 or cf::cleanup "$path: version mismatch, cannot proceed.";
3378 3451
3379 # patch in the exptable 3452 # patch in the exptable
… …
3393 3466
3394 cf::face::set_visibility $idx, $info->{visibility}; 3467 cf::face::set_visibility $idx, $info->{visibility};
3395 cf::face::set_magicmap $idx, $info->{magicmap}; 3468 cf::face::set_magicmap $idx, $info->{magicmap};
3396 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3469 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3397 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3470 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3471 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3398 3472
3399 cf::cede_to_tick; 3473 cf::cede_to_tick;
3400 } 3474 }
3401 3475
3402 while (my ($face, $info) = each %$faces) { 3476 while (my ($face, $info) = each %$faces) {
… …
3497} 3571}
3498 3572
3499sub reload_sound { 3573sub reload_sound {
3500 trace "loading sound config from $DATADIR/sound\n"; 3574 trace "loading sound config from $DATADIR/sound\n";
3501 3575
3502 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3503 or die "$DATADIR/sound $!";
3504
3505 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3576 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3506 3577
3507 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3578 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3508 my $sound = $soundconf->{compat}[$_] 3579 my $sound = $soundconf->{compat}[$_]
3509 or next; 3580 or next;
3510 3581
… …
3520} 3591}
3521 3592
3522sub reload_resources { 3593sub reload_resources {
3523 trace "reloading resource files...\n"; 3594 trace "reloading resource files...\n";
3524 3595
3596 reload_exp_table;
3597 reload_materials;
3525 reload_facedata; 3598 reload_facedata;
3526 reload_sound; 3599 reload_sound;
3527 reload_archetypes; 3600 reload_archetypes;
3528 reload_regions; 3601 reload_regions;
3529 reload_treasures; 3602 reload_treasures;
… …
3532} 3605}
3533 3606
3534sub reload_config { 3607sub reload_config {
3535 trace "reloading config file...\n"; 3608 trace "reloading config file...\n";
3536 3609
3537 open my $fh, "<:utf8", "$CONFDIR/config" 3610 my $config = load_file "$CONFDIR/config";
3538 or return; 3611 utf8::decode $config;
3539 3612 *CFG = decode_yaml $config;
3540 local $/;
3541 *CFG = YAML::XS::Load scalar <$fh>;
3542 3613
3543 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3614 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3544 3615
3545 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3616 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3546 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3617 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3550 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3621 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3551 and die "WARNING: m(un)lockall failed: $!\n"; 3622 and die "WARNING: m(un)lockall failed: $!\n";
3552 }; 3623 };
3553 warn $@ if $@; 3624 warn $@ if $@;
3554 } 3625 }
3555
3556 trace "finished reloading resource files\n";
3557} 3626}
3558 3627
3559sub pidfile() { 3628sub pidfile() {
3560 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3629 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3561 or die "$PIDFILE: $!"; 3630 or die "$PIDFILE: $!";
… …
3586 3655
3587sub main { 3656sub main {
3588 cf::init_globals; # initialise logging 3657 cf::init_globals; # initialise logging
3589 3658
3590 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3659 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3591 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3660 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3592 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3661 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3593 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3662 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3594 3663
3595 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3664 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3596 3665
… …
3604 }; 3673 };
3605 3674
3606 evthread_start IO::AIO::poll_fileno; 3675 evthread_start IO::AIO::poll_fileno;
3607 3676
3608 cf::sync_job { 3677 cf::sync_job {
3609 cf::init_experience; 3678 cf::incloader::init ();
3679
3610 cf::init_anim; 3680 cf::init_anim;
3611 cf::init_attackmess; 3681 cf::init_attackmess;
3612 cf::init_dynamic; 3682 cf::init_dynamic;
3613 3683
3614 cf::load_settings; 3684 cf::load_settings;
3615 cf::load_materials;
3616 3685
3617 reload_resources; 3686 reload_resources;
3618 reload_config; 3687 reload_config;
3619 db_init; 3688 db_init;
3620 3689
… …
3632 3701
3633 # no (long-running) fork's whatsoever before this point(!) 3702 # no (long-running) fork's whatsoever before this point(!)
3634 use POSIX (); 3703 use POSIX ();
3635 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3704 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3636 3705
3637 (pop @POST_INIT)->(0) while @POST_INIT; 3706 cf::_post_init 0;
3638 }; 3707 };
3639 3708
3640 cf::object::thawer::errors_are_fatal 0; 3709 cf::object::thawer::errors_are_fatal 0;
3641 info "parse errors in files are no longer fatal from this point on.\n"; 3710 info "parse errors in files are no longer fatal from this point on.\n";
3642 3711
3712 my $free_main; $free_main = EV::idle sub {
3713 undef $free_main;
3714 undef &main; # free gobs of memory :)
3715 };
3716
3643 main_loop; 3717 goto &main_loop;
3644} 3718}
3645 3719
3646############################################################################# 3720#############################################################################
3647# initialisation and cleanup 3721# initialisation and cleanup
3648 3722
… …
3747sub emergency_save() { 3821sub emergency_save() {
3748 my $freeze_guard = cf::freeze_mainloop; 3822 my $freeze_guard = cf::freeze_mainloop;
3749 3823
3750 info "emergency_perl_save: enter\n"; 3824 info "emergency_perl_save: enter\n";
3751 3825
3826 # this is a trade-off: we want to be very quick here, so
3827 # save all maps without fsync, and later call a global sync
3828 # (which in turn might be very very slow)
3829 local $USE_FSYNC = 0;
3830
3752 cf::sync_job { 3831 cf::sync_job {
3753 # this is a trade-off: we want to be very quick here, so 3832 cf::write_runtime_sync; # external watchdog should not bark
3754 # save all maps without fsync, and later call a global sync
3755 # (which in turn might be very very slow)
3756 local $USE_FSYNC = 0;
3757 3833
3758 # use a peculiar iteration method to avoid tripping on perl 3834 # use a peculiar iteration method to avoid tripping on perl
3759 # refcount bugs in for. also avoids problems with players 3835 # refcount bugs in for. also avoids problems with players
3760 # and maps saved/destroyed asynchronously. 3836 # and maps saved/destroyed asynchronously.
3761 info "emergency_perl_save: begin player save\n"; 3837 info "emergency_perl_save: begin player save\n";
… …
3765 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3841 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3766 $pl->save; 3842 $pl->save;
3767 } 3843 }
3768 info "emergency_perl_save: end player save\n"; 3844 info "emergency_perl_save: end player save\n";
3769 3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3770 info "emergency_perl_save: begin map save\n"; 3848 info "emergency_perl_save: begin map save\n";
3771 for my $path (keys %cf::MAP) { 3849 for my $path (keys %cf::MAP) {
3772 my $map = $cf::MAP{$path} or next; 3850 my $map = $cf::MAP{$path} or next;
3773 $map->valid or next; 3851 $map->valid or next;
3774 $map->save; 3852 $map->save;
3775 } 3853 }
3776 info "emergency_perl_save: end map save\n"; 3854 info "emergency_perl_save: end map save\n";
3777 3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3778 info "emergency_perl_save: begin database checkpoint\n"; 3858 info "emergency_perl_save: begin database checkpoint\n";
3779 BDB::db_env_txn_checkpoint $DB_ENV; 3859 BDB::db_env_txn_checkpoint $DB_ENV;
3780 info "emergency_perl_save: end database checkpoint\n"; 3860 info "emergency_perl_save: end database checkpoint\n";
3781 3861
3782 info "emergency_perl_save: begin write uuid\n"; 3862 info "emergency_perl_save: begin write uuid\n";
3783 write_uuid_sync 1; 3863 write_uuid_sync 1;
3784 info "emergency_perl_save: end write uuid\n"; 3864 info "emergency_perl_save: end write uuid\n";
3785 };
3786 3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 trace "emergency_perl_save: syncing database to disk";
3869 BDB::db_env_txn_checkpoint $DB_ENV;
3870
3787 info "emergency_perl_save: starting sync()\n"; 3871 info "emergency_perl_save: starting sync\n";
3788 IO::AIO::aio_sync sub { 3872 IO::AIO::aio_sync sub {
3789 info "emergency_perl_save: finished sync()\n"; 3873 info "emergency_perl_save: finished sync\n";
3874 };
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: flushing outstanding aio requests";
3879 while (IO::AIO::nreqs || BDB::nreqs) {
3880 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3881 }
3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3790 }; 3884 };
3791 3885
3792 info "emergency_perl_save: leave\n"; 3886 info "emergency_perl_save: leave\n";
3793} 3887}
3794 3888
3795sub post_cleanup { 3889sub post_cleanup {
3796 my ($make_core) = @_; 3890 my ($make_core) = @_;
3891
3892 IO::AIO::flush;
3797 3893
3798 error Carp::longmess "post_cleanup backtrace" 3894 error Carp::longmess "post_cleanup backtrace"
3799 if $make_core; 3895 if $make_core;
3800 3896
3801 my $fh = pidfile; 3897 my $fh = pidfile;
… …
3827 } 3923 }
3828} 3924}
3829 3925
3830sub do_reload_perl() { 3926sub do_reload_perl() {
3831 # can/must only be called in main 3927 # can/must only be called in main
3832 if (in_main) { 3928 unless (in_main) {
3833 error "can only reload from main coroutine"; 3929 error "can only reload from main coroutine";
3834 return; 3930 return;
3835 } 3931 }
3836 3932
3837 return if $RELOAD++; 3933 return if $RELOAD++;
3838 3934
3839 my $t1 = AE::time; 3935 my $t1 = AE::time;
3840 3936
3841 while ($RELOAD) { 3937 while ($RELOAD) {
3938 cf::get_slot 0.1, -1, "reload_perl";
3842 info "reloading..."; 3939 info "perl_reload: reloading...";
3843 3940
3844 trace "entering sync_job"; 3941 trace "perl_reload: entering sync_job";
3845 3942
3846 cf::sync_job { 3943 cf::sync_job {
3847 cf::write_runtime_sync; # external watchdog should not bark
3848 cf::emergency_save; 3944 #cf::emergency_save;
3849 cf::write_runtime_sync; # external watchdog should not bark
3850 3945
3851 trace "syncing database to disk";
3852 BDB::db_env_txn_checkpoint $DB_ENV;
3853
3854 # if anything goes wrong in here, we should simply crash as we already saved
3855
3856 trace "flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859 }
3860
3861 trace "cancelling all extension coros"; 3946 trace "perl_reload: cancelling all extension coros";
3862 $_->cancel for values %EXT_CORO; 3947 $_->cancel for values %EXT_CORO;
3863 %EXT_CORO = (); 3948 %EXT_CORO = ();
3864 3949
3865 trace "removing commands"; 3950 trace "perl_reload: removing commands";
3866 %COMMAND = (); 3951 %COMMAND = ();
3867 3952
3868 trace "removing ext/exti commands"; 3953 trace "perl_reload: removing ext/exti commands";
3869 %EXTCMD = (); 3954 %EXTCMD = ();
3870 %EXTICMD = (); 3955 %EXTICMD = ();
3871 3956
3872 trace "unloading/nuking all extensions"; 3957 trace "perl_reload: unloading/nuking all extensions";
3873 for my $pkg (@EXTS) { 3958 for my $pkg (@EXTS) {
3874 trace "... unloading $pkg"; 3959 trace "... unloading $pkg";
3875 3960
3876 if (my $cb = $pkg->can ("unload")) { 3961 if (my $cb = $pkg->can ("unload")) {
3877 eval { 3962 eval {
… …
3882 3967
3883 trace "... clearing $pkg"; 3968 trace "... clearing $pkg";
3884 clear_package $pkg; 3969 clear_package $pkg;
3885 } 3970 }
3886 3971
3887 trace "unloading all perl modules loaded from $LIBDIR"; 3972 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3888 while (my ($k, $v) = each %INC) { 3973 while (my ($k, $v) = each %INC) {
3889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3974 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3890 3975
3891 trace "... unloading $k"; 3976 trace "... unloading $k";
3892 delete $INC{$k}; 3977 delete $INC{$k};
… …
3899 } 3984 }
3900 3985
3901 clear_package $k; 3986 clear_package $k;
3902 } 3987 }
3903 3988
3904 trace "getting rid of safe::, as good as possible"; 3989 trace "perl_reload: getting rid of safe::, as good as possible";
3905 clear_package "safe::$_" 3990 clear_package "safe::$_"
3906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3991 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3907 3992
3908 trace "unloading cf.pm \"a bit\""; 3993 trace "perl_reload: unloading cf.pm \"a bit\"";
3909 delete $INC{"cf.pm"}; 3994 delete $INC{"cf.pm"};
3910 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3995 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3911 3996
3912 # don't, removes xs symbols, too, 3997 # don't, removes xs symbols, too,
3913 # and global variables created in xs 3998 # and global variables created in xs
3914 #clear_package __PACKAGE__; 3999 #clear_package __PACKAGE__;
3915 4000
3916 info "unload completed, starting to reload now"; 4001 info "perl_reload: unload completed, starting to reload now";
3917 4002
3918 trace "reloading cf.pm"; 4003 trace "perl_reload: reloading cf.pm";
3919 require cf; 4004 require cf;
3920 cf::_connect_to_perl_1; 4005 cf::_connect_to_perl_1;
3921 4006
3922 trace "loading config and database again"; 4007 trace "perl_reload: loading config and database again";
3923 cf::reload_config; 4008 cf::reload_config;
3924 4009
3925 trace "loading extensions"; 4010 trace "perl_reload: loading extensions";
3926 cf::load_extensions; 4011 cf::load_extensions;
3927 4012
3928 if ($REATTACH_ON_RELOAD) { 4013 if ($REATTACH_ON_RELOAD) {
3929 trace "reattaching attachments to objects/players"; 4014 trace "perl_reload: reattaching attachments to objects/players";
3930 _global_reattach; # objects, sockets 4015 _global_reattach; # objects, sockets
3931 trace "reattaching attachments to maps"; 4016 trace "perl_reload: reattaching attachments to maps";
3932 reattach $_ for values %MAP; 4017 reattach $_ for values %MAP;
3933 trace "reattaching attachments to players"; 4018 trace "perl_reload: reattaching attachments to players";
3934 reattach $_ for values %PLAYER; 4019 reattach $_ for values %PLAYER;
3935 } 4020 }
3936 4021
3937 trace "running post_init jobs"; 4022 cf::_post_init 1;
3938 (pop @POST_INIT)->(1) while @POST_INIT;
3939 4023
3940 trace "leaving sync_job"; 4024 trace "perl_reload: leaving sync_job";
3941 4025
3942 1 4026 1
3943 } or do { 4027 } or do {
3944 error $@; 4028 error $@;
3945 cf::cleanup "error while reloading, exiting."; 4029 cf::cleanup "perl_reload: error, exiting.";
3946 }; 4030 };
3947 4031
3948 info "reloaded";
3949 --$RELOAD; 4032 --$RELOAD;
3950 } 4033 }
3951 4034
3952 $t1 = AE::time - $t1; 4035 $t1 = AE::time - $t1;
3953 info "reload completed in ${t1}s\n"; 4036 info "perl_reload: completed in ${t1}s\n";
3954}; 4037};
3955 4038
3956our $RELOAD_WATCHER; # used only during reload 4039our $RELOAD_WATCHER; # used only during reload
3957 4040
3958sub reload_perl() { 4041sub reload_perl() {
… …
3979 reload_perl; 4062 reload_perl;
3980 }; 4063 };
3981 } 4064 }
3982}; 4065};
3983 4066
3984unshift @INC, $LIBDIR; 4067#############################################################################
3985 4068
3986my $bug_warning = 0; 4069my $bug_warning = 0;
3987 4070
3988our @WAIT_FOR_TICK; 4071our @WAIT_FOR_TICK;
3989our @WAIT_FOR_TICK_BEGIN; 4072our @WAIT_FOR_TICK_BEGIN;
3990 4073
3991sub wait_for_tick { 4074sub wait_for_tick() {
3992 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3993 4076
3994 my $signal = new Coro::Signal; 4077 my $signal = new Coro::Signal;
3995 push @WAIT_FOR_TICK, $signal; 4078 push @WAIT_FOR_TICK, $signal;
3996 $signal->wait; 4079 $signal->wait;
3997} 4080}
3998 4081
3999sub wait_for_tick_begin { 4082sub wait_for_tick_begin() {
4000 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4001 4084
4002 my $signal = new Coro::Signal; 4085 my $signal = new Coro::Signal;
4003 push @WAIT_FOR_TICK_BEGIN, $signal; 4086 push @WAIT_FOR_TICK_BEGIN, $signal;
4004 $signal->wait; 4087 $signal->wait;
… …
4056 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4139 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4057 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7; 4140 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4058 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4141 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4059 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4142 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
4060 4143
4061 (Coro::async { # async to keep sync_job from complaining
4062 cf::sync_job { 4144 cf::sync_job {
4063 eval { 4145 eval {
4064 BDB::db_env_open 4146 BDB::db_env_open
4065 $DB_ENV, 4147 $DB_ENV,
4066 $BDBDIR, 4148 $BDBDIR,
4067 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4149 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
4068 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4150 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
4069 0666; 4151 0666;
4070 4152
4071 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4153 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
4072 };
4073
4074 cf::cleanup "db_env_open(db): $@" if $@;
4075 }; 4154 };
4076 })->join; 4155
4156 cf::cleanup "db_env_open(db): $@" if $@;
4157 };
4077 } 4158 }
4078 4159
4079 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub { 4160 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4080 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4161 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4081 }; 4162 };
… …
4093 IO::AIO::min_parallel 8; 4174 IO::AIO::min_parallel 8;
4094 IO::AIO::max_poll_time $TICK * 0.1; 4175 IO::AIO::max_poll_time $TICK * 0.1;
4095 undef $AnyEvent::AIO::WATCHER; 4176 undef $AnyEvent::AIO::WATCHER;
4096} 4177}
4097 4178
4098my $_log_backtrace; 4179our $_log_backtrace;
4180our $_log_backtrace_last;
4099 4181
4100sub _log_backtrace { 4182sub _log_backtrace {
4101 my ($msg, @addr) = @_; 4183 my ($msg, @addr) = @_;
4102 4184
4103 $msg =~ s/\n//; 4185 $msg =~ s/\n$//;
4104 4186
4187 if ($_log_backtrace_last eq $msg) {
4188 LOG llevInfo, "[ABT] $msg\n";
4189 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4105 # limit the # of concurrent backtraces 4190 # limit the # of concurrent backtraces
4106 if ($_log_backtrace < 2) { 4191 } elsif ($_log_backtrace < 2) {
4192 $_log_backtrace_last = $msg;
4107 ++$_log_backtrace; 4193 ++$_log_backtrace;
4108 my $perl_bt = Carp::longmess $msg; 4194 my $perl_bt = Carp::longmess $msg;
4109 async { 4195 async {
4110 $Coro::current->{desc} = "abt $msg"; 4196 $Coro::current->{desc} = "abt $msg";
4111 4197
… …
4131 LOG llevInfo, "[ABT] $_\n" for @bt; 4217 LOG llevInfo, "[ABT] $_\n" for @bt;
4132 --$_log_backtrace; 4218 --$_log_backtrace;
4133 }; 4219 };
4134 } else { 4220 } else {
4135 LOG llevInfo, "[ABT] $msg\n"; 4221 LOG llevInfo, "[ABT] $msg\n";
4136 LOG llevInfo, "[ABT] [suppressed]\n"; 4222 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4137 } 4223 }
4138} 4224}
4139 4225
4140# load additional modules 4226# load additional modules
4141require "cf/$_.pm" for @EXTRA_MODULES; 4227require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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