tmp->requested = nmemb * size;
tmp->ptr = result;
tmp->prev = memalloc;
- tmp->next = NULL;
- if (memalloc)
+ tmp->next = memalloc ? memalloc->next : NULL;
+ if (memalloc) {
+ if (memalloc->next)
+ memalloc->next->prev = tmp;
memalloc->next = tmp;
+ }
else
memalloc = tmp;
if (heap_debug)
- fprintf(stderr, "heap req %08lx alloc %08lx @ %p\n", tmp->requested, tmp->allocated, tmp);
+ fprintf(stderr, "heap %p req %08lx alloc %08lx @ %p track %p next %p\n", memalloc, tmp->requested, tmp->allocated, tmp->ptr, tmp, memalloc->next);
}
}
else { // free allocation
struct mem_track *p = memalloc;
while (p) {
+ if(heap_debug)
+ fprintf(stderr, "%sheap %p free %08lx @ %p track %p next %p\n", (p->ptr != ptr ? " " : ""), memalloc, p->requested, p->ptr, p, p->next);
if (ptr == NULL-1 || p->ptr == ptr) { // free all or a specific allocation
- if (heap_debug)
- fprintf(stderr, "heap free %08lx @ %p\n", p->allocated, p);
tmp = p->next;
if (p->prev)
p->prev->next = p->next;