X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5fa8d6780a107eb5ae1ff8a233b0dd23cb065f8a..a2f695076e4f11e4033d66ad57e2274505f60d1c:/src/xbt/mmalloc/mrealloc.c

diff --git a/src/xbt/mmalloc/mrealloc.c b/src/xbt/mmalloc/mrealloc.c
index b9deaffdde..1a6d100209 100644
--- a/src/xbt/mmalloc/mrealloc.c
+++ b/src/xbt/mmalloc/mrealloc.c
@@ -1,13 +1,14 @@
-/* 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 <string.h>             /* Prototypes for memcpy, memmove, memset, etc */
 #include <stdlib.h> /* abort */
 
@@ -82,8 +83,10 @@ 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++)
+      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
+        mdp->heapinfo[it].busy_block.ignore = 0;
+      }
 
       mdp->heapinfo[block + blocks].busy_block.size
         = mdp->heapinfo[block].busy_block.size - blocks;
@@ -91,6 +94,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,6 +102,7 @@ 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.
@@ -129,6 +134,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,