[PATCH 2/4] realloc

[Eric Wong <e@80x24.org>]

---
 lib/Devel/Mwrap/trace-replay.h | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/Devel/Mwrap/trace-replay.h b/lib/Devel/Mwrap/trace-replay.h
index dfd443e..a2b0e50 100644
--- a/lib/Devel/Mwrap/trace-replay.h
+++ b/lib/Devel/Mwrap/trace-replay.h
@@ -25,13 +25,17 @@
 #ifdef __GLIBC__
 extern void __attribute__((weak)) malloc_stats(void);
 extern void __attribute__((weak)) malloc_info(int, FILE *);
-#	define MALLOC_STATS() do { \
-		if (malloc_stats) malloc_stats(); \
+#	define GLIBC_MALLOC_STATS() do { \
 		if (malloc_info) malloc_info(0, stderr); \
+		if (malloc_stats) malloc_stats(); \
 	} while (0)
-#else // TODO: jemalloc
-#	define MALLOC_STATS() do {} while (0)
+#else
+#	define GLIBC_MALLOC_STATS() do {} while (0)
 #endif
+
+extern void __attribute__((weak)) malloc_stats_print(
+	void (*wcb)(void *, const char *), void *, const char *opts);
+
 #include <urcu/rculist.h>
 #include <urcu/wfcqueue.h>
 #include "dlmalloc_c.h"
@@ -80,7 +84,6 @@ int main(int argc, char *argv[])
 	tr_ms->seg.sflags = EXTERN_BIT | USE_MMAP_BIT;
 	disable_contiguous(tr_ms);
 	size_t realloc_miss = 0, free_miss = 0, bad_entry = 0;
-	size_t realloc_hit = 0;
 	union {
 		struct tr_memalign do_memalign;
 		struct tr_free do_free;
@@ -160,9 +163,7 @@ int main(int argc, char *argv[])
 				if (k >= kh_end(old2cur)) {
 					realloc_miss++;
 				} else {
-					realloc_hit++;
-					cur = (void *)
-						kh_val(old2cur, k);
+					cur = (void *)kh_val(old2cur, k);
 					ptrmap_del(old2cur, k);
 				}
 			}
@@ -199,8 +200,11 @@ int main(int argc, char *argv[])
 	if (free_miss || realloc_miss || bad_entry)
 		fprintf(stderr, "miss free=%zu realloc=%zu bad=%zu\n",
 			free_miss, realloc_miss, bad_entry);
-	fprintf(stderr, "realloc_hit=%zu\n", realloc_hit);
-	MALLOC_STATS();
+
+	if (malloc_stats_print) // jemalloc loaded
+		malloc_stats_print(NULL, NULL, NULL);
+	else
+		GLIBC_MALLOC_STATS();
 
 	int c;
 	char *end;
@@ -226,7 +230,6 @@ int main(int argc, char *argv[])
 			(int)getpid(), s);
 		sleep(s);
 	}
-	fprintf(stderr, "truncated=%d\n", truncated);
 
 	return truncated;
 }