Changeset 2717

Timestamp:

28/08/2010 10:01:16 (18 months ago)

Author:

chris

Message:

Remove QDBM, and switch BackupClientInodeToIDMap to use the bundled TDB
instead.

Location:

box/trunk

Files:

• bin/bbackupd/BackupClientInodeToIDMap.cpp (modified) (13 diffs)
• bin/bbackupd/BackupClientInodeToIDMap.h (modified) (2 diffs)
• bootstrap (modified) (1 diff)
• configure.ac (modified) (1 diff)
• infrastructure/makebuildenv.pl.in (modified) (5 diffs)
• infrastructure/makeparcels.pl.in (modified) (2 diffs)
• modules.txt (modified) (1 diff)
• parcels.txt (modified) (2 diffs)
• qdbm (deleted)

box/trunk/bin/bbackupd/BackupClientInodeToIDMap.cpp

@@ -11 +11 @@
 
 #include <stdlib.h>
-#include <depot.h>
+
+#define _PUBLIC_
+#include "tdb.h"
 
 #define BACKIPCLIENTINODETOIDMAP_IMPLEMENTATION
@@ -27 +29 @@
 } IDBRecord;
 
-#define BOX_DBM_MESSAGE(stuff) stuff << " (qdbm): " << dperrmsg(dpecode)
+#define BOX_DBM_MESSAGE(stuff) stuff << " (tdb): " << tdb_error(mpContext)
 
 #define BOX_LOG_DBM_ERROR(stuff) \
@@ -37 +39 @@
                 BOX_DBM_MESSAGE(message << ": " << filename));
 
-#define ASSERT_DBM_OK(operation, message, filename, exception, subtype) \
-        if(!(operation)) \
+#define ASSERT_DBM(success, message, exception, subtype) \
+        if(!(success)) \
         { \
-                THROW_DBM_ERROR(message, filename, exception, subtype); \
+                THROW_DBM_ERROR(message, mFilename, exception, subtype); \
         }
 
 #define ASSERT_DBM_OPEN() \
-        if(mpDepot == 0) \
+        if(mpContext == 0) \
         { \
                 THROW_EXCEPTION_MESSAGE(BackupStoreException, InodeMapNotOpen, \
@@ -51 +53 @@
 
 #define ASSERT_DBM_CLOSED() \
-        if(mpDepot != 0) \
+        if(mpContext != 0) \
         { \
                 THROW_EXCEPTION_MESSAGE(CommonException, Internal, \
@@ -68 +70 @@
         : mReadOnly(true),
           mEmpty(false),
-          mpDepot(0)
+          mpContext(NULL)
 {
 }
@@ -82 +84 @@
 BackupClientInodeToIDMap::~BackupClientInodeToIDMap()
 {
-        if(mpDepot != 0)
+        if(mpContext != NULL)
         {
                 Close();
@@ -109 +111 @@
         
         // Open the database file
-        int mode = ReadOnly ? DP_OREADER : DP_OWRITER;
+        int mode = ReadOnly ? O_RDONLY : O_RDWR;
         if(CreateNew)
         {
-                mode |= DP_OCREAT;
-        }
-        
-        mpDepot = dpopen(Filename, mode, 0);
-        
-        ASSERT_DBM_OK(mpDepot, "Failed to open inode database", mFilename,
+                mode |= O_CREAT;
+        }
+        
+        mpContext = tdb_open(Filename, 0, 0, mode, 0700);
+        
+        ASSERT_DBM(mpContext != NULL, "Failed to open inode database",
                 BackupStoreException, BerkelyDBFailure);
         
@@ -138 +140 @@
 {
         ASSERT_DBM_CLOSED();
-        ASSERT(mpDepot == 0);
+        ASSERT(mpContext == NULL);
         mEmpty = true;
         mReadOnly = true;
@@ -154 +156 @@
 {
         ASSERT_DBM_OPEN();
-        ASSERT_DBM_OK(dpclose(mpDepot), "Failed to close inode database",
-                mFilename, BackupStoreException, BerkelyDBFailure);
-        mpDepot = 0;
-}
+        ASSERT_DBM(tdb_close(mpContext) == 0, "Failed to close inode database",
+                BackupStoreException, BerkelyDBFailure);
+        mpContext = NULL;
+}
+
+static TDB_DATA GetDatum(void* dptr, size_t dsize)
+{
+        TDB_DATA datum;
+        datum.dptr = (unsigned char *)dptr;
+        datum.dsize = dsize;
+        return datum;
+}
+
+#define GET_STRUCT_DATUM(structure) \
+        GetDatum(&structure, sizeof(structure))
 
 // --------------------------------------------------------------------------
@@ -177 +190 @@
         }
 
-        if(mpDepot == 0)
+        if(mpContext == 0)
         {
                 THROW_EXCEPTION(BackupStoreException, InodeMapNotOpen);
@@ -189 +202 @@
         rec.mInDirectory = InDirectory;
 
-        ASSERT_DBM_OK(dpput(mpDepot, (const char *)&InodeRef, sizeof(InodeRef),
-                (const char *)&rec, sizeof(rec), DP_DOVER),
-                "Failed to add record to inode database", mFilename,
+        ASSERT_DBM(tdb_store(mpContext, GET_STRUCT_DATUM(InodeRef),
+                GET_STRUCT_DATUM(rec), 0) == 0,
+                "Failed to add record to inode database",
                 BackupStoreException, BerkelyDBFailure);
 }
@@ -215 +228 @@
         }
 
-        if(mpDepot == 0)
+        if(mpContext == 0)
         {
                 THROW_EXCEPTION(BackupStoreException, InodeMapNotOpen);
@@ -222 +235 @@
         ASSERT_DBM_OPEN();
 
-        IDBRecord rec;
-        
-        if(dpgetwb(mpDepot, (const char *)&InodeRef, sizeof(InodeRef),
-                0, sizeof(IDBRecord), (char *)&rec) == -1)
+        TDB_DATA datum = tdb_fetch(mpContext, GET_STRUCT_DATUM(InodeRef));
+        if(datum.dptr == NULL)
         {
                 // key not in file
                 return false;
         }
+
+        IDBRecord rec;
+        if(datum.dsize != sizeof(rec))
+        {
+                THROW_EXCEPTION_MESSAGE(CommonException, Internal,
+                        "Failed to get inode database entry: "
+                        "record has wrong size: expected " <<
+                        sizeof(rec) << " but was " << datum.dsize <<
+                        " in " << mFilename);
+        }
                 
+        rec = *(IDBRecord *)datum.dptr;
+        free(datum.dptr);
+        
         // Return data
         rObjectIDOut = rec.mObjectID;

box/trunk/bin/bbackupd/BackupClientInodeToIDMap.h

@@ -18 +18 @@
 // avoid having to include the DB files when not necessary
 #ifndef BACKIPCLIENTINODETOIDMAP_IMPLEMENTATION
-        class DEPOT;
+        struct TDB_CONTEXT;
+        struct TDB_DATUM;
 #endif
 
@@ -50 +51 @@
         bool mEmpty;
         std::string mFilename;
-        DEPOT *mpDepot;
+        TDB_CONTEXT *mpContext;
 };
 

box/trunk/bootstrap

@@ -1 +1 @@
 #!/bin/sh
+
+set -e
 
 aclocal -I infrastructure/m4
 autoheader
 autoconf
+( cd bundled/tdb; ./autogen.sh; )

box/trunk/configure.ac

@@ -385 +385 @@
 
 cat parcels.txt | sed -e 's/#.*//' | while read cmd subdir configure_args; do
-        if test "$cmd" = "subdir"; then
+        if test "$cmd" = "configure"; then
                 echo
                 export CC CXX CXXFLAGS LDFLAGS LIBS

box/trunk/infrastructure/makebuildenv.pl.in

@@ -253 +253 @@
         # check directory exists
         die "Module $mod can't be found\n" unless -d $mod;
+
+        # skip bundled libraries with their own Makefile process        
+        next if ($mod =~ m|^bundled/|);
         
         # and put in lists
@@ -511 +514 @@
         }       
         
-
         # make include path
-        my $include_paths = join(' ',map {'-I../../'.$_} @all_deps_for_module);
+        my $include_paths = "";
+
+        foreach my $mod (@all_deps_for_module)
+        {
+                if ($mod =~ m|^bundled/| and -d "$mod/include")
+                {
+                        $include_paths .= "-I../../$mod/include ";
+                }
+                else
+                {
+                        $include_paths .= "-I../../$mod ";
+                }
+        }
 
         # is target a library?
@@ -775 +789 @@
                                 $dep_target = "\$(OUTBASE)/$dep/$1.a";
                         }
-                        elsif ($dep =~ m|^.*/(.*)|)
+                        elsif ($dep =~ m|^bundled/(.*)|)
+                        {
+                                $dep_target = "lib$1.a";
+                        }
+                        elsif ($dep =~ m|^bin/(.*)|)
                         {
                                 $dep_target = "\$(OUTBASE)/$dep/$1$platform_exe_ext";
@@ -781 +799 @@
                         else
                         {
-                                $dep_target = "lib$dep.a";
+                                die "Don't know how to add compile-time " .
+                                        "dependency on $dep";
                         }
 
@@ -802 +821 @@
         foreach my $dep (reverse @all_deps_for_module)
         {
-                if ($dep =~ m|^lib\/(.+)$|)
+                if ($dep =~ m|^lib/(.+)$|)
                 {
                         push @lib_files, "\$(OUTBASE)/$dep/$1.a";
                 }
-                elsif ($dep =~ m|^([^/]+)$|)
+                elsif ($dep =~ m|^bundled/(.+)$|)
                 {
                         push @lib_files, "../../$dep/lib$1.a";

box/trunk/infrastructure/makeparcels.pl.in

@@ -243 +243 @@
                         push @parcel_deps, "$dir/docs/${name}.html";
                 }
-                elsif ($type eq 'subdir')
+                elsif ($type eq 'configure')
                 {
                         shift @args;
@@ -255 +255 @@
 $name-clean:
         cd $name; \$(MAKE) clean
+
 EOF
                         push @parcel_deps, "$name-build";

box/trunk/modules.txt

@@ -27 +27 @@
 
 lib/backupclient        lib/server      lib/crypto      lib/compress
-lib/backupstore         lib/server      lib/raidfile    lib/backupclient
+lib/backupstore         lib/server      lib/raidfile    lib/backupclient                bundled/tdb
 
 bin/bbackupobjdump      lib/backupclient lib/backupstore
-bin/bbstored            lib/raidfile    lib/server      lib/backupstore lib/backupclient
+bin/bbstored            lib/raidfile    lib/server      lib/backupstore lib/backupclient        bundled/tdb
 bin/bbstoreaccounts     lib/raidfile    lib/backupstore
-bin/bbackupd            lib/server      lib/backupclient        qdbm
+bin/bbackupd            lib/server      lib/backupclient        bundled/tdb
 bin/bbackupquery        lib/server      lib/backupclient
 bin/bbackupctl          lib/server      lib/backupclient

box/trunk/parcels.txt

@@ -19 +19 @@
         html bbackupd.conf
 
-        subdir qdbm libqdbm.a
 
 EXCEPT:mingw32,mingw32msvc
@@ -67 +66 @@
         html raidfile.conf
 
+        configure bundled/tdb
+
 EXCEPT:mingw32,mingw32msvc
         man bbstored.8