--- deliantra/server/lib/cf.pm	2006/11/05 11:13:01	1.77
+++ deliantra/server/lib/cf.pm	2006/11/07 00:15:27	1.78
@@ -972,13 +972,14 @@
 
 =cut
 
+our $DB;
+
 {
-   my $db;
    my $path = cf::localdir . "/database.pst";
 
    sub db_load() {
       warn "loading database $path\n";#d# remove later
-      $db = stat $path ? Storable::retrieve $path : { };
+      $DB = stat $path ? Storable::retrieve $path : { };
    }
 
    my $pid;
@@ -987,8 +988,8 @@
       warn "saving database $path\n";#d# remove later
       waitpid $pid, 0 if $pid;
       if (0 == ($pid = fork)) {
-         $db->{_meta}{version} = 1;
-         Storable::nstore $db, "$path~";
+         $DB->{_meta}{version} = 1;
+         Storable::nstore $DB, "$path~";
          rename "$path~", $path;
          cf::_exit 0 if defined $pid;
       }
@@ -1012,15 +1013,15 @@
 
    sub db_get($;$) {
       @_ >= 2
-         ? $db->{$_[0]}{$_[1]}
-         : ($db->{$_[0]} ||= { })
+         ? $DB->{$_[0]}{$_[1]}
+         : ($DB->{$_[0]} ||= { })
    }
 
    sub db_put($$;$) {
       if (@_ >= 3) {
-         $db->{$_[0]}{$_[1]} = $_[2];
+         $DB->{$_[0]}{$_[1]} = $_[2];
       } else {
-         $db->{$_[0]} = $_[1];
+         $DB->{$_[0]} = $_[1];
       }
       db_dirty;
    }
@@ -1156,7 +1157,7 @@
       my $NOW = Event::time;
       $NEXT_TICK += $TICK;
 
-      # if we are delayed by four ticks, skip them all
+      # if we are delayed by four ticks or more, skip them all
       $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
 
       $TICK_WATCHER->at ($NEXT_TICK);
@@ -1164,7 +1165,7 @@
    },
 );
 
-IO::AIO::max_poll_time $TICK * 0.2;
+eval { IO::AIO::max_poll_time $TICK * 0.2 }; #d# remove eval after restart
 
 Event->io (fd   => IO::AIO::poll_fileno,
            poll => 'r',