A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[mc] Split address/location in dw_variable_t (which were in a union)
[simgrid.git]
/
src
/
xbt
/
mmalloc
/
mrealloc.c
diff --git
a/src/xbt/mmalloc/mrealloc.c
b/src/xbt/mmalloc/mrealloc.c
index
b9deaff
..
3569c14
100644
(file)
--- a/
src/xbt/mmalloc/mrealloc.c
+++ b/
src/xbt/mmalloc/mrealloc.c
@@
-2,7
+2,7
@@
Copyright 1990, 1991 Free Software Foundation
Written May 1989 by Mike Haertel. */
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
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-82,8
+82,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());
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].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 + blocks].busy_block.size
= mdp->heapinfo[block].busy_block.size - blocks;
@@
-91,6
+93,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.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) {
result = ptr;
} else if (blocks == mdp->heapinfo[block].busy_block.size) {
@@
-98,6
+101,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;
/* 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.
} else {
/* Won't fit, so allocate a new region that will.
@@
-129,6
+133,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;
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,
} else { /* fragment -> Either other fragment, or block */
/* The new size is different; allocate a new space,