Torture harder: random ops inside traverses.

[ccan] / ccan / tdb / open.c

diff --git a/ccan/tdb/open.c b/ccan/tdb/open.c
index b19e4cea293df769a588db89c71df25529d677ec..e58d381f7ce85fc675f9d6eb7cd48e8ba51a5e2e 100644 (file)
--- a/ccan/tdb/open.c
+++ b/ccan/tdb/open.c
@@ -153,12 +153,29 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
        unsigned char *vp;
        uint32_t vertest;
        unsigned v;
+#ifdef TDB_TRACE
+       char tracefile[strlen(name) + 32];
+#endif
 
        if (!(tdb = (struct tdb_context *)calloc(1, sizeof *tdb))) {
                /* Can't log this */
                errno = ENOMEM;
                goto fail;
        }
+
+#ifdef TDB_TRACE
+       if (!(tdb_flags & TDB_INTERNAL)) {
+               sprintf(tracefile, "%s.trace.%u", name, getpid());
+               tdb->tracefd = open(tracefile, O_WRONLY|O_CREAT|O_EXCL, 0600);
+               if (tdb->tracefd < 0)
+                       goto fail;
+               tdb_trace(tdb, "tdb_open %s %u %#x %#x %p\n",
+                         name, hash_size, tdb_flags, open_flags, hash_fn);
+       } else
+               /* All writes will fail.  That's OK. */
+               tdb->tracefd = -1;
+#endif
+
        tdb_io_init(tdb);
        tdb->fd = -1;
        tdb->name = NULL;
@@ -328,6 +345,8 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
 
        if (!tdb)
                return NULL;
+
+       close(tdb->tracefd);
        
        if (tdb->map_ptr) {
                if (tdb->flags & TDB_INTERNAL)
@@ -364,8 +383,9 @@ int tdb_close(struct tdb_context *tdb)
        struct tdb_context **i;
        int ret = 0;
 
+       tdb_trace(tdb, "tdb_close\n");
        if (tdb->transaction) {
-               tdb_transaction_cancel(tdb);
+               tdb_transaction_cancel_internal(tdb);
        }
 
        if (tdb->map_ptr) {
@@ -387,6 +407,7 @@ int tdb_close(struct tdb_context *tdb)
                }
        }
 
+       close(tdb->tracefd);
        memset(tdb, 0, sizeof(*tdb));
        SAFE_FREE(tdb);