[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.263 by root, Sat May 5 05:40:27 2007 UTC vs.
Revision 1.267 by root, Sat May 19 00:08:11 2007 UTC

 our $LINK_MAP; # the special {link} map, which is always available
 # used to convert map paths into valid unix filenames by replacing / by ∕
 our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
+our $LOAD;       # a number between 0 (idle) and 1 (too many objects)
+our $LOADAVG;    # same thing, but with alpha-smoothing
+our $tick_start; # for load detecting purposes
 binmode STDOUT;
 binmode STDERR;
 # read virtual server time, if available
 unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
 The time of the last (current) server tick.
 =item $cf::TICK
 The interval between server ticks, in seconds.
+=item $cf::LOADAVG
+The current CPU load on the server (alpha-smoothed), as a value between 0
+(none) and 1 (overloaded), indicating how much time is spent on processing
+objects per tick. Healthy values are < 0.5.
+=item $cf::LOAD
+The raw value load value from the last tick.
 =item %cf::CFG
 Configuration for the server, loaded from C</etc/crossfire/config>, or
 from wherever your confdir points to.
 sub sync_job(&) {
    my ($job) = @_;
    if ($Coro::current == $Coro::main) {
+      my $time = Event::time;
       # this is the main coro, too bad, we have to block
       # till the operation succeeds, freezing the server :/
       # TODO: use suspend/resume instead
       # (but this is cancel-safe)
       while ($busy) {
          Coro::cede or Event::one_event;
       }
+      $time = Event::time - $time;
+      LOG llevError | logBacktrace, Carp::longmess "long sync job"
+         if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
+      $tick_start += $time; # do not account sync jobs to server load
       wantarray ? @res : $res[0]
    } else {
       # we are in another coroutine, how wonderful, everything just works
       $job->()
    $coro
 }
 sub write_runtime {
+   my $runtime = "$LOCALDIR/runtime";
+   # first touch the runtime file to show we are still running:
+   # the fsync below can take a very very long time.
+   if (my $fh = aio_open $runtime, O_WRONLY, 0) {
+      utime undef, undef, $fh;
+   }
    my $guard = cf::lock_acquire "write_runtime";
-   my $runtime = "$LOCALDIR/runtime";
-   warn "starting to write runtime...\n";#d#
    my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
       or return;
    my $value = $cf::RUNTIME + 90 + 10;
    # 10 is the runtime save interval, for a monotonic clock
    # always fsync - this file is important
    aio_fsync $fh
       and return;
+   # touch it again to show we are up-to-date
+   utime undef, undef, $fh;
    close $fh
       or return;
    aio_rename "$runtime~", $runtime
       and return;
-   warn "... done writing runtime.\n";#d#
+   warn "runtime file written.\n";#d#
    1
 }
 =item cf::datalog type => key => value, ...
          $registry = $CB_TYPE[$object_type] ||= [];
       } elsif ($type eq "subtype") {
          defined $object_type or Carp::croak "subtype specified without type";
          my $object_subtype = shift @arg;
-         $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= [];
+         $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
       } elsif ($type eq "package") {
          my $pkg = shift @arg;
          while (my ($name, $id) = each %cb_id) {
    if (ref $_[0]) {
       _object_attach @_;
    } else {
       _attach shift->_attach_registry, @_;
    }
+   _recalc_want;
 };
 # all those should be optimised
 sub cf::attachable::detach {
    my ($obj, $name) = @_;
       delete $obj->{_attachment}{$name};
       reattach ($obj);
    } else {
       Carp::croak "cannot, currently, detach class attachments";
    }
+   _recalc_want;
 };
 sub cf::attachable::attached {
    my ($obj, $name) = @_;
          Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
             unless ++$bug_warning > 10;
          return;
       }
-      $NOW = Event::time;
+      $NOW = $tick_start = Event::time;
       cf::server_tick; # one server iteration
       $RUNTIME   += $TICK;
       $NEXT_TICK += $TICK;
       }
 #      my $AFTER = Event::time;
 #      warn $AFTER - $NOW;#d#
+      if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
+         $sig->send;
+      }
+      while (my $sig = shift @WAIT_FOR_TICK) {
+         $sig->send;
+      }
+      $NOW = Event::time;
       # if we are delayed by four ticks or more, skip them all
-      $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
+      $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
       $TICK_WATCHER->at ($NEXT_TICK);
       $TICK_WATCHER->start;
-      if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
+      $LOAD = ($NOW - $tick_start) / $TICK;
-         $sig->send;
+      $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
-      }
-      while (my $sig = shift @WAIT_FOR_TICK) {
-         $sig->send;
-      }
       _post_tick;
    },
 );
 {
    BDB::max_poll_time $TICK * 0.1;

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.263 by root, Sat May 5 05:40:27 2007 UTC vs. Revision 1.267 by root, Sat May 19 00:08:11 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.263 by root, Sat May 5 05:40:27 2007 UTC vs.
Revision 1.267 by root, Sat May 19 00:08:11 2007 UTC