Update malloc utrace structure parsing to reflect the change (r199265)

in how malloc_init is logged from (0, 0, 0) to (-1, 0, 0).

While we're here, simplify the logic.

Reviewed by:	jhb (earlier version)
This commit is contained in:
cperciva 2009-11-14 09:33:51 +00:00
parent 4b1529ed29
commit 54458befa1

View File

@ -1121,17 +1121,14 @@ ktruser_malloc(int len, unsigned char *p)
{
struct utrace_malloc *ut = (struct utrace_malloc *)p;
if (ut->p == NULL) {
if (ut->s == 0 && ut->r == NULL)
printf("malloc_init()\n");
else
printf("%p = malloc(%zu)\n", ut->r, ut->s);
} else {
if (ut->s == 0)
printf("free(%p)\n", ut->p);
else
printf("%p = realloc(%p, %zu)\n", ut->r, ut->p, ut->s);
}
if (ut->p == (void *)(intptr_t)(-1))
printf("malloc_init()\n");
else if (ut->s == 0)
printf("free(%p)\n", ut->p);
else if (ut->p == NULL)
printf("%p = malloc(%zu)\n", ut->r, ut->s);
else
printf("%p = realloc(%p, %zu)\n", ut->r, ut->p, ut->s);
}
void