Use simgrid::Host instead of xbt_dictelt_t for root main object

[simgrid.git] / src / mc / mc_smx.cpp

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index ab32689..2b051ca 100644 (file)
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -8,11 +8,13 @@
 
 #include <xbt/log.h>
 
-#include "simix/smx_private.h"
+#include "src/simix/smx_private.h"
 
-#include "mc_smx.h"
+#include "src/mc/mc_smx.h"
 #include "ModelChecker.hpp"
 
+using simgrid::mc::remote;
+
 extern "C" {
 
 static
@@ -55,13 +57,12 @@ mc_smx_process_info_t MC_smx_process_get_info(smx_process_t p)
  *  @param remote_swag Address of the process SWAG in the remote list
  */
 static void MC_process_refresh_simix_process_list(
-  mc_process_t process,
+  simgrid::mc::Process* process,
   xbt_dynar_t target, xbt_swag_t remote_swag)
 {
   // swag = REMOTE(*simix_global->process_list)
   s_xbt_swag_t swag;
-  MC_process_read(process, MC_PROCESS_NO_FLAG, &swag, remote_swag, sizeof(swag),
-    MC_PROCESS_INDEX_ANY);
+  process->read_bytes(&swag, sizeof(swag), remote(remote_swag));
 
   smx_process_t p;
   xbt_dynar_reset(target);
@@ -74,8 +75,7 @@ static void MC_process_refresh_simix_process_list(
     info.address = p;
     info.name = NULL;
     info.hostname = NULL;
-    MC_process_read(process, MC_PROCESS_NO_FLAG,
-      &info.copy, p, sizeof(info.copy), MC_PROCESS_INDEX_ANY);
+    process->read_bytes(&info.copy, sizeof(info.copy), remote(p));
     xbt_dynar_push(target, &info);
 
     // Lookup next process address:
@@ -84,10 +84,9 @@ static void MC_process_refresh_simix_process_list(
   assert(i == swag.count);
 }
 
-void MC_process_smx_refresh(mc_process_t process)
+void MC_process_smx_refresh(simgrid::mc::Process* process)
 {
   xbt_assert(mc_mode == MC_MODE_SERVER);
-  xbt_assert(!MC_process_is_self(process));
   if (process->cache_flags & MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES)
     return;
 
@@ -95,12 +94,12 @@ void MC_process_smx_refresh(mc_process_t process)
 
   // simix_global_p = REMOTE(simix_global);
   smx_global_t simix_global_p;
-  MC_process_read_variable(process, "simix_global", &simix_global_p, sizeof(simix_global_p));
+  process->read_variable("simix_global", &simix_global_p, sizeof(simix_global_p));
 
   // simix_global = REMOTE(*simix_global)
   s_smx_global_t simix_global;
-  MC_process_read(process, MC_PROCESS_NO_FLAG, &simix_global, simix_global_p, sizeof(simix_global),
-    MC_PROCESS_INDEX_ANY);
+  process->read_bytes(&simix_global, sizeof(simix_global),
+    remote(simix_global_p));
 
   MC_process_refresh_simix_process_list(
     process, process->smx_process_infos, simix_global.process_list);
@@ -176,10 +175,11 @@ mc_smx_process_info_t MC_smx_resolve_process_info(smx_process_t process_remote_a
 const char* MC_smx_process_get_host_name(smx_process_t p)
 {
   if (mc_mode == MC_MODE_CLIENT)
-    return SIMIX_host_get_name(p->smx_host);
+    return SIMIX_host_get_name(p->host);
 
-  mc_process_t process = &mc_model_checker->process();
+  simgrid::mc::Process* process = &mc_model_checker->process();
 
+  // FIXME, simgrid::Host
   // Currently, smx_host_t = xbt_dictelm_t.
   // TODO, add an static_assert on this if switching to C++
   // The host name is host->key and the host->key_len==strlen(host->key).
@@ -188,10 +188,10 @@ const char* MC_smx_process_get_host_name(smx_process_t p)
   if (!info->hostname) {
 
     // Read the hostname from the MCed process:
-    MC_process_read_simple(process, &host_copy, p->smx_host, sizeof(host_copy));
+    process->read_bytes(&host_copy, sizeof(host_copy), remote(p->host));
     int len = host_copy.key_len + 1;
     char hostname[len];
-    MC_process_read_simple(process, hostname, host_copy.key, len);
+    process->read_bytes(hostname, len, remote(host_copy.key));
     info->hostname = mc_model_checker->get_host_name(hostname);
   }
   return info->hostname;
@@ -199,7 +199,7 @@ const char* MC_smx_process_get_host_name(smx_process_t p)
 
 const char* MC_smx_process_get_name(smx_process_t p)
 {
-  mc_process_t process = &mc_model_checker->process();
+  simgrid::mc::Process* process = &mc_model_checker->process();
   if (mc_mode == MC_MODE_CLIENT)
     return p->name;
   if (!p->name)
@@ -207,27 +207,29 @@ const char* MC_smx_process_get_name(smx_process_t p)
 
   mc_smx_process_info_t info = MC_smx_process_get_info(p);
   if (!info->name) {
-    info->name = MC_process_read_string(process, p->name);
+    info->name = process->read_string(p->name);
   }
   return info->name;
 }
 
+#ifdef HAVE_SMPI
 int MC_smpi_process_count(void)
 {
   if (mc_mode == MC_MODE_CLIENT)
     return smpi_process_count();
   else {
     int res;
-    MC_process_read_variable(&mc_model_checker->process(), "process_count",
+    mc_model_checker->process().read_variable("process_count",
       &res, sizeof(res));
     return res;
   }
 }
+#endif
 
 unsigned long MC_smx_get_maxpid(void)
 {
   unsigned long maxpid;
-  MC_process_read_variable(&mc_model_checker->process(), "simix_process_maxpid",
+  mc_model_checker->process().read_variable("simix_process_maxpid",
     &maxpid, sizeof(maxpid));
   return maxpid;
 }