4 files changed, 116 insertions, 6 deletions

diff --git a/lib/ntdb/test/api-20-alloc-attr.c b/lib/ntdb/test/api-20-alloc-attr.c
new file mode 100644
index 0000000000..d5c7e718bc
--- /dev/null
+++ b/lib/ntdb/test/api-20-alloc-attr.c
@@ -0,0 +1,108 @@
+#include "config.h"
+#include "ntdb.h"
+#include "tap-interface.h"
+#include <ccan/hash/hash.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <assert.h>
+
+#include "logging.h"
+
+static const struct ntdb_context *curr_ntdb;
+static const struct ntdb_file *curr_file;
+
+static int owner_null_count,
+	owner_weird_count, alloc_count, free_count, expand_count;
+
+static void *test_alloc(const void *owner, size_t len, void *priv_data)
+{
+	void *ret;
+
+	if (!owner) {
+		owner_null_count++;
+	} else if (owner != curr_ntdb && owner != curr_file) {
+		owner_weird_count++;
+	}
+
+	alloc_count++;
+	ret = malloc(len);
+
+	/* The first time, this is the current ntdb, next is
+	 * for the file struct. */
+	if (!owner) {
+		if (!curr_ntdb) {
+			curr_ntdb = ret;
+		} else if (!curr_file) {
+			curr_file = ret;
+		}
+	}
+	assert(priv_data == &owner_weird_count);
+	return ret;
+}
+
+static void *test_expand(void *old, size_t newlen, void *priv_data)
+{
+	expand_count++;
+
+	assert(priv_data == &owner_weird_count);
+	return realloc(old, newlen);
+}
+
+static void test_free(void *old, void *priv_data)
+{
+	assert(priv_data == &owner_weird_count);
+	if (old) {
+		free_count++;
+	}
+	free(old);
+}
+
+int main(int argc, char *argv[])
+{
+	unsigned int i, j;
+	union ntdb_attribute alloc_attr;
+	struct ntdb_context *ntdb;
+	int flags[] = { NTDB_INTERNAL, NTDB_DEFAULT, NTDB_NOMMAP,
+			NTDB_INTERNAL|NTDB_CONVERT, NTDB_CONVERT,
+			NTDB_NOMMAP|NTDB_CONVERT };
+	NTDB_DATA key = { (unsigned char *)&j, sizeof(j) };
+	NTDB_DATA data = { (unsigned char *)&j, sizeof(j) };
+
+	alloc_attr.base.next = &tap_log_attr;
+	alloc_attr.base.attr = NTDB_ATTRIBUTE_ALLOCATOR;
+
+	alloc_attr.alloc.alloc = test_alloc;
+	alloc_attr.alloc.expand = test_expand;
+	alloc_attr.alloc.free = test_free;
+	alloc_attr.alloc.priv_data = &owner_weird_count;
+
+	plan_tests(sizeof(flags) / sizeof(flags[0]) * (1 + 500 * 3 + 4) + 1);
+
+	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
+		curr_ntdb = NULL;
+		curr_file = NULL;
+		ntdb = ntdb_open("run-12-store.ntdb", flags[i],
+			       O_RDWR|O_CREAT|O_TRUNC, 0600, &alloc_attr);
+		ok1(ntdb);
+		if (!ntdb)
+			continue;
+
+		for (j = 0; j < 500; j++) {
+			NTDB_DATA d = { NULL, 0 }; /* Bogus GCC warning */
+			ok1(ntdb_store(ntdb, key, data, NTDB_REPLACE) == 0);
+			ok1(ntdb_fetch(ntdb, key, &d) == NTDB_SUCCESS);
+			ok1(ntdb_deq(d, data));
+			test_free(d.dptr, &owner_weird_count);
+		}
+		ntdb_close(ntdb);
+
+		ok1(owner_null_count == 2+i*2);
+		ok1(owner_weird_count == 0);
+		ok1(alloc_count == free_count);
+		ok1(expand_count != 0);
+	}
+
+	ok1(tap_log_messages == 0);
+	return exit_status();
+}
diff --git a/lib/ntdb/test/failtest_helper.c b/lib/ntdb/test/failtest_helper.c
index cc110919c3..45b24512e9 100644
--- a/lib/ntdb/test/failtest_helper.c
+++ b/lib/ntdb/test/failtest_helper.c
@@ -39,6 +39,7 @@ static bool is_unlock(const struct failtest_call *call)
 bool exit_check_log(struct tlist_calls *history)
 {
 	const struct failtest_call *i;
+	unsigned int malloc_count = 0;
 
 	tlist_for_each(history, i, list) {
 		if (!i->fail)
@@ -52,8 +53,11 @@ bool exit_check_log(struct tlist_calls *history)
 			continue;
 
 		/* Initial allocation of ntdb doesn't log. */
-		if (failmatch(i, INITIAL_NTDB_MALLOC))
-			continue;
+		if (i->type == FAILTEST_MALLOC) {
+			if (malloc_count++ == 0) {
+				continue;
+			}
+		}
 
 		/* We don't block "failures" on non-blocking locks. */
 		if (is_nonblocking_lock(i))
@@ -77,8 +81,7 @@ block_repeat_failures(struct tlist_calls *history)
 	if (failtest_suppress)
 		return FAIL_DONT_FAIL;
 
-	if (failmatch(last, INITIAL_NTDB_MALLOC)
-	    || failmatch(last, URANDOM_OPEN)
+	if (failmatch(last, URANDOM_OPEN)
 	    || failmatch(last, URANDOM_READ)) {
 		return FAIL_PROBE;
 	}
diff --git a/lib/ntdb/test/failtest_helper.h b/lib/ntdb/test/failtest_helper.h
index 5f9166d8d5..8d1c374515 100644
--- a/lib/ntdb/test/failtest_helper.h
+++ b/lib/ntdb/test/failtest_helper.h
@@ -4,7 +4,6 @@
 #include <stdbool.h>
 
 /* FIXME: Check these! */
-#define INITIAL_NTDB_MALLOC	"open.c", 425, FAILTEST_MALLOC
 #define URANDOM_OPEN		"open.c", 62, FAILTEST_OPEN
 #define URANDOM_READ		"open.c", 42, FAILTEST_READ
 
diff --git a/lib/ntdb/test/run-57-die-during-transaction.c b/lib/ntdb/test/run-57-die-during-transaction.c
index c508854f01..b6ce57590b 100644
--- a/lib/ntdb/test/run-57-die-during-transaction.c
+++ b/lib/ntdb/test/run-57-die-during-transaction.c
@@ -78,7 +78,7 @@ static void free_all(void)
 }
 
 #define malloc malloc_noleak
-#define free free_noleak
+#define free(x) free_noleak(x)
 #define realloc realloc_noleak
 
 #include "ntdb-source.h"