Message ID | 1578917307-37611-1-git-send-email-liusirui@huawei.com |
---|---|
State | New |
Headers | show |
Series | malloc: fix compile error | expand |
On 2020/1/13 20:08, liusirui wrote: > Since e9c4fe93b3855239752819303ca377dff0ed0553, the commit changes struct > malloc_chunk member "size" to "mchunk_size". This cause a compile error > in function dump_heap, if macros MALLOC_DEBUG has defined and the value is > larger 1. > for (;; ) > { > - fprintf (stderr, "chunk %p size %10lx", p, (long) p->size); > + fprintf (stderr, "chunk %p size %10lx", p, (long) chunksize_nomask(p)); chunksize_nomask(p) add a white space like that "chunksize_nomask (p)" > if (p == top (heap->ar_ptr)) > { > fprintf (stderr, " (top)\n"); > break; > } > - else if (p->size == (0 | PREV_INUSE)) > + else if (chunksize_nomask(p) == (0 | PREV_INUSE)) chunksize_nomask(p) add a white space like that "chunksize_nomask (p)" > { > fprintf (stderr, " (fence)\n"); > break; >
diff --git a/malloc/arena.c b/malloc/arena.c index 74815ac..be5c9f9 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -419,13 +419,13 @@ dump_heap (heap_info *heap) ~MALLOC_ALIGN_MASK); for (;; ) { - fprintf (stderr, "chunk %p size %10lx", p, (long) p->size); + fprintf (stderr, "chunk %p size %10lx", p, (long) chunksize_nomask(p)); if (p == top (heap->ar_ptr)) { fprintf (stderr, " (top)\n"); break; } - else if (p->size == (0 | PREV_INUSE)) + else if (chunksize_nomask(p) == (0 | PREV_INUSE)) { fprintf (stderr, " (fence)\n"); break;