X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7e9b6e88f6c2daa87a9f5370596e5acc7f73fc6a..bf71c3c42ec41053cf17711276bfd40d9b3a93c1:/src/xbt/mmalloc/mrealloc.c diff --git a/src/xbt/mmalloc/mrealloc.c b/src/xbt/mmalloc/mrealloc.c index 23d0a1c202..589e412012 100644 --- a/src/xbt/mmalloc/mrealloc.c +++ b/src/xbt/mmalloc/mrealloc.c @@ -1,30 +1,28 @@ -/* Change the size of a block allocated by `mmalloc'. - Copyright 1990, 1991 Free Software Foundation - Written May 1989 by Mike Haertel. */ +/* Change the size of a block allocated by `mmalloc'. */ -/* Copyright (c) 2010. The SimGrid Team. +/* Copyright (c) 2010-2014. The SimGrid Team. * All rights reserved. */ /* 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. */ +/* Copyright 1990, 1991 Free Software Foundation + Written May 1989 by Mike Haertel. */ + #include /* Prototypes for memcpy, memmove, memset, etc */ #include /* abort */ #include "mmprivate.h" -/* Resize the given region to the new size, returning a pointer - to the (possibly moved) region. This is optimized for speed; - some benchmarks seem to indicate that greater compactness is - achieved by unconditionally allocating and copying to a - new region. This module has incestuous knowledge of the - internals of both mfree and mmalloc. */ +/* Resize the given region to the new size, returning a pointer to the (possibly moved) region. This is optimized for + * speed; some benchmarks seem to indicate that greater compactness is achieved by unconditionally allocating and + * copying to a new region. This module has incestuous knowledge of the internals of both mfree and mmalloc. */ void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size) { void *result; - int type; - size_t block, blocks, oldlimit; + size_t blocks; + size_t oldlimit; /* Only keep real realloc, and reroute hidden malloc and free to the relevant functions */ if (size == 0) { @@ -37,8 +35,8 @@ void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size) //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, refusing to proceed (another solution would be to malloc it instead of reallocing it, see source code)\n"); + printf("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(mdp, size); abort(); return result; @@ -53,17 +51,22 @@ void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size) if (size < SMALLEST_POSSIBLE_MALLOC) size = SMALLEST_POSSIBLE_MALLOC; - block = BLOCK(ptr); + size_t block = BLOCK(ptr); - type = mdp->heapinfo[block].type; + int type = mdp->heapinfo[block].type; switch (type) { - case -1: + case MMALLOC_TYPE_HEAPINFO: + fprintf(stderr, "Asked realloc a fragment coming from a heapinfo block. I'm confused.\n"); + abort(); + break; + + case MMALLOC_TYPE_FREE: fprintf(stderr, "Asked realloc a fragment coming from a *free* block. I'm puzzled.\n"); abort(); break; - case 0: + case MMALLOC_TYPE_UNFRAGMENTED: /* Maybe reallocate a large block to a small fragment. */ if (size <= BLOCKSIZE / 2) { // Full block -> Fragment; no need to optimize for time @@ -82,8 +85,12 @@ void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size) int it; /* The new size is smaller; return excess memory to the free list. */ //printf("(%s) return excess memory...",xbt_thread_self_name()); - for (it= block+blocks; it< mdp->heapinfo[block].busy_block.size ; it++) - mdp->heapinfo[it].type = 0; // FIXME that should be useless, type should already be 0 here + for (it= block+blocks; it< mdp->heapinfo[block].busy_block.size ; it++){ + mdp->heapinfo[it].type = MMALLOC_TYPE_UNFRAGMENTED; // FIXME that should be useless, type should already be 0 here + mdp->heapinfo[it].busy_block.ignore = 0; + mdp->heapinfo[it].busy_block.size = 0; + mdp->heapinfo[it].busy_block.busy_size = 0; + } mdp->heapinfo[block + blocks].busy_block.size = mdp->heapinfo[block].busy_block.size - blocks; @@ -91,6 +98,7 @@ void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size) mdp->heapinfo[block].busy_block.size = blocks; mdp->heapinfo[block].busy_block.busy_size = requested_size; + mdp->heapinfo[block].busy_block.ignore = 0; result = ptr; } else if (blocks == mdp->heapinfo[block].busy_block.size) { @@ -98,11 +106,13 @@ void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size) /* No block size change necessary; only update the requested size */ result = ptr; mdp->heapinfo[block].busy_block.busy_size = requested_size; + mdp->heapinfo[block].busy_block.ignore = 0; } 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. */ + Free the old region first in case there is sufficient adjacent free space to grow without moving. + This trick mandates using a specific version of mmalloc that does not memset the memory to 0 after + action for obvious reasons. */ blocks = mdp->heapinfo[block].busy_block.size; /* Prevent free from actually returning memory to the system. */ oldlimit = mdp->heaplimit; @@ -110,14 +120,22 @@ void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size) mfree(mdp, ptr); mdp->heaplimit = oldlimit; - result = mmalloc(mdp, requested_size); + result = mmalloc_no_memset(mdp, requested_size); + //fprintf(stderr,"remalloc(%zu)~>%p\n",requested_size,result); + if (ptr != result) memmove(result, ptr, blocks * BLOCKSIZE); + /* FIXME: we should memset the end of the recently area */ } break; default: /* Fragment -> ??; type=logarithm to base two of the fragment size. */ + if (type < 0) { + fprintf(stderr, "Unkown mmalloc block type.\n"); + abort(); + } + 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()); @@ -125,6 +143,7 @@ void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size) result = ptr; int frag_nb = RESIDUAL(result, BLOCKSIZE) >> type; mdp->heapinfo[block].busy_frag.frag_size[frag_nb] = requested_size; + mdp->heapinfo[block].busy_frag.ignore[frag_nb] = 0; } else { /* fragment -> Either other fragment, or block */ /* The new size is different; allocate a new space,