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.264 by root, Sun May 6 05:44:48 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->()
… …
372 my $runtime = "$LOCALDIR/runtime"; 396 my $runtime = "$LOCALDIR/runtime";
373 397
374 # first touch the runtime file to show we are still running: 398 # first touch the runtime file to show we are still running:
375 # the fsync below can take a very very long time. 399 # the fsync below can take a very very long time.
376 400
377 warn "touching runtime...\n";#d# 401 IO::AIO::aio_utime $runtime, undef, undef;
378 if (my $fh = aio_open $runtime, O_WRONLY, 0) {
379 utime undef, undef, $fh;
380 }
381 402
382 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
383 404
384 warn "starting to write runtime...\n";#d#
385 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
386 or return; 406 or return;
387 407
388 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
389 # 10 is the runtime save interval, for a monotonic clock 409 # 10 is the runtime save interval, for a monotonic clock
… …
395 # always fsync - this file is important 415 # always fsync - this file is important
396 aio_fsync $fh 416 aio_fsync $fh
397 and return; 417 and return;
398 418
399 # touch it again to show we are up-to-date 419 # touch it again to show we are up-to-date
400 utime undef, undef, $fh; 420 aio_utime $fh, undef, undef;
401 421
402 close $fh 422 close $fh
403 or return; 423 or return;
404 424
405 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
406 and return; 426 and return;
407 427
408 warn "... done writing runtime.\n";#d# 428 warn "runtime file written.\n";
409 429
410 1 430 1
411} 431}
412 432
413=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
606 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
607 627
608 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
609 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
610 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
611 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
612 632
613 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
614 my $pkg = shift @arg; 634 my $pkg = shift @arg;
615 635
616 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
… …
657 if (ref $_[0]) { 677 if (ref $_[0]) {
658 _object_attach @_; 678 _object_attach @_;
659 } else { 679 } else {
660 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
661 } 681 }
682 _recalc_want;
662}; 683};
663 684
664# all those should be optimised 685# all those should be optimised
665sub cf::attachable::detach { 686sub cf::attachable::detach {
666 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
… …
669 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
670 reattach ($obj); 691 reattach ($obj);
671 } else { 692 } else {
672 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
673 } 694 }
695 _recalc_want;
674}; 696};
675 697
676sub cf::attachable::attached { 698sub cf::attachable::attached {
677 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
678 700
… …
851 or return; 873 or return;
852 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
853 } 875 }
854 876
855 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
856 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
857 return ($data, $av); 879 return ($data, $av);
858} 880}
859 881
860############################################################################# 882#############################################################################
861# command handling &c 883# command handling &c
… …
1283 my ($self, $merge) = @_; 1305 my ($self, $merge) = @_;
1284 1306
1285 # we have to keep some variables in memory intact 1307 # we have to keep some variables in memory intact
1286 local $self->{path}; 1308 local $self->{path};
1287 local $self->{load_path}; 1309 local $self->{load_path};
1288 local $self->{deny_save};
1289 local $self->{deny_reset};
1290 1310
1291 $self->SUPER::thawer_merge ($merge); 1311 $self->SUPER::thawer_merge ($merge);
1292} 1312}
1293 1313
1294sub normalise { 1314sub normalise {
… …
1394 1414
1395 $_->change_map_light ($change) 1415 $_->change_map_light ($change)
1396 for grep $_->outdoor, values %cf::MAP; 1416 for grep $_->outdoor, values %cf::MAP;
1397} 1417}
1398 1418
1419sub decay_objects {
1420 my ($self) = @_;
1421
1422 return if $self->{deny_reset};
1423
1424 $self->do_decay_objects;
1425}
1426
1399sub unlink_save { 1427sub unlink_save {
1400 my ($self) = @_; 1428 my ($self) = @_;
1401 1429
1402 utf8::encode (my $save = $self->save_path); 1430 utf8::encode (my $save = $self->save_path);
1403 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1431 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1459 $self->load_header_orig 1487 $self->load_header_orig
1460 or return; 1488 or return;
1461 $self->prepare_orig; 1489 $self->prepare_orig;
1462 } 1490 }
1463 1491
1492 $self->{deny_reset} = 1
1493 if $self->no_reset;
1494
1464 $self->default_region (cf::region::find_by_path $self->{path}) 1495 $self->default_region (cf::region::find_by_path $self->{path})
1465 unless $self->default_region; 1496 unless $self->default_region;
1466 1497
1467 1 1498 1
1468} 1499}
… …
1483 $map->{last_save} = $cf::RUNTIME; 1514 $map->{last_save} = $cf::RUNTIME;
1484 1515
1485 $map->load_header 1516 $map->load_header
1486 or return; 1517 or return;
1487 1518
1488 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1519 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1489 # doing this can freeze the server in a sync job, obviously 1520 # doing this can freeze the server in a sync job, obviously
1490 #$cf::WAIT_FOR_TICK->wait; 1521 #$cf::WAIT_FOR_TICK->wait;
1491 $map->reset; 1522 $map->reset;
1492 undef $guard; 1523 undef $guard;
1493 return find $path; 1524 return find $path;
… …
1560 my ($self, $ob) = @_; 1591 my ($self, $ob) = @_;
1561 1592
1562 return find "~" . $ob->name . "/" . $self->{path} 1593 return find "~" . $ob->name . "/" . $self->{path}
1563 if $self->per_player; 1594 if $self->per_player;
1564 1595
1596# return find "?party/" . $ob->name . "/" . $self->{path}
1597# if $self->per_party;
1598
1565 $self 1599 $self
1566} 1600}
1567 1601
1568# 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
1569sub load_diag { 1603sub load_diag {
… …
1679 1713
1680sub reset_at { 1714sub reset_at {
1681 my ($self) = @_; 1715 my ($self) = @_;
1682 1716
1683 # TODO: safety, remove and allow resettable per-player maps 1717 # TODO: safety, remove and allow resettable per-player maps
1684 return 1e99 if $self->isa ("ext::map_per_player");#d#
1685 return 1e99 if $self->{deny_reset}; 1718 return 1e99 if $self->{deny_reset};
1686 1719
1687 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1720 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1688 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;
1689 1722
… …
1700 my ($self) = @_; 1733 my ($self) = @_;
1701 1734
1702 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1735 my $lock = cf::lock_acquire "map_data:$self->{path}";
1703 1736
1704 return if $self->players; 1737 return if $self->players;
1705 return if $self->isa ("ext::map_per_player");#d#
1706 1738
1707 warn "resetting map ", $self->path;#d# 1739 warn "resetting map ", $self->path;
1708 1740
1709 $self->in_memory (cf::MAP_SWAPPED); 1741 $self->in_memory (cf::MAP_SWAPPED);
1710 1742
1711 # need to save uniques path 1743 # need to save uniques path
1712 unless ($self->{deny_save}) { 1744 unless ($self->{deny_save}) {
… …
1744 $cf::MAP{$self->path} = $self; 1776 $cf::MAP{$self->path} = $self;
1745 1777
1746 $self->reset; # polite request, might not happen 1778 $self->reset; # polite request, might not happen
1747} 1779}
1748 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
1749=item cf::map::unique_maps 1799=item cf::map::unique_maps
1750 1800
1751Returns an arrayref of paths of all shared maps that have 1801Returns an arrayref of paths of all shared maps that have
1752instantiated unique items. May block. 1802instantiated unique items. May block.
1753 1803
1754=cut 1804=cut
1755 1805
1756sub unique_maps() { 1806sub unique_maps() {
1757 my $files = aio_readdir $UNIQUEDIR 1807 [
1758 or return; 1808 map {
1759
1760 my @paths;
1761
1762 for (@$files) {
1763 utf8::decode $_; 1809 utf8::decode $_;
1764 next if /\.pst$/; 1810 !/\.(?:pst|meta)$/ && /^$PATH_SEP/o
1765 next unless /^$PATH_SEP/o; 1811 ? normalise $_
1766 1812 : ()
1767 push @paths, cf::map::normalise $_; 1813 } @{ aio_readdir $UNIQUEDIR or [] }
1768 } 1814 ]
1769
1770 \@paths
1771} 1815}
1772 1816
1773package cf; 1817package cf;
1774 1818
1775=back 1819=back
… …
1881 $self->deactivate_recursive; 1925 $self->deactivate_recursive;
1882 1926
1883 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1927 return if UNIVERSAL::isa $self->map, "ext::map_link";
1884 1928
1885 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1929 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1886 if $self->map; 1930 if $self->map && $self->map->{path} ne "{link}";
1887 1931
1888 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1932 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1889} 1933}
1890 1934
1891sub cf::object::player::leave_link { 1935sub cf::object::player::leave_link {
1892 my ($self, $map, $x, $y) = @_; 1936 my ($self, $map, $x, $y) = @_;
1937
1938 return unless $self->contr->active;
1893 1939
1894 my $link_pos = delete $self->{_link_pos}; 1940 my $link_pos = delete $self->{_link_pos};
1895 1941
1896 unless ($map) { 1942 unless ($map) {
1897 # restore original map position 1943 # restore original map position
… …
1920 1966
1921 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1967 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1922 $self->enter_map ($map, $x, $y); 1968 $self->enter_map ($map, $x, $y);
1923} 1969}
1924 1970
1925cf::player->attach (
1926 on_logout => sub {
1927 my ($pl) = @_;
1928
1929 # abort map switching before logout
1930 if ($pl->ob->{_link_pos}) {
1931 cf::sync_job {
1932 $pl->ob->leave_link
1933 };
1934 }
1935 },
1936 on_login => sub {
1937 my ($pl) = @_;
1938
1939 # try to abort aborted map switching on player login :)
1940 # should happen only on crashes
1941 if ($pl->ob->{_link_pos}) {
1942 $pl->ob->enter_link;
1943 (async {
1944 $pl->ob->reply (undef,
1945 "There was an internal problem at your last logout, "
1946 . "the server will try to bring you to your intended destination in a second.",
1947 cf::NDI_RED);
1948 # we need this sleep as the login has a concurrent enter_exit running
1949 # and this sleep increases chances of the player not ending up in scorn
1950 Coro::Timer::sleep 1;
1951 $pl->ob->leave_link;
1952 })->prio (2);
1953 }
1954 },
1955);
1956
1957=item $player_object->goto ($path, $x, $y) 1971=item $player_object->goto ($path, $x, $y[, $check->($map)])
1958 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
1959=cut 1978=cut
1979
1980our $GOTOGEN;
1960 1981
1961sub cf::object::player::goto { 1982sub cf::object::player::goto {
1962 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;
1963 1987
1964 $self->enter_link; 1988 $self->enter_link;
1965 1989
1966 (async { 1990 (async {
1967 my $map = eval { 1991 my $map = eval {
1968 my $map = cf::map::find $path; 1992 my $map = cf::map::find $path;
1993
1994 if ($map) {
1969 $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
1970 $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 $@;
1971 } or 2007 }
1972 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1973 2008
2009 if ($gen == $self->{_goto_generation}) {
2010 delete $self->{_goto_generation};
1974 $self->leave_link ($map, $x, $y); 2011 $self->leave_link ($map, $x, $y);
2012 }
1975 })->prio (1); 2013 })->prio (1);
1976} 2014}
1977 2015
1978=item $player_object->enter_exit ($exit_object) 2016=item $player_object->enter_exit ($exit_object)
1979 2017
… …
2464 warn $@ if $@; 2502 warn $@ if $@;
2465 _exit 0; 2503 _exit 0;
2466 } 2504 }
2467} 2505}
2468 2506
2469
2470
2471############################################################################# 2507#############################################################################
2472# the server's init and main functions 2508# the server's init and main functions
2473 2509
2474sub load_facedata($) { 2510sub load_facedata($) {
2475 my ($path) = @_; 2511 my ($path) = @_;
… …
2546sub reload_resources { 2582sub reload_resources {
2547 warn "reloading resource files...\n"; 2583 warn "reloading resource files...\n";
2548 2584
2549 reload_regions; 2585 reload_regions;
2550 reload_facedata; 2586 reload_facedata;
2587 #reload_archetypes;#d#
2551 reload_archetypes; 2588 reload_archetypes;
2552 reload_treasures; 2589 reload_treasures;
2553 2590
2554 warn "finished reloading resource files\n"; 2591 warn "finished reloading resource files\n";
2555} 2592}
… …
2825 my $signal = new Coro::Signal; 2862 my $signal = new Coro::Signal;
2826 push @WAIT_FOR_TICK_BEGIN, $signal; 2863 push @WAIT_FOR_TICK_BEGIN, $signal;
2827 $signal->wait; 2864 $signal->wait;
2828} 2865}
2829 2866
2867 my $min = 1e6;#d#
2868 my $avg = 10;
2830$TICK_WATCHER = Event->timer ( 2869$TICK_WATCHER = Event->timer (
2831 reentrant => 0, 2870 reentrant => 0,
2832 parked => 1, 2871 parked => 1,
2833 prio => 0, 2872 prio => 0,
2834 at => $NEXT_TICK || $TICK, 2873 at => $NEXT_TICK || $TICK,
… …
2838 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"
2839 unless ++$bug_warning > 10; 2878 unless ++$bug_warning > 10;
2840 return; 2879 return;
2841 } 2880 }
2842 2881
2843 $NOW = Event::time; 2882 $NOW = $tick_start = Event::time;
2844 2883
2845 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 };
2846 2908
2847 $RUNTIME += $TICK; 2909 $RUNTIME += $TICK;
2848 $NEXT_TICK += $TICK; 2910 $NEXT_TICK += $TICK;
2849 2911
2850 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2912 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
2856 } 2918 }
2857 2919
2858# my $AFTER = Event::time; 2920# my $AFTER = Event::time;
2859# warn $AFTER - $NOW;#d# 2921# warn $AFTER - $NOW;#d#
2860 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
2861 # 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
2862 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2933 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2863 2934
2864 $TICK_WATCHER->at ($NEXT_TICK); 2935 $TICK_WATCHER->at ($NEXT_TICK);
2865 $TICK_WATCHER->start; 2936 $TICK_WATCHER->start;
2866 2937
2867 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2938 $LOAD = ($NOW - $tick_start) / $TICK;
2868 $sig->send; 2939 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2869 }
2870 while (my $sig = shift @WAIT_FOR_TICK) {
2871 $sig->send;
2872 }
2873 2940
2874 _post_tick; 2941 _post_tick;
2942
2943
2875 }, 2944 },
2876); 2945);
2877 2946
2878{ 2947{
2879 BDB::max_poll_time $TICK * 0.1; 2948 BDB::max_poll_time $TICK * 0.1;

Diff Legend

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