--- deliantra/Deliantra-Client/DC/DB.pm	2007/07/24 04:54:47	1.12
+++ deliantra/Deliantra-Client/DC/DB.pm	2007/12/26 18:20:46	1.27
@@ -18,116 +18,220 @@
 use utf8;
 
 use Carp ();
-use AnyEvent ();
 use Storable ();
 use Config;
+use BDB;
 
 use CFPlus;
 
-our $DB_HOME = "$Crossfire::VARDIR/cfplus-$BerkeleyDB::db_version-$Config{archname}";
+our $DBDIR   = "cfplus-" . BDB::VERSION . "-$Config{archname}";
+our $DB_HOME = "$Deliantra::VARDIR/$DBDIR";
 
-sub path_of_res($) {
-   utf8::downgrade $_[0]; # bug in unpack "H*"
-   "$DB_HOME/res-data-" . unpack "H*", $_[0]
+if (!-e $DB_HOME and -e "$Deliantra::OLDDIR/$DBDIR") {
+   rename "$Deliantra::OLDDIR/$DBDIR", $DB_HOME;
+   print STDERR "INFO: moved old database from $Deliantra::OLDDIR/$DBDIR to $DB_HOME\n";
 }
 
-sub sync {
-   # for debugging
-   #CFPlus::DB::Server::req (sync => sub { });
-   CFPlus::DB::Server::sync ();
+our $DB_ENV;
+our $DB_STATE;
+our %DB_TABLE;
+
+sub open_db {
+   mkdir $DB_HOME, 0777;
+
+   $DB_ENV = db_env_create;
+
+   $DB_ENV->set_errfile (\*STDERR);
+   $DB_ENV->set_msgfile (\*STDERR);
+   $DB_ENV->set_verbose (-1, 1);
+
+   $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::LOG_AUTOREMOVE | BDB::TXN_WRITE_NOSYNC);
+   $DB_ENV->set_cachesize (0, 2048 * 1024, 0);
+
+   db_env_open $DB_ENV, $DB_HOME,
+               BDB::CREATE | BDB::REGISTER | BDB::RECOVER | BDB::INIT_MPOOL | BDB::INIT_LOCK | BDB::INIT_TXN,
+               0666;
+
+   $! and die "cannot open database environment $DB_HOME: " . BDB::strerror;
+
+   1
 }
 
+sub table($) {
+   $DB_TABLE{$_[0]} ||= do {
+      my ($table) = @_;
+
+      $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
+
+      my $db = db_create $DB_ENV;
+      $db->set_flags (BDB::CHKSUM);
+
+      db_open $db, undef, $table, undef, BDB::BTREE,
+              BDB::AUTO_COMMIT | BDB::CREATE | BDB::READ_UNCOMMITTED, 0666;
+
+      $! and "unable to open/create database table $_[0]: ". BDB::strerror;
+
+      $db
+   }
+}
+
+#############################################################################
+
+unless (eval { open_db }) {
+   warn "$@";#d#
+   eval { File::Path::rmtree $DB_HOME };
+   open_db;
+}
+
+our $WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
+
+our $SYNC = EV::timer_ns 0, 60, sub {
+   $_[0]->stop;
+   db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
+};
+
+our $tilemap;
+
 sub exists($$$) {
-   CFPlus::DB::Server::req (exists => @_);
+   my ($db, $key, $cb) = @_;
+
+   my $data;
+   db_get table $db, undef, $key, $data, 0, sub {
+      $cb->($! ? () : length $data);
+   };
 }
 
 sub get($$$) {
-   CFPlus::DB::Server::req (get => @_);
+   my ($db, $key, $cb) = @_;
+
+   my $data;
+   db_get table $db, undef, $key, $data, 0, sub {
+      $cb->($! ? () : $data);
+   };
 }
 
 sub put($$$$) {
-   CFPlus::DB::Server::req (put => @_);
-}
+   my ($db, $key, $data, $cb) = @_;
 
-sub unlink($$) {
-   CFPlus::DB::Server::req (unlink => @_);
+   db_put table $db, undef, $key, $data, 0, sub {
+      $cb->($!);
+      $SYNC->again unless $SYNC->is_active;
+   };
 }
 
-sub write_file($$$) {
-   CFPlus::DB::Server::req (write_file => @_);
-}
+sub do_table {
+   my ($db, $cb) = @_;
 
-sub prefetch_file($$$) {
-   CFPlus::DB::Server::req (prefetch_file => @_);
+   $db = table $db;
+
+   my $cursor = $db->cursor;
+   my %kv;
+
+   for (;;) {
+      db_c_get $cursor, my $k, my $v, BDB::NEXT;
+      last if $!;
+      $kv{$k} = $v;
+   }
+
+   $cb->(\%kv);
 }
 
-our $tilemap;
+sub do_get_tile_id {
+   my ($name, $cb) = @_;
+
+   my $table = table "facemap";
+   my $id;
+
+   db_get $table, undef, $name, $id, 0;
+   return $cb->($id) unless $!;
+
+   for (1..100) {
+      my $txn = $DB_ENV->txn_begin;
+      db_get $table, $txn, id => $id, 0;
+
+      $id = 64 if $id < 64;
+
+      ++$id;
+
+      db_put $table, $txn, id => $id, 0;
+      db_txn_finish $txn;
+
+      $SYNC->again unless $SYNC->is_active;
+
+      return $cb->($id) unless $!;
+
+      select undef, undef, undef, 0.01 * rand;
+   }
+
+   die "maximum number of transaction retries reached - database problems?";
+}
 
 sub get_tile_id_sync($) {
-   my ($hash) = @_;
+   my ($name) = @_;
 
    # fetch the full face table first
    unless ($tilemap) {
-      CFPlus::DB::Server::req (table => facemap => sub { $tilemap = $_[0] });
-      sync;
+      do_table facemap => sub {
+         $tilemap = $_[0];
+         delete $tilemap->{id};
+         my %maptile = reverse %$tilemap;#d#
+         if ((scalar keys %$tilemap) != (scalar keys %maptile)) {#d#
+            $tilemap = { };#d#
+            CFPlus::error "FATAL: facemap is not a 1:1 mapping, please report this and delete your $DB_HOME directory!\n";#d#
+         }#d#
+      };
+      BDB::flush;
    }
 
-   $tilemap->{$hash} ||= do {
+   $tilemap->{$name} ||= do {
       my $id;
-      CFPlus::DB::Server::req (get_tile_id => $hash, sub { $id = $_[0] });
-      sync;
+      do_get_tile_id $name, sub {
+         $id = $_[0];
+      };
+      BDB::flush;
       $id
    }
 }
 
-package CFPlus::DB::Server;
-
-use strict;
+#############################################################################
 
-use Fcntl;
-use BerkeleyDB;
+sub path_of_res($) {
+   utf8::downgrade $_[0]; # bug in unpack "H*"
+   "$DB_HOME/res-data-" . unpack "H*", $_[0]
+}
 
-our $DB_ENV;
-our $DB_STATE;
-our %DB_TABLE;
+sub sync {
+   # for debugging
+   #CFPlus::DB::Server::req (sync => sub { });
+   CFPlus::DB::Server::sync ();
+}
 
-sub open_db {
-   mkdir $DB_HOME, 0777;
-   my $recover = $BerkeleyDB::db_version >= 4.4 
-                 ? eval "DB_REGISTER | DB_RECOVER"
-                 : 0;
-
-   $DB_ENV = new BerkeleyDB::Env
-                    -Home => $DB_HOME,
-                    -Cachesize => 8_000_000,
-                    -ErrFile => "$DB_HOME/errorlog.txt",
-#                 -ErrPrefix => "DATABASE",
-                    -Verbose => 1,
-                    -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
-                    -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
-                       or die "unable to create/open database home $DB_HOME: $BerkeleyDB::Error";
+sub unlink($$) {
+   CFPlus::DB::Server::req (unlink => @_);
+}
 
-   1
+sub read_file($$) {
+   CFPlus::DB::Server::req (read_file => @_);
 }
 
-sub table($) {
-   $DB_TABLE{$_[0]} ||= do {
-      my ($table) = @_;
+sub write_file($$$) {
+   CFPlus::DB::Server::req (write_file => @_);
+}
 
-      $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
+sub prefetch_file($$$) {
+   CFPlus::DB::Server::req (prefetch_file => @_);
+}
 
-      new BerkeleyDB::Btree
-         -Env      => $DB_ENV,
-         -Filename => $table,
-#      -Filename => "database",
-#      -Subname  => $table,
-         -Property => DB_CHKSUM,
-         -Flags    => DB_CREATE | DB_UPGRADE,
-            or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
-   }
+sub logprint($$$) {
+   CFPlus::DB::Server::req (logprint => @_);
 }
 
-our $SYNC_INTERVAL = 60;
+package CFPlus::DB::Server;
+
+use strict;
+
+use EV ();
+use Fcntl;
 
 our %CB;
 our $FH;
@@ -142,7 +246,7 @@
 
    substr $write_buf, 0, $len, "";
 
-   undef $fh_w_watcher
+   $fh_w_watcher->stop
       unless length $write_buf;
 }
 
@@ -188,115 +292,70 @@
    $write_buf .= pack "N/a*", Storable::freeze [$id, $type, @args];
    $CB{$id} = $cb;
 
-   $fh_w_watcher = AnyEvent->io (fh => $FH, poll => 'w', cb => \&fh_write);
-}
-
-sub sync_tick {
-   req "sync", sub { };
-   $sync_timer = AnyEvent->timer (after => $SYNC_INTERVAL, cb => \&sync_tick);
-}
-
-sub do_sync {
-   $DB_ENV->txn_checkpoint (0, 0, 0);
-   ()
-}
-
-sub do_exists {
-   my ($db, $key) = @_;
-
-   utf8::downgrade $key;
-   my $data;
-   (table $db)->db_get ($key, $data) == 0
-      ? length $data
-      : ()
-}
-
-sub do_get {
-   my ($db, $key) = @_;
-
-   utf8::downgrade $key;
-   my $data;
-   (table $db)->db_get ($key, $data) == 0
-      ? $data
-      : ()
+   $fh_w_watcher->start;
 }
 
-sub do_put {
-   my ($db, $key, $data) = @_;
-
-   utf8::downgrade $key;
-   utf8::downgrade $data;
-   (table $db)->db_put ($key => $data)
-}
-
-sub do_table {
-   my ($db) = @_;
-
-   $db = table $db;
-
-   my $cursor = $db->db_cursor;
-   my %kv;
-   my ($k, $v);
-   $kv{$k} = $v while $cursor->c_get ($k, $v, BerkeleyDB::DB_NEXT) == 0;
-
-   \%kv
+sub do_unlink {
+   unlink $_[0];
 }
 
-sub do_get_tile_id {
-   my ($hash) = @_;
-
-   my $id;
-   my $table = table "facemap";
-
-   return $id
-      if $table->db_get ($hash, $id) == 0;
-
-   for (1..100) {
-      my $txn = $DB_ENV->txn_begin;
-      my $status = $table->db_get (id => $id);
-      if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
-         $id = ($id || 64) + 1;
-         if ($table->db_put (id => $id) == 0
-             && $table->db_put ($hash => $id) == 0) {
-            $txn->txn_commit;
-
-            return $id;
-         }
-      }
-      $txn->txn_abort;
-   }
+sub do_read_file {
+   my ($path) = @_;
 
-   die "maximum number of transaction retries reached - database problems?";
-}
+   utf8::downgrade $path;
+   open my $fh, "<:raw", $path
+      or return;
+   sysread $fh, my $buf, -s $fh;
 
-sub do_unlink {
-   unlink $_[0];
+   $buf
 }
 
 sub do_write_file {
-   my ($file, $data) = @_;
+   my ($path, $data) = @_;
 
-   utf8::downgrade $file;
+   utf8::downgrade $path;
    utf8::downgrade $data;
-   open my $fh, ">:raw", $file
+   open my $fh, ">:raw", $path
       or return;
-   print $fh $data;
+   syswrite $fh, $data;
    close $fh;
 
    1
 }
 
 sub do_prefetch_file {
-   my ($file, $size) = @_;
+   my ($path, $size) = @_;
 
-   utf8::downgrade $file;
-   open my $fh, "<:raw", $file
+   utf8::downgrade $path;
+   open my $fh, "<:raw", $path
       or return;
    sysread $fh, my $buf, $size;
 
    1
 }
 
+our %LOG_FH;
+
+sub do_logprint {
+   my ($path, $line) = @_;
+
+   $LOG_FH{$path} ||= do {
+      open my $fh, ">>:utf8", $path
+         or warn "Couldn't open logfile $path: $!";
+
+      $fh->autoflush (1);
+
+      $fh
+   };
+
+   my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
+
+   my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
+               $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
+
+   print { $LOG_FH{$path} } "$ts $line\n"
+}
+
 sub run {
    ($FH, my $fh) = CFPlus::socketpipe;
 
@@ -306,15 +365,12 @@
    my $pid = fork;
    
    if (defined $pid && !$pid) {
+      local $SIG{QUIT};
       local $SIG{__DIE__};
+      local $SIG{__WARN__};
       eval {
          close $FH;
 
-         unless (eval { open_db }) {
-            eval { File::Path::rmtree $DB_HOME };
-            open_db;
-         }
-
          while () {
             4 == read $fh, my $len, 4
                or last;
@@ -329,19 +385,19 @@
                or die "$type: unknown database request type\n";
             my $res = pack "N/a*", Storable::freeze [$id, $cb->(@args)];
             (syswrite $fh, $res) == length $res
-               or die;
+               or die "DB::write: $!";
          }
       };
 
       my $error = $@;
 
       eval {
-         undef %DB_TABLE;
-         undef $DB_ENV;
-
          Storable::store_fd [die => $error], $fh;
       };
 
+      warn $error
+         if $error;
+
       CFPlus::_exit 0;
    }
 
@@ -350,9 +406,8 @@
 
    $CB{die} = sub { die shift };
 
-   $fh_r_watcher = AnyEvent->io (fh => $FH, poll => 'r', cb => \&fh_read);
-
-   sync_tick;
+   $fh_r_watcher = EV::io $FH, EV::READ , \&fh_read;
+   $fh_w_watcher = EV::io $FH, EV::WRITE, \&fh_write;
 }
 
 sub stop {