/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include <string.h> /* Prototypes for memcpy, memmove, memset, etc */
+#include <string.h> /* Prototypes for memcpy, memmove, memset, etc */
#include "mmprivate.h"
new region. This module has incestuous knowledge of the
internals of both mfree and mmalloc. */
-void* mrealloc (void *md, void *ptr, size_t size) {
+void *mrealloc(void *md, void *ptr, size_t size)
+{
struct mdesc *mdp;
- void* result;
+ void *result;
int type;
size_t block, blocks, oldlimit;
-
if (size == 0) {
- mfree (md, ptr);
- return (mmalloc (md, 0));
+ mfree(md, ptr);
+ return (mmalloc(md, 0));
} else if (ptr == NULL) {
- return (mmalloc (md, size));
+ return (mmalloc(md, size));
}
- mdp = MD_TO_MDP (md);
+ mdp = MD_TO_MDP(md);
//printf("(%s)realloc %p to %d...",xbt_thread_self_name(),ptr,(int)size);
- 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");
- result = mmalloc(md,size);
+ 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");
+ result = mmalloc(md, size);
abort();
return result;
}
- LOCK(mdp);
- if (mdp -> mrealloc_hook != NULL)
- {
- UNLOCK(mdp);
- return ((*mdp -> mrealloc_hook) (md, ptr, size));
+ if (mdp->mrealloc_hook != NULL) {
+ return mdp->mrealloc_hook(md, ptr, size);
}
- block = BLOCK (ptr);
+ block = BLOCK(ptr);
- type = mdp -> heapinfo[block].busy.type;
- switch (type)
- {
+ type = mdp->heapinfo[block].busy.type;
+ switch (type) {
case 0:
/* Maybe reallocate a large block to a small fragment. */
- if (size <= BLOCKSIZE / 2)
- {
- UNLOCK(mdp);
+ if (size <= BLOCKSIZE / 2) {
//printf("(%s) alloc large block...",xbt_thread_self_name());
- result = mmalloc (md, size);
- if (result != NULL)
- {
- memcpy (result, ptr, size);
- mfree (md, ptr);
+ result = mmalloc(md, size);
+ if (result != NULL) {
+ memcpy(result, ptr, size);
+ mfree(md, ptr);
return (result);
}
}
/* The new size is a large allocation as well;
- see if we can hold it in place. */
- LOCK(mdp);
- blocks = BLOCKIFY (size);
- if (blocks < mdp -> heapinfo[block].busy.info.size)
- {
+ see if we can hold it in place. */
+ blocks = BLOCKIFY(size);
+ if (blocks < mdp->heapinfo[block].busy.info.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;
- mfree (md, ADDRESS (block + blocks));
+ 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;
+ mfree(md, ADDRESS(block + blocks));
result = ptr;
- }
- else if (blocks == mdp -> heapinfo[block].busy.info.size)
- {
+ } else if (blocks == mdp->heapinfo[block].busy.info.size) {
/* No size change necessary. */
result = ptr;
- }
- else
- {
+ } 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;
+ Free the old region first in case there is sufficient
+ adjacent free space to grow without moving. */
+ blocks = mdp->heapinfo[block].busy.info.size;
/* Prevent free from actually returning memory to the system. */
- oldlimit = mdp -> heaplimit;
- mdp -> heaplimit = 0;
- mfree (md, ptr);
- mdp -> heaplimit = oldlimit;
- UNLOCK(mdp);
- result = mmalloc (md, size);
+ oldlimit = mdp->heaplimit;
+ mdp->heaplimit = 0;
+ mfree(md, ptr);
+ mdp->heaplimit = oldlimit;
+ result = mmalloc(md, size);
if (result == NULL) {
- mmalloc (md, blocks * BLOCKSIZE);
+ mmalloc(md, blocks * BLOCKSIZE);
return (NULL);
}
if (ptr != result)
- memmove (result, ptr, blocks * BLOCKSIZE);
- LOCK(mdp);
+ memmove(result, ptr, blocks * BLOCKSIZE);
}
break;
default:
/* Old size is a fragment; type is logarithm
- to base two of the fragment size. */
+ to base two of the fragment size. */
if (size > (size_t) (1 << (type - 1)) && size <= (size_t) (1 << type)) {
/* The new size is the same kind of fragment. */
//printf("(%s) new size is same kind of fragment...",xbt_thread_self_name());
result = ptr;
} else {
/* The new size is different; allocate a new space,
- and copy the lesser of the new size and the old. */
+ and copy the lesser of the new size and the old. */
//printf("(%s) new size is different...",xbt_thread_self_name());
- UNLOCK(mdp);
- result = mmalloc (md, size);
+ result = mmalloc(md, size);
if (result == NULL)
return (NULL);
- memcpy (result, ptr, MIN (size, (size_t) 1 << type));
- mfree (md, ptr);
+ memcpy(result, ptr, MIN(size, (size_t) 1 << type));
+ mfree(md, ptr);
}
break;
}