Switch to CDB environment.

* configure.ac: Version 0.99.91
* src/tbf.c (dbdir): New static.
(tbf_set_db_name): Remove.
(tbf_set_db_dir): New function.
(tbf_open): Rename the parameter and related variables.
Create a CDB environment and the database in it.
(vmod_open): Change semantics of the first argument.
* src/vmod-tbf.3: Update.
* tests/Makefile.am (distclean-local): New rule, instead of
DISTCLEANFILES.
* tests/test00.vtc: Update call to tbf.open.
* tests/test01.vtc: Likewise.
* tests/test02.vtc: Likewise.
* tests/test03.vtc: Likewise.

8 files changed, 175 insertions, 83 deletions

diff --git a/configure.ac b/configure.ac
index 9c228f6..4ca4e6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,13 +11,13 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with vmod-tbf.  If not, see <http://www.gnu.org/licenses/>.
 AC_PREREQ(2.69)
-AC_INIT([vmod-tbf], 0.99.90, [gray@gnu.org])
+AC_INIT([vmod-tbf], 0.99.91, [gray@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/vmod_tbf.vcc)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_SYSTEM
diff --git a/src/tbf.c b/src/tbf.c
index 1dfb6c6..7050fc7 100644
--- a/src/tbf.c
+++ b/src/tbf.c
@@ -17,12 +17,13 @@
 #include <config.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdbool.h>
 #include <syslog.h>
 #include <inttypes.h>
+#include <sys/stat.h>
 #include <db.h>
 #include "vrt.h"
 #include "vcc_if.h"
 #include "bin/varnishd/cache.h"
 
 static int debug_level;
@@ -38,20 +39,25 @@ debugprt(const char *fmt, ...)
 #define debug(n,c) do { if (debug_level>=(n)) debugprt c; } while (0)
 
 #ifndef USEC_PER_SEC
 # define USEC_PER_SEC  1000000L
 #endif
 
+#define DEFDBNAME "tbf.bdb"
+#define DEFOPENPARAMS "truncate"
+#define DBFILEMODE 0640
+
+static char *dbdir;
 static char *dbname;
+static DB_ENV *dbenv;
 static DB *db;
 static uint64_t autosync_max;
 static uint64_t autosync_count;
 static int tbf_disabled;
 
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-#define DBFILEMODE 0640
 
 
 /* The keylock structure serializes accesses to each db record, ensuring
    that no other thread could modify the data between calls to get and
    put */
    
@@ -119,184 +125,258 @@ keylock_remove_safe(struct keylock *kp)
         VTAILQ_REMOVE(&keylock_head, kp, list);
         VTAILQ_INSERT_TAIL(&keylock_avail, kp, list);
         pthread_mutex_unlock(&mutex);
 }
 
 static void
-tbf_set_db_name(const char *file_name)
+tbf_set_db_dir(const char *dir)
 {
-        if (dbname)
-                free(dbname);
-        dbname = strdup(file_name);
-        if (!dbname)
-                abort();
+        if (dbdir)
+                free(dbdir);
+        dbdir = strdup(dir);
+        AN(dbdir);
 }
 
-struct mode_kw {
-        char *mkw_str;
-        int mkw_len;
-        int mkw_tok;
+struct param_kw {
+        char *pkw_str;
+        int pkw_len;
+        int pkw_tok;
 };
 
 enum {
-        MKW_TRUNCATE,
-        MKW_MODE,
-        MKW_SYNC,
-        MKW_DEBUG,
+        PKW_TRUNCATE,
+        PKW_MODE,
+        PKW_SYNC,
+        PKW_DEBUG,
+        PKW_DBNAME
 };
 
-static struct mode_kw mode_kw_tab[] = {
+static struct param_kw param_kw_tab[] = {
 #define S(s) #s, sizeof(#s)-1
-        { S(truncate), MKW_TRUNCATE },
-        { S(trunc), MKW_TRUNCATE },
-        { S(mode=), MKW_MODE },
-        { S(sync=), MKW_SYNC },
-        { S(debug=), MKW_DEBUG },
+        { S(truncate), PKW_TRUNCATE },
+        { S(trunc), PKW_TRUNCATE },
+        { S(mode=), PKW_MODE },
+        { S(sync=), PKW_SYNC },
+        { S(debug=), PKW_DEBUG },
+        { S(dbname=), PKW_DBNAME },
         { NULL }
 #undef S
 };
 
 static void
-tbf_open(const char *mode)
+tbf_open(const char *params)
 {
         int rc;
-        int flags = DB_CREATE|DB_THREAD;
         int filemode = DBFILEMODE;
         uint64_t n;
         char *p;
+        struct stat st;
+        int truncate = 0;
         
-        if (!dbname)
-                tbf_set_db_name(LOCALSTATEDIR "/tbf.db");
-        
-        rc = db_create(&db, NULL, 0);
-        if (rc) {
-                syslog(LOG_DAEMON|LOG_ERR, "cannot create db struct");
-                return;
+        if (!dbdir) {
+                dbdir = strdup(LOCALSTATEDIR "/vmod-tbf");
+                AN(dbdir);
         }
-
-        while (*mode) {
-                struct mode_kw *mkw;
+        if (!dbname) {
+                dbname = strdup(DEFDBNAME);
+                AN(dbname);
+        }
+        
+        while (*params) {
+                struct param_kw *pkw;
                 
-                for (mkw = mode_kw_tab; mkw->mkw_str; mkw++) {
-                        if (strncmp(mode, mkw->mkw_str, mkw->mkw_len) == 0)
+                for (pkw = param_kw_tab; pkw->pkw_str; pkw++) {
+                        if (strncmp(params, pkw->pkw_str, pkw->pkw_len) == 0)
                                 break;
                 }
 
-                if (!mkw->mkw_str) {
-                        syslog(LOG_DAEMON|LOG_ERR, "invalid keyword %s", mode);
+                if (!pkw->pkw_str) {
+                        syslog(LOG_DAEMON|LOG_ERR, "invalid keyword %s", params);
                         break;
                 }
 
-                mode += mkw->mkw_len;
+                params += pkw->pkw_len;
                 
-                switch (mkw->mkw_tok) {
-                case MKW_TRUNCATE:
-                        flags |= DB_TRUNCATE;
+                switch (pkw->pkw_tok) {
+                case PKW_TRUNCATE:
+                        truncate = 1;
                         break;
 
-                case MKW_MODE:
+                case PKW_MODE:
                         errno = 0;
-                        n = strtoul(mode, &p, 8);
+                        n = strtoul(params, &p, 8);
                         if (errno || (n & ~0777) || !(*p == 0 || *p == ';')) {
                                 syslog(LOG_DAEMON|LOG_ERR,
                                        "invalid file mode near %s", p);
-                                mode += strlen(mode);
+                                params += strlen(params);
                         } else {
                                 filemode = n;
-                                mode = p;
+                                params = p;
                         }
                         break;