X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Fopen.c;h=4a1cb235e271228564038c6173b1056b21573be1;hp=a5cf47e7249606ec72093f13f148adcbeb393566;hb=41391dd9a73e1aa8bb8193cf6335542c703f20e9;hpb=e1f11b7b1e39ceb092155ba742b34f0785d88d06;ds=sidebyside

diff --git a/ccan/tdb/open.c b/ccan/tdb/open.c
index a5cf47e7..4a1cb235 100644
--- a/ccan/tdb/open.c
+++ b/ccan/tdb/open.c
@@ -163,15 +163,6 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
 		goto fail;
 	}
 
-#ifdef TDB_TRACE
-	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);
-#endif
-
 	tdb_io_init(tdb);
 	tdb->fd = -1;
 	tdb->name = NULL;
@@ -218,6 +209,10 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
 			TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_open_ex: tdb_new_database failed!"));
 			goto fail;
 		}
+#ifdef TDB_TRACE
+		/* All tracing will fail.  That's ok. */
+		tdb->tracefd = -1;
+#endif
 		goto internal;
 	}
 
@@ -326,6 +321,15 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
 		goto fail;
 	}
 
+#ifdef TDB_TRACE
+	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_enable_seqnum(tdb);
+	tdb_trace_open(tdb, "tdb_open", hash_size, tdb_flags, open_flags);
+#endif
+
  internal:
 	/* Internal (memory-only) databases skip all the code above to
 	 * do with disk files, and resume here by releasing their
@@ -381,7 +385,7 @@ int tdb_close(struct tdb_context *tdb)
 
 	tdb_trace(tdb, "tdb_close");
 	if (tdb->transaction) {
-		tdb_transaction_cancel(tdb);
+		tdb_transaction_cancel_internal(tdb);
 	}
 
 	if (tdb->map_ptr) {