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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.211 by root, Tue Feb 13 16:23:32 2007 UTC vs.
Revision 1.212 by root, Tue Feb 13 19:25:44 2007 UTC

    $coro
 }
 sub write_runtime {
-   $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
    my $runtime = cf::localdir . "/runtime";
    my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
       or return;
       return;
    }
    warn "reloading...";
-   warn "cancelling server ticker";
+   warn "entering sync_job";
-   $TICK_WATCHER->cancel;
+   sync_job {
+      write_runtime;
-   cf::emergency_save;
+      cf::emergency_save;
+      write_runtime;
-   eval {
+      warn "syncing database to disk";
+      BDB::db_env_txn_checkpoint $DB_ENV;
       # 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 "syncing database to disk";
-      BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
       warn "flushing outstanding aio requests";
       for (;;) {
          BDB::flush;
          IO::AIO::flush;
       reattach $_ for values %MAP;
       warn "loading reloadable resources";
       load_resources;
-      warn "restarting server ticker";
+      warn "leaving sync_job";
-      $TICK_WATCHER->start;
+      1
-   };
+   } or do {
-   if ($@) {
       warn $@;
       warn "error while reloading, exiting.";
       exit 1;
-   }
+   };
    warn "reloaded";
 };
 our $RELOAD_WATCHER; # used only during reload
       $NEXT_TICK += $TICK;
       $WAIT_FOR_TICK->broadcast;
       $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
-      Event::sweep;
-      Coro::cede_notself;
 #      my $AFTER = Event::time;
 #      warn $AFTER - $NOW;#d#
       # if we are delayed by four ticks or more, skip them all
       $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
 }
 $WRITE_RUNTIME_WATCHER = Event->timer (
    reentrant => 0,
    data      => WF_AUTOCANCEL,
+   parked    => 1,
    after     => 1,
    interval  => 10,
    prio      => 6,  # keep it lowest so it acts like a watchdog
-   cb        => Coro::unblock_sub {
+   cb        => sub {
+      $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
+      Coro::async_pool {
-      write_runtime
+         write_runtime
-         or warn "ERROR: unable to write runtime file: $!";
+            or warn "ERROR: unable to write runtime file: $!";
+      };
    },
 );
 END { cf::emergency_save }

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.211 by root, Tue Feb 13 16:23:32 2007 UTC vs. Revision 1.212 by root, Tue Feb 13 19:25:44 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.211 by root, Tue Feb 13 16:23:32 2007 UTC vs.
Revision 1.212 by root, Tue Feb 13 19:25:44 2007 UTC