X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Fopen.c;h=69885284c55d6abfce78b4d15d9b126a442d8ea1;hp=b19e4cea293df769a588db89c71df25529d677ec;hb=efda07f8f8bb9f07b8242a443aab91f8279476db;hpb=7104b7bc2e7f9829891477dbb04a9df926a656a7;ds=sidebyside

diff --git a/ccan/tdb/open.c b/ccan/tdb/open.c
index b19e4cea..69885284 100644
--- a/ccan/tdb/open.c
+++ b/ccan/tdb/open.c
@@ -159,6 +159,7 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
 		errno = ENOMEM;
 		goto fail;
 	}
+
 	tdb_io_init(tdb);
 	tdb->fd = -1;
 	tdb->name = NULL;
@@ -205,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;
 	}
 
@@ -313,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
@@ -328,6 +347,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 +385,9 @@ int tdb_close(struct tdb_context *tdb)
 	struct tdb_context **i;
 	int ret = 0;
 
+	tdb_trace(tdb, "tdb_close");
 	if (tdb->transaction) {
-		tdb_transaction_cancel(tdb);
+		tdb_transaction_cancel_internal(tdb);
 	}
 
 	if (tdb->map_ptr) {
@@ -387,6 +409,7 @@ int tdb_close(struct tdb_context *tdb)
 		}
 	}
 
+	close(tdb->tracefd);
 	memset(tdb, 0, sizeof(*tdb));
 	SAFE_FREE(tdb);