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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.450 by root, Mon Sep 22 01:33:09 2008 UTC vs.
Revision 1.451 by root, Mon Sep 22 05:42:41 2008 UTC

 our %EXTCMD       = ();
 our %EXTICMD      = ();
 our %EXT_CORO     = (); # coroutines bound to extensions
 our %EXT_MAP      = (); # pluggable maps
-our $RELOAD; # number of reloads so far
+our $RELOAD; # number of reloads so far, non-zero while in reload
 our @EVENT;
 our $CONFDIR     = confdir;
 our $DATADIR     = datadir;
 our $LIBDIR      = "$DATADIR/ext";
       return;#d#
    }#d#
    # wait for lock, if any
    while ($LOCK{$key}) {
+      #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
       push @{ $LOCK{$key} }, $Coro::current;
       Coro::schedule;
    }
 }
    my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
    for my $name (keys %$leaf_symtab) {
       _gv_clear *{"$pkg$name"};
 #      use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
    }
-   warn "cleared package #$pkg\n";#d#
+   warn "cleared package $pkg\n";#d#
 }
-our $RELOAD; # how many times to reload
 sub do_reload_perl() {
    # can/must only be called in main
    if ($Coro::current != $Coro::main) {
       warn "can only reload from main coroutine";
 sub reload_perl() {
    # doing reload synchronously and two reloads happen back-to-back,
    # coro crashes during coro_state_free->destroy here.
-   $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
+   $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
       do_reload_perl;
       undef $RELOAD_WATCHER;
    };
 }

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