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
THROWF won't work in mmalloc: it needs to malloc stuff (I'm sure)
[simgrid.git]
/
src
/
xbt
/
mmalloc
/
mrealloc.c
diff --git
a/src/xbt/mmalloc/mrealloc.c
b/src/xbt/mmalloc/mrealloc.c
index
0e03a92
..
3176981
100644
(file)
--- a/
src/xbt/mmalloc/mrealloc.c
+++ b/
src/xbt/mmalloc/mrealloc.c
@@
-26,11
+26,9
@@
void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size)
int type;
size_t block, blocks, oldlimit;
int type;
size_t block, blocks, oldlimit;
- /* Only keep real realloc
and
hidden malloc and free to the relevant functions */
+ /* Only keep real realloc
, and reroute
hidden malloc and free to the relevant functions */
if (size == 0) {
if (size == 0) {
- fprintf(stderr,"free from realloc...");
mfree(mdp, ptr);
mfree(mdp, ptr);
- fprintf(stderr,"done\n");
return mmalloc(mdp, 0);
} else if (ptr == NULL) {
return mmalloc(mdp, size);
return mmalloc(mdp, 0);
} else if (ptr == NULL) {
return mmalloc(mdp, size);
@@
-49,10
+47,13
@@
void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size)
block = BLOCK(ptr);
type = mdp->heapinfo[block].type;
block = BLOCK(ptr);
type = mdp->heapinfo[block].type;
- if (type<0)
- THROWF(arg_error,0,"Asked realloc a fragment comming from a *free* block. I'm puzzled.");
switch (type) {
switch (type) {
+ case -1:
+ fprintf(stderr, "Asked realloc a fragment comming from a *free* block. I'm puzzled.\n");
+ abort();
+ break;
+
case 0:
/* Maybe reallocate a large block to a small fragment. */
case 0:
/* Maybe reallocate a large block to a small fragment. */