/* Prototypes for local functions */
-static int initialize(struct mdesc *mdp);
-static void *morecore(struct mdesc *mdp, size_t size);
-static void *align(struct mdesc *mdp, size_t size);
-
-/* Aligned allocation. */
+static int initialize(xbt_mheap_t mdp);
+static void *register_morecore(xbt_mheap_t mdp, size_t size);
+static void *align(xbt_mheap_t mdp, size_t size);
+/* Allocation aligned on block boundary */
static void *align(struct mdesc *mdp, size_t size)
{
void *result;
unsigned long int adj;
- result = mdp->morecore(mdp, size);
+ result = mmorecore(mdp, size);
+
+ /* if this reservation does not fill up the last block of our resa,
+ * complete the reservation by also asking for the full lastest block.
+ *
+ * Also, the returned block is aligned to the end of block (but I've
+ * no fucking idea of why, actually -- http://abstrusegoose.com/432 --
+ * but not doing so seems to lead to issues).
+ */
adj = RESIDUAL(result, BLOCKSIZE);
if (adj != 0) {
adj = BLOCKSIZE - adj;
- mdp->morecore(mdp, adj);
+ mmorecore(mdp, adj);
result = (char *) result + adj;
}
return (result);
}
-/* Set everything up and remember that we have. */
-
-static int initialize(struct mdesc *mdp)
+/* Finish the initialization of the mheap. If we want to inline it
+ * properly, we need to make the align function publicly visible, too */
+static int initialize(xbt_mheap_t mdp)
{
mdp->heapsize = HEAP / BLOCKSIZE;
mdp->heapinfo = (malloc_info *)
return (1);
}
-/* Get neatly aligned memory, initializing or
- growing the heap info table as necessary. */
-
-static void *morecore(struct mdesc *mdp, size_t size)
+/* Get neatly aligned memory from the low level layers, and register it
+ * into the heap info table as necessary. */
+static void *register_morecore(struct mdesc *mdp, size_t size)
{
void *result;
malloc_info *newinfo, *oldinfo;
}
newinfo = (malloc_info *) align(mdp, newsize * sizeof(malloc_info));
if (newinfo == NULL) {
- mdp->morecore(mdp, -size);
+ mmorecore(mdp, -size);
return (NULL);
}
memset((void *) newinfo, 0, newsize * sizeof(malloc_info));
/* Allocate memory from the heap. */
-void *mmalloc(void *md, size_t size)
+void *mmalloc(xbt_mheap_t mdp, size_t size)
{
- struct mdesc *mdp;
void *result;
size_t block, blocks, lastblocks, start;
register size_t i;
if (size == 0)
size = 1;
- mdp = MD_TO_MDP(md);
// printf("(%s) Mallocing %d bytes on %p (default: %p)...",xbt_thread_self_name(),size,mdp,__mmalloc_default_mdp);fflush(stdout);
- if (mdp->mmalloc_hook != NULL) {
- return mdp->mmalloc_hook(md, size);
- }
-
if (!(mdp->flags & MMALLOC_INITIALIZED)) {
if (!initialize(mdp)) {
return (NULL);
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. */
//printf("(%s) No free fragment...",xbt_thread_self_name());
- result = mmalloc(md, BLOCKSIZE);
+ result = mmalloc(mdp, BLOCKSIZE);
//printf("(%s) Fragment: %p...",xbt_thread_self_name(),result);
if (result == NULL) {
return (NULL);
mdp->heapinfo[block].busy.type = log;
mdp->heapinfo[block].busy.info.frag.nfree = i - 1;
mdp->heapinfo[block].busy.info.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.
lastblocks = mdp->heapinfo[block].free.size;
if (mdp->heaplimit != 0 &&
block + lastblocks == mdp->heaplimit &&
- mdp->morecore(mdp, 0) == ADDRESS(block + lastblocks) &&
- (morecore(mdp, (blocks - lastblocks) * BLOCKSIZE)) != NULL) {
+ mmorecore(mdp, 0) == ADDRESS(block + lastblocks) &&
+ (register_morecore(mdp, (blocks - lastblocks) * BLOCKSIZE)) != NULL) {
/* Which block we are extending (the `final free
block' referred to above) might have changed, if
it got combined with a freed info table. */
block = mdp->heapinfo[0].free.prev;
mdp->heapinfo[block].free.size += (blocks - lastblocks);
- mdp->heapstats.bytes_free += (blocks - lastblocks) * BLOCKSIZE;
continue;
}
- result = morecore(mdp, blocks * BLOCKSIZE);
+ result = register_morecore(mdp, blocks * BLOCKSIZE);
if (result == NULL) {
return (NULL);
}
mdp->heapinfo[block].busy.type = 0;
mdp->heapinfo[block].busy.info.block.size = blocks;
mdp->heapinfo[block].busy.info.block.busy_size = size;
- mdp->heapstats.chunks_used++;
- mdp->heapstats.bytes_used += blocks * BLOCKSIZE;
return (result);
}
}
= mdp->heapinfo[block].free.prev;
mdp->heapinfo[mdp->heapinfo[block].free.prev].free.next
= mdp->heapindex = mdp->heapinfo[block].free.next;
- mdp->heapstats.chunks_free--;
}
mdp->heapinfo[block].busy.type = 0;
mdp->heapinfo[block].busy.info.block.size = blocks;
mdp->heapinfo[block].busy.info.block.busy_size = 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);
return (result);
