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.257 by root, Sat Apr 21 17:34:24 2007 UTC vs.
Revision 1.276 by root, Sun Jun 10 04:05:47 2007 UTC

… …
90our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
91 91
92# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 94
95our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing
97our $tick_start; # for load detecting purposes
98
95binmode STDOUT; 99binmode STDOUT;
96binmode STDERR; 100binmode STDERR;
97 101
98# read virtual server time, if available 102# read virtual server time, if available
99unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
… …
139 143
140=item $cf::TICK 144=item $cf::TICK
141 145
142The interval between server ticks, in seconds. 146The interval between server ticks, in seconds.
143 147
148=item $cf::LOADAVG
149
150The current CPU load on the server (alpha-smoothed), as a value between 0
151(none) and 1 (overloaded), indicating how much time is spent on processing
152objects per tick. Healthy values are < 0.5.
153
154=item $cf::LOAD
155
156The raw value load value from the last tick.
157
144=item %cf::CFG 158=item %cf::CFG
145 159
146Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
147from wherever your confdir points to. 161from wherever your confdir points to.
148 162
… …
173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
192@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
178@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 193@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
179 194
180# we bless all objects into (empty) derived classes to force a method lookup 195# we bless all objects into (empty) derived classes to force a method lookup
181# within the Safe compartment. 196# within the Safe compartment.
182for my $pkg (qw( 197for my $pkg (qw(
183 cf::global cf::attachable 198 cf::global cf::attachable
… …
318 333
319sub sync_job(&) { 334sub sync_job(&) {
320 my ($job) = @_; 335 my ($job) = @_;
321 336
322 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
323 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
325 342
326 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 344 # (but this is cancel-safe)
… …
338 355
339 while ($busy) { 356 while ($busy) {
340 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
341 } 358 }
342 359
360 $time = Event::time - $time;
361
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load
366
343 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
344 } else { 368 } else {
345 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
346 370
347 $job->() 371 $job->()
… …
367 391
368 $coro 392 $coro
369} 393}
370 394
371sub write_runtime { 395sub write_runtime {
396 my $runtime = "$LOCALDIR/runtime";
397
398 # first touch the runtime file to show we are still running:
399 # the fsync below can take a very very long time.
400
401 IO::AIO::aio_utime $runtime, undef, undef;
402
372 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
373
374 my $runtime = "$LOCALDIR/runtime";
375 404
376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
377 or return; 406 or return;
378 407
379 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
… …
385 414
386 # always fsync - this file is important 415 # always fsync - this file is important
387 aio_fsync $fh 416 aio_fsync $fh
388 and return; 417 and return;
389 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
390 close $fh 422 close $fh
391 or return; 423 or return;
392 424
393 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
394 and return; 426 and return;
427
428 warn "runtime file written.\n";
395 429
396 1 430 1
397} 431}
398 432
399=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
592 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
593 627
594 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
595 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
596 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
597 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
598 632
599 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
600 my $pkg = shift @arg; 634 my $pkg = shift @arg;
601 635
602 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
… …
643 if (ref $_[0]) { 677 if (ref $_[0]) {
644 _object_attach @_; 678 _object_attach @_;
645 } else { 679 } else {
646 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
647 } 681 }
682 _recalc_want;
648}; 683};
649 684
650# all those should be optimised 685# all those should be optimised
651sub cf::attachable::detach { 686sub cf::attachable::detach {
652 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
… …
655 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
656 reattach ($obj); 691 reattach ($obj);
657 } else { 692 } else {
658 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
659 } 694 }
695 _recalc_want;
660}; 696};
661 697
662sub cf::attachable::attached { 698sub cf::attachable::attached {
663 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
664 700
… …
837 or return; 873 or return;
838 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
839 } 875 }
840 876
841 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
842 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
843 return ($data, $av); 879 return ($data, $av);
844} 880}
845 881
846############################################################################# 882#############################################################################
847# command handling &c 883# command handling &c
… …
1269 my ($self, $merge) = @_; 1305 my ($self, $merge) = @_;
1270 1306
1271 # we have to keep some variables in memory intact 1307 # we have to keep some variables in memory intact
1272 local $self->{path}; 1308 local $self->{path};
1273 local $self->{load_path}; 1309 local $self->{load_path};
1274 local $self->{deny_save};
1275 local $self->{deny_reset};
1276 1310
1277 $self->SUPER::thawer_merge ($merge); 1311 $self->SUPER::thawer_merge ($merge);
1278} 1312}
1279 1313
1280sub normalise { 1314sub normalise {
… …
1380 1414
1381 $_->change_map_light ($change) 1415 $_->change_map_light ($change)
1382 for grep $_->outdoor, values %cf::MAP; 1416 for grep $_->outdoor, values %cf::MAP;
1383} 1417}
1384 1418
1419sub decay_objects {
1420 my ($self) = @_;
1421
1422 return if $self->{deny_reset};
1423
1424 $self->do_decay_objects;
1425}
1426
1385sub unlink_save { 1427sub unlink_save {
1386 my ($self) = @_; 1428 my ($self) = @_;
1387 1429
1388 utf8::encode (my $save = $self->save_path); 1430 utf8::encode (my $save = $self->save_path);
1389 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1431 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1445 $self->load_header_orig 1487 $self->load_header_orig
1446 or return; 1488 or return;
1447 $self->prepare_orig; 1489 $self->prepare_orig;
1448 } 1490 }
1449 1491
1492 $self->{deny_reset} = 1
1493 if $self->no_reset;
1494
1450 $self->default_region (cf::region::find_by_path $self->{path}) 1495 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region; 1496 unless $self->default_region;
1452 1497
1453 1 1498 1
1454} 1499}
… …
1469 $map->{last_save} = $cf::RUNTIME; 1514 $map->{last_save} = $cf::RUNTIME;
1470 1515
1471 $map->load_header 1516 $map->load_header
1472 or return; 1517 or return;
1473 1518
1474 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1519 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1475 # doing this can freeze the server in a sync job, obviously 1520 # doing this can freeze the server in a sync job, obviously
1476 #$cf::WAIT_FOR_TICK->wait; 1521 #$cf::WAIT_FOR_TICK->wait;
1477 $map->reset; 1522 $map->reset;
1478 undef $guard; 1523 undef $guard;
1479 return find $path; 1524 return find $path;
… …
1546 my ($self, $ob) = @_; 1591 my ($self, $ob) = @_;
1547 1592
1548 return find "~" . $ob->name . "/" . $self->{path} 1593 return find "~" . $ob->name . "/" . $self->{path}
1549 if $self->per_player; 1594 if $self->per_player;
1550 1595
1596# return find "?party/" . $ob->name . "/" . $self->{path}
1597# if $self->per_party;
1598
1551 $self 1599 $self
1552} 1600}
1553 1601
1554# find and load all maps in the 3x3 area around a map 1602# find and load all maps in the 3x3 area around a map
1555sub load_diag { 1603sub load_diag {
… …
1665 1713
1666sub reset_at { 1714sub reset_at {
1667 my ($self) = @_; 1715 my ($self) = @_;
1668 1716
1669 # TODO: safety, remove and allow resettable per-player maps 1717 # TODO: safety, remove and allow resettable per-player maps
1670 return 1e99 if $self->isa ("ext::map_per_player");#d#
1671 return 1e99 if $self->{deny_reset}; 1718 return 1e99 if $self->{deny_reset};
1672 1719
1673 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1720 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1674 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1721 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1675 1722
… …
1686 my ($self) = @_; 1733 my ($self) = @_;
1687 1734
1688 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1735 my $lock = cf::lock_acquire "map_data:$self->{path}";
1689 1736
1690 return if $self->players; 1737 return if $self->players;
1691 return if $self->isa ("ext::map_per_player");#d#
1692 1738
1693 warn "resetting map ", $self->path;#d# 1739 warn "resetting map ", $self->path;
1694 1740
1695 $self->in_memory (cf::MAP_SWAPPED); 1741 $self->in_memory (cf::MAP_SWAPPED);
1696 1742
1697 # need to save uniques path 1743 # need to save uniques path
1698 unless ($self->{deny_save}) { 1744 unless ($self->{deny_save}) {
… …
1730 $cf::MAP{$self->path} = $self; 1776 $cf::MAP{$self->path} = $self;
1731 1777
1732 $self->reset; # polite request, might not happen 1778 $self->reset; # polite request, might not happen
1733} 1779}
1734 1780
1781=item $maps = cf::map::tmp_maps
1782
1783Returns an arrayref with all map paths of currently instantiated and saved
1784maps.
1785
1786=cut
1787
1788sub tmp_maps() {
1789 [
1790 map {
1791 utf8::decode $_;
1792 !/\.(?:pst|meta)$/ && /^$PATH_SEP/o
1793 ? normalise $_
1794 : ()
1795 } @{ aio_readdir $TMPDIR or [] }
1796 ]
1797}
1798
1735=item cf::map::unique_maps 1799=item cf::map::unique_maps
1736 1800
1737Returns an arrayref of paths of all shared maps that have 1801Returns an arrayref of paths of all shared maps that have
1738instantiated unique items. May block. 1802instantiated unique items. May block.
1739 1803
1740=cut 1804=cut
1741 1805
1742sub unique_maps() { 1806sub unique_maps() {
1743 my $files = aio_readdir $UNIQUEDIR 1807 [
1744 or return; 1808 map {
1745
1746 my @paths;
1747
1748 for (@$files) {
1749 utf8::decode $_; 1809 utf8::decode $_;
1750 next if /\.pst$/; 1810 !/\.(?:pst|meta)$/ && /^$PATH_SEP/o
1751 next unless /^$PATH_SEP/o; 1811 ? normalise $_
1752 1812 : ()
1753 push @paths, cf::map::normalise $_; 1813 } @{ aio_readdir $UNIQUEDIR or [] }
1754 } 1814 ]
1755
1756 \@paths
1757} 1815}
1758 1816
1759package cf; 1817package cf;
1760 1818
1761=back 1819=back
… …
1862} 1920}
1863 1921
1864sub cf::object::player::enter_link { 1922sub cf::object::player::enter_link {
1865 my ($self) = @_; 1923 my ($self) = @_;
1866 1924
1925 $self->deactivate_recursive;
1926
1867 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1927 return if UNIVERSAL::isa $self->map, "ext::map_link";
1868 1928
1869 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1929 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1870 if $self->map; 1930 if $self->map && $self->map->{path} ne "{link}";
1871 1931
1872 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1932 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1873} 1933}
1874 1934
1875sub cf::object::player::leave_link { 1935sub cf::object::player::leave_link {
1876 my ($self, $map, $x, $y) = @_; 1936 my ($self, $map, $x, $y) = @_;
1937
1938 return unless $self->contr->active;
1877 1939
1878 my $link_pos = delete $self->{_link_pos}; 1940 my $link_pos = delete $self->{_link_pos};
1879 1941
1880 unless ($map) { 1942 unless ($map) {
1881 # restore original map position 1943 # restore original map position
… …
1904 1966
1905 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1967 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1906 $self->enter_map ($map, $x, $y); 1968 $self->enter_map ($map, $x, $y);
1907} 1969}
1908 1970
1909cf::player->attach (
1910 on_logout => sub {
1911 my ($pl) = @_;
1912
1913 # abort map switching before logout
1914 if ($pl->ob->{_link_pos}) {
1915 cf::sync_job {
1916 $pl->ob->leave_link
1917 };
1918 }
1919 },
1920 on_login => sub {
1921 my ($pl) = @_;
1922
1923 # try to abort aborted map switching on player login :)
1924 # should happen only on crashes
1925 if ($pl->ob->{_link_pos}) {
1926 $pl->ob->enter_link;
1927 (async {
1928 $pl->ob->reply (undef,
1929 "There was an internal problem at your last logout, "
1930 . "the server will try to bring you to your intended destination in a second.",
1931 cf::NDI_RED);
1932 # we need this sleep as the login has a concurrent enter_exit running
1933 # and this sleep increases chances of the player not ending up in scorn
1934 Coro::Timer::sleep 1;
1935 $pl->ob->leave_link;
1936 })->prio (2);
1937 }
1938 },
1939);
1940
1941=item $player_object->goto ($path, $x, $y) 1971=item $player_object->goto ($path, $x, $y[, $check->($map)])
1942 1972
1973Moves the player to the given map-path and coordinates by first freezing
1974her, loading and preparing them map, calling the provided $check callback
1975that has to return the map if sucecssful, and then unfreezes the player on
1976the new (success) or old (failed) map position.
1977
1943=cut 1978=cut
1979
1980our $GOTOGEN;
1944 1981
1945sub cf::object::player::goto { 1982sub cf::object::player::goto {
1946 my ($self, $path, $x, $y) = @_; 1983 my ($self, $path, $x, $y, $check) = @_;
1984
1985 # do generation counting so two concurrent goto's will be executed in-order
1986 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1947 1987
1948 $self->enter_link; 1988 $self->enter_link;
1949 1989
1950 (async { 1990 (async {
1951 my $map = eval { 1991 my $map = eval {
1952 my $map = cf::map::find $path; 1992 my $map = cf::map::find $path;
1993
1994 if ($map) {
1953 $map = $map->customise_for ($self) if $map; 1995 $map = $map->customise_for ($self);
1996 $map = $check->($map) if $check && $map;
1997 } else {
1998 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1999 }
2000
1954 $map 2001 $map
2002 };
2003
2004 if ($@) {
2005 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2006 LOG llevError | logBacktrace, Carp::longmess $@;
1955 } or 2007 }
1956 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1957 2008
2009 if ($gen == $self->{_goto_generation}) {
2010 delete $self->{_goto_generation};
1958 $self->leave_link ($map, $x, $y); 2011 $self->leave_link ($map, $x, $y);
2012 }
1959 })->prio (1); 2013 })->prio (1);
1960} 2014}
1961 2015
1962=item $player_object->enter_exit ($exit_object) 2016=item $player_object->enter_exit ($exit_object)
1963 2017
… …
2433 2487
2434 die $$res unless "ARRAY" eq ref $res; 2488 die $$res unless "ARRAY" eq ref $res;
2435 2489
2436 return wantarray ? @$res : $res->[-1]; 2490 return wantarray ? @$res : $res->[-1];
2437 } else { 2491 } else {
2492 reset_signals;
2438 local $SIG{__WARN__}; 2493 local $SIG{__WARN__};
2494 local $SIG{__DIE__};
2439 eval { 2495 eval {
2440 local $SIG{__DIE__};
2441 close $fh1; 2496 close $fh1;
2442 2497
2443 my @res = eval { $cb->(@args) }; 2498 my @res = eval { $cb->(@args) };
2444 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 2499 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2445 }; 2500 };
2446 2501
2447 warn $@ if $@; 2502 warn $@ if $@;
2448 _exit 0; 2503 _exit 0;
2449 } 2504 }
2450} 2505}
2451
2452
2453 2506
2454############################################################################# 2507#############################################################################
2455# the server's init and main functions 2508# the server's init and main functions
2456 2509
2457sub load_facedata($) { 2510sub load_facedata($) {
… …
2529sub reload_resources { 2582sub reload_resources {
2530 warn "reloading resource files...\n"; 2583 warn "reloading resource files...\n";
2531 2584
2532 reload_regions; 2585 reload_regions;
2533 reload_facedata; 2586 reload_facedata;
2587 #reload_archetypes;#d#
2534 reload_archetypes; 2588 reload_archetypes;
2535 reload_treasures; 2589 reload_treasures;
2536 2590
2537 warn "finished reloading resource files\n"; 2591 warn "finished reloading resource files\n";
2538} 2592}
… …
2808 my $signal = new Coro::Signal; 2862 my $signal = new Coro::Signal;
2809 push @WAIT_FOR_TICK_BEGIN, $signal; 2863 push @WAIT_FOR_TICK_BEGIN, $signal;
2810 $signal->wait; 2864 $signal->wait;
2811} 2865}
2812 2866
2867 my $min = 1e6;#d#
2868 my $avg = 10;
2813$TICK_WATCHER = Event->timer ( 2869$TICK_WATCHER = Event->timer (
2814 reentrant => 0, 2870 reentrant => 0,
2815 parked => 1, 2871 parked => 1,
2816 prio => 0, 2872 prio => 0,
2817 at => $NEXT_TICK || $TICK, 2873 at => $NEXT_TICK || $TICK,
… …
2821 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2877 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2822 unless ++$bug_warning > 10; 2878 unless ++$bug_warning > 10;
2823 return; 2879 return;
2824 } 2880 }
2825 2881
2826 $NOW = Event::time; 2882 $NOW = $tick_start = Event::time;
2827 2883
2828 cf::server_tick; # one server iteration 2884 cf::server_tick; # one server iteration
2885
2886 0 && sync_job {#d#
2887 for(1..10) {
2888 my $t = Event::time;
2889 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2890 or die;
2891
2892 $map->width (50);
2893 $map->height (50);
2894 $map->alloc;
2895 $map->_load_objects ("/tmp/x.map", 1);
2896 my $t = Event::time - $t;
2897
2898 #next unless $t < 0.0013;#d#
2899 if ($t < $min) {
2900 $min = $t;
2901 }
2902 $avg = $avg * 0.99 + $t * 0.01;
2903 }
2904 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2905 exit 0;
2906 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2907 };
2829 2908
2830 $RUNTIME += $TICK; 2909 $RUNTIME += $TICK;
2831 $NEXT_TICK += $TICK; 2910 $NEXT_TICK += $TICK;
2832 2911
2833 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2912 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
2839 } 2918 }
2840 2919
2841# my $AFTER = Event::time; 2920# my $AFTER = Event::time;
2842# warn $AFTER - $NOW;#d# 2921# warn $AFTER - $NOW;#d#
2843 2922
2923 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2924 $sig->send;
2925 }
2926 while (my $sig = shift @WAIT_FOR_TICK) {
2927 $sig->send;
2928 }
2929
2930 $NOW = Event::time;
2931
2844 # if we are delayed by four ticks or more, skip them all 2932 # if we are delayed by four ticks or more, skip them all
2845 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2933 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2846 2934
2847 $TICK_WATCHER->at ($NEXT_TICK); 2935 $TICK_WATCHER->at ($NEXT_TICK);
2848 $TICK_WATCHER->start; 2936 $TICK_WATCHER->start;
2849 2937
2850 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2938 $LOAD = ($NOW - $tick_start) / $TICK;
2851 $sig->send; 2939 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2852 }
2853 while (my $sig = shift @WAIT_FOR_TICK) {
2854 $sig->send;
2855 }
2856 2940
2857 _post_tick; 2941 _post_tick;
2942
2943
2858 }, 2944 },
2859); 2945);
2860 2946
2861{ 2947{
2862 BDB::max_poll_time $TICK * 0.1; 2948 BDB::max_poll_time $TICK * 0.1;
… …
2921 prio => 6, 3007 prio => 6,
2922 cb => \&IO::AIO::poll_cb, 3008 cb => \&IO::AIO::poll_cb,
2923 ); 3009 );
2924} 3010}
2925 3011
3012my $_log_backtrace;
3013
3014sub _log_backtrace {
3015 my ($msg, @addr) = @_;
3016
3017 $msg =~ s/\n//;
3018
3019 # limit the # of concurrent backtraces
3020 if ($_log_backtrace < 2) {
3021 ++$_log_backtrace;
3022 async {
3023 my @bt = fork_call {
3024 @addr = map { sprintf "%x", $_ } @addr;
3025 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3026 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3027 or die "addr2line: $!";
3028
3029 my @funcs;
3030 my @res = <$fh>;
3031 chomp for @res;
3032 while (@res) {
3033 my ($func, $line) = splice @res, 0, 2, ();
3034 push @funcs, "[$func] $line";
3035 }
3036
3037 @funcs
3038 };
3039
3040 LOG llevInfo, "[ABT] $msg\n";
3041 LOG llevInfo, "[ABT] $_\n" for @bt;
3042 --$_log_backtrace;
3043 };
3044 } else {
3045 LOG llevInfo, "[ABT] $msg\n";
3046 LOG llevInfo, "[ABT] [suppressed]\n";
3047 }
3048}
3049
2926# load additional modules 3050# load additional modules
2927use cf::pod; 3051use cf::pod;
2928 3052
2929END { cf::emergency_save } 3053END { cf::emergency_save }
2930 3054

Diff Legend

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