+/* Copyright (c) 2020-2021. 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 "api.hpp"
#include "src/kernel/activity/MailboxImpl.hpp"
#include "src/kernel/activity/MutexImpl.hpp"
+#include "src/kernel/actor/SimcallObserver.hpp"
#include "src/mc/Session.hpp"
-#include "src/mc/checker/SimcallInspector.hpp"
+#include "src/mc/checker/Checker.hpp"
+#include "src/mc/mc_base.hpp"
#include "src/mc/mc_comm_pattern.hpp"
+#include "src/mc/mc_exit.hpp"
#include "src/mc/mc_pattern.hpp"
#include "src/mc/mc_private.hpp"
-#include "src/mc/mc_smx.hpp"
+#include "src/mc/remote/RemoteProcess.hpp"
+#include "src/surf/HostImpl.hpp"
-#include "src/mc/remote/RemoteSimulation.hpp"
#include <xbt/asserts.h>
#include <xbt/log.h>
#include "simgrid/s4u/Host.hpp"
return colors[id % colors.size()];
}
-static char* pointer_to_string(void* pointer)
+static std::string pointer_to_string(void* pointer)
{
- if (XBT_LOG_ISENABLED(Api, xbt_log_priority_verbose))
- return bprintf("%p", pointer);
+ return XBT_LOG_ISENABLED(Api, xbt_log_priority_verbose) ? xbt::string_printf("%p", pointer) : "(verbose only)";
+}
- return xbt_strdup("(verbose only)");
+static std::string buff_size_to_string(size_t buff_size)
+{
+ return XBT_LOG_ISENABLED(Api, xbt_log_priority_verbose) ? std::to_string(buff_size) : "(verbose only)";
}
-static char* buff_size_to_string(size_t buff_size)
+static void simcall_translate(smx_simcall_t req,
+ simgrid::mc::Remote<simgrid::kernel::activity::CommImpl>& buffered_comm);
+
+static bool request_is_enabled_by_idx(const RemoteProcess& process, smx_simcall_t req, unsigned int idx)
{
- if (XBT_LOG_ISENABLED(Api, xbt_log_priority_verbose))
- return bprintf("%zu", buff_size);
+ kernel::activity::CommImpl* remote_act = nullptr;
+ switch (req->call_) {
+ case Simcall::COMM_WAIT:
+ /* FIXME: check also that src and dst processes are not suspended */
+ remote_act = simcall_comm_wait__getraw__comm(req);
+ break;
+
+ case Simcall::COMM_WAITANY:
+ remote_act = process.read(remote(simcall_comm_waitany__get__comms(req) + idx));
+ break;
+
+ case Simcall::COMM_TESTANY:
+ remote_act = process.read(remote(simcall_comm_testany__get__comms(req) + idx));
+ break;
+
+ default:
+ return true;
+ }
- return xbt_strdup("(verbose only)");
+ Remote<kernel::activity::CommImpl> temp_comm;
+ process.read(temp_comm, remote(remote_act));
+ const kernel::activity::CommImpl* comm = temp_comm.get_buffer();
+ return comm->src_actor_.get() && comm->dst_actor_.get();
}
/* Search an enabled transition for the given process.
* Things can get muddled with the WAITANY and TESTANY simcalls, that are rewritten on the fly to a bunch of WAIT
* (resp TEST) transitions using the transition.argument field to remember what was the last returned sub-transition.
*/
-static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::State* state, smx_actor_t actor)
+static inline smx_simcall_t MC_state_choose_request_for_process(const RemoteProcess& process, simgrid::mc::State* state,
+ smx_actor_t actor)
{
/* reset the outgoing transition */
simgrid::mc::ActorState* procstate = &state->actor_states_[actor->get_pid()];
- state->transition_.pid_ = -1;
+ state->transition_.aid_ = -1;
state->transition_.times_considered_ = -1;
state->transition_.textual[0] = '\0';
state->executed_req_.call_ = Simcall::NONE;
return nullptr; // Not executable in the application
smx_simcall_t req = nullptr;
- if (actor->simcall_.inspector_ != nullptr) {
- state->transition_.times_considered_ = procstate->times_considered;
- procstate->times_considered++;
- if (actor->simcall_.mc_max_consider_ <= procstate->times_considered)
+ if (actor->simcall_.observer_ != nullptr) {
+ state->transition_.times_considered_ = procstate->get_times_considered_and_inc();
+ if (actor->simcall_.mc_max_consider_ <= procstate->get_times_considered())
procstate->set_done();
req = &actor->simcall_;
} else
switch (actor->simcall_.call_) {
case Simcall::COMM_WAITANY:
state->transition_.times_considered_ = -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)) {
- state->transition_.times_considered_ = procstate->times_considered;
- ++procstate->times_considered;
+ while (procstate->get_times_considered() < simcall_comm_waitany__get__count(&actor->simcall_)) {
+ if (simgrid::mc::request_is_enabled_by_idx(process, &actor->simcall_, procstate->get_times_considered())) {
+ state->transition_.times_considered_ = procstate->get_times_considered_and_inc();
break;
}
- ++procstate->times_considered;
+ procstate->get_times_considered_and_inc();
}
- if (procstate->times_considered >= simcall_comm_waitany__get__count(&actor->simcall_))
+ if (procstate->get_times_considered() >= simcall_comm_waitany__get__count(&actor->simcall_))
procstate->set_done();
if (state->transition_.times_considered_ != -1)
req = &actor->simcall_;
break;
- case Simcall::COMM_TESTANY: {
- unsigned start_count = procstate->times_considered;
+ case Simcall::COMM_TESTANY:
state->transition_.times_considered_ = -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)) {
- state->transition_.times_considered_ = procstate->times_considered;
- ++procstate->times_considered;
+ while (procstate->get_times_considered() < simcall_comm_testany__get__count(&actor->simcall_)) {
+ if (simgrid::mc::request_is_enabled_by_idx(process, &actor->simcall_, procstate->get_times_considered())) {
+ state->transition_.times_considered_ = procstate->get_times_considered_and_inc();
break;
}
- ++procstate->times_considered;
+ procstate->get_times_considered_and_inc();
}
- if (procstate->times_considered >= simcall_comm_testany__get__count(&actor->simcall_))
+ if (procstate->get_times_considered() >= simcall_comm_testany__get__count(&actor->simcall_))
procstate->set_done();
-
- if (state->transition_.times_considered_ != -1 || start_count == 0)
+ if (state->transition_.times_considered_ != -1)
req = &actor->simcall_;
-
break;
- }
case Simcall::COMM_WAIT: {
simgrid::mc::RemotePtr<simgrid::kernel::activity::CommImpl> remote_act =
- remote(simcall_comm_wait__getraw__comm(&actor->simcall_));
+ remote(simcall_comm_wait__get__comm(&actor->simcall_));
simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_act;
- mc_model_checker->get_remote_simulation().read(temp_act, remote_act);
+ process.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_.times_considered_ = 0; // OK
if (not req)
return nullptr;
- state->transition_.pid_ = actor->get_pid();
+ state->transition_.aid_ = actor->get_pid();
state->executed_req_ = *req;
+
// Fetch the data of the request and translate it:
state->internal_req_ = *req;
+ state->internal_req_.mc_value_ = state->transition_.times_considered_;
+ simcall_translate(&state->internal_req_, state->internal_comm_);
+
+ return req;
+}
+
+static void simcall_translate(smx_simcall_t req,
+ simgrid::mc::Remote<simgrid::kernel::activity::CommImpl>& buffered_comm)
+{
+ simgrid::kernel::activity::CommImpl* chosen_comm;
/* 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;
- simgrid::kernel::activity::CommImpl* remote_comm;
- remote_comm = mc_model_checker->get_remote_simulation().read(
- remote(simcall_comm_waitany__get__comms(req) + state->transition_.times_considered_));
- 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);
+ case Simcall::COMM_WAITANY:
+ req->call_ = Simcall::COMM_WAIT;
+ chosen_comm =
+ mc_model_checker->get_remote_process().read(remote(simcall_comm_waitany__get__comms(req) + req->mc_value_));
+
+ mc_model_checker->get_remote_process().read(buffered_comm, remote(chosen_comm));
+ simcall_comm_wait__set__comm(req, buffered_comm.get_buffer());
+ simcall_comm_wait__set__timeout(req, 0);
break;
- }
case Simcall::COMM_TESTANY:
- state->internal_req_.call_ = Simcall::COMM_TEST;
+ req->call_ = Simcall::COMM_TEST;
+ chosen_comm =
+ mc_model_checker->get_remote_process().read(remote(simcall_comm_testany__get__comms(req) + req->mc_value_));
- if (state->transition_.times_considered_ > 0) {
- simgrid::kernel::activity::CommImpl* remote_comm = mc_model_checker->get_remote_simulation().read(
- remote(simcall_comm_testany__get__comms(req) + state->transition_.times_considered_));
- 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_.times_considered_);
+ mc_model_checker->get_remote_process().read(buffered_comm, remote(chosen_comm));
+ simcall_comm_test__set__comm(req, buffered_comm.get_buffer());
+ simcall_comm_test__set__result(req, req->mc_value_);
break;
case Simcall::COMM_WAIT:
- 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());
+ chosen_comm = simcall_comm_wait__get__comm(req);
+ mc_model_checker->get_remote_process().read(buffered_comm, remote(chosen_comm));
+ simcall_comm_wait__set__comm(req, buffered_comm.get_buffer());
break;
case Simcall::COMM_TEST:
- 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());
+ chosen_comm = simcall_comm_test__get__comm(req);
+ mc_model_checker->get_remote_process().read(buffered_comm, remote(chosen_comm));
+ simcall_comm_test__set__comm(req, buffered_comm.get_buffer());
break;
default:
/* No translation needed */
break;
}
-
- return req;
}
-simgrid::kernel::activity::CommImpl* Api::get_comm(smx_simcall_t const r) const
+simgrid::kernel::activity::CommImpl* Api::get_comm_or_nullptr(smx_simcall_t const r) const
{
- switch (r->call_) {
- case Simcall::COMM_WAIT:
- return simcall_comm_wait__getraw__comm(r);
- case Simcall::COMM_TEST:
- return simcall_comm_test__getraw__comm(r);
- default:
- return nullptr;
- }
+ if (r->call_ == Simcall::COMM_WAIT)
+ return simcall_comm_wait__get__comm(r);
+ if (r->call_ == Simcall::COMM_TEST)
+ return simcall_comm_test__get__comm(r);
+ return nullptr;
}
/** Statically "upcast" a s_smx_actor_t into an ActorInformation
return process_info;
}
-// Does half the job
-bool Api::request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const
+bool Api::simcall_check_dependency(smx_simcall_t req1, smx_simcall_t req2) const
{
- if (r1->call_ == Simcall::COMM_ISEND && r2->call_ == Simcall::COMM_IRECV)
- return false;
+ const auto IRECV = Simcall::COMM_IRECV;
+ const auto ISEND = Simcall::COMM_ISEND;
+ const auto TEST = Simcall::COMM_TEST;
+ const auto WAIT = Simcall::COMM_WAIT;
- if (r1->call_ == Simcall::COMM_IRECV && r2->call_ == Simcall::COMM_ISEND)
+ if (req1->issuer_ == req2->issuer_)
return false;
- // Those are internal requests, we do not need indirection because those objects are copies:
- const kernel::activity::CommImpl* synchro1 = get_comm(r1);
- const kernel::activity::CommImpl* synchro2 = get_comm(r2);
+ /* The independence theorem only consider 4 simcalls. All others are dependent with anything. */
+ if (req1->call_ != ISEND && req1->call_ != IRECV && req1->call_ != TEST && req1->call_ != WAIT)
+ return true;
+ if (req2->call_ != ISEND && req2->call_ != IRECV && req2->call_ != TEST && req2->call_ != WAIT)
+ return true;
- if ((r1->call_ == Simcall::COMM_ISEND || r1->call_ == Simcall::COMM_IRECV) && r2->call_ == Simcall::COMM_WAIT) {
- auto mbox = get_mbox_remote_addr(r1);
- RemotePtr<kernel::activity::MailboxImpl> synchro2_mbox_cpy = remote(synchro2->mbox_cpy);
+ /* Timeouts in wait transitions are not considered by the independence theorem, thus assumed dependent */
+ if ((req1->call_ == WAIT && simcall_comm_wait__get__timeout(req1) > 0) ||
+ (req2->call_ == WAIT && simcall_comm_wait__get__timeout(req2) > 0))
+ return true;
- if (mbox != synchro2_mbox_cpy && simcall_comm_wait__get__timeout(r2) <= 0)
- return false;
+ /* Make sure that req1 and req2 are in alphabetic order */
+ if (req1->call_ > req2->call_) {
+ auto temp = req1;
+ req1 = req2;
+ req2 = temp;
+ }
- if ((r1->issuer_ != synchro2->src_actor_.get()) && (r1->issuer_ != synchro2->dst_actor_.get()) &&
- simcall_comm_wait__get__timeout(r2) <= 0)
- return false;
+ auto comm1 = get_comm_or_nullptr(req1);
+ auto comm2 = get_comm_or_nullptr(req2);
- 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)
+ /* First case: that's not the same kind of request (we also know that req1 < req2 alphabetically) */
+ if (req1->call_ != req2->call_) {
+ if (req1->call_ == IRECV && req2->call_ == ISEND)
return false;
- 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;
- }
+ if ((req1->call_ == IRECV || req1->call_ == ISEND) && req2->call_ == WAIT) {
+ auto mbox1 = get_mbox_remote_addr(req1);
+ auto mbox2 = remote(comm2->mbox_cpy);
+
+ if (mbox1 != mbox2 && simcall_comm_wait__get__timeout(req2) <= 0)
+ return false;
+
+ if ((req1->issuer_ != comm2->src_actor_.get()) && (req1->issuer_ != comm2->dst_actor_.get()) &&
+ simcall_comm_wait__get__timeout(req2) <= 0)
+ return false;
+
+ if ((req1->call_ == ISEND) && (comm2->type_ == kernel::activity::CommImpl::Type::SEND) &&
+ (comm2->src_buff_ != simcall_comm_isend__get__src_buff(req1)) && simcall_comm_wait__get__timeout(req2) <= 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. */
+ if ((req1->call_ == IRECV) && (comm2->type_ == kernel::activity::CommImpl::Type::RECEIVE) &&
+ (comm2->dst_buff_ != simcall_comm_irecv__get__dst_buff(req1)) && simcall_comm_wait__get__timeout(req2) <= 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. */
#if 0
- if((r1->call == Simcall::COMM_ISEND || r1->call == Simcall::COMM_IRECV)
- && r2->call == Simcall::COMM_TEST)
+ if((req1->call == ISEND || req1->call == IRECV)
+ && req2->call == TEST)
return false;
#endif
- 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 (req1->call_ == TEST && req2->call_ == WAIT &&
+ (comm1->src_actor_.get() == nullptr || comm1->dst_actor_.get() == nullptr))
+ return false;
- if (r1->call_ == Simcall::COMM_TEST &&
- (simcall_comm_test__get__comm(r1) == nullptr || synchro1->src_buff_ == nullptr || synchro1->dst_buff_ == nullptr))
- return false;
+ if (req1->call_ == TEST &&
+ (simcall_comm_test__get__comm(req1) == nullptr || comm1->src_buff_ == nullptr || comm1->dst_buff_ == nullptr))
+ return false;
+ if (req2->call_ == TEST &&
+ (simcall_comm_test__get__comm(req2) == nullptr || comm2->src_buff_ == nullptr || comm2->dst_buff_ == nullptr))
+ return false;
- 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;
+ if (req1->call_ == TEST && req2->call_ == WAIT && comm1->src_buff_ == comm2->src_buff_ &&
+ comm1->dst_buff_ == comm2->dst_buff_)
+ return false;
- 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;
+ if (req1->call_ == TEST && req2->call_ == WAIT && comm1->src_buff_ != nullptr && comm1->dst_buff_ != nullptr &&
+ comm2->src_buff_ != nullptr && comm2->dst_buff_ != nullptr && comm1->dst_buff_ != comm2->src_buff_ &&
+ comm1->dst_buff_ != comm2->dst_buff_ && comm2->dst_buff_ != comm1->src_buff_)
+ return false;
- return true;
-}
+ return true;
+ }
-const char* Api::actor_get_host_name(smx_actor_t actor) const
-{
- return get_actor_host_name(actor).c_str();
+ /* Second case: req1 and req2 are of the same call type */
+ switch (req1->call_) {
+ case ISEND:
+ return simcall_comm_isend__get__mbox(req1) == simcall_comm_isend__get__mbox(req2);
+ case IRECV:
+ return simcall_comm_irecv__get__mbox(req1) == simcall_comm_irecv__get__mbox(req2);
+ case WAIT:
+ if (comm1->src_buff_ == comm2->src_buff_ && comm1->dst_buff_ == comm2->dst_buff_)
+ return false;
+ if (comm1->src_buff_ != nullptr && comm1->dst_buff_ != nullptr && comm2->src_buff_ != nullptr &&
+ comm2->dst_buff_ != nullptr && comm1->dst_buff_ != comm2->src_buff_ && comm1->dst_buff_ != comm2->dst_buff_ &&
+ comm2->dst_buff_ != comm1->src_buff_)
+ return false;
+ return true;
+ default:
+ return true;
+ }
}
xbt::string const& Api::get_actor_host_name(smx_actor_t actor) const
if (mc_model_checker == nullptr)
return actor->get_host()->get_name();
- const simgrid::mc::RemoteSimulation* process = &mc_model_checker->get_remote_simulation();
+ const simgrid::mc::RemoteProcess* process = &mc_model_checker->get_remote_process();
// Read the simgrid::xbt::string in the MCed process:
simgrid::mc::ActorInformation* info = actor_info_cast(actor);
- auto remote_string_address =
- remote(reinterpret_cast<const simgrid::xbt::string_data*>(&actor->get_host()->get_name()));
- simgrid::xbt::string_data remote_string = process->read(remote_string_address);
- std::vector<char> hostname(remote_string.len + 1);
- // no need to read the terminating null byte, and thus hostname[remote_string.len] is guaranteed to be '\0'
- process->read_bytes(hostname.data(), remote_string.len, remote(remote_string.data));
- info->hostname = &mc_model_checker->get_host_name(hostname.data());
+
+ if (not info->hostname) {
+ Remote<s4u::Host> temp_host = process->read(remote(actor->get_host()));
+ auto remote_string_address = remote(&xbt::string::to_string_data(temp_host.get_buffer()->get_impl()->get_name()));
+ simgrid::xbt::string_data remote_string = process->read(remote_string_address);
+ std::vector<char> hostname(remote_string.len + 1);
+ // no need to read the terminating null byte, and thus hostname[remote_string.len] is guaranteed to be '\0'
+ process->read_bytes(hostname.data(), remote_string.len, remote(remote_string.data));
+ info->hostname = &mc_model_checker->get_host_name(hostname.data());
+ }
return *info->hostname;
}
-const char* Api::actor_get_name(smx_actor_t actor) const
+xbt::string const& Api::get_actor_name(smx_actor_t actor) const
{
if (mc_model_checker == nullptr)
- return actor->get_cname();
-
- const simgrid::mc::RemoteSimulation* process = &mc_model_checker->get_remote_simulation();
+ return actor->get_name();
simgrid::mc::ActorInformation* info = actor_info_cast(actor);
if (info->name.empty()) {
+ const simgrid::mc::RemoteProcess* process = &mc_model_checker->get_remote_process();
+
simgrid::xbt::string_data string_data = simgrid::xbt::string::to_string_data(actor->name_);
info->name = process->read_string(remote(string_data.data), string_data.len);
}
- return info->name.c_str();
+ return info->name;
+}
+
+std::string Api::get_actor_string(smx_actor_t actor) const
+{
+ std::string res;
+ if (actor) {
+ res = "(" + std::to_string(actor->get_pid()) + ")";
+ if (actor->get_host())
+ res += std::string(get_actor_host_name(actor)) + " (" + std::string(get_actor_name(actor)) + ")";
+ else
+ res += get_actor_name(actor);
+ } else
+ res = "(0) ()";
+ return res;
}
-void Api::initialize(char** argv) const
+std::string Api::get_actor_dot_label(smx_actor_t actor) const
{
- simgrid::mc::session = new simgrid::mc::Session([argv] {
+ std::string res = "(" + std::to_string(actor->get_pid()) + ")";
+ if (actor->get_host())
+ res += get_actor_host_name(actor);
+ return res;
+}
+
+simgrid::mc::Checker* Api::initialize(char** argv, simgrid::mc::CheckerAlgorithm algo) const
+{
+ auto session = new simgrid::mc::Session([argv] {
int i = 1;
while (argv[i] != nullptr && argv[i][0] == '-')
i++;
xbt_assert(argv[i] != nullptr,
"Unable to find a binary to exec on the command line. Did you only pass config flags?");
execvp(argv[i], argv + i);
- xbt_die("The model-checked process failed to exec(): %s", strerror(errno));
+ xbt_die("The model-checked process failed to exec(%s): %s", argv[i], strerror(errno));
});
-}
-std::vector<simgrid::mc::ActorInformation>& Api::get_actors() const
-{
- return mc_model_checker->get_remote_simulation().actors();
+ simgrid::mc::Checker* checker;
+ switch (algo) {
+ case CheckerAlgorithm::CommDeterminism:
+ checker = simgrid::mc::create_communication_determinism_checker(session);
+ break;
+
+ case CheckerAlgorithm::UDPOR:
+ checker = simgrid::mc::create_udpor_checker(session);
+ break;
+
+ case CheckerAlgorithm::Safety:
+ checker = simgrid::mc::create_safety_checker(session);
+ break;
+
+ case CheckerAlgorithm::Liveness:
+ checker = simgrid::mc::create_liveness_checker(session);
+ break;
+
+ default:
+ THROW_IMPOSSIBLE;
+ }
+
+ // FIXME: session and checker are never deleted
+ simgrid::mc::session_singleton = session;
+ mc_model_checker->setChecker(checker);
+ return checker;
}
-bool Api::actor_is_enabled(aid_t pid) const
+std::vector<simgrid::mc::ActorInformation>& Api::get_actors() const
{
- return session->actor_is_enabled(pid);
+ return mc_model_checker->get_remote_process().actors();
}
unsigned long Api::get_maxpid() const
{
- return MC_smx_get_maxpid();
+ return mc_model_checker->get_remote_process().get_maxpid();
}
int Api::get_actors_size() const
{
- return mc_model_checker->get_remote_simulation().actors().size();
+ return mc_model_checker->get_remote_process().actors().size();
}
RemotePtr<kernel::activity::CommImpl> Api::get_comm_isend_raw_addr(smx_simcall_t request) const
{
- auto comm_addr = simgrid::simix::unmarshal_raw<simgrid::kernel::activity::ActivityImpl*>(request->result_);
- return RemotePtr<kernel::activity::CommImpl>(static_cast<kernel::activity::CommImpl*>(comm_addr));
-}
-
-RemotePtr<kernel::activity::CommImpl> Api::get_comm_irecv_raw_addr(smx_simcall_t request) const
-{
- auto comm_addr = simgrid::simix::unmarshal_raw<simgrid::kernel::activity::ActivityImpl*>(request->result_);
- return RemotePtr<kernel::activity::CommImpl>(static_cast<kernel::activity::CommImpl*>(comm_addr));
-}
-
-RemotePtr<kernel::activity::CommImpl> Api::get_comm_wait_raw_addr(smx_simcall_t request) const
-{
- auto comm_addr = simgrid::simix::unmarshal_raw<simgrid::kernel::activity::CommImpl*>(request->args_[0]);
- return RemotePtr<kernel::activity::CommImpl>(comm_addr);
+ return remote(static_cast<kernel::activity::CommImpl*>(simcall_comm_isend__getraw__result(request)));
}
RemotePtr<kernel::activity::CommImpl> Api::get_comm_waitany_raw_addr(smx_simcall_t request, int value) const
{
- auto addr = simgrid::simix::unmarshal_raw<simgrid::kernel::activity::CommImpl**>(request->args_[0]) + value;
- auto comm_addr = mc_model_checker->get_remote_simulation().read(remote(addr));
+ auto addr = simcall_comm_waitany__getraw__comms(request) + value;
+ auto comm_addr = mc_model_checker->get_remote_process().read(remote(addr));
return RemotePtr<kernel::activity::CommImpl>(static_cast<kernel::activity::CommImpl*>(comm_addr));
}
std::string Api::get_pattern_comm_rdv(RemotePtr<kernel::activity::CommImpl> const& addr) const
{
- Remote<kernel::activity::CommImpl> temp_synchro;
- mc_model_checker->get_remote_simulation().read(temp_synchro, addr);
- const kernel::activity::CommImpl* synchro = temp_synchro.get_buffer();
+ Remote<kernel::activity::CommImpl> temp_activity;
+ mc_model_checker->get_remote_process().read(temp_activity, addr);
+ const kernel::activity::CommImpl* activity = temp_activity.get_buffer();
- 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));
+ char* remote_name = mc_model_checker->get_remote_process().read<char*>(RemotePtr<char*>(
+ (uint64_t)(activity->get_mailbox() ? &activity->get_mailbox()->get_name() : &activity->mbox_cpy->get_name())));
+ auto rdv = mc_model_checker->get_remote_process().read_string(RemotePtr<char>(remote_name));
return rdv;
}
unsigned long Api::get_pattern_comm_src_proc(RemotePtr<kernel::activity::CommImpl> const& addr) const
{
- Remote<kernel::activity::CommImpl> temp_synchro;
- mc_model_checker->get_remote_simulation().read(temp_synchro, addr);
- const kernel::activity::CommImpl* synchro = temp_synchro.get_buffer();
+ Remote<kernel::activity::CommImpl> temp_activity;
+ mc_model_checker->get_remote_process().read(temp_activity, addr);
+ const kernel::activity::CommImpl* activity = temp_activity.get_buffer();
auto src_proc =
- mc_model_checker->get_remote_simulation().resolve_actor(mc::remote(synchro->src_actor_.get()))->get_pid();
+ mc_model_checker->get_remote_process().resolve_actor(mc::remote(activity->src_actor_.get()))->get_pid();
return src_proc;
}
unsigned long Api::get_pattern_comm_dst_proc(RemotePtr<kernel::activity::CommImpl> const& addr) const
{
- Remote<kernel::activity::CommImpl> temp_synchro;
- mc_model_checker->get_remote_simulation().read(temp_synchro, addr);
- const kernel::activity::CommImpl* synchro = temp_synchro.get_buffer();
+ Remote<kernel::activity::CommImpl> temp_activity;
+ mc_model_checker->get_remote_process().read(temp_activity, addr);
+ const kernel::activity::CommImpl* activity = temp_activity.get_buffer();
auto src_proc =
- mc_model_checker->get_remote_simulation().resolve_actor(mc::remote(synchro->dst_actor_.get()))->get_pid();
+ mc_model_checker->get_remote_process().resolve_actor(mc::remote(activity->dst_actor_.get()))->get_pid();
return src_proc;
}
std::vector<char> Api::get_pattern_comm_data(RemotePtr<kernel::activity::CommImpl> const& addr) const
{
simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
- mc_model_checker->get_remote_simulation().read(temp_comm, addr);
+ mc_model_checker->get_remote_process().read(temp_comm, addr);
const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_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_process().read_bytes(buffer.data(), buffer.size(), remote(comm->src_buff_));
}
return buffer;
}
#if HAVE_SMPI
bool Api::check_send_request_detached(smx_simcall_t const& simcall) const
{
- simgrid::smpi::Request mpi_request;
- mc_model_checker->get_remote_simulation().read(
- &mpi_request, remote(static_cast<smpi::Request*>(simcall_comm_isend__get__data(simcall))));
- return mpi_request.detached();
+ Remote<simgrid::smpi::Request> mpi_request;
+ mc_model_checker->get_remote_process().read(
+ mpi_request, remote(static_cast<smpi::Request*>(simcall_comm_isend__get__data(simcall))));
+ return mpi_request.get_buffer()->detached();
}
#endif
smx_actor_t Api::get_src_actor(RemotePtr<kernel::activity::CommImpl> const& comm_addr) const
{
simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
- mc_model_checker->get_remote_simulation().read(temp_comm, comm_addr);
+ mc_model_checker->get_remote_process().read(temp_comm, comm_addr);
const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer();
- auto src_proc = mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(comm->src_actor_.get()));
+ auto src_proc = mc_model_checker->get_remote_process().resolve_actor(simgrid::mc::remote(comm->src_actor_.get()));
return src_proc;
}
smx_actor_t Api::get_dst_actor(RemotePtr<kernel::activity::CommImpl> const& comm_addr) const
{
simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
- mc_model_checker->get_remote_simulation().read(temp_comm, comm_addr);
+ mc_model_checker->get_remote_process().read(temp_comm, comm_addr);
const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer();
- auto dst_proc = mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(comm->dst_actor_.get()));
+ auto dst_proc = mc_model_checker->get_remote_process().resolve_actor(simgrid::mc::remote(comm->dst_actor_.get()));
return dst_proc;
}
std::size_t Api::get_remote_heap_bytes() const
{
- RemoteSimulation& process = mc_model_checker->get_remote_simulation();
+ RemoteProcess& process = mc_model_checker->get_remote_process();
auto heap_bytes_used = mmalloc_get_bytes_used_remote(process.get_heap()->heaplimit, process.get_malloc_info());
return heap_bytes_used;
}
-void Api::session_initialize() const
-{
- session->initialize();
-}
-
void Api::mc_inc_visited_states() const
{
mc_model_checker->visited_states++;
return mc_model_checker->executed_transitions;
}
-bool Api::mc_check_deadlock() const
-{
- return mc_model_checker->checkDeadlock();
-}
-
-void Api::mc_show_deadlock() const
+void Api::mc_check_deadlock() const
{
- MC_show_deadlock();
+ if (mc_model_checker->checkDeadlock()) {
+ MC_show_deadlock();
+ throw DeadlockError();
+ }
}
/** Get the issuer of a simcall (`req->issuer`)
auto address = simgrid::mc::remote(req->issuer_);
// Lookup by address:
- for (auto& actor : mc_model_checker->get_remote_simulation().actors())
+ for (auto& actor : mc_model_checker->get_remote_process().actors())
if (actor.address == address)
return actor.copy.get_buffer();
- for (auto& actor : mc_model_checker->get_remote_simulation().dead_actors())
+ for (auto& actor : mc_model_checker->get_remote_process().dead_actors())
if (actor.address == address)
return actor.copy.get_buffer();
RemotePtr<kernel::activity::MailboxImpl> Api::get_mbox_remote_addr(smx_simcall_t const req) const
{
- RemotePtr<kernel::activity::MailboxImpl> mbox_addr;
- switch (req->call_) {
- case Simcall::COMM_ISEND:
- case Simcall::COMM_IRECV: {
- auto mbox_addr_ptr = simix::unmarshal<smx_mailbox_t>(req->args_[1]);
- mbox_addr = remote(mbox_addr_ptr);
- break;
- }
- default:
- mbox_addr = RemotePtr<kernel::activity::MailboxImpl>();
- break;
- }
- return mbox_addr;
+ if (req->call_ == Simcall::COMM_ISEND)
+ return remote(simcall_comm_isend__get__mbox(req));
+ if (req->call_ == Simcall::COMM_IRECV)
+ return remote(simcall_comm_irecv__get__mbox(req));
+ THROW_IMPOSSIBLE;
}
RemotePtr<kernel::activity::ActivityImpl> Api::get_comm_remote_addr(smx_simcall_t const req) const
{
- RemotePtr<kernel::activity::ActivityImpl> comm_addr;
- switch (req->call_) {
- case Simcall::COMM_ISEND:
- case Simcall::COMM_IRECV: {
- auto comm_addr_ptr = simgrid::simix::unmarshal_raw<simgrid::kernel::activity::ActivityImpl*>(req->result_);
- comm_addr = remote(comm_addr_ptr);
- break;
- }
- default:
- comm_addr = RemotePtr<kernel::activity::ActivityImpl>();
- break;
- }
- return comm_addr;
+ if (req->call_ == Simcall::COMM_ISEND)
+ return remote(simcall_comm_isend__getraw__result(req));
+ if (req->call_ == Simcall::COMM_IRECV)
+ return remote(simcall_comm_irecv__getraw__result(req));
+ THROW_IMPOSSIBLE;
}
bool Api::mc_is_null() const
return mc_model_checker->getChecker();
}
-void Api::set_checker(Checker* const checker) const
-{
- xbt_assert(mc_model_checker);
- xbt_assert(mc_model_checker->getChecker() == nullptr);
- mc_model_checker->setChecker(checker);
-}
-
void Api::handle_simcall(Transition const& transition) const
{
mc_model_checker->handle_simcall(transition);
smx_simcall_t Api::mc_state_choose_request(simgrid::mc::State* state) const
{
- for (auto& actor : mc_model_checker->get_remote_simulation().actors()) {
+ RemoteProcess& process = mc_model_checker->get_remote_process();
+ for (auto& actor : process.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;
- smx_simcall_t res = MC_state_choose_request_for_process(state, actor.copy.get_buffer());
+ smx_simcall_t res = MC_state_choose_request_for_process(process, state, actor.copy.get_buffer());
if (res)
return res;
}
return nullptr;
}
-std::list<transition_detail_t> Api::get_enabled_transitions(simgrid::mc::State* state)
+std::list<transition_detail_t> Api::get_enabled_transitions(simgrid::mc::State* state) const
{
std::list<transition_detail_t> tr_list{};
- for (auto& actor : mc_model_checker->get_remote_simulation().actors()) {
+ for (auto& actor : mc_model_checker->get_remote_process().actors()) {
auto actor_pid = actor.copy.get_buffer()->get_pid();
auto actor_impl = actor.copy.get_buffer();
if (not simgrid::mc::actor_is_enabled(actor_impl))
continue;
- transition_detail_t transition = std::unique_ptr<s_transition_detail>(new s_transition_detail());
- Simcall simcall_call = actor_impl->simcall_.call_;
- smx_simcall_t simcall = &actor_impl->simcall_;
- transition->call_ = simcall_call;
+ auto transition = std::make_unique<s_transition_detail>();
+ Simcall simcall_call = actor_impl->simcall_.call_;
+ smx_simcall_t simcall = &actor_impl->simcall_;
+ transition->call_ = simcall_call;
switch (simcall_call) {
case Simcall::COMM_ISEND:
- case Simcall::COMM_IRECV: {
+ case Simcall::COMM_IRECV:
transition->mbox_remote_addr = get_mbox_remote_addr(simcall);
transition->comm_remote_addr = get_comm_remote_addr(simcall);
break;
- }
default:
break;
}
tr_list.emplace_back(std::move(transition));
}
-
- return tr_list;
-}
-bool Api::simcall_check_dependency(smx_simcall_t const req1, smx_simcall_t const req2) const
-{
- if (req1->issuer_ == req2->issuer_)
- return false;
-
- /* Wait with timeout transitions are not considered by the independence theorem, thus we consider them as dependent
- * with all other transitions */
- if ((req1->call_ == Simcall::COMM_WAIT && simcall_comm_wait__get__timeout(req1) > 0) ||
- (req2->call_ == Simcall::COMM_WAIT && simcall_comm_wait__get__timeout(req2) > 0))
- return true;
-
- if (req1->call_ != req2->call_)
- return request_depend_asymmetric(req1, req2) && request_depend_asymmetric(req2, req1);
-
- // Those are internal requests, we do not need indirection because those objects are copies:
- const kernel::activity::CommImpl* synchro1 = get_comm(req1);
- const kernel::activity::CommImpl* synchro2 = get_comm(req2);
-
- switch (req1->call_) {
- case Simcall::COMM_ISEND:
- return simcall_comm_isend__get__mbox(req1) == simcall_comm_isend__get__mbox(req2);
- case Simcall::COMM_IRECV:
- return simcall_comm_irecv__get__mbox(req1) == simcall_comm_irecv__get__mbox(req2);
- case Simcall::COMM_WAIT:
- if (synchro1->src_buff_ == synchro2->src_buff_ && synchro1->dst_buff_ == synchro2->dst_buff_)
- return false;
- 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 true;
- default:
- return true;
- }
+ return tr_list;
}
-std::string Api::request_to_string(smx_simcall_t req, int value, RequestType request_type) const
+std::string Api::request_to_string(smx_simcall_t req, int value) const
{
xbt_assert(mc_model_checker != nullptr, "Must be called from MCer");
- 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;
- }
-
- const char* type = nullptr;
- char* args = nullptr;
+ std::string type;
+ std::string args;
smx_actor_t issuer = simcall_get_issuer(req);
- if (issuer->simcall_.inspector_ != nullptr) {
+ if (issuer->simcall_.observer_ != nullptr)
return mc_model_checker->simcall_to_string(issuer->get_pid(), value);
- } else
- switch (req->call_) {
- case Simcall::COMM_ISEND: {
- 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->get_host())
- args = bprintf("src=(%ld)%s (%s), buff=%s, size=%s", issuer->get_pid(), actor_get_host_name(issuer),
- actor_get_name(issuer), p, bs);
- else
- args = bprintf("src=(%ld)%s, buff=%s, size=%s", issuer->get_pid(), actor_get_name(issuer), p, bs);
- xbt_free(bs);
- xbt_free(p);
- break;
- }
+ switch (req->call_) {
+ case Simcall::COMM_ISEND:
+ type = "iSend";
+ args = "src=" + get_actor_string(issuer);
+ args += ", buff=" + pointer_to_string(simcall_comm_isend__get__src_buff(req));
+ args += ", size=" + buff_size_to_string(simcall_comm_isend__get__src_buff_size(req));
+ break;
- case Simcall::COMM_IRECV: {
- size_t* remote_size = simcall_comm_irecv__get__dst_buff_size(req);
- size_t size = 0;
- if (remote_size)
- mc_model_checker->get_remote_simulation().read_bytes(&size, sizeof(size), remote(remote_size));
-
- type = "iRecv";
- char* p = pointer_to_string(simcall_comm_irecv__get__dst_buff(req));
- char* bs = buff_size_to_string(size);
- if (issuer->get_host())
- args = bprintf("dst=(%ld)%s (%s), buff=%s, size=%s", issuer->get_pid(), actor_get_host_name(issuer),
- actor_get_name(issuer), p, bs);
- else
- args = bprintf("dst=(%ld)%s, buff=%s, size=%s", issuer->get_pid(), actor_get_name(issuer), p, bs);
- xbt_free(bs);
- xbt_free(p);
- break;
- }
+ case Simcall::COMM_IRECV: {
+ size_t* remote_size = simcall_comm_irecv__get__dst_buff_size(req);
+ size_t size = 0;
+ if (remote_size)
+ mc_model_checker->get_remote_process().read_bytes(&size, sizeof(size), remote(remote_size));
+
+ type = "iRecv";
+ args = "dst=" + get_actor_string(issuer);
+ args += ", buff=" + pointer_to_string(simcall_comm_irecv__get__dst_buff(req));
+ args += ", size=" + buff_size_to_string(size);
+ break;
+ }
- case Simcall::COMM_WAIT: {
- simgrid::kernel::activity::CommImpl* remote_act = simcall_comm_wait__getraw__comm(req);
- char* p;
- if (value == -1) {
- type = "WaitTimeout";
- p = pointer_to_string(remote_act);
- args = bprintf("comm=%s", p);
- } else {
- type = "Wait";
- p = pointer_to_string(remote_act);
-
- simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_synchro;
- const simgrid::kernel::activity::CommImpl* act;
- if (use_remote_comm) {
- mc_model_checker->get_remote_simulation().read(temp_synchro, remote(remote_act));
- act = temp_synchro.get_buffer();
- } else
- act = remote_act;
-
- smx_actor_t src_proc =
- 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,
- src_proc ? actor_get_host_name(src_proc) : "", src_proc ? actor_get_name(src_proc) : "",
- dst_proc ? dst_proc->get_pid() : 0, dst_proc ? actor_get_host_name(dst_proc) : "",
- dst_proc ? actor_get_name(dst_proc) : "");
- }
- xbt_free(p);
- break;
- }
+ case Simcall::COMM_WAIT: {
+ simgrid::kernel::activity::CommImpl* remote_act = simcall_comm_wait__get__comm(req);
+ if (value == -1) {
+ type = "WaitTimeout";
+ args = "comm=" + pointer_to_string(remote_act);
+ } else {
+ type = "Wait";
- case Simcall::COMM_TEST: {
- simgrid::kernel::activity::CommImpl* remote_act = simcall_comm_test__getraw__comm(req);
- simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_synchro;
+ simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_activity;
const simgrid::kernel::activity::CommImpl* act;
- if (use_remote_comm) {
- mc_model_checker->get_remote_simulation().read(temp_synchro, remote(remote_act));
- act = temp_synchro.get_buffer();
- } else
- act = remote_act;
-
- char* p;
- 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);
- } else {
- type = "Test TRUE";
- p = pointer_to_string(remote_act);
-
- smx_actor_t src_proc =
- 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(), actor_get_name(src_proc),
- actor_get_host_name(src_proc), dst_proc->get_pid(), actor_get_name(dst_proc),
- actor_get_host_name(dst_proc));
- }
- xbt_free(p);
- break;
+ mc_model_checker->get_remote_process().read(temp_activity, remote(remote_act));
+ act = temp_activity.get_buffer();
+
+ smx_actor_t src_proc =
+ mc_model_checker->get_remote_process().resolve_actor(simgrid::mc::remote(act->src_actor_.get()));
+ smx_actor_t dst_proc =
+ mc_model_checker->get_remote_process().resolve_actor(simgrid::mc::remote(act->dst_actor_.get()));
+ args = "comm=" + pointer_to_string(remote_act);
+ args += " [" + get_actor_string(src_proc) + "-> " + get_actor_string(dst_proc) + "]";
}
+ break;
+ }
- case Simcall::COMM_WAITANY: {
- type = "WaitAny";
- size_t count = simcall_comm_waitany__get__count(req);
- if (count > 0) {
- 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);
- xbt_free(p);
- } else
- args = bprintf("comm at idx %d", value);
- break;
+ case Simcall::COMM_TEST: {
+ simgrid::kernel::activity::CommImpl* remote_act = simcall_comm_test__get__comm(req);
+ simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_activity;
+ const simgrid::kernel::activity::CommImpl* act;
+ mc_model_checker->get_remote_process().read(temp_activity, remote(remote_act));
+ act = temp_activity.get_buffer();
+
+ if (act->src_actor_.get() == nullptr || act->dst_actor_.get() == nullptr) {
+ type = "Test FALSE";
+ args = "comm=" + pointer_to_string(remote_act);
+ } else {
+ type = "Test TRUE";
+
+ smx_actor_t src_proc =
+ mc_model_checker->get_remote_process().resolve_actor(simgrid::mc::remote(act->src_actor_.get()));
+ smx_actor_t dst_proc =
+ mc_model_checker->get_remote_process().resolve_actor(simgrid::mc::remote(act->dst_actor_.get()));
+ args = "comm=" + pointer_to_string(remote_act);
+ args += " [" + get_actor_string(src_proc) + " -> " + get_actor_string(dst_proc) + "]";
}
+ break;
+ }
- case Simcall::COMM_TESTANY:
- if (value == -1) {
- type = "TestAny FALSE";
- args = xbt_strdup("-");
- } else {
- type = "TestAny";
- args = bprintf("(%d of %zu)", value + 1, simcall_comm_testany__get__count(req));
- }
- break;
+ case Simcall::COMM_WAITANY: {
+ type = "WaitAny";
+ size_t count = simcall_comm_waitany__get__count(req);
+ if (count > 0) {
+ simgrid::kernel::activity::CommImpl* remote_sync;
+ remote_sync =
+ mc_model_checker->get_remote_process().read(remote(simcall_comm_waitany__get__comms(req) + value));
+ args = "comm=" + pointer_to_string(remote_sync) + xbt::string_printf("(%d of %zu)", value + 1, count);
+ } else
+ args = "comm at idx " + std::to_string(value);
+ break;
+ }
- case Simcall::MUTEX_TRYLOCK:
- case Simcall::MUTEX_LOCK: {
- if (req->call_ == Simcall::MUTEX_LOCK)
- type = "Mutex LOCK";
- else
- type = "Mutex TRYLOCK";
-
- simgrid::mc::Remote<simgrid::kernel::activity::MutexImpl> mutex;
- mc_model_checker->get_remote_simulation().read_bytes(mutex.get_buffer(), sizeof(mutex),
- remote(req->call_ == Simcall::MUTEX_LOCK
- ? simcall_mutex_lock__get__mutex(req)
- : simcall_mutex_trylock__get__mutex(req)));
- args = bprintf("locked = %d, owner = %d, sleeping = n/a", mutex.get_buffer()->is_locked(),
- mutex.get_buffer()->get_owner() != nullptr
- ? (int)mc_model_checker->get_remote_simulation()
- .resolve_actor(simgrid::mc::remote(mutex.get_buffer()->get_owner()))
- ->get_pid()
- : -1);
- break;
+ case Simcall::COMM_TESTANY:
+ if (value == -1) {
+ type = "TestAny FALSE";
+ args = "-";
+ } else {
+ type = "TestAny";
+ args = xbt::string_printf("(%d of %zu)", value + 1, simcall_comm_testany__get__count(req));
}
+ break;
- default:
- type = SIMIX_simcall_name(req->call_);
- args = bprintf("??");
- break;
- }
+ default:
+ type = SIMIX_simcall_name(*req);
+ args = "??";
+ break;
+ }
- std::string str;
- if (args != nullptr)
- str = simgrid::xbt::string_printf("[(%ld)%s (%s)] %s(%s)", issuer->get_pid(), actor_get_host_name(issuer),
- actor_get_name(issuer), type, args);
- else
- str = simgrid::xbt::string_printf("[(%ld)%s (%s)] %s ", issuer->get_pid(), actor_get_host_name(issuer),
- actor_get_name(issuer), type);
- xbt_free(args);
- return str;
+ return "[" + get_actor_string(issuer) + "] " + type + "(" + args + ")";
}
std::string Api::request_get_dot_output(smx_simcall_t req, int value) const
std::string label;
- if (req->inspector_ != nullptr) {
+ if (req->observer_ != nullptr) {
label = mc_model_checker->simcall_dot_label(issuer->get_pid(), value);
} else
switch (req->call_) {
case Simcall::COMM_ISEND:
- if (issuer->get_host())
- label = xbt::string_printf("[(%ld)%s] iSend", issuer->get_pid(), actor_get_host_name(issuer));
- else
- label = bprintf("[(%ld)] iSend", issuer->get_pid());
+ label = "[" + get_actor_dot_label(issuer) + "] iSend";
break;
case Simcall::COMM_IRECV:
- if (issuer->get_host())
- label = xbt::string_printf("[(%ld)%s] iRecv", issuer->get_pid(), actor_get_host_name(issuer));
- else
- label = xbt::string_printf("[(%ld)] iRecv", issuer->get_pid());
+ label = "[" + get_actor_dot_label(issuer) + "] iRecv";
break;
case Simcall::COMM_WAIT:
if (value == -1) {
- if (issuer->get_host())
- label = xbt::string_printf("[(%ld)%s] WaitTimeout", issuer->get_pid(), actor_get_host_name(issuer));
- else
- label = xbt::string_printf("[(%ld)] WaitTimeout", issuer->get_pid());
+ label = "[" + get_actor_dot_label(issuer) + "] WaitTimeout";
} else {
- kernel::activity::ActivityImpl* remote_act = simcall_comm_wait__getraw__comm(req);
+ kernel::activity::ActivityImpl* remote_act = simcall_comm_wait__get__comm(req);
Remote<kernel::activity::CommImpl> temp_comm;
- mc_model_checker->get_remote_simulation().read(temp_comm,
- remote(static_cast<kernel::activity::CommImpl*>(remote_act)));
+ mc_model_checker->get_remote_process().read(temp_comm,
+ remote(static_cast<kernel::activity::CommImpl*>(remote_act)));
const kernel::activity::CommImpl* comm = temp_comm.get_buffer();
const kernel::actor::ActorImpl* src_proc =
- mc_model_checker->get_remote_simulation().resolve_actor(mc::remote(comm->src_actor_.get()));
+ mc_model_checker->get_remote_process().resolve_actor(mc::remote(comm->src_actor_.get()));
const kernel::actor::ActorImpl* dst_proc =
- mc_model_checker->get_remote_simulation().resolve_actor(mc::remote(comm->dst_actor_.get()));
- if (issuer->get_host())
- label = xbt::string_printf("[(%ld)%s] Wait [(%ld)->(%ld)]", issuer->get_pid(), actor_get_host_name(issuer),
- src_proc ? src_proc->get_pid() : 0, dst_proc ? dst_proc->get_pid() : 0);
- else
- label = xbt::string_printf("[(%ld)] Wait [(%ld)->(%ld)]", issuer->get_pid(),
- src_proc ? src_proc->get_pid() : 0, dst_proc ? dst_proc->get_pid() : 0);
+ mc_model_checker->get_remote_process().resolve_actor(mc::remote(comm->dst_actor_.get()));
+ label = "[" + get_actor_dot_label(issuer) + "] Wait";
+ label += " [(" + std::to_string(src_proc ? src_proc->get_pid() : 0) + ")";
+ label += "->(" + std::to_string(dst_proc ? dst_proc->get_pid() : 0) + ")]";
}
break;
case Simcall::COMM_TEST: {
- kernel::activity::ActivityImpl* remote_act = simcall_comm_test__getraw__comm(req);
+ kernel::activity::ActivityImpl* remote_act = simcall_comm_test__get__comm(req);
Remote<simgrid::kernel::activity::CommImpl> temp_comm;
- mc_model_checker->get_remote_simulation().read(temp_comm,
- remote(static_cast<kernel::activity::CommImpl*>(remote_act)));
+ mc_model_checker->get_remote_process().read(temp_comm,
+ remote(static_cast<kernel::activity::CommImpl*>(remote_act)));
const kernel::activity::CommImpl* comm = temp_comm.get_buffer();
if (comm->src_actor_.get() == nullptr || comm->dst_actor_.get() == nullptr) {
- if (issuer->get_host())
- label = xbt::string_printf("[(%ld)%s] Test FALSE", issuer->get_pid(), actor_get_host_name(issuer));
- else
- label = bprintf("[(%ld)] Test FALSE", issuer->get_pid());
+ label = "[" + get_actor_dot_label(issuer) + "] Test FALSE";
} else {
- if (issuer->get_host())
- label = xbt::string_printf("[(%ld)%s] Test TRUE", issuer->get_pid(), actor_get_host_name(issuer));
- else
- label = xbt::string_printf("[(%ld)] Test TRUE", issuer->get_pid());
+ label = "[" + get_actor_dot_label(issuer) + "] Test TRUE";
}
break;
}
- case Simcall::COMM_WAITANY: {
- size_t comms_size = simcall_comm_waitany__get__count(req);
- if (issuer->get_host())
- label = xbt::string_printf("[(%ld)%s] WaitAny [%d of %zu]", issuer->get_pid(), actor_get_host_name(issuer),
- value + 1, comms_size);
- else
- label = xbt::string_printf("[(%ld)] WaitAny [%d of %zu]", issuer->get_pid(), value + 1, comms_size);
+ case Simcall::COMM_WAITANY:
+ label = "[" + get_actor_dot_label(issuer) + "] WaitAny";
+ label += xbt::string_printf(" [%d of %zu]", value + 1, simcall_comm_waitany__get__count(req));
break;
- }
case Simcall::COMM_TESTANY:
if (value == -1) {
- if (issuer->get_host())
- label = xbt::string_printf("[(%ld)%s] TestAny FALSE", issuer->get_pid(), actor_get_host_name(issuer));
- else
- label = xbt::string_printf("[(%ld)] TestAny FALSE", issuer->get_pid());
+ label = "[" + get_actor_dot_label(issuer) + "] TestAny FALSE";
} else {
- if (issuer->get_host())
- label = xbt::string_printf("[(%ld)%s] TestAny TRUE [%d of %lu]", issuer->get_pid(),
- actor_get_host_name(issuer), value + 1, simcall_comm_testany__get__count(req));
- else
- label = xbt::string_printf("[(%ld)] TestAny TRUE [%d of %lu]", issuer->get_pid(), value + 1,
- simcall_comm_testany__get__count(req));
+ label = "[" + get_actor_dot_label(issuer) + "] TestAny TRUE";
+ label += xbt::string_printf(" [%d of %zu]", value + 1, simcall_comm_testany__get__count(req));
}
break;
- case Simcall::MUTEX_TRYLOCK:
- label = xbt::string_printf("[(%ld)] Mutex TRYLOCK", issuer->get_pid());
- break;
-
- case Simcall::MUTEX_LOCK:
- label = xbt::string_printf("[(%ld)] Mutex LOCK", issuer->get_pid());
- break;
-
default:
THROW_UNIMPLEMENTED;
}
- return xbt::string_printf("label = \"%s\", color = %s, fontcolor = %s", label.c_str(), color, color);
+ return "label = \"" + label + "\", color = " + color + ", fontcolor = " + color;
}
#if HAVE_SMPI
int Api::get_smpi_request_tag(smx_simcall_t const& simcall, simgrid::simix::Simcall type) const
{
- simgrid::smpi::Request mpi_request;
void* simcall_data = nullptr;
if (type == Simcall::COMM_ISEND)
simcall_data = simcall_comm_isend__get__data(simcall);
else if (type == Simcall::COMM_IRECV)
simcall_data = simcall_comm_irecv__get__data(simcall);
- mc_model_checker->get_remote_simulation().read(&mpi_request, remote(static_cast<smpi::Request*>(simcall_data)));
- return mpi_request.tag();
+ Remote<simgrid::smpi::Request> mpi_request;
+ mc_model_checker->get_remote_process().read(mpi_request, remote(static_cast<smpi::Request*>(simcall_data)));
+ return mpi_request.get_buffer()->tag();
}
#endif
void Api::restore_state(std::shared_ptr<simgrid::mc::Snapshot> system_state) const
{
- system_state->restore(&mc_model_checker->get_remote_simulation());
+ system_state->restore(&mc_model_checker->get_remote_process());
}
void Api::log_state() const
{
- session->log_state();
+ session_singleton->log_state();
}
bool Api::snapshot_equal(const Snapshot* s1, const Snapshot* s2) const
void Api::s_close() const
{
- session->close();
-}
-
-void Api::restore_initial_state() const
-{
- session->restore_initial_state();
+ session_singleton->close();
}
void Api::execute(Transition& transition, smx_simcall_t simcall) const
{
/* FIXME: once all simcalls have observers, kill the simcall parameter and use mc_model_checker->simcall_to_string() */
- auto textual =
- simgrid::mc::Api::get().request_to_string(simcall, transition.times_considered_, RequestType::executed);
- strcpy((char*)transition.textual, textual.c_str());
-
- session->execute(transition);
+ transition.textual = request_to_string(simcall, transition.times_considered_);
+ session_singleton->execute(transition);
}
-#if SIMGRID_HAVE_MC
void Api::automaton_load(const char* file) const
{
MC_automaton_load(file);
}
-#endif
std::vector<int> Api::automaton_propositional_symbol_evaluate() const
{
