alloc: include any-object allocations in alloc_report

peff · gitster · commit c335d74d349d · 2014-06-12T10:29:42.000-07:00
When 2c1cbec (Use proper object allocators for unknown object nodes too, 2007-04-16), added a special "any_object" allocator, it never taught alloc_report to report on it. To do so we need to add an extra type argument to the REPORT macro, as that commit did for DEFINE_ALLOCATOR. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/alloc.c b/alloc.c
@@ -57,13 +57,14 @@ static void report(const char *name, unsigned int count, size_t size)
 			name, count, (uintmax_t) size);
 }
 
-#define REPORT(name)	\
-    report(#name, name##_allocs, name##_allocs * sizeof(struct name) >> 10)
+#define REPORT(name, type)	\
+    report(#name, name##_allocs, name##_allocs * sizeof(type) >> 10)
 
 void alloc_report(void)
 {
-	REPORT(blob);
-	REPORT(tree);
-	REPORT(commit);
-	REPORT(tag);
+	REPORT(blob, struct blob);
+	REPORT(tree, struct tree);
+	REPORT(commit, struct commit);
+	REPORT(tag, struct tag);
+	REPORT(object, union any_object);
 }

Original file line number	Diff line number	Diff line change
`@@ -57,13 +57,14 @@ static void report(const char *name, unsigned int count, size_t size)`
`57`	`57`	`name, count, (uintmax_t) size);`
`58`	`58`	`}`
`59`	`59`
`60`		`-#define REPORT(name) \`
`61`		`- report(#name, name##_allocs, name##_allocs * sizeof(struct name) >> 10)`
	`60`	`+#define REPORT(name, type) \`
	`61`	`+ report(#name, name##_allocs, name##_allocs * sizeof(type) >> 10)`
`62`	`62`
`63`	`63`	`void alloc_report(void)`
`64`	`64`	`{`
`65`		`- REPORT(blob);`
`66`		`- REPORT(tree);`
`67`		`- REPORT(commit);`
`68`		`- REPORT(tag);`
	`65`	`+ REPORT(blob, struct blob);`
	`66`	`+ REPORT(tree, struct tree);`
	`67`	`+ REPORT(commit, struct commit);`
	`68`	`+ REPORT(tag, struct tag);`
	`69`	`+ REPORT(object, union any_object);`
`69`	`70`	`}`