--- deliantra/server/lib/cf.pm	2008/02/01 15:54:07	1.411
+++ deliantra/server/lib/cf.pm	2008/04/10 09:10:45	1.414
@@ -1,3 +1,24 @@
+# 
+# This file is part of Deliantra, the Roguelike Realtime MMORPG.
+# 
+# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+# 
+# Deliantra is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# 
+# The authors can be reached via e-mail to <support@deliantra.net>
+# 
+
 package cf;
 
 use utf8;
@@ -6,13 +27,13 @@
 use Symbol;
 use List::Util;
 use Socket;
-use EV 1.86;
+use EV 3.2;
 use Opcode;
 use Safe;
 use Safe::Hole;
 use Storable ();
 
-use Coro 4.32 ();
+use Coro 4.50 ();
 use Coro::State;
 use Coro::Handle;
 use Coro::EV;
@@ -71,7 +92,6 @@
 our %RESOURCE;
 
 our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
-our $TICK_WATCHER;
 our $AIO_POLL_WATCHER;
 our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
 our $NEXT_TICK;
@@ -98,7 +118,8 @@
 
 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
+our $JITTER;     # average jitter
+our $TICK_START; # for load detecting purposes
 
 binmode STDOUT;
 binmode STDERR;
@@ -341,13 +362,9 @@
 }
 
 sub freeze_mainloop {
-   return unless $TICK_WATCHER->is_active;
+   tick_inhibit_inc;
 
-   my $guard = Coro::guard {
-      $TICK_WATCHER->start;
-   };
-   $TICK_WATCHER->stop;
-   $guard
+   Coro::guard \&tick_inhibit_dec;
 }
 
 =item cf::periodic $interval, $cb
@@ -458,8 +475,6 @@
       
       LOG llevError, Carp::longmess "sync job";#d#
 
-      # TODO: use suspend/resume instead
-      # (but this is cancel-safe)
       my $freeze_guard = freeze_mainloop;
 
       my $busy = 1;
@@ -480,12 +495,9 @@
          }
       }
 
-      $time = EV::time - $time;
-
-      LOG llevError | logBacktrace, Carp::longmess "long sync job"
-         if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
+      my $time = EV::time - $time;
 
-      $tick_start += $time; # do not account sync jobs to server load
+      $TICK_START += $time; # do not account sync jobs to server load
 
       wantarray ? @res : $res[0]
    } else {
@@ -3351,8 +3363,8 @@
    db_init;
    load_extensions;
 
-   $TICK_WATCHER->start;
    $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
+   evthread_start IO::AIO::poll_fileno;
    EV::loop;
 }
 
@@ -3597,7 +3609,7 @@
 our @WAIT_FOR_TICK_BEGIN;
 
 sub wait_for_tick {
-   return unless $TICK_WATCHER->is_active;
+   return if tick_inhibit;
    return if $Coro::current == $Coro::main;
 
    my $signal = new Coro::Signal;
@@ -3606,7 +3618,7 @@
 }
 
 sub wait_for_tick_begin {
-   return unless $TICK_WATCHER->is_active;
+   return if tick_inhibit;
    return if $Coro::current == $Coro::main;
 
    my $signal = new Coro::Signal;
@@ -3614,20 +3626,15 @@
    $signal->wait;
 }
 
-$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
+sub tick {
    if ($Coro::current != $Coro::main) {
       Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
          unless ++$bug_warning > 10;
       return;
    }
 
-   $NOW = $tick_start = EV::now;
-
    cf::server_tick; # one server iteration
 
-   $RUNTIME += $TICK;
-   $NEXT_TICK = $_[0]->at;
-
    if ($NOW >= $NEXT_RUNTIME_WRITE) {
       $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
       Coro::async_pool {
@@ -3644,12 +3651,17 @@
       $sig->send;
    }
 
-   $LOAD = ($NOW - $tick_start) / $TICK;
+   $LOAD = ($NOW - $TICK_START) / $TICK;
    $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
 
-   _post_tick;
-};
-$TICK_WATCHER->priority (EV::MAXPRI);
+   if (0) {
+      if ($NEXT_TICK) {
+         my $jitter = $TICK_START - $NEXT_TICK;
+         $JITTER = $JITTER * 0.75 + $jitter * 0.25;
+         warn "jitter $JITTER\n";#d#
+      }
+   }
+}
 
 {
    # configure BDB