Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/src/mc/mc_smx.h b/src/mc/mc_smx.h
index d83a73e..c078cca 100644 (file)
--- a/src/mc/mc_smx.h
+++ b/src/mc/mc_smx.h
@@ -10,8 +10,6 @@
 #include <stddef.h>
 
 #include <xbt/base.h>
-#include <xbt/dynar.h>
-#include <xbt/dynar.hpp>
 #include <xbt/log.h>
 
 #include <simgrid/simix.h>
@@ -19,7 +17,7 @@
 #include "src/smpi/private.h"
 
 #include "src/mc/Process.hpp"
-#include "src/mc/mc_protocol.h"
+#include "src/mc/remote/mc_protocol.h"
 
 /** @file
  *  @brief (Cross-process, MCer/MCed) Access to SMX structures
@@ -43,8 +41,6 @@
 
 SG_BEGIN_DECL()
 
-XBT_PRIVATE void MC_process_smx_refresh(simgrid::mc::Process* process);
-
 /** Get the issuer of  a simcall (`req->issuer`)
  *
  *  In split-process mode, it does the black magic necessary to get an address
@@ -54,22 +50,13 @@ XBT_PRIVATE void MC_process_smx_refresh(simgrid::mc::Process* process);
  *  @param process the MCed process
  *  @param req     the simcall (copied in the local process)
  */
-XBT_PRIVATE smx_process_t MC_smx_simcall_get_issuer(smx_simcall_t req);
+XBT_PRIVATE smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req);
 
-XBT_PRIVATE const char* MC_smx_process_get_name(smx_process_t p);
-XBT_PRIVATE const char* MC_smx_process_get_host_name(smx_process_t p);
+XBT_PRIVATE const char* MC_smx_actor_get_name(smx_actor_t p);
+XBT_PRIVATE const char* MC_smx_actor_get_host_name(smx_actor_t p);
 
 XBT_PRIVATE int MC_smpi_process_count(void);
 
-
-/* ***** Resolve (local/MCer structure from remote/MCed addresses) ***** */
-
-/** Get a local copy of the process from the process remote address */
-XBT_PRIVATE smx_process_t MC_smx_resolve_process(smx_process_t process_remote_address);
-
-/** Get the process info structure from the process remote address */
-XBT_PRIVATE simgrid::mc::SimixProcessInformation* MC_smx_resolve_process_info(smx_process_t process_remote_address);
-
 XBT_PRIVATE unsigned long MC_smx_get_maxpid(void);
 
 SG_END_DECL()