ebl cleanup

[bacula/bacula] / bacula / patches / testing / accurate-db.patch

diff --git a/bacula/patches/testing/accurate-db.patch b/bacula/patches/testing/accurate-db.patch
index 5d2b78816d6e9ebf54f4c3f5defb052b3f505023..89517d6034a70b75ea4620335afba84da3a01fa1 100644 (file)
--- a/bacula/patches/testing/accurate-db.patch
+++ b/bacula/patches/testing/accurate-db.patch
@@ -1,8 +1,8 @@
 Index: src/filed/accurate.c
 ===================================================================
---- src/filed/accurate.c       (révision 7288)
+--- src/filed/accurate.c       (révision 7351)
 +++ src/filed/accurate.c       (copie de travail)
-@@ -32,193 +32,295 @@
+@@ -32,193 +32,311 @@
  
  #include "bacula.h"
  #include "filed.h"
@@ -56,10 +56,12 @@ Index: src/filed/accurate.c
 +   void finish();
 +private:
 +   DB *db;                      /* DB object */
++   DB_ENV *dbenv;               /* DB Env object */
 +   DBC *cursorp;                /* DB cursor  */
 +   DBT dbkey;
 +   DBT dbdata;
 +   POOLMEM *hash_name;          /* file name for hash */
++   bool first_pass;
 +};
 +
 +void AccurateBackendDB::destroy()
@@ -75,6 +77,11 @@ Index: src/filed/accurate.c
 +      db->close(db, DB_NOSYNC);
 +      db = NULL;
 +   }
++   if (dbenv) {
++      dbenv->dbremove(dbenv, NULL, hash_name, NULL, 0);
++      dbenv->close(dbenv, 0);
++      dbenv = NULL;
++   }
 +   if (hash_name) {
 +      unlink(hash_name);        /* remove the hash on disk */
 +      free_pool_memory(hash_name);
@@ -96,18 +103,28 @@ Index: src/filed/accurate.c
 -   elt = (CurFile*)tcadbget(jcr->file_list, 
 -                          fname, strlen(fname)+1, &size);
 -   if (elt)
-+   if ((ret = db_create(&db, NULL, 0)) != 0) {
-+      Jmsg(jcr, M_ERROR, 1, _("Can't open accurate hash disk ERR=%i\n"), ret);
-+      return 0;
++   if ((ret = db_env_create(&dbenv, 0)) != 0) {
++      Jmsg(jcr, M_ERROR, 1, _("Can't open initialize hash disk ERR=%i\n"), ret);
++      return false;
 +   }
 +
-+   db->set_errfile(db, stderr);
-+   db->set_errpfx(db, "hash");
++   dbenv->set_cachesize(dbenv, 0, 256 * 1024 * 1024, 0);
++   dbenv->set_errfile(dbenv, stderr);
++   dbenv->set_errpfx(dbenv, "hash");
++   
++   int flags = DB_PRIVATE | DB_INIT_MPOOL | DB_CREATE | DB_THREAD;
++   if ((ret = dbenv->open(dbenv, working_directory, flags, 0)) != 0) {
++      destroy();
++      Jmsg(jcr, M_ERROR, 1, _("Can't open initialize hash disk ERR=%i\n"), ret);
++      return false;
++   }
 +
-+   if ((ret = db->set_cachesize(db, 0, 32 * 1024 * 1024, 0)) != 0) {
-+      Jmsg(jcr, M_ERROR, 1, _("Can't setup hash disk cache size ERR=%i\n"), ret);
-+      db->close(db, DB_NOSYNC);
-+      db=NULL;
++   dbenv->set_flags(dbenv, DB_TXN_NOSYNC, 1);
++   
++   if ((ret = db_create(&db, dbenv, 0)) != 0) {
++      destroy();
++      Jmsg(jcr, M_ERROR, 1, _("Can't open accurate hash disk ERR=%i\n"), ret);
++      return false;
 +   }
 +
 +   hash_name  = get_pool_memory(PM_MESSAGE);
@@ -123,16 +140,15 @@ Index: src/filed/accurate.c
 -      memcpy(ret, elt, sizeof(CurFile));
 -      realfree(elt);
 -//    Dmsg1(dbglvl, "lookup <%s> ok\n", fname);
-+      db->close(db, DB_NOSYNC);
-+      db=NULL;
-+      free_pool_memory(hash_name);
-+      hash_name = NULL;
++      destroy();
 +      Jmsg(jcr, M_ERROR, 1, _("Can't setup hash disk ERR=%i\n"), ret);
-+      return 0;
++      return false;
     }
 -   return found;
++   
++   first_pass=0;
 +
-+   return db != NULL;
++   return true;
  }
  
 -/* Create tokyo dbm hash file 
@@ -432,7 +448,7 @@ Index: src/filed/accurate.c
     return true;
  }
  
-@@ -228,7 +330,8 @@
+@@ -228,7 +346,8 @@
   */
  bool accurate_send_deleted_list(JCR *jcr)
  {
@@ -442,7 +458,7 @@ Index: src/filed/accurate.c
     FF_PKT *ff_pkt;
     int stream = STREAM_UNIX_ATTRIBUTES;
  
-@@ -242,31 +345,28 @@
+@@ -242,31 +361,28 @@
  
     ff_pkt = init_find_files();
     ff_pkt->type = FT_DELETED;
@@ -483,7 +499,7 @@ Index: src/filed/accurate.c
  static bool accurate_add_file(JCR *jcr, char *fname, char *lstat)
  {
     bool ret = true;
-@@ -278,25 +378,12 @@
+@@ -278,25 +394,12 @@
     elt.mtime = statp.st_mtime;
     elt.seen = 0;
  
@@ -512,7 +528,7 @@ Index: src/filed/accurate.c
     return ret;
  }
  
-@@ -324,7 +411,7 @@
+@@ -324,7 +427,7 @@
        fname = ff_pkt->fname;
     } 
  
@@ -521,7 +537,7 @@ Index: src/filed/accurate.c
        Dmsg1(dbglvl, "accurate %s (not found)\n", fname);
        stat = true;
        goto bail_out;
-@@ -343,7 +430,7 @@
+@@ -343,7 +446,7 @@
       stat = true;
     }
  
@@ -530,7 +546,7 @@ Index: src/filed/accurate.c
     Dmsg2(dbglvl, "accurate %s = %i\n", fname, stat);
  
  bail_out:
-@@ -379,7 +466,7 @@
+@@ -379,7 +482,7 @@
     while (dir->recv() >= 0) {
        len = strlen(dir->msg) + 1;
        if (len < dir->msglen) {
@@ -539,7 +555,7 @@ Index: src/filed/accurate.c
        }
     }
  
-@@ -398,17 +485,3 @@
+@@ -398,17 +501,3 @@
  
     return true;
  }
@@ -559,7 +575,7 @@ Index: src/filed/accurate.c
 -#endif
 Index: src/filed/filed.h
 ===================================================================
---- src/filed/filed.h  (révision 7288)
+--- src/filed/filed.h  (révision 7351)
 +++ src/filed/filed.h  (copie de travail)
 @@ -35,11 +35,35 @@
  
@@ -604,7 +620,7 @@ Index: src/filed/filed.h
  #include "findlib/find.h"
 Index: src/baconfig.h
 ===================================================================
---- src/baconfig.h     (révision 7288)
+--- src/baconfig.h     (révision 7351)
 +++ src/baconfig.h     (copie de travail)
 @@ -113,6 +113,12 @@
  
@@ -621,7 +637,7 @@ Index: src/baconfig.h
     #include <libintl.h>
 Index: src/jcr.h
 ===================================================================
---- src/jcr.h  (révision 7288)
+--- src/jcr.h  (révision 7351)
 +++ src/jcr.h  (copie de travail)
 @@ -341,12 +341,7 @@
     CRYPTO_CTX crypto;                 /* Crypto ctx */