X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/808bc801011b8291383a7fb87669eb67f46f3a07..f59a0f20f1d471426dda7ca467be463c1b0ad6f3:/src/mc/mc_request.cpp

diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp
index e7e0942b3a..e2087298af 100644
--- a/src/mc/mc_request.cpp
+++ b/src/mc/mc_request.cpp
@@ -223,7 +223,7 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid
   const char* type = nullptr;
   char *args = nullptr;
 
-  smx_process_t issuer = MC_smx_simcall_get_issuer(req);
+  smx_actor_t issuer = MC_smx_simcall_get_issuer(req);
 
   switch (req->call) {
 
@@ -295,9 +295,9 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid
       } else
         act = remote_act;
 
-      smx_process_t src_proc = mc_model_checker->process().resolveProcess(
+      smx_actor_t src_proc = mc_model_checker->process().resolveProcess(
         simgrid::mc::remote(act->src_proc));
-      smx_process_t dst_proc = mc_model_checker->process().resolveProcess(
+      smx_actor_t dst_proc = mc_model_checker->process().resolveProcess(
         simgrid::mc::remote(act->dst_proc));
       args = bprintf("comm=%s [(%lu)%s (%s)-> (%lu)%s (%s)]", p,
                      src_proc ? src_proc->pid : 0,
@@ -332,9 +332,9 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid
       type = "Test TRUE";
       p = pointer_to_string(remote_act);
 
-      smx_process_t src_proc = mc_model_checker->process().resolveProcess(
+      smx_actor_t src_proc = mc_model_checker->process().resolveProcess(
         simgrid::mc::remote(act->src_proc));
-      smx_process_t dst_proc = mc_model_checker->process().resolveProcess(
+      smx_actor_t dst_proc = mc_model_checker->process().resolveProcess(
         simgrid::mc::remote(act->dst_proc));
       args = bprintf("comm=%s [(%lu)%s (%s) -> (%lu)%s (%s)]", p,
                      src_proc->pid,
@@ -354,7 +354,7 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid
     mc_model_checker->process().read_bytes(
       &comms, sizeof(comms), remote(simcall_comm_waitany__get__comms(req)));
     if (!xbt_dynar_is_empty(&comms)) {
-      smx_synchro_t remote_sync;
+      smx_activity_t remote_sync;
       read_element(mc_model_checker->process(),
         &remote_sync, remote(simcall_comm_waitany__get__comms(req)), value,
         sizeof(remote_sync));
@@ -434,7 +434,7 @@ namespace mc {
 
 bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx)
 {
-  smx_synchro_t remote_act = nullptr;
+  smx_activity_t remote_act = nullptr;
   switch (req->call) {
 
   case SIMCALL_COMM_WAIT:
@@ -466,7 +466,7 @@ bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx)
   return comm->src_proc && comm->dst_proc;
 }
 
-bool process_is_enabled(smx_process_t process)
+bool process_is_enabled(smx_actor_t process)
 {
   return simgrid::mc::request_is_enabled(&process->simcall);
 }
@@ -496,7 +496,7 @@ std::string request_get_dot_output(smx_simcall_t req, int value)
 {
   std::string label;
 
-  const smx_process_t issuer = MC_smx_simcall_get_issuer(req);
+  const smx_actor_t issuer = MC_smx_simcall_get_issuer(req);
 
   switch (req->call) {
   case SIMCALL_COMM_ISEND:
@@ -523,15 +523,15 @@ std::string request_get_dot_output(smx_simcall_t req, int value)
       else
         label = simgrid::xbt::string_printf("[(%lu)] WaitTimeout", issuer->pid);
     } else {
-      smx_synchro_t remote_act = simcall_comm_wait__get__comm(req);
+      smx_activity_t remote_act = simcall_comm_wait__get__comm(req);
       simgrid::mc::Remote<simgrid::kernel::activity::Comm> temp_comm;
       mc_model_checker->process().read(temp_comm, remote(
         static_cast<simgrid::kernel::activity::Comm*>(remote_act)));
       simgrid::kernel::activity::Comm* comm = temp_comm.getBuffer();
 
-      smx_process_t src_proc = mc_model_checker->process().resolveProcess(
+      smx_actor_t src_proc = mc_model_checker->process().resolveProcess(
         simgrid::mc::remote(comm->src_proc));
-      smx_process_t dst_proc = mc_model_checker->process().resolveProcess(
+      smx_actor_t dst_proc = mc_model_checker->process().resolveProcess(
         simgrid::mc::remote(comm->dst_proc));
       if (issuer->host)
         label = simgrid::xbt::string_printf("[(%lu)%s] Wait [(%lu)->(%lu)]",
@@ -549,7 +549,7 @@ std::string request_get_dot_output(smx_simcall_t req, int value)
   }
 
   case SIMCALL_COMM_TEST: {
-    smx_synchro_t remote_act = simcall_comm_test__get__comm(req);
+    smx_activity_t remote_act = simcall_comm_test__get__comm(req);
     simgrid::mc::Remote<simgrid::kernel::activity::Comm> temp_comm;
     mc_model_checker->process().read(temp_comm, remote(
       static_cast<simgrid::kernel::activity::Comm*>(remote_act)));