Copyright 1990, 1991 Free Software Foundation
Written May 1989 by Mike Haertel. */
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010-2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
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;
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) {
/* 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.
mdp->heaplimit = oldlimit;
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 */
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,