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
damn!
[simgrid.git]
/
src
/
mc
/
mc_client.cpp
diff --git
a/src/mc/mc_client.cpp
b/src/mc/mc_client.cpp
index
3956391
..
cf57b91
100644
(file)
--- a/
src/mc/mc_client.cpp
+++ b/
src/mc/mc_client.cpp
@@
-19,7
+19,6
@@
#include "src/mc/mc_client.h"
// We won't need those once the separation MCer/MCed is complete:
#include "src/mc/mc_client.h"
// We won't need those once the separation MCer/MCed is complete:
-#include "src/mc/mc_mmalloc.h"
#include "src/mc/mc_ignore.h"
#include "src/mc/mc_private.h" // MC_deadlock_check()
#include "src/mc/mc_smx.h"
#include "src/mc/mc_ignore.h"
#include "src/mc/mc_private.h" // MC_deadlock_check()
#include "src/mc/mc_smx.h"
@@
-47,7
+46,7
@@
void MC_client_init(void)
if (!fd_env)
xbt_die("MC socket not found");
if (!fd_env)
xbt_die("MC socket not found");
- int fd =
atoi(fd_env
);
+ int fd =
xbt_str_parse_int(fd_env,bprintf("Variable %s should contain a number but contains '%%s'", MC_ENV_SOCKET_FD)
);
XBT_DEBUG("Model-checked application found socket FD %i", fd);
int type;
XBT_DEBUG("Model-checked application found socket FD %i", fd);
int type;
@@
-63,7
+62,7
@@
void MC_client_init(void)
mc_client->active = 1;
// Waiting for the model-checker:
mc_client->active = 1;
// Waiting for the model-checker:
- if (ptrace(PTRACE_TRACEME, 0,
NULL
, NULL) == -1 || raise(SIGSTOP) != 0)
+ if (ptrace(PTRACE_TRACEME, 0,
nullptr
, NULL) == -1 || raise(SIGSTOP) != 0)
xbt_die("Could not wait for the model-checker");
MC_client_handle_messages();
}
xbt_die("Could not wait for the model-checker");
MC_client_handle_messages();
}