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
Check if MAP_ANONYMOUS is defined after including sys/mman.h.
[simgrid.git]
/
src
/
xbt
/
mmalloc
/
mfree.c
diff --git
a/src/xbt/mmalloc/mfree.c
b/src/xbt/mmalloc/mfree.c
index
af83720
..
ca48a1e
100644
(file)
--- a/
src/xbt/mmalloc/mfree.c
+++ b/
src/xbt/mmalloc/mfree.c
@@
-1,17
+1,19
@@
-/* Free a block of memory allocated by `mmalloc'.
- Copyright 1990, 1991, 1992 Free Software Foundation
+/* Free a block of memory allocated by `mmalloc'. */
- Written May 1989 by Mike Haertel.
- Heavily modified Mar 1992 by Fred Fish. (fnf@cygnus.com) */
-
-/* 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. */
* 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, 1992 Free Software Foundation
+
+ Written May 1989 by Mike Haertel.
+ Heavily modified Mar 1992 by Fred Fish. (fnf@cygnus.com) */
+
#include "mmprivate.h"
#include "xbt/ex.h"
#include "mmprivate.h"
#include "xbt/ex.h"
+#include "mc/mc.h"
/* Return memory to the heap.
Like `mfree' but don't call a mfree_hook if there is one. */
/* Return memory to the heap.
Like `mfree' but don't call a mfree_hook if there is one. */
@@
-33,7
+35,7
@@
void mfree(struct mdesc *mdp, void *ptr)
block = BLOCK(ptr);
if ((char *) ptr < (char *) mdp->heapbase || block > mdp->heapsize) {
block = BLOCK(ptr);
if ((char *) ptr < (char *) mdp->heapbase || block > mdp->heapsize) {
- fprintf(stderr,"Ouch, this pointer is not mine
. I refuse to free it. I refuse it to
death!!\n");
+ fprintf(stderr,"Ouch, this pointer is not mine
, I refuse to free it. Give me valid pointers, or give me
death!!\n");
abort();
}
abort();
}
@@
-53,6
+55,11
@@
void mfree(struct mdesc *mdp, void *ptr)
mdp -> heapstats.bytes_free +=
mdp -> heapinfo[block].busy_block.size * BLOCKSIZE;
mdp -> heapstats.bytes_free +=
mdp -> heapinfo[block].busy_block.size * BLOCKSIZE;
+ if(MC_is_active()){
+ if(mdp->heapinfo[block].busy_block.ignore > 0)
+ MC_remove_ignore_heap(ptr, mdp -> heapinfo[block].busy_block.busy_size);
+ }
+
/* Find the free cluster previous to this one in the free list.
Start searching at the last block referenced; this may benefit
programs with locality of allocation. */
/* Find the free cluster previous to this one in the free list.
Start searching at the last block referenced; this may benefit
programs with locality of allocation. */
@@
-155,8
+162,14
@@
void mfree(struct mdesc *mdp, void *ptr)
THROWF(system_error, 0, "Asked to free a fragment that is already free. I'm puzzled\n");
}
THROWF(system_error, 0, "Asked to free a fragment that is already free. I'm puzzled\n");
}
+ if(MC_is_active()){
+ if(mdp->heapinfo[block].busy_frag.ignore[frag_nb] > 0)
+ MC_remove_ignore_heap(ptr, mdp->heapinfo[block].busy_frag.frag_size[frag_nb]);
+ }
+
/* Set size used in the fragment to -1 */
mdp->heapinfo[block].busy_frag.frag_size[frag_nb] = -1;
/* Set size used in the fragment to -1 */
mdp->heapinfo[block].busy_frag.frag_size[frag_nb] = -1;
+ mdp->heapinfo[block].busy_frag.ignore[frag_nb] = 0;
// fprintf(stderr,"nfree:%zu capa:%d\n", mdp->heapinfo[block].busy_frag.nfree,(BLOCKSIZE >> type));
if (mdp->heapinfo[block].busy_frag.nfree ==
// fprintf(stderr,"nfree:%zu capa:%d\n", mdp->heapinfo[block].busy_frag.nfree,(BLOCKSIZE >> type));
if (mdp->heapinfo[block].busy_frag.nfree ==
@@
-168,7
+181,7
@@
void mfree(struct mdesc *mdp, void *ptr)
mdp->heapinfo[block].type = 0;
mdp->heapinfo[block].busy_block.size = 1;
mdp->heapinfo[block].busy_block.busy_size = 0;
mdp->heapinfo[block].type = 0;
mdp->heapinfo[block].busy_block.size = 1;
mdp->heapinfo[block].busy_block.busy_size = 0;
-
+
/* Keep the statistics accurate. */
mdp -> heapstats.chunks_used++;
mdp -> heapstats.bytes_used += BLOCKSIZE;
/* Keep the statistics accurate. */
mdp -> heapstats.chunks_used++;
mdp -> heapstats.bytes_used += BLOCKSIZE;
@@
-192,3
+205,4
@@
void mfree(struct mdesc *mdp, void *ptr)
break;
}
}
break;
}
}
+