--- deliantra/server/lib/cf.pm	2007/10/26 04:47:00	1.393
+++ deliantra/server/lib/cf.pm	2007/12/05 11:08:34	1.398
@@ -6,7 +6,7 @@
 use Symbol;
 use List::Util;
 use Socket;
-use Event;
+use EV;
 use Opcode;
 use Safe;
 use Safe::Hole;
@@ -15,7 +15,7 @@
 use Coro 4.1 ();
 use Coro::State;
 use Coro::Handle;
-use Coro::Event;
+use Coro::EV;
 use Coro::Timer;
 use Coro::Signal;
 use Coro::Semaphore;
@@ -23,7 +23,7 @@
 use Coro::Storable;
 use Coro::Util ();
 
-use JSON::XS ();
+use JSON::XS 2.01 ();
 use BDB ();
 use Data::Dumper;
 use Digest::MD5;
@@ -40,8 +40,6 @@
 Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
 
-$Event::Eval = 1; # no idea why this is required, but it is
-
 # work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
 $YAML::Syck::ImplicitUnicode = 1;
 
@@ -164,7 +162,7 @@
 
 =item %cf::CFG
 
-Configuration for the server, loaded from C</etc/crossfire/config>, or
+Configuration for the server, loaded from C</etc/deliantra-server/config>, or
 from wherever your confdir points to.
 
 =item cf::wait_for_tick, cf::wait_for_tick_begin
@@ -217,7 +215,7 @@
    @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
 }
 
-$Event::DIED = sub {
+$EV::DIED = sub {
    warn "error in event callback: @_";
 };
 
@@ -250,11 +248,11 @@
    } || "[unable to dump $_[0]: '$@']";
 }
 
-=item $ref = cf::from_json $json
+=item $ref = cf::decode_json $json
 
 Converts a JSON string into the corresponding perl data structure.
 
-=item $json = cf::to_json $ref
+=item $json = cf::encode_json $ref
 
 Converts a perl data structure into its JSON representation.
 
@@ -262,8 +260,8 @@
 
 our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
 
-sub to_json   ($) { $json_coder->encode ($_[0]) }
-sub from_json ($) { $json_coder->decode ($_[0]) }
+sub encode_json($) { $json_coder->encode ($_[0]) }
+sub decode_json($) { $json_coder->decode ($_[0]) }
 
 =item cf::lock_wait $string
 
@@ -338,6 +336,21 @@
    $guard
 }
 
+=item cf::periodic $interval, $cb
+
+Like EV::periodic, but randomly selects a starting point so that the actions
+get spread over timer.
+
+=cut
+
+sub periodic($$) {
+   my ($interval, $cb) = @_;
+
+   my $start = rand List::Util::min 180, $interval;
+
+   EV::periodic $start, $interval, 0, $cb
+}
+
 =item cf::get_slot $time[, $priority[, $name]]
 
 Allocate $time seconds of blocking CPU time at priority C<$priority>:
@@ -408,8 +421,8 @@
 
 =item cf::sync_job { BLOCK }
 
-The design of Crossfire TRT requires that the main coroutine ($Coro::main)
-is always able to handle events or runnable, as Crossfire TRT is only
+The design of Deliantra requires that the main coroutine ($Coro::main)
+is always able to handle events or runnable, as Deliantra is only
 partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
 acceptable.
 
@@ -424,7 +437,7 @@
    my ($job) = @_;
 
    if ($Coro::current == $Coro::main) {
-      my $time = Event::time;
+      my $time = EV::time;
 
       # this is the main coro, too bad, we have to block
       # till the operation succeeds, freezing the server :/
@@ -449,11 +462,11 @@
          if (Coro::nready) {
             Coro::cede_notself;
          } else {
-            Event::one_event;
+            EV::loop EV::LOOP_ONESHOT;
          }
       }
 
-      $time = Event::time - $time;
+      $time = EV::time - $time;
 
       LOG llevError | logBacktrace, Carp::longmess "long sync job"
          if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
@@ -493,7 +506,7 @@
 Executes the given code block with the given arguments in a seperate
 process, returning the results. Everything must be serialisable with
 Coro::Storable. May, of course, block. Note that the executed sub may
-never block itself or use any form of Event handling.
+never block itself or use any form of event handling.
 
 =cut
 
@@ -664,7 +677,7 @@
 
 In the following description, CLASS can be any of C<global>, C<object>
 C<player>, C<client> or C<map> (i.e. the attachable objects in
-Crossfire TRT).
+Deliantra).
 
 =over 4
 
@@ -1044,7 +1057,7 @@
    on_instantiate => sub {
       my ($obj, $data) = @_;
 
-      $data = from_json $data;
+      $data = decode_json $data;
 
       for (@$data) {
          my ($name, $args) = @$_;
@@ -2627,7 +2640,7 @@
 
    $rmp->{random_seed} ||= $exit->random_seed;
 
-   my $data = cf::to_json $rmp;
+   my $data = cf::encode_json $rmp;
    my $md5 = Digest::MD5::md5_hex $data;
    my $meta = "$RANDOMDIR/$md5.meta";
 
@@ -3308,7 +3321,7 @@
       Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
       (async {
          $Coro::current->{desc} = "IDLE BUG HANDLER";
-         Event::one_event;
+         EV::loop EV::LOOP_ONESHOT;
       })->prio (Coro::PRIO_MAX);
    };
 
@@ -3317,7 +3330,8 @@
    load_extensions;
 
    $TICK_WATCHER->start;
-   Event::loop;
+   $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
+   EV::loop;
 }
 
 #############################################################################
@@ -3325,16 +3339,11 @@
 
 # install some emergency cleanup handlers
 BEGIN {
+   our %SIGWATCHER = ();
    for my $signal (qw(INT HUP TERM)) {
-      Event->signal (
-         reentrant => 0,
-         data      => WF_AUTOCANCEL,
-         signal    => $signal,
-         prio      => 0,
-         cb        => sub {
-            cf::cleanup "SIG$signal";
-         },
-      );
+      $SIGWATCHER{$signal} = EV::signal $signal, sub {
+         cf::cleanup "SIG$signal";
+      };
    }
 }
 
@@ -3438,11 +3447,6 @@
 
       # if anything goes wrong in here, we should simply crash as we already saved
 
-      warn "cancelling all WF_AUTOCANCEL watchers";
-      for (Event::all_watchers) {
-         $_->cancel if $_->data & WF_AUTOCANCEL;
-      }
-
       warn "flushing outstanding aio requests";
       for (;;) {
          BDB::flush;
@@ -3546,15 +3550,10 @@
    # doing reload synchronously and two reloads happen back-to-back,
    # coro crashes during coro_state_free->destroy here.
 
-   $RELOAD_WATCHER ||= Event->timer (
-      reentrant => 0,
-      after     => 0,
-      data      => WF_AUTOCANCEL,
-      cb => sub {
-         do_reload_perl;
-         undef $RELOAD_WATCHER;
-      },
-   );
+   $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
+      undef $RELOAD_WATCHER;
+      do_reload_perl;
+   };
 }
 
 register_command "reload" => sub {
@@ -3594,68 +3593,47 @@
    $signal->wait;
 }
 
-$TICK_WATCHER = Event->timer (
-   reentrant => 0,
-   parked    => 1,
-   prio      => 0,
-   at        => $NEXT_TICK || $TICK,
-   data      => WF_AUTOCANCEL,
-   cb        => sub {
-      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 = Event::time;
-
-      cf::server_tick; # one server iteration
-
-      $RUNTIME   += $TICK;
-      $NEXT_TICK += $TICK;
-
-      if ($NOW >= $NEXT_RUNTIME_WRITE) {
-         $NEXT_RUNTIME_WRITE = $NOW + 10;
-         Coro::async_pool {
-            $Coro::current->{desc} = "runtime saver";
-            write_runtime
-               or warn "ERROR: unable to write runtime file: $!";
-         };
-      }
+$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
+   if ($Coro::current != $Coro::main) {
+      Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
+         unless ++$bug_warning > 10;
+      return;
+   }
 
-      if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
-         $sig->send;
-      }
-      while (my $sig = shift @WAIT_FOR_TICK) {
-         $sig->send;
-      }
+   $NOW = $tick_start = EV::now;
 
-      $NOW = Event::time;
+   cf::server_tick; # one server iteration
 
-      # if we are delayed by four ticks or more, skip them all
-      $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
+   $RUNTIME   += $TICK;
+   $NEXT_TICK += $TICK;
 
-      $TICK_WATCHER->at ($NEXT_TICK);
-      $TICK_WATCHER->start;
+   if ($NOW >= $NEXT_RUNTIME_WRITE) {
+      $NEXT_RUNTIME_WRITE = $NOW + 10;
+      Coro::async_pool {
+         $Coro::current->{desc} = "runtime saver";
+         write_runtime
+            or warn "ERROR: unable to write runtime file: $!";
+      };
+   }
 
-      $LOAD = ($NOW - $tick_start) / $TICK;
-      $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
+   if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
+      $sig->send;
+   }
+   while (my $sig = shift @WAIT_FOR_TICK) {
+      $sig->send;
+   }
 
-      _post_tick;
-   },
-);
+   $LOAD = ($NOW - $tick_start) / $TICK;
+   $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
+
+   _post_tick;
+};
+$TICK_WATCHER->priority (EV::MAXPRI);
 
 {
    BDB::min_parallel 8;
    BDB::max_poll_time $TICK * 0.1;
-   $BDB_POLL_WATCHER = Event->io (
-      reentrant => 0,
-      fd        => BDB::poll_fileno,
-      poll      => 'r',
-      prio      => 0,
-      data      => WF_AUTOCANCEL,
-      cb        => \&BDB::poll_cb,
-   );
+   $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
 
    BDB::set_sync_prepare {
       my $status;
@@ -3695,36 +3673,15 @@
       };
    }
 
-   $BDB_DEADLOCK_WATCHER = Event->timer (
-      after     => 3,
-      interval  => 1,
-      hard      => 1,
-      prio      => 0,
-      data      => WF_AUTOCANCEL,
-      cb        => sub {
-         BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
-      },
-   );
-   $BDB_CHECKPOINT_WATCHER = Event->timer (
-      after     => 11,
-      interval  => 60,
-      hard      => 1,
-      prio      => 0,
-      data      => WF_AUTOCANCEL,
-      cb        => sub {
-         BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
-      },
-   );
-   $BDB_TRICKLE_WATCHER = Event->timer (
-      after     => 5,
-      interval  => 10,
-      hard      => 1,
-      prio      => 0,
-      data      => WF_AUTOCANCEL,
-      cb        => sub {
-         BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
-      },
-   );
+   $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
+      BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
+   };
+   $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
+      BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
+   };
+   $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
+      BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
+   };
 }
 
 {
@@ -3732,14 +3689,7 @@
 
    undef $Coro::AIO::WATCHER;
    IO::AIO::max_poll_time $TICK * 0.1;
-   $AIO_POLL_WATCHER = Event->io (
-      reentrant => 0,
-      data      => WF_AUTOCANCEL,
-      fd        => IO::AIO::poll_fileno,
-      poll      => 'r',
-      prio      => 0,
-      cb        => \&IO::AIO::poll_cb,
-   );
+   $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
 }
 
 my $_log_backtrace;