cosmetics

diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp
index 855c0a7..d5a8195 100644 (file)
--- a/src/mc/ModelChecker.cpp
+++ b/src/mc/ModelChecker.cpp
@@ -251,26 +251,23 @@ bool ModelChecker::handle_message(char* buffer, ssize_t size)
 
   case MC_MESSAGE_REGISTER_SYMBOL:
     {
-      s_mc_register_symbol_message_t message;
-      if (size != sizeof(message))
-        xbt_die("Broken message");
-      memcpy(&message, buffer, sizeof(message));
-      if (message.callback)
-        xbt_die("Support for client-side function proposition is not implemented.");
-      XBT_DEBUG("Received symbol: %s", message.name);
-
-      if (simgrid::mc::property_automaton == nullptr)
-        simgrid::mc::property_automaton = xbt_automaton_new();
-
-      simgrid::mc::RemoteClient* process = &this->process();
-      simgrid::mc::RemotePtr<int> address
-        = simgrid::mc::remote((int*) message.data);
-      simgrid::xbt::add_proposition(simgrid::mc::property_automaton,
-        message.name,
-        [process, address]() { return process->read(address); }
-        );
-
-      break;
+    s_mc_message_register_symbol_t message;
+    if (size != sizeof(message))
+      xbt_die("Broken message");
+    memcpy(&message, buffer, sizeof(message));
+    if (message.callback)
+      xbt_die("Support for client-side function proposition is not implemented.");
+    XBT_DEBUG("Received symbol: %s", message.name);
+
+    if (simgrid::mc::property_automaton == nullptr)
+      simgrid::mc::property_automaton = xbt_automaton_new();
+
+    simgrid::mc::RemoteClient* process  = &this->process();
+    simgrid::mc::RemotePtr<int> address = simgrid::mc::remote((int*)message.data);
+    simgrid::xbt::add_proposition(simgrid::mc::property_automaton, message.name,
+                                  [process, address]() { return process->read(address); });
+
+    break;
     }
 
   case MC_MESSAGE_WAITING:

diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp
index 28e8e0c..be90588 100644 (file)
--- a/src/mc/mc_checkpoint.cpp
+++ b/src/mc/mc_checkpoint.cpp
@@ -595,12 +595,9 @@ void restore_snapshot_regions(simgrid::mc::Snapshot* snapshot)
   }
 
 #if HAVE_SMPI
-  // TODO, send a message to implement this in the MCed process
   if(snapshot->privatization_index >= 0) {
     // Fix the privatization mmap:
-    s_mc_message_restore message;
-    message.type = MC_MESSAGE_RESTORE;
-    message.index = snapshot->privatization_index;
+    s_mc_message_restore message{MC_MESSAGE_RESTORE, snapshot->privatization_index};
     mc_model_checker->process().getChannel().send(message);
   }
 #endif

diff --git a/src/mc/remote/Client.cpp b/src/mc/remote/Client.cpp
index 8eaa9f9..dae03e7 100644 (file)
--- a/src/mc/remote/Client.cpp
+++ b/src/mc/remote/Client.cpp
@@ -101,6 +101,7 @@ void Client::handleDeadlockCheck(mc_message_t* msg)
 }
 void Client::handleContinue(mc_message_t* msg)
 {
+  /* Nothing to do */
 }
 void Client::handleSimcall(s_mc_message_simcall_handle_t* message)
 {
@@ -223,7 +224,7 @@ void Client::unignoreHeap(void* address, std::size_t size)
 
 void Client::declareSymbol(const char* name, int* value)
 {
-  s_mc_register_symbol_message_t message;
+  s_mc_message_register_symbol_t message;
   message.type = MC_MESSAGE_REGISTER_SYMBOL;
   if (strlen(name) + 1 > sizeof(message.name))
     xbt_die("Symbol is too long");

diff --git a/src/mc/remote/mc_protocol.h b/src/mc/remote/mc_protocol.h
index 192a78c..4ca6653 100644 (file)
--- a/src/mc/remote/mc_protocol.h
+++ b/src/mc/remote/mc_protocol.h
@@ -67,6 +67,7 @@ struct s_mc_message_int {
 };
 typedef struct s_mc_message_int mc_message_int_t;
 
+/* Client->Server */
 struct s_mc_message_ignore_heap {
   e_mc_message_type type;
   int block;
@@ -89,6 +90,15 @@ struct s_mc_message_stack_region {
 };
 typedef struct s_mc_message_stack_region s_mc_message_stack_region_t;
 
+struct s_mc_message_register_symbol {
+  e_mc_message_type type;
+  char name[128];
+  int (*callback)(void*);
+  void* data;
+};
+typedef struct s_mc_message_register_symbol s_mc_message_register_symbol_t;
+
+/* Server -> client */
 struct s_mc_message_simcall_handle {
   e_mc_message_type type;
   unsigned long pid;
@@ -96,14 +106,6 @@ struct s_mc_message_simcall_handle {
 };
 typedef struct s_mc_message_simcall_handle s_mc_message_simcall_handle_t;
 
-struct s_mc_register_symbol_message {
-  e_mc_message_type type;
-  char name[128];
-  int (*callback)(void*);
-  void* data;
-};
-typedef struct s_mc_register_symbol_message s_mc_register_symbol_message_t;
-
 struct s_mc_message_restore {
   e_mc_message_type type;
   int index;