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] Fix broken type in compare_heap_area_with_type
[simgrid.git]
/
src
/
xbt
/
mmalloc
/
mmorecore.c
diff --git
a/src/xbt/mmalloc/mmorecore.c
b/src/xbt/mmalloc/mmorecore.c
index
dfd9cf7
..
197341d
100644
(file)
--- a/
src/xbt/mmalloc/mmorecore.c
+++ b/
src/xbt/mmalloc/mmorecore.c
@@
-3,7
+3,8
@@
Contributed by Fred Fish at Cygnus Support. fnf@cygnus.com */
Contributed by Fred Fish at Cygnus Support. fnf@cygnus.com */
-/* Copyright (c) 2010-2012. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2012. 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. */
/* 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. */
@@
-53,7
+54,7
@@
static size_t pagesize;
It never returns NULL. Instead, it dies verbosely on errors. */
It never returns NULL. Instead, it dies verbosely on errors. */
-void *mmorecore(struct mdesc *mdp,
in
t size)
+void *mmorecore(struct mdesc *mdp,
ssize_
t size)
{
ssize_t test = 0;
void *result; // please keep it uninitialized to track issues
{
ssize_t test = 0;
void *result; // please keep it uninitialized to track issues
@@
-123,7
+124,9
@@
void *mmorecore(struct mdesc *mdp, int size)
char buff[1024];
fprintf(stderr,"Internal error: mmap returned MAP_FAILED! error: %s\n",strerror(errno));
sprintf(buff,"cat /proc/%d/maps",getpid());
char buff[1024];
fprintf(stderr,"Internal error: mmap returned MAP_FAILED! error: %s\n",strerror(errno));
sprintf(buff,"cat /proc/%d/maps",getpid());
- system(buff);
+ int status = system(buff);
+ if (status == -1 || !(WIFEXITED(status) && WEXITSTATUS(status) == 0))
+ fprintf(stderr, "Something went wrong when trying to %s\n", buff);
sleep(1);
abort();
}
sleep(1);
abort();
}