#include <xbt/sysdep.h>
#include <xbt/mmalloc.h>
-#include "mc_protocol.h"
-#include "mc_client.h"
+#include "src/mc/mc_protocol.h"
+#include "src/mc/mc_client.h"
// We won't need those once the separation MCer/MCed is complete:
-#include "mc_mmalloc.h"
-#include "mc_ignore.h"
-#include "mc_private.h" // MC_deadlock_check()
-#include "mc_smx.h"
+#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"
extern "C" {
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;