X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7e3052a90110227b0628cfde015552c1dd154563..86ae7d28b617b71122346630ab42983f09276633:/src/mc/mc_state.cpp

diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp
index 535dae9642..98b2344a5c 100644
--- a/src/mc/mc_state.cpp
+++ b/src/mc/mc_state.cpp
@@ -1,36 +1,34 @@
-/* Copyright (c) 2008-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2020. 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. */
 
 #include "src/mc/mc_state.hpp"
-#include "src/mc/mc_comm_pattern.hpp"
+// #include "src/mc/mc_comm_pattern.hpp"
 #include "src/mc/mc_config.hpp"
 #include "src/mc/mc_request.hpp"
-#include "src/mc/mc_smx.hpp"
+#include "src/mc/mc_api.hpp"
 
 #include <boost/range/algorithm.hpp>
 
 using simgrid::mc::remote;
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc, "Logging specific to MC (state)");
+using mcapi = simgrid::mc::mc_api;
 
 namespace simgrid {
 namespace mc {
 
 State::State(unsigned long state_number) : num_(state_number)
 {
-  this->internal_comm.clear();
-  this->internal_req  = s_smx_simcall();
-  this->executed_req_ = s_smx_simcall();
-
-  actor_states_.resize(MC_smx_get_maxpid());
+  this->internal_comm_.clear();
+  auto maxpid = mcapi::get().get_maxpid();
+  actor_states_.resize(maxpid);
   /* Stateful model checking */
   if ((_sg_mc_checkpoint > 0 && (state_number % _sg_mc_checkpoint == 0)) || _sg_mc_termination) {
-    system_state = std::make_shared<simgrid::mc::Snapshot>(num_);
+    auto snapshot_ptr = mcapi::get().take_snapshot(num_);
+    system_state_ = std::shared_ptr<simgrid::mc::Snapshot>(snapshot_ptr);
     if (_sg_mc_comms_determinism || _sg_mc_send_determinism) {
-      MC_state_copy_incomplete_communications_pattern(this);
-      MC_state_copy_index_communications_pattern(this);
+      mcapi::get().copy_incomplete_comm_pattern(this);
+      mcapi::get().copy_index_comm_pattern(this);
     }
   }
 }
@@ -72,11 +70,11 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta
     return nullptr; // Not executable in the application
 
   smx_simcall_t req = nullptr;
-  switch (actor->simcall.call_) {
+  switch (actor->simcall_.call_) {
     case SIMCALL_COMM_WAITANY:
       state->transition_.argument_ = -1;
-      while (procstate->times_considered < simcall_comm_waitany__get__count(&actor->simcall)) {
-        if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall, procstate->times_considered)) {
+      while (procstate->times_considered < simcall_comm_waitany__get__count(&actor->simcall_)) {
+        if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall_, procstate->times_considered)) {
           state->transition_.argument_ = procstate->times_considered;
           ++procstate->times_considered;
           break;
@@ -84,17 +82,17 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta
         ++procstate->times_considered;
       }
 
-      if (procstate->times_considered >= simcall_comm_waitany__get__count(&actor->simcall))
+      if (procstate->times_considered >= simcall_comm_waitany__get__count(&actor->simcall_))
         procstate->set_done();
       if (state->transition_.argument_ != -1)
-        req = &actor->simcall;
+        req = &actor->simcall_;
       break;
 
     case SIMCALL_COMM_TESTANY: {
       unsigned start_count       = procstate->times_considered;
       state->transition_.argument_ = -1;
-      while (procstate->times_considered < simcall_comm_testany__get__count(&actor->simcall)) {
-        if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall, procstate->times_considered)) {
+      while (procstate->times_considered < simcall_comm_testany__get__count(&actor->simcall_)) {
+        if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall_, procstate->times_considered)) {
           state->transition_.argument_ = procstate->times_considered;
           ++procstate->times_considered;
           break;
@@ -102,21 +100,21 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta
         ++procstate->times_considered;
       }
 
-      if (procstate->times_considered >= simcall_comm_testany__get__count(&actor->simcall))
+      if (procstate->times_considered >= simcall_comm_testany__get__count(&actor->simcall_))
         procstate->set_done();
 
       if (state->transition_.argument_ != -1 || start_count == 0)
-        req = &actor->simcall;
+        req = &actor->simcall_;
 
       break;
     }
 
     case SIMCALL_COMM_WAIT: {
       simgrid::mc::RemotePtr<simgrid::kernel::activity::CommImpl> remote_act =
-          remote(static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(&actor->simcall)));
+          remote(simcall_comm_wait__getraw__comm(&actor->simcall_));
       simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_act;
-      mc_model_checker->process().read(temp_act, remote_act);
-      simgrid::kernel::activity::CommImpl* act = temp_act.get_buffer();
+      mc_model_checker->get_remote_simulation().read(temp_act, remote_act);
+      const simgrid::kernel::activity::CommImpl* act = temp_act.get_buffer();
       if (act->src_actor_.get() && act->dst_actor_.get())
         state->transition_.argument_ = 0; // OK
       else if (act->src_actor_.get() == nullptr && act->type_ == simgrid::kernel::activity::CommImpl::Type::READY &&
@@ -125,24 +123,24 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta
       else
         state->transition_.argument_ = -1; // timeout
       procstate->set_done();
-      req = &actor->simcall;
+      req = &actor->simcall_;
       break;
     }
 
     case SIMCALL_MC_RANDOM: {
-      int min_value              = simcall_mc_random__get__min(&actor->simcall);
+      int min_value                = simcall_mc_random__get__min(&actor->simcall_);
       state->transition_.argument_ = procstate->times_considered + min_value;
       procstate->times_considered++;
-      if (state->transition_.argument_ == simcall_mc_random__get__max(&actor->simcall))
+      if (state->transition_.argument_ == simcall_mc_random__get__max(&actor->simcall_))
         procstate->set_done();
-      req = &actor->simcall;
+      req = &actor->simcall_;
       break;
     }
 
     default:
       procstate->set_done();
       state->transition_.argument_ = 0;
-      req                        = &actor->simcall;
+      req                          = &actor->simcall_;
       break;
   }
   if (not req)
@@ -151,47 +149,47 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta
   state->transition_.pid_ = actor->get_pid();
   state->executed_req_    = *req;
   // Fetch the data of the request and translate it:
-  state->internal_req = *req;
+  state->internal_req_ = *req;
 
   /* The waitany and testany request are transformed into a wait or test request over the corresponding communication
    * action so it can be treated later by the dependence function. */
   switch (req->call_) {
     case SIMCALL_COMM_WAITANY: {
-      state->internal_req.call_ = SIMCALL_COMM_WAIT;
+      state->internal_req_.call_ = SIMCALL_COMM_WAIT;
       simgrid::kernel::activity::CommImpl* remote_comm;
-      remote_comm = mc_model_checker->process().read(
+      remote_comm = mc_model_checker->get_remote_simulation().read(
           remote(simcall_comm_waitany__get__comms(req) + state->transition_.argument_));
-      mc_model_checker->process().read(state->internal_comm, remote(remote_comm));
-      simcall_comm_wait__set__comm(&state->internal_req, state->internal_comm.get_buffer());
-      simcall_comm_wait__set__timeout(&state->internal_req, 0);
+      mc_model_checker->get_remote_simulation().read(state->internal_comm_, remote(remote_comm));
+      simcall_comm_wait__set__comm(&state->internal_req_, state->internal_comm_.get_buffer());
+      simcall_comm_wait__set__timeout(&state->internal_req_, 0);
       break;
     }
 
     case SIMCALL_COMM_TESTANY:
-      state->internal_req.call_ = SIMCALL_COMM_TEST;
+      state->internal_req_.call_ = SIMCALL_COMM_TEST;
 
       if (state->transition_.argument_ > 0) {
-        simgrid::kernel::activity::CommImpl* remote_comm = mc_model_checker->process().read(
+        simgrid::kernel::activity::CommImpl* remote_comm = mc_model_checker->get_remote_simulation().read(
             remote(simcall_comm_testany__get__comms(req) + state->transition_.argument_));
-        mc_model_checker->process().read(state->internal_comm, remote(remote_comm));
+        mc_model_checker->get_remote_simulation().read(state->internal_comm_, remote(remote_comm));
       }
 
-      simcall_comm_test__set__comm(&state->internal_req, state->internal_comm.get_buffer());
-      simcall_comm_test__set__result(&state->internal_req, state->transition_.argument_);
+      simcall_comm_test__set__comm(&state->internal_req_, state->internal_comm_.get_buffer());
+      simcall_comm_test__set__result(&state->internal_req_, state->transition_.argument_);
       break;
 
     case SIMCALL_COMM_WAIT:
-      mc_model_checker->process().read_bytes(&state->internal_comm, sizeof(state->internal_comm),
-                                             remote(simcall_comm_wait__getraw__comm(req)));
-      simcall_comm_wait__set__comm(&state->executed_req_, state->internal_comm.get_buffer());
-      simcall_comm_wait__set__comm(&state->internal_req, state->internal_comm.get_buffer());
+      mc_model_checker->get_remote_simulation().read_bytes(&state->internal_comm_, sizeof(state->internal_comm_),
+                                                           remote(simcall_comm_wait__getraw__comm(req)));
+      simcall_comm_wait__set__comm(&state->executed_req_, state->internal_comm_.get_buffer());
+      simcall_comm_wait__set__comm(&state->internal_req_, state->internal_comm_.get_buffer());
       break;
 
     case SIMCALL_COMM_TEST:
-      mc_model_checker->process().read_bytes(&state->internal_comm, sizeof(state->internal_comm),
-                                             remote(simcall_comm_test__getraw__comm(req)));
-      simcall_comm_test__set__comm(&state->executed_req_, state->internal_comm.get_buffer());
-      simcall_comm_test__set__comm(&state->internal_req, state->internal_comm.get_buffer());
+      mc_model_checker->get_remote_simulation().read_bytes(&state->internal_comm_, sizeof(state->internal_comm_),
+                                                           remote(simcall_comm_test__getraw__comm(req)));
+      simcall_comm_test__set__comm(&state->executed_req_, state->internal_comm_.get_buffer());
+      simcall_comm_test__set__comm(&state->internal_req_, state->internal_comm_.get_buffer());
       break;
 
     default:
@@ -204,7 +202,7 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta
 
 smx_simcall_t MC_state_choose_request(simgrid::mc::State* state)
 {
-  for (auto& actor : mc_model_checker->process().actors()) {
+  for (auto& actor : mc_model_checker->get_remote_simulation().actors()) {
     /* Only consider the actors that were marked as interleaving by the checker algorithm */
     if (not state->actor_states_[actor.copy.get_buffer()->get_pid()].is_todo())
       continue;