--- deliantra/server/lib/cf.pm	2007/02/02 19:59:22	1.204
+++ deliantra/server/lib/cf.pm	2007/02/11 22:42:09	1.207
@@ -17,6 +17,7 @@
 use Coro::Semaphore;
 use Coro::AIO;
 
+use BDB ();
 use Data::Dumper;
 use Digest::MD5;
 use Fcntl;
@@ -50,7 +51,10 @@
 our $WRITE_RUNTIME_WATCHER;
 our $NEXT_TICK;
 our $NOW;
-our $USE_FSYNC; # use fsync to write maps - default off
+our $USE_FSYNC = 1; # use fsync to write maps - default off
+
+our $BDB_POLL_WATCHER;
+our $DB_ENV;
 
 our %CFG;
 
@@ -61,6 +65,7 @@
 our %MAP;    # all maps
 our $LINK_MAP; # the special {link} map, which is always available
 our $RANDOM_MAPS = cf::localdir . "/random";
+our $BDB_ENV_DIR = cf::localdir . "/db";
 
 our $WAIT_FOR_TICK;     $WAIT_FOR_TICK     ||= new Coro::Signal;
 our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
@@ -83,6 +88,7 @@
 mkdir cf::localdir . "/" . cf::tmpdir;
 mkdir cf::localdir . "/" . cf::uniquedir;
 mkdir $RANDOM_MAPS;
+mkdir $BDB_ENV_DIR;
 
 our $EMERGENCY_POSITION;
 
@@ -2554,17 +2560,66 @@
    },
 );
 
-IO::AIO::max_poll_time $TICK * 0.1;
+{
+   BDB::max_poll_time $TICK * 0.1;
+   $BDB_POLL_WATCHER = Event->io (
+      reentrant => 0,
+      fd        => BDB::poll_fileno,
+      poll      => 'r',
+      prio      => 0,
+      data      => WF_AUTOCANCEL,
+      cb        => \&BDB::poll_cb,
+   );
+   BDB::min_parallel 8;
 
-undef $Coro::AIO::WATCHER;
-$AIO_POLL_WATCHER = Event->io (
-   reentrant => 0,
-   fd        => IO::AIO::poll_fileno,
-   poll      => 'r',
-   prio      => 6,
-   data      => WF_AUTOCANCEL,
-   cb        => \&IO::AIO::poll_cb,
-);
+   BDB::set_sync_prepare {
+      my $status;
+      my $current = $Coro::current;
+      (
+         sub {
+            $status = $!;
+            $current->ready; undef $current;
+         },
+         sub {
+            Coro::schedule while defined $current;
+            $! = $status;
+         },
+      )
+   };
+
+   unless ($DB_ENV) {
+      $DB_ENV = BDB::db_env_create;
+
+      cf::sync_job {
+         BDB::db_env_open
+            $DB_ENV,
+            $BDB_ENV_DIR,
+            BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
+            | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
+            0666;
+
+         cf::cleanup "$!" if $!;
+            
+         $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
+         $DB_ENV->set_lk_detect;
+      };
+   }
+}
+
+{
+   IO::AIO::min_parallel 8;
+
+   undef $Coro::AIO::WATCHER;
+   IO::AIO::max_poll_time $TICK * 0.1;
+   $AIO_POLL_WATCHER = Event->io (
+      reentrant => 0,
+      fd        => IO::AIO::poll_fileno,
+      poll      => 'r',
+      prio      => 6,
+      data      => WF_AUTOCANCEL,
+      cb        => \&IO::AIO::poll_cb,
+   );
+}
 
 $WRITE_RUNTIME_WATCHER = Event->timer (
    reentrant => 0,