X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Fopen.c;h=69885284c55d6abfce78b4d15d9b126a442d8ea1;hp=1e9ce83a25550c8f7434d6a4540a4034c901f4c3;hb=efda07f8f8bb9f07b8242a443aab91f8279476db;hpb=6d35d746f123291ba93a592997dcd5b6fe7828cf

diff --git a/ccan/tdb/open.c b/ccan/tdb/open.c
index 1e9ce83a..69885284 100644
--- a/ccan/tdb/open.c
+++ b/ccan/tdb/open.c
@@ -153,9 +153,6 @@ 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 */
@@ -163,15 +160,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 +206,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 +318,20 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
 		goto fail;
 	}
 
+#ifdef TDB_TRACE
+	{
+		char tracefile[strlen(name) + 32];
+
+		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
@@ -379,7 +385,7 @@ int tdb_close(struct tdb_context *tdb)
 	struct tdb_context **i;
 	int ret = 0;
 
-	tdb_trace(tdb, "tdb_close\n");
+	tdb_trace(tdb, "tdb_close");
 	if (tdb->transaction) {
 		tdb_transaction_cancel_internal(tdb);
 	}