Kill now unused mc_xbt.

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

diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp
index 556e335..3d5d088 100644 (file)
--- a/src/mc/mc_request.cpp
+++ b/src/mc/mc_request.cpp
@@ -1,21 +1,14 @@
-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2008-2019. The SimGrid Team. All rights reserved.          */

 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 

-#include <cassert>
-
-#include <xbt/log.h>
-#include <xbt/str.h>
-#include <xbt/sysdep.h>
-#include <xbt/dynar.h>
-
-#include "src/mc/mc_request.h"
-#include "src/mc/mc_safety.h"
-#include "src/mc/mc_private.h"
-#include "src/mc/mc_smx.h"
-#include "src/mc/mc_xbt.hpp"
+#include "src/mc/mc_request.hpp"
+#include "src/include/mc/mc.h"
+#include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/activity/MutexImpl.hpp"
+#include "src/mc/ModelChecker.hpp"
+#include "src/mc/mc_smx.hpp"

 
 using simgrid::mc::remote;
 
 
 using simgrid::mc::remote;
 


@@ -25,27 +18,26 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_request, mc,
 static char *pointer_to_string(void *pointer);
 static char *buff_size_to_string(size_t size);
 
 static char *pointer_to_string(void *pointer);
 static char *buff_size_to_string(size_t size);
 

-static inline
-smx_synchro_t MC_get_comm(smx_simcall_t r)
+static inline simgrid::kernel::activity::CommImpl* MC_get_comm(smx_simcall_t r)

 {
   switch (r->call ) {
   case SIMCALL_COMM_WAIT:
 {
   switch (r->call ) {
   case SIMCALL_COMM_WAIT:

-    return simcall_comm_wait__get__comm(r);
+    return static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(r));

   case SIMCALL_COMM_TEST:
   case SIMCALL_COMM_TEST:

-    return simcall_comm_test__get__comm(r);
+    return static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_test__getraw__comm(r));

   default:
     return nullptr;
   }
 }
 
 static inline
   default:
     return nullptr;
   }
 }
 
 static inline

-smx_mailbox_t MC_get_rdv(smx_simcall_t r)
+smx_mailbox_t MC_get_mbox(smx_simcall_t r)

 {
   switch(r->call) {
   case SIMCALL_COMM_ISEND:
 {
   switch(r->call) {
   case SIMCALL_COMM_ISEND:

-    return simcall_comm_isend__get__rdv(r);
+    return simcall_comm_isend__get__mbox(r);

   case SIMCALL_COMM_IRECV:
   case SIMCALL_COMM_IRECV:

-    return simcall_comm_irecv__get__rdv(r);
+    return simcall_comm_irecv__get__mbox(r);

   default:
     return nullptr;
   }
   default:
     return nullptr;
   }


@@ -66,84 +58,72 @@ bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2)
 
   // Those are internal requests, we do not need indirection
   // because those objects are copies:
 
   // Those are internal requests, we do not need indirection
   // because those objects are copies:

-  smx_synchro_t synchro1 = MC_get_comm(r1);
-  smx_synchro_t synchro2 = MC_get_comm(r2);
+  simgrid::kernel::activity::CommImpl* synchro1 = MC_get_comm(r1);
+  simgrid::kernel::activity::CommImpl* synchro2 = MC_get_comm(r2);

 
   if ((r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV)
       && r2->call == SIMCALL_COMM_WAIT) {
 
 
   if ((r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV)
       && r2->call == SIMCALL_COMM_WAIT) {
 

-    smx_mailbox_t rdv = MC_get_rdv(r1);
+    smx_mailbox_t mbox = MC_get_mbox(r1);

 
 

-    if (rdv != synchro2->comm.rdv_cpy
+    if (mbox != synchro2->mbox_cpy

         && simcall_comm_wait__get__timeout(r2) <= 0)
       return false;
 
         && simcall_comm_wait__get__timeout(r2) <= 0)
       return false;
 

-    if ((r1->issuer != synchro2->comm.src_proc)
-        && (r1->issuer != synchro2->comm.dst_proc)
-        && simcall_comm_wait__get__timeout(r2) <= 0)
+    if ((r1->issuer != synchro2->src_actor_.get()) && (r1->issuer != synchro2->dst_actor_.get()) &&
+        simcall_comm_wait__get__timeout(r2) <= 0)

       return false;
 
       return false;
 

-    if ((r1->call == SIMCALL_COMM_ISEND)
-        && (synchro2->comm.type == SIMIX_COMM_SEND)
-        && (synchro2->comm.src_buff !=
-            simcall_comm_isend__get__src_buff(r1))
-        && simcall_comm_wait__get__timeout(r2) <= 0)
+    if ((r1->call == SIMCALL_COMM_ISEND) && (synchro2->type == kernel::activity::CommImpl::Type::SEND) &&
+        (synchro2->src_buff_ != simcall_comm_isend__get__src_buff(r1)) && simcall_comm_wait__get__timeout(r2) <= 0)

       return false;
 
       return false;
 

-    if ((r1->call == SIMCALL_COMM_IRECV)
-        && (synchro2->comm.type == SIMIX_COMM_RECEIVE)
-        && (synchro2->comm.dst_buff != simcall_comm_irecv__get__dst_buff(r1))
-        && simcall_comm_wait__get__timeout(r2) <= 0)
+    if ((r1->call == SIMCALL_COMM_IRECV) && (synchro2->type == kernel::activity::CommImpl::Type::RECEIVE) &&
+        (synchro2->dst_buff_ != simcall_comm_irecv__get__dst_buff(r1)) && simcall_comm_wait__get__timeout(r2) <= 0)

       return false;
   }
 
   /* FIXME: the following rule assumes that the result of the
    * isend/irecv call is not stored in a buffer used in the
    * test call. */
       return false;
   }
 
   /* FIXME: the following rule assumes that the result of the
    * isend/irecv call is not stored in a buffer used in the
    * test call. */

-  /*if(   (r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV)
+#if 0
+  if((r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV)

      &&  r2->call == SIMCALL_COMM_TEST)
      &&  r2->call == SIMCALL_COMM_TEST)

-     return FALSE; */
+     return false;
+#endif

 
 

-  if (r1->call == SIMCALL_COMM_WAIT
-      && (r2->call == SIMCALL_COMM_WAIT || r2->call == SIMCALL_COMM_TEST)
-      && (synchro1->comm.src_proc == nullptr || synchro1->comm.dst_proc == NULL))
+  if (r1->call == SIMCALL_COMM_WAIT && (r2->call == SIMCALL_COMM_WAIT || r2->call == SIMCALL_COMM_TEST) &&
+      (synchro1->src_actor_.get() == nullptr || synchro1->dst_actor_.get() == nullptr))

     return false;
 
   if (r1->call == SIMCALL_COMM_TEST &&
     return false;
 
   if (r1->call == SIMCALL_COMM_TEST &&

-      (simcall_comm_test__get__comm(r1) == nullptr
-       || synchro1->comm.src_buff == nullptr
-       || synchro1->comm.dst_buff == nullptr))
+      (simcall_comm_test__get__comm(r1) == nullptr || synchro1->src_buff_ == nullptr || synchro1->dst_buff_ == nullptr))

     return false;
 
     return false;
 

-  if (r1->call == SIMCALL_COMM_TEST && r2->call == SIMCALL_COMM_WAIT
-      && synchro1->comm.src_buff == synchro2->comm.src_buff
-      && synchro1->comm.dst_buff == synchro2->comm.dst_buff)
+  if (r1->call == SIMCALL_COMM_TEST && r2->call == SIMCALL_COMM_WAIT && synchro1->src_buff_ == synchro2->src_buff_ &&
+      synchro1->dst_buff_ == synchro2->dst_buff_)

     return false;
 
     return false;
 

-  if (r1->call == SIMCALL_COMM_WAIT && r2->call == SIMCALL_COMM_TEST
-      && synchro1->comm.src_buff != nullptr
-      && synchro1->comm.dst_buff != nullptr
-      && synchro2->comm.src_buff != nullptr
-      && synchro2->comm.dst_buff != nullptr
-      && synchro1->comm.dst_buff != synchro2->comm.src_buff
-      && synchro1->comm.dst_buff != synchro2->comm.dst_buff
-      && synchro2->comm.dst_buff != synchro1->comm.src_buff)
+  if (r1->call == SIMCALL_COMM_WAIT && r2->call == SIMCALL_COMM_TEST && synchro1->src_buff_ != nullptr &&
+      synchro1->dst_buff_ != nullptr && synchro2->src_buff_ != nullptr && synchro2->dst_buff_ != nullptr &&
+      synchro1->dst_buff_ != synchro2->src_buff_ && synchro1->dst_buff_ != synchro2->dst_buff_ &&
+      synchro2->dst_buff_ != synchro1->src_buff_)

     return false;
 
   return true;
 }
 
     return false;
 
   return true;
 }
 

-// Those are MC_state_get_internal_request(state)
+// Those are internal_req

 bool request_depend(smx_simcall_t r1, smx_simcall_t r2)
 {
   if (r1->issuer == r2->issuer)
     return false;
 
 bool request_depend(smx_simcall_t r1, smx_simcall_t r2)
 {
   if (r1->issuer == r2->issuer)
     return false;
 

-  /* Wait with timeout transitions are not considered by the independance theorem, thus we consider them as dependant with all other transitions */
+  /* Wait with timeout transitions are not considered by the independence theorem, thus we consider them as dependent with all other transitions */

   if ((r1->call == SIMCALL_COMM_WAIT && simcall_comm_wait__get__timeout(r1) > 0)
       || (r2->call == SIMCALL_COMM_WAIT
           && simcall_comm_wait__get__timeout(r2) > 0))
   if ((r1->call == SIMCALL_COMM_WAIT && simcall_comm_wait__get__timeout(r1) > 0)
       || (r2->call == SIMCALL_COMM_WAIT
           && simcall_comm_wait__get__timeout(r2) > 0))

-    return TRUE;
+    return true;

 
   if (r1->call != r2->call)
     return request_depend_asymmetric(r1, r2)
 
   if (r1->call != r2->call)
     return request_depend_asymmetric(r1, r2)


@@ -151,28 +131,24 @@ bool request_depend(smx_simcall_t r1, smx_simcall_t r2)
 
   // Those are internal requests, we do not need indirection
   // because those objects are copies:
 
   // Those are internal requests, we do not need indirection
   // because those objects are copies:

-  smx_synchro_t synchro1 = MC_get_comm(r1);
-  smx_synchro_t synchro2 = MC_get_comm(r2);
+  simgrid::kernel::activity::CommImpl* synchro1 = MC_get_comm(r1);
+  simgrid::kernel::activity::CommImpl* synchro2 = MC_get_comm(r2);

 
   switch(r1->call) {
   case SIMCALL_COMM_ISEND:
 
   switch(r1->call) {
   case SIMCALL_COMM_ISEND:

-    return simcall_comm_isend__get__rdv(r1) == simcall_comm_isend__get__rdv(r2);
+    return simcall_comm_isend__get__mbox(r1)
+      == simcall_comm_isend__get__mbox(r2);

   case SIMCALL_COMM_IRECV:
   case SIMCALL_COMM_IRECV:

-    return simcall_comm_irecv__get__rdv(r1) == simcall_comm_irecv__get__rdv(r2);
+    return simcall_comm_irecv__get__mbox(r1)
+      == simcall_comm_irecv__get__mbox(r2);

   case SIMCALL_COMM_WAIT:
   case SIMCALL_COMM_WAIT:

-    if (synchro1->comm.src_buff == synchro2->comm.src_buff
-        && synchro1->comm.dst_buff == synchro2->comm.dst_buff)
+    if (synchro1->src_buff_ == synchro2->src_buff_ && synchro1->dst_buff_ == synchro2->dst_buff_)

       return false;
       return false;

-    else if (synchro1->comm.src_buff != nullptr
-        && synchro1->comm.dst_buff != nullptr
-        && synchro2->comm.src_buff != nullptr
-        && synchro2->comm.dst_buff != nullptr
-        && synchro1->comm.dst_buff != synchro2->comm.src_buff
-        && synchro1->comm.dst_buff != synchro2->comm.dst_buff
-        && synchro2->comm.dst_buff != synchro1->comm.src_buff)
+    if (synchro1->src_buff_ != nullptr && synchro1->dst_buff_ != nullptr && synchro2->src_buff_ != nullptr &&
+        synchro2->dst_buff_ != nullptr && synchro1->dst_buff_ != synchro2->src_buff_ &&
+        synchro1->dst_buff_ != synchro2->dst_buff_ && synchro2->dst_buff_ != synchro1->src_buff_)

       return false;
       return false;

-    else
-      return true;
+    return true;

   default:
     return true;
   }
   default:
     return true;
   }


@@ -202,6 +178,8 @@ static char *buff_size_to_string(size_t buff_size)
 
 std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc::RequestType request_type)
 {
 
 std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc::RequestType request_type)
 {

+  xbt_assert(mc_model_checker != nullptr, "Must be called from MCer");
+

   bool use_remote_comm = true;
   switch(request_type) {
   case simgrid::mc::RequestType::simix:
   bool use_remote_comm = true;
   switch(request_type) {
   case simgrid::mc::RequestType::simix:


@@ -211,12 +189,14 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid
   case simgrid::mc::RequestType::internal:
     use_remote_comm = false;
     break;
   case simgrid::mc::RequestType::internal:
     use_remote_comm = false;
     break;

+  default:
+    THROW_IMPOSSIBLE;

   }
 
   const char* type = nullptr;
   char *args = nullptr;
 
   }
 
   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) {
 
 
   switch (req->call) {
 


@@ -224,16 +204,11 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid
     type = "iSend";
     char* p = pointer_to_string(simcall_comm_isend__get__src_buff(req));
     char* bs = buff_size_to_string(simcall_comm_isend__get__src_buff_size(req));
     type = "iSend";
     char* p = pointer_to_string(simcall_comm_isend__get__src_buff(req));
     char* bs = buff_size_to_string(simcall_comm_isend__get__src_buff_size(req));

-    if (issuer->host)
-      args =
-          bprintf("src=(%lu)%s (%s), buff=%s, size=%s", issuer->pid,
-                  MC_smx_process_get_host_name(issuer),
-                  MC_smx_process_get_name(issuer),
-                  p, bs);
+    if (issuer->get_host())
+      args = bprintf("src=(%ld)%s (%s), buff=%s, size=%s", issuer->get_pid(), MC_smx_actor_get_host_name(issuer),
+                     MC_smx_actor_get_name(issuer), p, bs);

     else
     else

-      args =
-          bprintf("src=(%lu)%s, buff=%s, size=%s", issuer->pid,
-                  MC_smx_process_get_name(issuer), p, bs);
+      args = bprintf("src=(%ld)%s, buff=%s, size=%s", issuer->get_pid(), MC_smx_actor_get_name(issuer), p, bs);

     xbt_free(bs);
     xbt_free(p);
     break;
     xbt_free(bs);
     xbt_free(p);
     break;


@@ -241,8 +216,6 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid
 
   case SIMCALL_COMM_IRECV: {
     size_t* remote_size = simcall_comm_irecv__get__dst_buff_size(req);
 
   case SIMCALL_COMM_IRECV: {
     size_t* remote_size = simcall_comm_irecv__get__dst_buff_size(req);

-
-    // size_t size = size_pointer ? *size_pointer : 0;

     size_t size = 0;
     if (remote_size)
       mc_model_checker->process().read_bytes(&size, sizeof(size),
     size_t size = 0;
     if (remote_size)
       mc_model_checker->process().read_bytes(&size, sizeof(size),


@@ -251,24 +224,19 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid
     type = "iRecv";
     char* p = pointer_to_string(simcall_comm_irecv__get__dst_buff(req));
     char* bs = buff_size_to_string(size);
     type = "iRecv";
     char* p = pointer_to_string(simcall_comm_irecv__get__dst_buff(req));
     char* bs = buff_size_to_string(size);

-    if (issuer->host)
-      args =
-          bprintf("dst=(%lu)%s (%s), buff=%s, size=%s", issuer->pid,
-                  MC_smx_process_get_host_name(issuer),
-                  MC_smx_process_get_name(issuer),
-                  p, bs);
+    if (issuer->get_host())
+      args = bprintf("dst=(%ld)%s (%s), buff=%s, size=%s", issuer->get_pid(), MC_smx_actor_get_host_name(issuer),
+                     MC_smx_actor_get_name(issuer), p, bs);

     else
     else

-      args =
-          bprintf("dst=(%lu)%s, buff=%s, size=%s", issuer->pid,
-                  MC_smx_process_get_name(issuer),
-                  p, bs);
+      args = bprintf("dst=(%ld)%s, buff=%s, size=%s", issuer->get_pid(), MC_smx_actor_get_name(issuer), p, bs);

     xbt_free(bs);
     xbt_free(p);
     break;
   }
 
   case SIMCALL_COMM_WAIT: {
     xbt_free(bs);
     xbt_free(p);
     break;
   }
 
   case SIMCALL_COMM_WAIT: {

-    smx_synchro_t remote_act = simcall_comm_wait__get__comm(req);
+    simgrid::kernel::activity::CommImpl* remote_act =
+        static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(req));

     char* p;
     if (value == -1) {
       type = "WaitTimeout";
     char* p;
     if (value == -1) {
       type = "WaitTimeout";


@@ -278,42 +246,41 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid
       type = "Wait";
       p = pointer_to_string(remote_act);
 
       type = "Wait";
       p = pointer_to_string(remote_act);
 

-      s_smx_synchro_t synchro;
-      smx_synchro_t act;
+      simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_synchro;
+      simgrid::kernel::activity::CommImpl* act;

       if (use_remote_comm) {
       if (use_remote_comm) {

-        mc_model_checker->process().read_bytes(&synchro,
-          sizeof(synchro), remote(remote_act));
-        act = &synchro;
+        mc_model_checker->process().read(temp_synchro,
+                                         remote(static_cast<simgrid::kernel::activity::CommImpl*>(remote_act)));
+        act = temp_synchro.getBuffer();

       } else
         act = remote_act;
 
       } else
         act = remote_act;
 

-      smx_process_t src_proc = MC_smx_resolve_process(act->comm.src_proc);
-      smx_process_t dst_proc = MC_smx_resolve_process(act->comm.dst_proc);
-      args = bprintf("comm=%s [(%lu)%s (%s)-> (%lu)%s (%s)]", p,
-                     src_proc ? src_proc->pid : 0,
-                     src_proc ? MC_smx_process_get_host_name(src_proc) : "",
-                     src_proc ? MC_smx_process_get_name(src_proc) : "",
-                     dst_proc ? dst_proc->pid : 0,
-                     dst_proc ? MC_smx_process_get_host_name(dst_proc) : "",
-                     dst_proc ? MC_smx_process_get_name(dst_proc) : "");
+      smx_actor_t src_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(act->src_actor_.get()));
+      smx_actor_t dst_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(act->dst_actor_.get()));
+      args =
+          bprintf("comm=%s [(%ld)%s (%s)-> (%ld)%s (%s)]", p, src_proc ? src_proc->get_pid() : 0,
+                  src_proc ? MC_smx_actor_get_host_name(src_proc) : "", src_proc ? MC_smx_actor_get_name(src_proc) : "",
+                  dst_proc ? dst_proc->get_pid() : 0, dst_proc ? MC_smx_actor_get_host_name(dst_proc) : "",
+                  dst_proc ? MC_smx_actor_get_name(dst_proc) : "");

     }
     xbt_free(p);
     break;
   }
 
   case SIMCALL_COMM_TEST: {
     }
     xbt_free(p);
     break;
   }
 
   case SIMCALL_COMM_TEST: {

-    smx_synchro_t remote_act = simcall_comm_test__get__comm(req);
-    s_smx_synchro_t synchro;
-      smx_synchro_t act;
-      if (use_remote_comm) {
-        mc_model_checker->process().read_bytes(&synchro,
-          sizeof(synchro), remote(remote_act));
-        act = &synchro;
-      } else
-        act = remote_act;
+    simgrid::kernel::activity::CommImpl* remote_act =
+        static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_test__getraw__comm(req));
+    simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_synchro;
+    simgrid::kernel::activity::CommImpl* act;
+    if (use_remote_comm) {
+      mc_model_checker->process().read(temp_synchro,
+                                       remote(static_cast<simgrid::kernel::activity::CommImpl*>(remote_act)));
+      act = temp_synchro.getBuffer();
+    } else
+      act = remote_act;

 
     char* p;
 
     char* p;

-    if (act->comm.src_proc == nullptr || act->comm.dst_proc == NULL) {
+    if (act->src_actor_.get() == nullptr || act->dst_actor_.get() == nullptr) {

       type = "Test FALSE";
       p = pointer_to_string(remote_act);
       args = bprintf("comm=%s", p);
       type = "Test FALSE";
       p = pointer_to_string(remote_act);
       args = bprintf("comm=%s", p);


@@ -321,15 +288,11 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid
       type = "Test TRUE";
       p = pointer_to_string(remote_act);
 
       type = "Test TRUE";
       p = pointer_to_string(remote_act);
 

-      smx_process_t src_proc = MC_smx_resolve_process(act->comm.src_proc);
-      smx_process_t dst_proc = MC_smx_resolve_process(act->comm.dst_proc);
-      args = bprintf("comm=%s [(%lu)%s (%s) -> (%lu)%s (%s)]", p,
-                     src_proc->pid,
-                     MC_smx_process_get_name(src_proc),
-                     MC_smx_process_get_host_name(src_proc),
-                     dst_proc->pid,
-                     MC_smx_process_get_name(dst_proc),
-                     MC_smx_process_get_host_name(dst_proc));
+      smx_actor_t src_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(act->src_actor_.get()));
+      smx_actor_t dst_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(act->dst_actor_.get()));
+      args = bprintf("comm=%s [(%ld)%s (%s) -> (%ld)%s (%s)]", p, src_proc->get_pid(), MC_smx_actor_get_name(src_proc),
+                     MC_smx_actor_get_host_name(src_proc), dst_proc->get_pid(), MC_smx_actor_get_name(dst_proc),
+                     MC_smx_actor_get_host_name(dst_proc));

     }
     xbt_free(p);
     break;
     }
     xbt_free(p);
     break;


@@ -337,17 +300,12 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid
 
   case SIMCALL_COMM_WAITANY: {
     type = "WaitAny";
 
   case SIMCALL_COMM_WAITANY: {
     type = "WaitAny";

-    s_xbt_dynar_t comms;
-    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;
-      read_element(mc_model_checker->process(),
-        &remote_sync, remote(simcall_comm_waitany__get__comms(req)), value,
-        sizeof(remote_sync));
-      char* p = pointer_to_string(remote_sync);
-      args = bprintf("comm=%s (%d of %lu)",
-        p, value + 1, xbt_dynar_length(&comms));
+    size_t count = simcall_comm_waitany__get__count(req);
+    if (count > 0) {
+      simgrid::kernel::activity::ActivityImpl* remote_sync;
+      remote_sync = mc_model_checker->process().read(remote(simcall_comm_waitany__getraw__comms(req) + value));
+      char* p     = pointer_to_string(remote_sync);
+      args        = bprintf("comm=%s (%d of %zu)", p, value + 1, count);

       xbt_free(p);
     } else
       args = bprintf("comm at idx %d", value);
       xbt_free(p);
     } else
       args = bprintf("comm at idx %d", value);


@@ -362,8 +320,7 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid
       type = "TestAny";
       args =
           bprintf("(%d of %zu)", value + 1,
       type = "TestAny";
       args =
           bprintf("(%d of %zu)", value + 1,

-                  read_length(mc_model_checker->process(),
-                    simcall_comm_testany__get__comms(req)));
+                    simcall_comm_testany__get__count(req));

     }
     break;
 
     }
     break;
 


@@ -374,21 +331,18 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid
     else
       type = "Mutex TRYLOCK";
 
     else
       type = "Mutex TRYLOCK";
 

-    s_smx_mutex_t mutex;
-    mc_model_checker->process().read_bytes(&mutex, sizeof(mutex),
+    simgrid::mc::Remote<simgrid::kernel::activity::MutexImpl> mutex;
+    mc_model_checker->process().read_bytes(mutex.getBuffer(), sizeof(mutex),

       remote(
         req->call == SIMCALL_MUTEX_LOCK
         ? simcall_mutex_lock__get__mutex(req)
         : simcall_mutex_trylock__get__mutex(req)
       ));
       remote(
         req->call == SIMCALL_MUTEX_LOCK
         ? simcall_mutex_lock__get__mutex(req)
         : simcall_mutex_trylock__get__mutex(req)
       ));

-    s_xbt_swag_t mutex_sleeping;
-    mc_model_checker->process().read_bytes(&mutex_sleeping, sizeof(mutex_sleeping),
-      remote(mutex.sleeping));
-
-    args = bprintf("locked = %d, owner = %d, sleeping = %d",
-      mutex.locked,
-      mutex.owner != nullptr ? (int) MC_smx_resolve_process(mutex.owner)->pid : -1,
-      mutex_sleeping.count);
+    args = bprintf(
+        "locked = %d, owner = %d, sleeping = n/a", mutex.getBuffer()->locked,
+        mutex.getBuffer()->owner != nullptr
+            ? (int)mc_model_checker->process().resolveActor(simgrid::mc::remote(mutex.getBuffer()->owner))->get_pid()
+            : -1);

     break;
   }
 
     break;
   }
 


@@ -398,20 +352,18 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid
     break;
 
   default:
     break;
 
   default:

-    THROW_UNIMPLEMENTED;
+    type = SIMIX_simcall_name(req->call);
+    args = bprintf("??");
+    break;

   }
 
   std::string str;
   if (args != nullptr)
   }
 
   std::string str;
   if (args != nullptr)

-    str = simgrid::xbt::string_printf("[(%lu)%s (%s)] %s(%s)", issuer->pid,
-                MC_smx_process_get_host_name(issuer),
-                MC_smx_process_get_name(issuer),
-                type, args);
+    str = simgrid::xbt::string_printf("[(%ld)%s (%s)] %s(%s)", issuer->get_pid(), MC_smx_actor_get_host_name(issuer),
+                                      MC_smx_actor_get_name(issuer), type, args);

   else
   else

-    str = simgrid::xbt::string_printf("[(%lu)%s (%s)] %s ", issuer->pid,
-                MC_smx_process_get_host_name(issuer),
-                MC_smx_process_get_name(issuer),
-                type);
+    str = simgrid::xbt::string_printf("[(%ld)%s (%s)] %s ", issuer->get_pid(), MC_smx_actor_get_host_name(issuer),
+                                      MC_smx_actor_get_name(issuer), type);

   xbt_free(args);
   return str;
 }
   xbt_free(args);
   return str;
 }


@@ -421,44 +373,32 @@ namespace mc {
 
 bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx)
 {
 
 bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx)
 {

-  smx_synchro_t remote_act = nullptr;
+  simgrid::kernel::activity::ActivityImpl* remote_act = nullptr;

   switch (req->call) {
 
   case SIMCALL_COMM_WAIT:
     /* FIXME: check also that src and dst processes are not suspended */
   switch (req->call) {
 
   case SIMCALL_COMM_WAIT:
     /* FIXME: check also that src and dst processes are not suspended */

-    remote_act = simcall_comm_wait__get__comm(req);
+    remote_act = simcall_comm_wait__getraw__comm(req);

     break;
 
     break;
 

-  case SIMCALL_COMM_WAITANY: {
-    read_element(
-      mc_model_checker->process(), &remote_act,
-      remote(simcall_comm_waitany__get__comms(req)),
-      idx, sizeof(remote_act));
-    }
+  case SIMCALL_COMM_WAITANY:
+    remote_act = mc_model_checker->process().read(remote(simcall_comm_testany__getraw__comms(req) + idx));

     break;
 
     break;
 

-  case SIMCALL_COMM_TESTANY: {
-    read_element(
-      mc_model_checker->process(), &remote_act,
-      remote(simcall_comm_testany__get__comms(req)),
-      idx, sizeof(remote_act));
-    }
+  case SIMCALL_COMM_TESTANY:
+    remote_act = mc_model_checker->process().read(remote(simcall_comm_testany__getraw__comms(req) + idx));

     break;
 
   default:
     return true;
   }
 
     break;
 
   default:
     return true;
   }
 

-  s_smx_synchro_t synchro;
-  mc_model_checker->process().read_bytes(
-    &synchro, sizeof(synchro), remote(remote_act));
-  return synchro.comm.src_proc && synchro.comm.dst_proc;
+  simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
+  mc_model_checker->process().read(temp_comm, remote(static_cast<simgrid::kernel::activity::CommImpl*>(remote_act)));
+  simgrid::kernel::activity::CommImpl* comm = temp_comm.getBuffer();
+  return comm->src_actor_.get() && comm->dst_actor_.get();

 }
 
 }
 

-bool process_is_enabled(smx_process_t process)
-{
-  return simgrid::mc::request_is_enabled(&process->simcall);
-}

 
 static const char* colors[] = {
   "blue",
 
 static const char* colors[] = {
   "blue",


@@ -481,150 +421,126 @@ static inline const char* get_color(int id)
   return colors[id % (sizeof(colors) / sizeof(colors[0])) ];
 }
 
   return colors[id % (sizeof(colors) / sizeof(colors[0])) ];
 }
 

-char *request_get_dot_output(smx_simcall_t req, int value)
+std::string request_get_dot_output(smx_simcall_t req, int value)

 {
 {

-  char *label = nullptr;
+  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:
 
   switch (req->call) {
   case SIMCALL_COMM_ISEND:

-    if (issuer->host)
-      label =
-          bprintf("[(%lu)%s] iSend", issuer->pid,
-                  MC_smx_process_get_host_name(issuer));
+    if (issuer->get_host())
+      label = simgrid::xbt::string_printf("[(%ld)%s] iSend", issuer->get_pid(), MC_smx_actor_get_host_name(issuer));

     else
     else

-      label = bprintf("[(%lu)] iSend", issuer->pid);
+      label = bprintf("[(%ld)] iSend", issuer->get_pid());

     break;
 
   case SIMCALL_COMM_IRECV:
     break;
 
   case SIMCALL_COMM_IRECV:

-    if (issuer->host)
-      label =
-          bprintf("[(%lu)%s] iRecv", issuer->pid,
-                  MC_smx_process_get_host_name(issuer));
+    if (issuer->get_host())
+      label = simgrid::xbt::string_printf("[(%ld)%s] iRecv", issuer->get_pid(), MC_smx_actor_get_host_name(issuer));

     else
     else

-      label = bprintf("[(%lu)] iRecv", issuer->pid);
+      label = simgrid::xbt::string_printf("[(%ld)] iRecv", issuer->get_pid());

     break;
 
     break;
 

-  case SIMCALL_COMM_WAIT: {
+  case SIMCALL_COMM_WAIT:

     if (value == -1) {
     if (value == -1) {

-      if (issuer->host)
+      if (issuer->get_host())

         label =
         label =

-            bprintf("[(%lu)%s] WaitTimeout", issuer->pid,
-                    MC_smx_process_get_host_name(issuer));
+            simgrid::xbt::string_printf("[(%ld)%s] WaitTimeout", issuer->get_pid(), MC_smx_actor_get_host_name(issuer));

       else
       else

-        label = bprintf("[(%lu)] WaitTimeout", issuer->pid);
+        label = simgrid::xbt::string_printf("[(%ld)] WaitTimeout", issuer->get_pid());

     } else {
     } else {

-      smx_synchro_t remote_act = simcall_comm_wait__get__comm(req);
-      s_smx_synchro_t synchro;
-      mc_model_checker->process().read_bytes(&synchro,
-        sizeof(synchro), remote(remote_act));
-
-      smx_process_t src_proc = MC_smx_resolve_process(synchro.comm.src_proc);
-      smx_process_t dst_proc = MC_smx_resolve_process(synchro.comm.dst_proc);
-      if (issuer->host)
-        label =
-            bprintf("[(%lu)%s] Wait [(%lu)->(%lu)]", issuer->pid,
-                    MC_smx_process_get_host_name(issuer),
-                    src_proc ? src_proc->pid : 0,
-                    dst_proc ? dst_proc->pid : 0);
+      simgrid::kernel::activity::ActivityImpl* remote_act = simcall_comm_wait__getraw__comm(req);
+      simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
+      mc_model_checker->process().read(temp_comm,
+                                       remote(static_cast<simgrid::kernel::activity::CommImpl*>(remote_act)));
+      simgrid::kernel::activity::CommImpl* comm = temp_comm.getBuffer();
+
+      smx_actor_t src_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(comm->src_actor_.get()));
+      smx_actor_t dst_proc = mc_model_checker->process().resolveActor(simgrid::mc::remote(comm->dst_actor_.get()));
+      if (issuer->get_host())
+        label = simgrid::xbt::string_printf("[(%ld)%s] Wait [(%ld)->(%ld)]", issuer->get_pid(),
+                                            MC_smx_actor_get_host_name(issuer), src_proc ? src_proc->get_pid() : 0,
+                                            dst_proc ? dst_proc->get_pid() : 0);

       else
       else

-        label =
-            bprintf("[(%lu)] Wait [(%lu)->(%lu)]", issuer->pid,
-                    src_proc ? src_proc->pid : 0,
-                    dst_proc ? dst_proc->pid : 0);
+        label = simgrid::xbt::string_printf("[(%ld)] Wait [(%ld)->(%ld)]", issuer->get_pid(),
+                                            src_proc ? src_proc->get_pid() : 0, dst_proc ? dst_proc->get_pid() : 0);

     }
     break;
     }
     break;

-  }

 
   case SIMCALL_COMM_TEST: {
 
   case SIMCALL_COMM_TEST: {

-    smx_synchro_t remote_act = simcall_comm_test__get__comm(req);
-    s_smx_synchro_t synchro;
-    mc_model_checker->process().read_bytes(&synchro,
-      sizeof(synchro), remote(remote_act));
-    if (synchro.comm.src_proc == nullptr || synchro.comm.dst_proc == NULL) {
-      if (issuer->host)
+    simgrid::kernel::activity::ActivityImpl* remote_act = simcall_comm_test__getraw__comm(req);
+    simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
+    mc_model_checker->process().read(temp_comm, remote(static_cast<simgrid::kernel::activity::CommImpl*>(remote_act)));
+    simgrid::kernel::activity::CommImpl* comm = temp_comm.getBuffer();
+    if (comm->src_actor_.get() == nullptr || comm->dst_actor_.get() == nullptr) {
+      if (issuer->get_host())

         label =
         label =

-            bprintf("[(%lu)%s] Test FALSE", issuer->pid,
-                    MC_smx_process_get_host_name(issuer));
+            simgrid::xbt::string_printf("[(%ld)%s] Test FALSE", issuer->get_pid(), MC_smx_actor_get_host_name(issuer));

       else
       else

-        label = bprintf("[(%lu)] Test FALSE", issuer->pid);
+        label = bprintf("[(%ld)] Test FALSE", issuer->get_pid());

     } else {
     } else {

-      if (issuer->host)
+      if (issuer->get_host())

         label =
         label =

-            bprintf("[(%lu)%s] Test TRUE", issuer->pid,
-                    MC_smx_process_get_host_name(issuer));
+            simgrid::xbt::string_printf("[(%ld)%s] Test TRUE", issuer->get_pid(), MC_smx_actor_get_host_name(issuer));

       else
       else

-        label = bprintf("[(%lu)] Test TRUE", issuer->pid);
+        label = simgrid::xbt::string_printf("[(%ld)] Test TRUE", issuer->get_pid());

     }
     break;
   }
 
   case SIMCALL_COMM_WAITANY: {
     }
     break;
   }
 
   case SIMCALL_COMM_WAITANY: {

-    unsigned long comms_size = read_length(
-      mc_model_checker->process(), remote(simcall_comm_waitany__get__comms(req)));
-    if (issuer->host)
-      label =
-          bprintf("[(%lu)%s] WaitAny [%d of %lu]", issuer->pid,
-                  MC_smx_process_get_host_name(issuer), value + 1,
-                  comms_size);
+    size_t comms_size = simcall_comm_waitany__get__count(req);
+    if (issuer->get_host())
+      label = simgrid::xbt::string_printf("[(%ld)%s] WaitAny [%d of %zu]", issuer->get_pid(),
+                                          MC_smx_actor_get_host_name(issuer), value + 1, comms_size);

     else
     else

-      label =
-          bprintf("[(%lu)] WaitAny [%d of %lu]", issuer->pid, value + 1,
-                  comms_size);
+      label = simgrid::xbt::string_printf("[(%ld)] WaitAny [%d of %zu]", issuer->get_pid(), value + 1, comms_size);

     break;
   }
 
   case SIMCALL_COMM_TESTANY:
     if (value == -1) {
     break;
   }
 
   case SIMCALL_COMM_TESTANY:
     if (value == -1) {

-      if (issuer->host)
-        label =
-            bprintf("[(%lu)%s] TestAny FALSE", issuer->pid,
-                    MC_smx_process_get_host_name(issuer));
+      if (issuer->get_host())
+        label = simgrid::xbt::string_printf("[(%ld)%s] TestAny FALSE", issuer->get_pid(),
+                                            MC_smx_actor_get_host_name(issuer));

       else
       else

-        label = bprintf("[(%lu)] TestAny FALSE", issuer->pid);
+        label = simgrid::xbt::string_printf("[(%ld)] TestAny FALSE", issuer->get_pid());

     } else {
     } else {

-      if (issuer->host)
-        label =
-            bprintf("[(%lu)%s] TestAny TRUE [%d of %lu]", issuer->pid,
-                    MC_smx_process_get_host_name(issuer), value + 1,
-                    xbt_dynar_length(simcall_comm_testany__get__comms(req)));
+      if (issuer->get_host())
+        label = simgrid::xbt::string_printf("[(%ld)%s] TestAny TRUE [%d of %lu]", issuer->get_pid(),
+                                            MC_smx_actor_get_host_name(issuer), value + 1,
+                                            simcall_comm_testany__get__count(req));

       else
       else

-        label =
-            bprintf("[(%lu)] TestAny TRUE [%d of %lu]", issuer->pid,
-                    value + 1,
-                    xbt_dynar_length(simcall_comm_testany__get__comms(req)));
+        label = simgrid::xbt::string_printf("[(%ld)] TestAny TRUE [%d of %lu]", issuer->get_pid(), value + 1,
+                                            simcall_comm_testany__get__count(req));

     }
     break;
 
   case SIMCALL_MUTEX_TRYLOCK:
     }
     break;
 
   case SIMCALL_MUTEX_TRYLOCK:

-    label = bprintf("[(%lu)] Mutex TRYLOCK", issuer->pid);
+    label = simgrid::xbt::string_printf("[(%ld)] Mutex TRYLOCK", issuer->get_pid());

     break;
 
   case SIMCALL_MUTEX_LOCK:
     break;
 
   case SIMCALL_MUTEX_LOCK:

-    label = bprintf("[(%lu)] Mutex LOCK", issuer->pid);
+    label = simgrid::xbt::string_printf("[(%ld)] Mutex LOCK", issuer->get_pid());

     break;
 
   case SIMCALL_MC_RANDOM:
     break;
 
   case SIMCALL_MC_RANDOM:

-    if (issuer->host)
-      label =
-          bprintf("[(%lu)%s] MC_RANDOM (%d)", issuer->pid,
-                  MC_smx_process_get_host_name(issuer), value);
+    if (issuer->get_host())
+      label = simgrid::xbt::string_printf("[(%ld)%s] MC_RANDOM (%d)", issuer->get_pid(),
+                                          MC_smx_actor_get_host_name(issuer), value);

     else
     else

-      label = bprintf("[(%lu)] MC_RANDOM (%d)", issuer->pid, value);
+      label = simgrid::xbt::string_printf("[(%ld)] MC_RANDOM (%d)", issuer->get_pid(), value);

     break;
 
   default:
     THROW_UNIMPLEMENTED;
   }
 
     break;
 
   default:
     THROW_UNIMPLEMENTED;
   }
 

-  const char* color = get_color(issuer->pid - 1);
-  char* str =
-      bprintf("label = \"%s\", color = %s, fontcolor = %s", label,
-              color, color);
-  xbt_free(label);
-  return str;
-
+  const char* color = get_color(issuer->get_pid() - 1);
+  return  simgrid::xbt::string_printf(
+        "label = \"%s\", color = %s, fontcolor = %s", label.c_str(),
+        color, color);

 }
 
 }
 }
 
 }