TEST HACK: tr_info() in DEBUG_HEAP even when successful

marc-hb · marc-hb · commit 0c8d717dd245 · 2021-09-14T06:28:28.000Z
No crash when guarded with if(trace_get())

Signed-off-by: Marc Herbert &lt;marc.herbert@intel.com&gt;
diff --git a/src/lib/alloc.c b/src/lib/alloc.c
@@ -548,7 +548,7 @@ static void free_block(void *ptr)
 #endif
 }
 
-#if CONFIG_DEBUG_HEAP
+#if CONFIG_DEBUG_HEAP || 1
 
 static void trace_heap_blocks(struct mm_heap *heap)
 {
@@ -651,6 +651,11 @@ static void alloc_trace_heap(enum mem_zone zone, uint32_t caps, size_t bytes)
 			tr_err(&mem_tr, "failed to alloc 0x%x bytes zone 0x%x caps 0x%x flags 0x%x", \
 			       bytes, zone, caps, flags); \
 			alloc_trace_heap(zone, caps, bytes); \
+		}							\
+			else {						\
+				tr_info(&mem_tr, "MARC: allocated ptr %p 0x%x bytes at zone 0x%x", \
+					ptr, bytes, zone);		\
+		} \
 	}
 
 #else

Original file line number	Diff line number	Diff line change
`@@ -548,7 +548,7 @@ static void free_block(void *ptr)`
`548`	`548`	`#endif`
`549`	`549`	`}`
`550`	`550`
`551`		`-#if CONFIG_DEBUG_HEAP`
	`551`	`+#if CONFIG_DEBUG_HEAP \|\| 1`
`552`	`552`
`553`	`553`	`static void trace_heap_blocks(struct mm_heap *heap)`
`554`	`554`	`{`
`@@ -651,6 +651,11 @@ static void alloc_trace_heap(enum mem_zone zone, uint32_t caps, size_t bytes)`
`651`	`651`	`tr_err(&mem_tr, "failed to alloc 0x%x bytes zone 0x%x caps 0x%x flags 0x%x", \`
`652`	`652`	`bytes, zone, caps, flags); \`
`653`	`653`	`alloc_trace_heap(zone, caps, bytes); \`
	`654`	`+ } \`
	`655`	`+ else { \`
	`656`	`+ tr_info(&mem_tr, "MARC: allocated ptr %p 0x%x bytes at zone 0x%x", \`
	`657`	`+ ptr, bytes, zone); \`
	`658`	`+ } \`
`654`	`659`	`}`
`655`	`660`
`656`	`661`	`#else`