[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/DB.pm

Comparing deliantra/Deliantra-Client/DC/DB.pm (file contents):
Revision 1.2 by root, Fri Apr 6 08:09:43 2007 UTC vs.
Revision 1.11 by root, Sat Jul 14 12:05:53 2007 UTC

 =head1 NAME
-CFPlus::DB - async. database access for cfplus
+CFPlus::DB - async. database and filesystem access for cfplus
 =head1 SYNOPSIS
  use CFPlus::DB;
 use strict;
 use utf8;
 use Carp ();
 use AnyEvent ();
-use Storable (); # finally
+use Storable ();
+use Config;
+use CFPlus;
+our $DB_HOME = "$Crossfire::VARDIR/cfplus-$BerkeleyDB::db_version-$Config{archname}";
+sub path_of_res($) {
+   "$DB_HOME/res-data-$_[0]"
+}
 sub sync {
    # for debugging
    #CFPlus::DB::Server::req (sync => sub { });
    CFPlus::DB::Server::sync ();
 }
+sub exists($$$) {
+   CFPlus::DB::Server::req (exists => @_);
+}
 sub get($$$) {
    CFPlus::DB::Server::req (get => @_);
 }
 sub put($$$$) {
    CFPlus::DB::Server::req (put => @_);
+}
+sub unlink($$) {
+   CFPlus::DB::Server::req (unlink => @_);
+}
+sub write_file($$$) {
+   CFPlus::DB::Server::req (write_file => @_);
+}
+sub prefetch_file($$$) {
+   CFPlus::DB::Server::req (prefetch_file => @_);
 }
 our $tilemap;
 sub get_tile_id_sync($) {
 use strict;
 use Fcntl;
 use BerkeleyDB;
-our $DB_HOME = "$Crossfire::VARDIR/cfplus";
 our $DB_ENV;
 our $DB_STATE;
 our %DB_TABLE;
 sub open_db {
          -Flags    => DB_CREATE | DB_UPGRADE,
             or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
    }
 }
-our $SYNC_INTERVAL = 6;
+our $SYNC_INTERVAL = 60;
 our %CB;
 our $FH;
 our $ID = "aaa0";
 our ($fh_r_watcher, $fh_w_watcher);
 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
       : ()
 }
 sub do_put {
    my ($db, $key, $data) = @_;
+   utf8::downgrade $key;
+   utf8::downgrade $data;
    (table $db)->db_put ($key => $data)
 }
 sub do_table {
    my ($db) = @_;
    }
    die "maximum number of transaction retries reached - database problems?";
 }
+sub do_unlink {
+   unlink $_[0];
+}
+sub do_write_file {
+   my ($file, $data) = @_;
+   utf8::downgrade $file;
+   utf8::downgrade $data;
+   open my $fh, ">:raw", $file
+      or return;
+   print $fh $data;
+   close $fh;
+   1
+}
+sub do_prefetch_file {
+   my ($file, $size) = @_;
+   utf8::downgrade $file;
+   open my $fh, "<:raw", $file
+      or return;
+   sysread $fh, my $buf, $size;
+   1
+}
 sub run {
    ($FH, my $fh) = CFPlus::socketpipe;
    my $oldfh = select $FH; $| = 1; select $oldfh;
    my $oldfh = select $fh; $| = 1; select $oldfh;
       local $SIG{__DIE__};
       eval {
          close $FH;
          unless (eval { open_db }) {
-            File::Path::rmtree $DB_HOME;
+            eval { File::Path::rmtree $DB_HOME };
             open_db;
          }
          while () {
             4 == read $fh, my $len, 4
       CFPlus::_exit 0;
    }
    close $fh;
-   fcntl $FH, F_SETFL, O_NONBLOCK;
+   CFPlus::fh_nonblocking $FH, 1;
    $CB{die} = sub { die shift };
    $fh_r_watcher = AnyEvent->io (fh => $FH, poll => 'r', cb => \&fh_read);
    sync_tick;
+}
+sub stop {
+   close $FH;
 }
 1;
 =back

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/DB.pm (file contents): Revision 1.2 by root, Fri Apr 6 08:09:43 2007 UTC vs. Revision 1.11 by root, Sat Jul 14 12:05:53 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/DB.pm (file contents):
Revision 1.2 by root, Fri Apr 6 08:09:43 2007 UTC vs.
Revision 1.11 by root, Sat Jul 14 12:05:53 2007 UTC