X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b923f24fcb86571011626426f577fe6322094bb3..f2ae9283d896f8581020b2357fd2706d68ce9ede:/src/mc/mc_smx.cpp

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index c1ea4b3f38..54e9ba964a 100644
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -19,7 +19,7 @@ using simgrid::mc::remote;
 static inline simgrid::mc::ActorInformation* actor_info_cast(smx_actor_t actor)
 {
   simgrid::mc::ActorInformation temp;
-  std::size_t offset = (char*) temp.copy.getBuffer() - (char*)&temp;
+  std::size_t offset = (char*)temp.copy.get_buffer() - (char*)&temp;
 
   simgrid::mc::ActorInformation* process_info = (simgrid::mc::ActorInformation*)((char*)actor - offset);
   return process_info;
@@ -77,9 +77,9 @@ void RemoteClient::refresh_simix()
   Remote<simgrid::simix::Global> simix_global =
     this->read<simgrid::simix::Global>(simix_global_p);
 
-  MC_process_refresh_simix_actor_dynar(this, this->smx_actors_infos, remote(simix_global.getBuffer()->actors_vector));
+  MC_process_refresh_simix_actor_dynar(this, this->smx_actors_infos, remote(simix_global.get_buffer()->actors_vector));
   MC_process_refresh_simix_actor_dynar(this, this->smx_dead_actors_infos,
-                                       remote(simix_global.getBuffer()->dead_actors_vector));
+                                       remote(simix_global.get_buffer()->dead_actors_vector));
 
   this->cache_flags_ |= RemoteClient::cache_simix_processes;
 }
@@ -106,10 +106,10 @@ smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall const* req)
   // Lookup by address:
   for (auto& actor : mc_model_checker->process().actors())
     if (actor.address == address)
-      return actor.copy.getBuffer();
+      return actor.copy.get_buffer();
   for (auto& actor : mc_model_checker->process().dead_actors())
     if (actor.address == address)
-      return actor.copy.getBuffer();
+      return actor.copy.get_buffer();
 
   xbt_die("Issuer not found");
 }
@@ -145,21 +145,12 @@ const char* MC_smx_actor_get_name(smx_actor_t actor)
   return info->name.c_str();
 }
 
-#if HAVE_SMPI
-int MC_smpi_process_count()
-{
-  if (mc_model_checker == nullptr)
-    return smpi_process_count();
-  int res;
-  mc_model_checker->process().read_variable("process_count", &res, sizeof(res));
-  return res;
-}
-#endif
-
 unsigned long MC_smx_get_maxpid()
 {
   unsigned long maxpid;
-  mc_model_checker->process().read_variable("simix_process_maxpid",
-    &maxpid, sizeof(maxpid));
+  const char* name = "simgrid::kernel::actor::maxpid";
+  if (mc_model_checker->process().find_variable(name) == nullptr)
+    name = "maxpid"; // We seem to miss the namespaces when compiling with GCC
+  mc_model_checker->process().read_variable(name, &maxpid, sizeof(maxpid));
   return maxpid;
 }