#include <cerrno>
#include <sys/types.h>
+#include <sys/ptrace.h>
#include <sys/socket.h>
#include <xbt/log.h>
#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_ignore.h"
+#include "src/mc/mc_private.h" // MC_deadlock_check()
+#include "src/mc/mc_smx.h"
extern "C" {
void MC_client_init(void)
{
+ if (mc_mode != MC_MODE_NONE)
+ return;
+ if (!getenv(MC_ENV_SOCKET_FD))
+ return;
+ mc_mode = MC_MODE_CLIENT;
+
if (mc_client) {
XBT_WARN("MC_client_init called more than once.");
return;
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;
mc_client = xbt_new0(s_mc_client_t, 1);
mc_client->fd = fd;
mc_client->active = 1;
-}
-void MC_client_hello(void)
-{
- if (MC_protocol_hello(mc_client->fd) != 0)
- xbt_die("Could not say hello the MC server");
+ // Waiting for the model-checker:
+ if (ptrace(PTRACE_TRACEME, 0, nullptr, NULL) == -1 || raise(SIGSTOP) != 0)
+ xbt_die("Could not wait for the model-checker");
+ MC_client_handle_messages();
}
void MC_client_send_message(void* message, size_t size)
}
break;
+ case MC_MESSAGE_RESTORE:
+ {
+ s_mc_restore_message_t message;
+ if (s != sizeof(message))
+ xbt_die("Unexpected size for SIMCALL_HANDLE");
+ memcpy(&message, message_buffer, sizeof(message));
+ smpi_really_switch_data_segment(message.index);
+ }
+ break;
+
default:
xbt_die("%s received unexpected message %s (%i)",
MC_mode_name(mc_mode),