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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.86 by root, Thu Dec 14 05:09:32 2006 UTC vs.
Revision 1.87 by root, Thu Dec 14 22:45:40 2006 UTC

 # work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
 $YAML::Syck::ImplicitUnicode = 1;
 use strict;
+sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
 our %COMMAND      = ();
 our %COMMAND_TIME = ();
 our %EXTCMD       = ();
    sub db_sync() {
       db_save if $dirty;
       undef $dirty;
    }
-   my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, cb => sub {
+   my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
       db_sync;
    });
    sub db_dirty() {
       $dirty = 1;
    $msg->("reloading...");
    eval {
       # cancel all watchers
-      $_->cancel for Event::all_watchers;
+      for (Event::all_watchers) {
+         $_->cancel if $_->data & WF_AUTOCANCEL;
+      }
       # unload all extensions
       for (@exts) {
          $msg->("unloading <$_>");
          unload_extension $_;
 $TICK_WATCHER = Event->timer (
    prio  => 1,
    async => 1,
    at    => $NEXT_TICK || 1,
+   data  => WF_AUTOCANCEL,
    cb    => sub {
       cf::server_tick; # one server iteration
       my $NOW = Event::time;
       $NEXT_TICK += $TICK;
 IO::AIO::max_poll_time $TICK * 0.2;
 Event->io (fd   => IO::AIO::poll_fileno,
            poll => 'r',
            prio => 5,
+           data => WF_AUTOCANCEL,
            cb   => \&IO::AIO::poll_cb);
 1

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