#include <xbt/log.h>
#include <xbt/sysdep.h>
+#include <xbt/mmalloc.h>
#include "mc_protocol.h"
#include "mc_client.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_client, mc, "MC client logic");
+// We won't need those once the separation MCer/MCed is complete:
+#include "mc_mmalloc.h"
+#include "mc_ignore.h"
+#include "mc_model_checker.h"
+#include "mc_private.h" // MC_deadlock_check()
+#include "mc_smx.h"
-typedef struct s_mc_client {
- int active;
- int fd;
-} s_mc_client_t, mc_client_t;
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_client, mc, "MC client logic");
-static s_mc_client_t mc_client;
+mc_client_t mc_client;
void MC_client_init(void)
{
- mc_client.fd = -1;
- mc_client.active = 1;
+ if (mc_client) {
+ XBT_WARN("MC_client_init called more than once.");
+ return;
+ }
+
char* fd_env = getenv(MC_ENV_SOCKET_FD);
if (!fd_env)
xbt_die("MC socket not found");
int type;
socklen_t socklen = sizeof(type);
if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &type, &socklen) != 0)
- xbt_die("Could not check socket type: %s", strerror(errno));
+ xbt_die("Could not check socket type");
if (type != SOCK_DGRAM)
xbt_die("Unexpected socket type %i", type);
XBT_DEBUG("Model-checked application found expected socket type");
- mc_client.fd = fd;
+ mc_client = xbt_new0(s_mc_client_t, 1);
+ mc_client->fd = fd;
+ mc_client->active = 1;
}
void MC_client_hello(void)
{
- XBT_DEBUG("Greeting the MC server");
- if (MC_protocol_hello(mc_client.fd) != 0)
+ if (MC_protocol_hello(mc_client->fd) != 0)
xbt_die("Could not say hello the MC server");
- XBT_DEBUG("Greeted the MC server");
+}
+
+void MC_client_send_message(void* message, size_t size)
+{
+ if (MC_protocol_send(mc_client->fd, message, size))
+ xbt_die("Could not send message %i", (int) ((mc_message_t)message)->type);
+}
+
+void MC_client_send_simple_message(int type)
+{
+ if (MC_protocol_send_simple_message(mc_client->fd, type))
+ xbt_die("Could not send message %i", type);
}
void MC_client_handle_messages(void)
{
while (1) {
XBT_DEBUG("Waiting messages from model-checker");
+
+ char message_buffer[MC_MESSAGE_LENGTH];
+ size_t s;
+ if ((s = MC_receive_message(mc_client->fd, &message_buffer, sizeof(message_buffer), 0)) == -1)
+ xbt_die("Could not receive commands from the model-checker");
+
s_mc_message_t message;
- if (recv(mc_client.fd, &message, sizeof(message), 0) == -1)
- xbt_die("Could not receive commands from the model-checker: %s",
- strerror(errno));
- XBT_DEBUG("Receive message from model-checker");
+ if (s < sizeof(message))
+ xbt_die("Received message is too small");
+ memcpy(&message, message_buffer, sizeof(message));
switch (message.type) {
+
+ case MC_MESSAGE_DEADLOCK_CHECK:
+ {
+ int result = MC_deadlock_check();
+ s_mc_int_message_t answer;
+ answer.type = MC_MESSAGE_DEADLOCK_CHECK_REPLY;
+ answer.value = result;
+ if (MC_protocol_send(mc_client->fd, &answer, sizeof(answer)))
+ xbt_die("Could not send response");
+ }
+ break;
+
case MC_MESSAGE_CONTINUE:
return;
+
+ case MC_MESSAGE_SIMCALL_HANDLE:
+ {
+ s_mc_simcall_handle_message_t message;
+ if (s != sizeof(message))
+ xbt_die("Unexpected size for SIMCALL_HANDLE");
+ memcpy(&message, message_buffer, sizeof(message));
+ smx_process_t process = SIMIX_process_from_PID(message.pid);
+ if (!process)
+ xbt_die("Invalid pid %lu", (unsigned long) message.pid);
+ SIMIX_simcall_handle(&process->simcall, message.value);
+ MC_protocol_send_simple_message(mc_client->fd, MC_MESSAGE_WAITING);
+ }
+ break;
+
default:
- xbt_die("Unexpected message from model-checker %i", message.type);
+ xbt_die("%s received unexpected message %s (%i)",
+ MC_mode_name(mc_mode),
+ MC_message_type_name(message.type),
+ message.type
+ );
}
}
}
+
+void MC_client_main_loop(void)
+{
+ while (1) {
+ MC_protocol_send_simple_message(mc_client->fd, MC_MESSAGE_WAITING);
+ MC_client_handle_messages();
+ MC_wait_for_requests();
+ }
+}
