}
/* Allocate memory from the heap. */
-
-void *mmalloc(xbt_mheap_t mdp, size_t size)
+void *mmalloc(xbt_mheap_t mdp, size_t size) {
+ void *res= mmalloc_no_memset(mdp,size);
+ memset(res,0,size);
+ return res;
+}
+/* Spliting mmalloc this way is mandated by a trick in mrealloc, that gives
+ back the memory of big blocks to the system before reallocating them: we don't
+ want to loose the beginning of the area when this happens */
+void *mmalloc_no_memset(xbt_mheap_t mdp, size_t size)
{
void *result;
size_t block, blocks, lastblocks, start;
size_t requested_size = size; // The amount of memory requested by user, for real
+ check_fraghead(mdp);
+
/* Work even if the user was stupid enough to ask a ridicullously small block (even 0-length),
* ie return a valid block that can be realloced and freed.
* glibc malloc does not use this trick but return a constant pointer, but we need to enlist the free fragments later on.
frag_nb = RESIDUAL(result, BLOCKSIZE) >> log;
mdp->heapinfo[block].busy_frag.frag_size[frag_nb] = requested_size;
- //FIXME setup backtrace
+ xbt_backtrace_no_malloc(mdp->heapinfo[block].busy_frag.bt[frag_nb],XBT_BACKTRACE_SIZE);
next->prev->next = next->next;
if (next->next != NULL) {
}
if (--mdp->heapinfo[block].busy_frag.nfree != 0) {
mdp->heapinfo[block].busy_frag.first =
- RESIDUAL(next->next, BLOCKSIZE) >> log;
+ RESIDUAL(next->next, BLOCKSIZE) >> log;
}
+ /* Update the statistics. */
+ mdp -> heapstats.chunks_used++;
+ mdp -> heapstats.bytes_used += 1 << log;
+ mdp -> heapstats.chunks_free--;
+ mdp -> heapstats.bytes_free -= 1 << log;
+
} else {
/* No free fragments of the desired size, so get a new block
and break it into fragments, returning the first. */
result = mmalloc(mdp, BLOCKSIZE); // does not return NULL
- /* Link all fragments but the first into the free list, and mark their requested size to 0. */
+ /* Link all fragments but the first into the free list, and mark their requested size to -1. */
block = BLOCK(result);
for (i = 1; i < (size_t) (BLOCKSIZE >> log); ++i) {
- mdp->heapinfo[block].busy_frag.frag_size[i] = 0;
+ mdp->heapinfo[block].busy_frag.frag_size[i] = -1;
next = (struct list *) ((char *) result + (i << log));
next->next = mdp->fraghead[log].next;
next->prev = &mdp->fraghead[log];
}
}
mdp->heapinfo[block].busy_frag.frag_size[0] = requested_size;
- // FIXME: setup backtrace
-
+ xbt_backtrace_no_malloc(mdp->heapinfo[block].busy_frag.bt[0],XBT_BACKTRACE_SIZE);
+
/* Initialize the nfree and first counters for this block. */
mdp->heapinfo[block].type = log;
mdp->heapinfo[block].busy_frag.nfree = i - 1;
mdp->heapinfo[block].busy_frag.first = i - 1;
+
+ mdp -> heapstats.chunks_free += (BLOCKSIZE >> log) - 1;
+ mdp -> heapstats.bytes_free += BLOCKSIZE - (1 << log);
+ mdp -> heapstats.bytes_used -= BLOCKSIZE - (1 << log);
}
} else {
/* Large allocation to receive one or more blocks.
start = block = MALLOC_SEARCH_START;
while (mdp->heapinfo[block].free_block.size < blocks) {
if (mdp->heapinfo[block].type >=0) { // Don't trust xbt_die and friends in malloc-level library, you fool!
- fprintf(stderr,"Internal error: found a free block not marked as such (block=%lu type=%lu). Please report this bug.\n",(unsigned long)block,(unsigned long)mdp->heapinfo[block].type);
- abort();
+ fprintf(stderr,"Internal error: found a free block not marked as such (block=%lu type=%lu). Please report this bug.\n",(unsigned long)block,(unsigned long)mdp->heapinfo[block].type);
+ abort();
}
block = mdp->heapinfo[block].free_block.next;
result = register_morecore(mdp, blocks * BLOCKSIZE);
block = BLOCK(result);
- for (it=0;it<blocks;it++)
- mdp->heapinfo[block+it].type = 0;
+ for (it=0;it<blocks;it++){
+ mdp->heapinfo[block+it].type = 0;
+ }
mdp->heapinfo[block].busy_block.size = blocks;
mdp->heapinfo[block].busy_block.busy_size = requested_size;
mdp->heapinfo[block].busy_block.bt_size=xbt_backtrace_no_malloc(mdp->heapinfo[block].busy_block.bt,XBT_BACKTRACE_SIZE);
+ mdp -> heapstats.chunks_used++;
+ mdp -> heapstats.bytes_used += blocks * BLOCKSIZE;
+
+ check_fraghead(mdp);
return result;
}
/* The block we found has a bit left over,
so relink the tail end back into the free list. */
mdp->heapinfo[block + blocks].free_block.size
- = mdp->heapinfo[block].free_block.size - blocks;
+ = mdp->heapinfo[block].free_block.size - blocks;
mdp->heapinfo[block + blocks].free_block.next
- = mdp->heapinfo[block].free_block.next;
+ = mdp->heapinfo[block].free_block.next;
mdp->heapinfo[block + blocks].free_block.prev
- = mdp->heapinfo[block].free_block.prev;
+ = mdp->heapinfo[block].free_block.prev;
mdp->heapinfo[mdp->heapinfo[block].free_block.prev].free_block.next
- = mdp->heapinfo[mdp->heapinfo[block].free_block.next].free_block.prev
- = mdp->heapindex = block + blocks;
+ = mdp->heapinfo[mdp->heapinfo[block].free_block.next].free_block.prev
+ = mdp->heapindex = block + blocks;
} else {
/* The block exactly matches our requirements,
so just remove it from the list. */
mdp->heapinfo[mdp->heapinfo[block].free_block.next].free_block.prev
- = mdp->heapinfo[block].free_block.prev;
+ = mdp->heapinfo[block].free_block.prev;
mdp->heapinfo[mdp->heapinfo[block].free_block.prev].free_block.next
- = mdp->heapindex = mdp->heapinfo[block].free_block.next;
+ = mdp->heapindex = mdp->heapinfo[block].free_block.next;
}
- for (it=0;it<blocks;it++)
+ for (it=0;it<blocks;it++){
mdp->heapinfo[block+it].type = 0;
+ }
mdp->heapinfo[block].busy_block.size = blocks;
mdp->heapinfo[block].busy_block.busy_size = requested_size;
//mdp->heapinfo[block].busy_block.bt_size = 0;
mdp->heapinfo[block].busy_block.bt_size = xbt_backtrace_no_malloc(mdp->heapinfo[block].busy_block.bt,XBT_BACKTRACE_SIZE);
+
+ mdp -> heapstats.chunks_used++;
+ mdp -> heapstats.bytes_used += blocks * BLOCKSIZE;
+ mdp -> heapstats.bytes_free -= blocks * BLOCKSIZE;
+
}
//printf("(%s) Done mallocing. Result is %p\n",xbt_thread_self_name(),result);fflush(stdout);
+ check_fraghead(mdp);
return (result);
}
