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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.174 by root, Sun Jan 14 19:55:37 2007 UTC vs.
Revision 1.175 by root, Sun Jan 14 21:20:51 2007 UTC

 use Storable;
 use Opcode;
 use Safe;
 use Safe::Hole;
-use Coro 3.3 ();
+use Coro 3.4 ();
 use Coro::Event;
 use Coro::Timer;
 use Coro::Signal;
 use Coro::Semaphore;
 use Coro::AIO;
 sub main {
    # we must not ever block the main coroutine
    local $Coro::idle = sub {
       Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
+      (async {
+         warn "BP1\n";#d#
-      async { Event::one_event };
+         Event::one_event;
+         warn "BP2\n";#d#
+      })->prio (Coro::PRIO_MAX);
    };
    cfg_load;
    db_load;
    load_extensions;
    }
    warn "reloaded";
 };
+our $RELOAD_WATCHER; # used only during reload
 register_command "reload" => sub {
    my ($who, $arg) = @_;
    if ($who->flag (FLAG_WIZ)) {
-      $who->message ("start of reload.");
+      $who->message ("reloading server.");
+      # doing reload synchronously and two reloads happen back-to-back,
+      # coro crashes during coro_state_free->destroy here.
+      $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
-      reload;
+         reload;
-      $who->message ("end of reload.");
+         undef $RELOAD_WATCHER;
+      });
    }
 };
 unshift @INC, $LIBDIR;

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