* under the terms of the license (GNU LGPL) which comes with this package. */
#include <string.h> /* Prototypes for memcpy, memmove, memset, etc */
+#include <stdlib.h> /* abort */
#include "mmprivate.h"
if ((char *) ptr < (char *) mdp->heapbase || BLOCK(ptr) > mdp->heapsize) {
printf
- ("FIXME. Ouch, this pointer is not mine. I will malloc it instead of reallocing it. (please report this bug)\n");
+ ("FIXME. Ouch, this pointer is not mine, refusing to proceed (another solution would be to malloc it instead of reallocing it, see source code)\n");
result = mmalloc(md, size);
abort();
return result;
}
- if (mdp->mrealloc_hook != NULL) {
- return mdp->mrealloc_hook(md, ptr, size);
- }
-
block = BLOCK(ptr);
type = mdp->heapinfo[block].busy.type;
/* The new size is a large allocation as well;
see if we can hold it in place. */
blocks = BLOCKIFY(size);
- if (blocks < mdp->heapinfo[block].busy.info.size) {
+ if (blocks < mdp->heapinfo[block].busy.info.block.size) {
/* The new size is smaller; return excess memory to the free list. */
//printf("(%s) return excess memory...",xbt_thread_self_name());
mdp->heapinfo[block + blocks].busy.type = 0;
- mdp->heapinfo[block + blocks].busy.info.size
- = mdp->heapinfo[block].busy.info.size - blocks;
- mdp->heapinfo[block].busy.info.size = blocks;
+ mdp->heapinfo[block + blocks].busy.info.block.size
+ = mdp->heapinfo[block].busy.info.block.size - blocks;
+ mdp->heapinfo[block].busy.info.block.size = blocks;
+ mdp->heapinfo[block].busy.info.block.busy_size = size;
mfree(md, ADDRESS(block + blocks));
result = ptr;
- } else if (blocks == mdp->heapinfo[block].busy.info.size) {
+ } else if (blocks == mdp->heapinfo[block].busy.info.block.size) {
/* No size change necessary. */
result = ptr;
} else {
/* Won't fit, so allocate a new region that will.
Free the old region first in case there is sufficient
adjacent free space to grow without moving. */
- blocks = mdp->heapinfo[block].busy.info.size;
+ blocks = mdp->heapinfo[block].busy.info.block.size;
/* Prevent free from actually returning memory to the system. */
oldlimit = mdp->heaplimit;
mdp->heaplimit = 0;