--- deliantra/server/lib/cf.pm	2010/04/07 18:35:56	1.511
+++ deliantra/server/lib/cf.pm	2010/04/11 04:52:07	1.512
@@ -505,7 +505,7 @@
    my ($job) = @_;
 
    if ($Coro::current == $Coro::main) {
-      my $time = EV::time;
+      my $time = AE::time;
 
       # this is the main coro, too bad, we have to block
       # till the operation succeeds, freezing the server :/
@@ -532,7 +532,7 @@
          }
       }
 
-      my $time = EV::time - $time;
+      my $time = AE::time - $time;
 
       $TICK_START += $time; # do not account sync jobs to server load
 
@@ -3586,14 +3586,14 @@
 BEGIN {
    our %SIGWATCHER = ();
    for my $signal (qw(INT HUP TERM)) {
-      $SIGWATCHER{$signal} = EV::signal $signal, sub {
+      $SIGWATCHER{$signal} = AE::signal $signal, sub {
          cf::cleanup "SIG$signal";
       };
    }
 }
 
 sub write_runtime_sync {
-   my $t0 = EV::time;
+   my $t0 = AE::time;
 
    # first touch the runtime file to show we are still running:
    # the fsync below can take a very very long time.
@@ -3625,7 +3625,7 @@
    aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
       and return;
 
-   warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
+   warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
 
    1
 }
@@ -3773,7 +3773,7 @@
 
    return if $RELOAD++;
 
-   my $t1 = EV::time;
+   my $t1 = AE::time;
 
    while ($RELOAD) {
       warn "reloading...";
@@ -3886,7 +3886,7 @@
       --$RELOAD;
    }
 
-   $t1 = EV::time - $t1;
+   $t1 = AE::time - $t1;
    warn "reload completed in ${t1}s\n";
 };
 
@@ -3899,7 +3899,7 @@
    $RELOAD_WATCHER ||= cf::async {
       Coro::AIO::aio_wait cache_extensions;
 
-      $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
+      $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
          do_reload_perl;
          undef $RELOAD_WATCHER;
       };
@@ -3950,7 +3950,7 @@
 
    cf::server_tick; # one server iteration
 
-   #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
+   #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
 
    if ($NOW >= $NEXT_RUNTIME_WRITE) {
       $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;