Merge with fragmagit/master

diff --combined MANIFEST.in
index e84b420,0a79b29..68e6a0b
--- 1/MANIFEST.in
--- 2/MANIFEST.in
+++ b/MANIFEST.in
@@@ -368,6 -368,8 +368,8 @@@ include examples/s4u/cloud-simple/s4u-c
  include examples/s4u/cloud-simple/s4u-cloud-simple.tesh
  include examples/s4u/comm-dependent/s4u-comm-dependent.cpp
  include examples/s4u/comm-dependent/s4u-comm-dependent.tesh
+ include examples/s4u/comm-host2host/s4u-comm-host2host.cpp
+ include examples/s4u/comm-host2host/s4u-comm-host2host.tesh
  include examples/s4u/comm-ready/s4u-comm-ready.cpp
  include examples/s4u/comm-ready/s4u-comm-ready.tesh
  include examples/s4u/comm-ready/s4u-comm-ready_d.xml
@@@ -2302,8 -2304,6 +2304,8 @@@ include src/mc/inspect/mc_unw.hp
  include src/mc/inspect/mc_unw_vmread.cpp
  include src/mc/mc_api.cpp
  include src/mc/mc_api.hpp
 +include src/mc/udpor_global.cpp
 +include src/mc/udpor_global.hpp
  include src/mc/mc_base.cpp
  include src/mc/mc_base.h
  include src/mc/mc_client_api.cpp
@@@ -2350,6 -2350,7 +2352,6 @@@ include src/mc/sosp/Region.hp
  include src/mc/sosp/Snapshot.cpp
  include src/mc/sosp/Snapshot.hpp
  include src/mc/sosp/Snapshot_test.cpp
 -include src/mc/udpor_global.hpp
  include src/msg/msg_comm.cpp
  include src/msg/msg_global.cpp
  include src/msg/msg_legacy.cpp

diff --combined src/mc/mc_api.cpp
index 9767e72,0eae8bb..fa34ccb
--- 1/src/mc/mc_api.cpp
--- 2/src/mc/mc_api.cpp
+++ b/src/mc/mc_api.cpp
@@@ -3,12 -3,12 +3,12 @@@
  #include "src/kernel/activity/MailboxImpl.hpp"
  #include "src/kernel/activity/MutexImpl.hpp"
  #include "src/mc/Session.hpp"
 +#include "src/mc/checker/SimcallInspector.hpp"
  #include "src/mc/mc_comm_pattern.hpp"
 +#include "src/mc/mc_pattern.hpp"
  #include "src/mc/mc_private.hpp"
  #include "src/mc/mc_smx.hpp"
  #include "src/mc/remote/RemoteSimulation.hpp"
 -#include "src/mc/mc_pattern.hpp"
 -#include "src/mc/checker/SimcallInspector.hpp"
  #include <xbt/asserts.h>
  #include <xbt/log.h>
  // #include <xbt/dynar.h>
@@@ -32,7 -32,7 +32,7 @@@ static inline const char* get_color(in
    return colors[id % colors.size()];
  }
  
 -static char *pointer_to_string(void *pointer)
 +static char* pointer_to_string(void* pointer)
  {
    if (XBT_LOG_ISENABLED(mc_api, xbt_log_priority_verbose))
      return bprintf("%p", pointer);
@@@ -40,7 -40,7 +40,7 @@@
    return xbt_strdup("(verbose only)");
  }
  
 -static char *buff_size_to_string(size_t buff_size)
 +static char* buff_size_to_string(size_t buff_size)
  {
    if (XBT_LOG_ISENABLED(mc_api, xbt_log_priority_verbose))
      return bprintf("%zu", buff_size);
@@@ -66,7 -66,7 +66,7 @@@ static inline smx_simcall_t MC_state_ch
    simgrid::mc::ActorState* procstate = &state->actor_states_[actor->get_pid()];
    state->transition_.pid_            = -1;
    state->transition_.argument_       = -1;
 -  state->executed_req_.call_         =  Simcall::NONE;
 +  state->executed_req_.call_         = Simcall::NONE;
  
    if (not simgrid::mc::actor_is_enabled(actor))
      return nullptr; // Not executable in the application
@@@ -235,8 -235,7 +235,8 @@@ int mc_api::get_actors_size() cons
    return mc_model_checker->get_remote_simulation().actors().size();
  }
  
 -bool mc_api::comm_addr_equal(const kernel::activity::CommImpl* comm_addr1, const kernel::activity::CommImpl* comm_addr2) const
 +bool mc_api::comm_addr_equal(const kernel::activity::CommImpl* comm_addr1,
 +                             const kernel::activity::CommImpl* comm_addr2) const
  {
    return remote(comm_addr1) == remote(comm_addr2);
  }
@@@ -254,8 -253,7 +254,8 @@@ kernel::activity::CommImpl* mc_api::get
  
  kernel::activity::CommImpl* mc_api::get_comm_waitany_raw_addr(smx_simcall_t request, int value) const
  {
 -  auto addr = mc_model_checker->get_remote_simulation().read(remote(simcall_comm_waitany__getraw__comms(request) + value));
 +  auto addr =
 +      mc_model_checker->get_remote_simulation().read(remote(simcall_comm_waitany__getraw__comms(request) + value));
    return static_cast<simgrid::kernel::activity::CommImpl*>(addr);
  }
  
@@@ -267,7 -265,7 +267,7 @@@ std::string mc_api::get_pattern_comm_rd
  
    char* remote_name = mc_model_checker->get_remote_simulation().read<char*>(RemotePtr<char*>(
        (uint64_t)(synchro->get_mailbox() ? &synchro->get_mailbox()->get_name() : &synchro->mbox_cpy->get_name())));
 -  auto rdv = mc_model_checker->get_remote_simulation().read_string(RemotePtr<char>(remote_name));
 +  auto rdv          = mc_model_checker->get_remote_simulation().read_string(RemotePtr<char>(remote_name));
    return rdv;
  }
  
@@@ -276,8 -274,7 +276,8 @@@ unsigned long mc_api::get_pattern_comm_
    Remote<kernel::activity::CommImpl> temp_synchro;
    mc_model_checker->get_remote_simulation().read(temp_synchro, remote((simgrid::kernel::activity::CommImpl*)addr));
    const kernel::activity::CommImpl* synchro = temp_synchro.get_buffer();
 -  auto src_proc = mc_model_checker->get_remote_simulation().resolve_actor(mc::remote(synchro->src_actor_.get()))->get_pid();
 +  auto src_proc =
 +      mc_model_checker->get_remote_simulation().resolve_actor(mc::remote(synchro->src_actor_.get()))->get_pid();
    return src_proc;
  }
  
@@@ -286,8 -283,7 +286,8 @@@ unsigned long mc_api::get_pattern_comm_
    Remote<kernel::activity::CommImpl> temp_synchro;
    mc_model_checker->get_remote_simulation().read(temp_synchro, remote((simgrid::kernel::activity::CommImpl*)addr));
    const kernel::activity::CommImpl* synchro = temp_synchro.get_buffer();
 -  auto src_proc = mc_model_checker->get_remote_simulation().resolve_actor(mc::remote(synchro->dst_actor_.get()))->get_pid();
 +  auto src_proc =
 +      mc_model_checker->get_remote_simulation().resolve_actor(mc::remote(synchro->dst_actor_.get()))->get_pid();
    return src_proc;
  }
  
@@@ -297,10 -293,11 +297,10 @@@ std::vector<char> mc_api::get_pattern_c
    mc_model_checker->get_remote_simulation().read(temp_synchro, remote((simgrid::kernel::activity::CommImpl*)addr));
    const kernel::activity::CommImpl* synchro = temp_synchro.get_buffer();
  
 -  std::vector<char> buffer {};
 +  std::vector<char> buffer{};
    if (synchro->src_buff_ != nullptr) {
      buffer.resize(synchro->src_buff_size_);
 -    mc_model_checker->get_remote_simulation().read_bytes(buffer.data(), buffer.size(),
 -                                                         remote(synchro->src_buff_));
 +    mc_model_checker->get_remote_simulation().read_bytes(buffer.data(), buffer.size(), remote(synchro->src_buff_));
    }
    return buffer;
  }
@@@ -310,11 -307,12 +310,11 @@@ std::vector<char> mc_api::get_pattern_c
    simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
    mc_model_checker->get_remote_simulation().read(temp_comm, remote((kernel::activity::CommImpl*)comm_addr));
    const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer();
 -  
 -  std::vector<char> buffer {};
 +
 +  std::vector<char> buffer{};
    if (comm->src_buff_ != nullptr) {
      buffer.resize(comm->src_buff_size_);
 -    mc_model_checker->get_remote_simulation().read_bytes(buffer.data(), buffer.size(),
 -                                                         remote(comm->src_buff_));
 +    mc_model_checker->get_remote_simulation().read_bytes(buffer.data(), buffer.size(), remote(comm->src_buff_));
    }
    return buffer;
  }
@@@ -367,11 -365,6 +367,6 @@@ void mc_api::session_initialize() cons
    session->initialize();
  }
  
- ModelChecker* mc_api::get_model_checker() const
- {
-   return mc_model_checker;
- }
- 
  void mc_api::mc_inc_visited_states() const
  {
    mc_model_checker->visited_states++;
@@@ -407,11 -400,6 +402,11 @@@ smx_actor_t mc_api::simcall_get_issuer(
    return MC_smx_simcall_get_issuer(req);
  }
  
 +long mc_api::simcall_get_actor_id(s_smx_simcall const* req) const
 +{
 +  return MC_smx_simcall_get_issuer(req)->get_pid();
 +}
 +
  bool mc_api::mc_is_null() const
  {
    auto is_null = (mc_model_checker == nullptr) ? true : false;
@@@ -487,20 -475,20 +482,20 @@@ std::string mc_api::request_to_string(s
      return req->inspector_->to_string();
  
    bool use_remote_comm = true;
 -  switch(request_type) {
 -  case simgrid::mc::RequestType::simix:
 -    use_remote_comm = true;
 -    break;
 -  case simgrid::mc::RequestType::executed:
 -  case simgrid::mc::RequestType::internal:
 -    use_remote_comm = false;
 -    break;
 -  default:
 -    THROW_IMPOSSIBLE;
 +  switch (request_type) {
 +    case simgrid::mc::RequestType::simix:
 +      use_remote_comm = true;
 +      break;
 +    case simgrid::mc::RequestType::executed:
 +    case simgrid::mc::RequestType::internal:
 +      use_remote_comm = false;
 +      break;
 +    default:
 +      THROW_IMPOSSIBLE;
    }
  
    const char* type = nullptr;
 -  char *args = nullptr;
 +  char* args       = nullptr;
  
    smx_actor_t issuer = MC_smx_simcall_get_issuer(req);
  
@@@ -561,7 -549,7 +556,7 @@@
              mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(act->src_actor_.get()));
          smx_actor_t dst_proc =
              mc_model_checker->get_remote_simulation().resolve_actor(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,
 +        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) : "",
@@@ -594,7 -582,7 +589,7 @@@
              mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(act->src_actor_.get()));
          smx_actor_t dst_proc =
              mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(act->dst_actor_.get()));
 -        args                 = bprintf("comm=%s [(%ld)%s (%s) -> (%ld)%s (%s)]", p, src_proc->get_pid(),
 +        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));
        }
@@@ -609,8 -597,8 +604,8 @@@
          simgrid::kernel::activity::CommImpl* remote_sync;
          remote_sync =
              mc_model_checker->get_remote_simulation().read(remote(simcall_comm_waitany__get__comms(req) + value));
 -        char* p     = pointer_to_string(remote_sync);
 -        args        = bprintf("comm=%s (%d of %zu)", p, value + 1, count);
 +        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);
@@@ -667,7 -655,7 +662,7 @@@
      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;  
 +  return str;
  }
  
  std::string mc_api::request_get_dot_output(smx_simcall_t req, int value) const
@@@ -790,7 -778,7 +785,7 @@@
        THROW_UNIMPLEMENTED;
    }
  
 -  return xbt::string_printf("label = \"%s\", color = %s, fontcolor = %s", label.c_str(), color, color);  
 +  return xbt::string_printf("label = \"%s\", color = %s, fontcolor = %s", label.c_str(), color, color);
  }
  
  const char* mc_api::simcall_get_name(simgrid::simix::Simcall kind) const
@@@ -849,16 -837,16 +844,16 @@@ void mc_api::execute(Transition const& 
  }
  
  #if SIMGRID_HAVE_MC
 -void mc_api::automaton_load(const char *file) const
 -{ 
 -  MC_automaton_load(file); 
 +void mc_api::automaton_load(const char* file) const
 +{
 +  MC_automaton_load(file);
  }
  #endif
  
 -std::vector<int> mc_api::automaton_propositional_symbol_evaluate() const  
 +std::vector<int> mc_api::automaton_propositional_symbol_evaluate() const
  {
    unsigned int cursor = 0;
 -  std::vector<int> values;    
 +  std::vector<int> values;
    xbt_automaton_propositional_symbol_t ps = nullptr;
    xbt_dynar_foreach (mc::property_automaton->propositional_symbols, cursor, ps)
      values.push_back(xbt_automaton_propositional_symbol_evaluate(ps));
@@@ -878,7 -866,7 +873,7 @@@ std::vector<xbt_automaton_state_t> mc_a
  
  int mc_api::compare_automaton_exp_label(const xbt_automaton_exp_label* l) const
  {
 -  unsigned int cursor = 0;
 +  unsigned int cursor                    = 0;
    xbt_automaton_propositional_symbol_t p = nullptr;
    xbt_dynar_foreach (simgrid::mc::property_automaton->propositional_symbols, cursor, p) {
      if (std::strcmp(xbt_automaton_propositional_symbol_get_name(p), l->u.predicat) == 0)
@@@ -894,13 -882,15 +889,13 @@@ void mc_api::set_property_automaton(xbt
  
  xbt_automaton_exp_label_t mc_api::get_automaton_transition_label(xbt_dynar_t const& dynar, int index) const
  {
 -  const xbt_automaton_transition* transition =
 -      xbt_dynar_get_as(dynar, index, xbt_automaton_transition_t);
 +  const xbt_automaton_transition* transition = xbt_dynar_get_as(dynar, index, xbt_automaton_transition_t);
    return transition->label;
  }
  
  xbt_automaton_state_t mc_api::get_automaton_transition_dst(xbt_dynar_t const& dynar, int index) const
  {
 -  const xbt_automaton_transition* transition =
 -      xbt_dynar_get_as(dynar, index, xbt_automaton_transition_t);
 +  const xbt_automaton_transition* transition = xbt_dynar_get_as(dynar, index, xbt_automaton_transition_t);
    return transition->dst;
  }
  

diff --combined src/mc/mc_api.hpp
index d26ab5e,5319007..401eae0
--- 1/src/mc/mc_api.hpp
--- 2/src/mc/mc_api.hpp
+++ b/src/mc/mc_api.hpp
@@@ -75,7 -75,6 +75,6 @@@ public
    std::size_t get_remote_heap_bytes() const;
  
    // MODEL CHECKER APIs
-   ModelChecker* get_model_checker() const;
    void mc_inc_visited_states() const;
    void mc_inc_executed_trans() const;
    unsigned long mc_get_visited_states() const;
@@@ -99,8 -98,6 +98,8 @@@
    std::string request_get_dot_output(smx_simcall_t req, int value) const;
    const char *simcall_get_name(simgrid::simix::Simcall kind) const;
    smx_actor_t simcall_get_issuer(s_smx_simcall const* req) const;
 +  long simcall_get_actor_id(s_smx_simcall const* req) const;
 +
  #if HAVE_SMPI
    int get_smpi_request_tag(smx_simcall_t const& simcall, simgrid::simix::Simcall type) const;
  #endif