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.550 by root, Fri May 14 22:56:47 2010 UTC vs.
Revision 1.567 by root, Mon May 2 16:16:00 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011 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.
… …
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";
… …
312} 314}
313 315
314$EV::DIED = sub { 316$EV::DIED = sub {
315 Carp::cluck "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
316}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
317 324
318############################################################################# 325#############################################################################
319 326
320=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
321 328
… …
342 $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;
343 $d 350 $d
344 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
345} 352}
346 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
347=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
348 369
349Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
350 371
351=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
357our $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
358 379
359sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
361 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
362=item $ref = cf::yaml_load $scalar 391=item $ref = cf::decode_yaml $scalar
363 392
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). 393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365 394
366=cut 395=cut
367 396
368sub fork_call(&@); 397sub decode_yaml($) {
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_ 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]
372} 412}
373 413
374=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
375 415
376Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
… …
460 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
461} 501}
462 502
463=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
464 504
465Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
466This 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
467of 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.
468 512
469The 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
470used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
471 515
472Useful for short background jobs. 516Useful for short background jobs.
… …
767 811
768 my @data; 812 my @data;
769 my $md5; 813 my $md5;
770 814
771 for (0 .. $#$src) { 815 for (0 .. $#$src) {
772 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
773 or Carp::croak "$src->[$_]: $!";
774 } 817 }
775 818
776 # if processing is expensive, check 819 # if processing is expensive, check
777 # checksum first 820 # checksum first
778 if (1) { 821 if (1) {
… …
1512 1555
1513 while (my ($k, $v) = each %todo) { 1556 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory}; 1558 if exists $v->{meta}{mandatory};
1516 } 1559 }
1560
1561 last;
1517 } 1562 }
1518 } 1563 }
1519 }; 1564 };
1520} 1565}
1521 1566
… …
1861sub generate_random_map { 1906sub generate_random_map {
1862 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1863 1908
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865 1910
1866 # mit "rum" bekleckern, nicht
1867 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1871 $rmp->{exit_on_final_map},
1872 $rmp->{xsize}, $rmp->{ysize},
1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1875 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1876 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1877 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1878 (cf::region::find $rmp->{region}), $rmp->{custom}
1879 )
1880} 1912}
1881 1913
1882=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1883 1915
1884Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
… …
1935 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1936 $path = "$base/$path"; 1968 $path = "$base/$path";
1937 } 1969 }
1938 1970
1939 for ($path) { 1971 for ($path) {
1940 redo if s{//}{/};
1941 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1942 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1943 } 1974 }
1944 1975
1945 $path 1976 $path
… …
1963 1994
1964 Carp::cluck "unable to resolve path '$path' (base '$base')"; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1965 () 1996 ()
1966} 1997}
1967 1998
1999# may re-bless or do other evil things
1968sub init { 2000sub init {
1969 my ($self) = @_; 2001 my ($self) = @_;
1970 2002
1971 $self 2003 $self
1972} 2004}
… …
2037 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
2038 2070
2039 1 2071 1
2040} 2072}
2041 2073
2074# used to laod the header of an original map
2042sub load_header_orig { 2075sub load_header_orig {
2043 my ($self) = @_; 2076 my ($self) = @_;
2044 2077
2045 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
2046} 2079}
2047 2080
2081# used to laod the header of an instantiated map
2048sub load_header_temp { 2082sub load_header_temp {
2049 my ($self) = @_; 2083 my ($self) = @_;
2050 2084
2051 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
2052} 2086}
2053 2087
2088# called after loading the header from an instantiated map
2054sub prepare_temp { 2089sub prepare_temp {
2055 my ($self) = @_; 2090 my ($self) = @_;
2056 2091
2057 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
2058 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
2059 # safety 2094 # safety
2060 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
2061 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
2062} 2097}
2063 2098
2099# called after loading the header from an original map
2064sub prepare_orig { 2100sub prepare_orig {
2065 my ($self) = @_; 2101 my ($self) = @_;
2066 2102
2067 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
2068 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
… …
2094sub find { 2130sub find {
2095 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
2096 2132
2097 cf::cede_to_tick; 2133 cf::cede_to_tick;
2098 2134
2099 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
2100 2136
2101 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2102 my $guard2 = cf::lock_acquire "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
2103 2139
2104 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
… …
2144 $self->alloc; 2180 $self->alloc;
2145 2181
2146 $self->pre_load; 2182 $self->pre_load;
2147 cf::cede_to_tick; 2183 cf::cede_to_tick;
2148 2184
2185 if (exists $self->{load_path}) {
2149 my $f = new_from_file cf::object::thawer $self->{load_path}; 2186 my $f = new_from_file cf::object::thawer $self->{load_path};
2150 $f->skip_block; 2187 $f->skip_block;
2151 $self->_load_objects ($f) 2188 $self->_load_objects ($f)
2152 or return; 2189 or return;
2153 2190
2154 $self->post_load_original 2191 $self->post_load_original
2155 if delete $self->{load_original}; 2192 if delete $self->{load_original};
2156 2193
2157 if (my $uniq = $self->uniq_path) { 2194 if (my $uniq = $self->uniq_path) {
2158 utf8::encode $uniq; 2195 utf8::encode $uniq;
2159 unless (aio_stat $uniq) { 2196 unless (aio_stat $uniq) {
2160 if (my $f = new_from_file cf::object::thawer $uniq) { 2197 if (my $f = new_from_file cf::object::thawer $uniq) {
2161 $self->clear_unique_items; 2198 $self->clear_unique_items;
2162 $self->_load_objects ($f); 2199 $self->_load_objects ($f);
2163 $f->resolve_delayed_derefs; 2200 $f->resolve_delayed_derefs;
2201 }
2164 } 2202 }
2165 } 2203 }
2166 }
2167 2204
2168 $f->resolve_delayed_derefs; 2205 $f->resolve_delayed_derefs;
2206 } else {
2207 $self->post_load_original
2208 if delete $self->{load_original};
2209 }
2169 2210
2170 cf::cede_to_tick; 2211 cf::cede_to_tick;
2171 # now do the right thing for maps 2212 # now do the right thing for maps
2172 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
2173 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
… …
2187 2228
2188 $self->in_memory (cf::MAP_ACTIVE); 2229 $self->in_memory (cf::MAP_ACTIVE);
2189 } 2230 }
2190 2231
2191 $self->post_load; 2232 $self->post_load;
2233
2234 1
2192} 2235}
2193 2236
2194# customize the map for a given player, i.e. 2237# customize the map for a given player, i.e.
2195# return the _real_ map. used by e.g. per-player 2238# return the _real_ map. used by e.g. per-player
2196# maps to change the path to ~playername/mappath 2239# maps to change the path to ~playername/mappath
… …
2255our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2256 2299
2257sub find_async { 2300sub find_async {
2258 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2259 2302
2260 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2261 2304
2262 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2263 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2306 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2264 } 2307 }
2265 2308
… …
2776 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2777 } 2820 }
2778 } 2821 }
2779 2822
2780 my $map = eval { 2823 my $map = eval {
2781 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2782 2825
2783 if ($map) { 2826 if ($map) {
2784 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2785 $map = $check->($map, $x, $y, $self) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2786 } else { 2829 } else {
… …
2876 $Coro::current->{desc} = "enter_exit"; 2919 $Coro::current->{desc} = "enter_exit";
2877 2920
2878 unless (eval { 2921 unless (eval {
2879 $self->deactivate_recursive; # just to be sure 2922 $self->deactivate_recursive; # just to be sure
2880 2923
2881 # random map handling
2882 {
2883 my $guard = cf::lock_acquire "exit_prepare:$exit";
2884
2885 prepare_random_map $exit
2886 if $exit->slaying eq "/!";
2887 }
2888
2889 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2890 my $x = $exit->stats->hp; 2925 my $x = $exit->stats->hp;
2891 my $y = $exit->stats->sp; 2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $slaying eq "/!"; # need to re-check after getting the lock
2937
2938 } elsif ($slaying eq '!up') {
2939 $map = $exit->map->tile_path (cf::TILE_UP);
2940 $x = $exit->x;
2941 $y = $exit->y;
2942
2943 } elsif ($slaying eq '!down') {
2944 $map = $exit->map->tile_path (cf::TILE_DOWN);
2945 $x = $exit->x;
2946 $y = $exit->y;
2947 }
2892 2948
2893 $self->goto ($map, $x, $y); 2949 $self->goto ($map, $x, $y);
2894 2950
2895 # if exit is damned, update players death & WoR home-position 2951 # if exit is damned, update players death & WoR home-position
2896 $self->contr->savebed ($map, $x, $y) 2952 $self->contr->savebed ($map, $x, $y)
… …
3411 3467
3412 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3468 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3413 3469
3414 trace "loading facedata from $path\n"; 3470 trace "loading facedata from $path\n";
3415 3471
3416 0 < aio_load $path, my $facedata 3472 my $facedata = decode_storable load_file $path;
3417 or die "$path: $!";
3418
3419 $facedata = Coro::Storable::thaw $facedata;
3420 3473
3421 $facedata->{version} == 2 3474 $facedata->{version} == 2
3422 or cf::cleanup "$path: version mismatch, cannot proceed."; 3475 or cf::cleanup "$path: version mismatch, cannot proceed.";
3423 3476
3424 # patch in the exptable 3477 # patch in the exptable
… …
3438 3491
3439 cf::face::set_visibility $idx, $info->{visibility}; 3492 cf::face::set_visibility $idx, $info->{visibility};
3440 cf::face::set_magicmap $idx, $info->{magicmap}; 3493 cf::face::set_magicmap $idx, $info->{magicmap};
3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3494 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3495 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3496 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3443 3497
3444 cf::cede_to_tick; 3498 cf::cede_to_tick;
3445 } 3499 }
3446 3500
3447 while (my ($face, $info) = each %$faces) { 3501 while (my ($face, $info) = each %$faces) {
… …
3542} 3596}
3543 3597
3544sub reload_sound { 3598sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n"; 3599 trace "loading sound config from $DATADIR/sound\n";
3546 3600
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3601 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3551 3602
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3603 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_] 3604 my $sound = $soundconf->{compat}[$_]
3554 or next; 3605 or next;
3555 3606
… …
3579} 3630}
3580 3631
3581sub reload_config { 3632sub reload_config {
3582 trace "reloading config file...\n"; 3633 trace "reloading config file...\n";
3583 3634
3584 0 < aio_load "$CONFDIR/config", my $config 3635 my $config = load_file "$CONFDIR/config";
3585 or die "$CONFDIR/config: $!";
3586
3587 utf8::decode $config; 3636 utf8::decode $config;
3588 *CFG = yaml_load $config; 3637 *CFG = decode_yaml $config;
3589 3638
3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3639 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3591 3640
3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3641 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3642 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3631 3680
3632sub main { 3681sub main {
3633 cf::init_globals; # initialise logging 3682 cf::init_globals; # initialise logging
3634 3683
3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3684 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3685 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3686 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3687 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3639 3688
3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3689 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3641 3690
… …
4150 IO::AIO::min_parallel 8; 4199 IO::AIO::min_parallel 8;
4151 IO::AIO::max_poll_time $TICK * 0.1; 4200 IO::AIO::max_poll_time $TICK * 0.1;
4152 undef $AnyEvent::AIO::WATCHER; 4201 undef $AnyEvent::AIO::WATCHER;
4153} 4202}
4154 4203
4155my $_log_backtrace; 4204our $_log_backtrace;
4205our $_log_backtrace_last;
4156 4206
4157sub _log_backtrace { 4207sub _log_backtrace {
4158 my ($msg, @addr) = @_; 4208 my ($msg, @addr) = @_;
4159 4209
4160 $msg =~ s/\n//; 4210 $msg =~ s/\n$//;
4161 4211
4212 if ($_log_backtrace_last eq $msg) {
4213 LOG llevInfo, "[ABT] $msg\n";
4214 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4162 # limit the # of concurrent backtraces 4215 # limit the # of concurrent backtraces
4163 if ($_log_backtrace < 2) { 4216 } elsif ($_log_backtrace < 2) {
4217 $_log_backtrace_last = $msg;
4164 ++$_log_backtrace; 4218 ++$_log_backtrace;
4165 my $perl_bt = Carp::longmess $msg; 4219 my $perl_bt = Carp::longmess $msg;
4166 async { 4220 async {
4167 $Coro::current->{desc} = "abt $msg"; 4221 $Coro::current->{desc} = "abt $msg";
4168 4222
… …
4188 LOG llevInfo, "[ABT] $_\n" for @bt; 4242 LOG llevInfo, "[ABT] $_\n" for @bt;
4189 --$_log_backtrace; 4243 --$_log_backtrace;
4190 }; 4244 };
4191 } else { 4245 } else {
4192 LOG llevInfo, "[ABT] $msg\n"; 4246 LOG llevInfo, "[ABT] $msg\n";
4193 LOG llevInfo, "[ABT] [suppressed]\n"; 4247 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4194 } 4248 }
4195} 4249}
4196 4250
4197# load additional modules 4251# load additional modules
4198require "cf/$_.pm" for @EXTRA_MODULES; 4252require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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