#include "src/mc/Session.hpp"
#include "src/mc/checker/SimcallInspector.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/RemoteSimulation.hpp"
#include <xbt/asserts.h>
#include <xbt/log.h>
-// #include <xbt/dynar.h>
-
+#include "simgrid/s4u/Host.hpp"
+#include "xbt/string.hpp"
#if HAVE_SMPI
#include "src/smpi/include/smpi_request.hpp"
#endif
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(Api, mc, "Logging specific to MC Fasade APIs ");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(Api, mc, "Logging specific to MC Facade APIs ");
using Simcall = simgrid::simix::Simcall;
return colors[id % colors.size()];
}
-static char* pointer_to_string(void* pointer)
-{
- if (XBT_LOG_ISENABLED(Api, xbt_log_priority_verbose))
- return bprintf("%p", pointer);
-
- return xbt_strdup("(verbose only)");
-}
-
-static char* buff_size_to_string(size_t buff_size)
-{
- if (XBT_LOG_ISENABLED(Api, xbt_log_priority_verbose))
- return bprintf("%zu", buff_size);
-
- return xbt_strdup("(verbose only)");
-}
-
-inline
-smx_mailbox_t get_mbox(smx_simcall_t const r)
+static std::string pointer_to_string(void* pointer)
{
- switch (r->call_) {
- case Simcall::COMM_ISEND:
- return simcall_comm_isend__get__mbox(r);
- case Simcall::COMM_IRECV:
- return simcall_comm_irecv__get__mbox(r);
- default:
- return nullptr;
- }
+ return XBT_LOG_ISENABLED(Api, xbt_log_priority_verbose) ? xbt::string_printf("%p", pointer) : "(verbose only)";
}
-inline simgrid::kernel::activity::CommImpl* get_comm(smx_simcall_t const r)
+static std::string buff_size_to_string(size_t buff_size)
{
- 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;
- }
-}
-
-// Does half the job
-inline bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2)
-{
- if (r1->call_ == Simcall::COMM_ISEND && r2->call_ == Simcall::COMM_IRECV)
- return false;
-
- if (r1->call_ == Simcall::COMM_IRECV && r2->call_ == Simcall::COMM_ISEND)
- 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);
-
- if ((r1->call_ == Simcall::COMM_ISEND || r1->call_ == Simcall::COMM_IRECV) && r2->call_ == Simcall::COMM_WAIT) {
- const kernel::activity::MailboxImpl* mbox = get_mbox(r1); // r1->get_mboxx')
-
- if (mbox != synchro2->mbox_cpy
- && simcall_comm_wait__get__timeout(r2) <= 0)
- return false;
-
- if ((r1->issuer_ != synchro2->src_actor_.get()) && (r1->issuer_ != synchro2->dst_actor_.get()) &&
- simcall_comm_wait__get__timeout(r2) <= 0)
- return false;
-
- 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;
-
- 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. */
-#if 0
- if((r1->call == Simcall::COMM_ISEND || r1->call == Simcall::COMM_IRECV)
- && r2->call == Simcall::COMM_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 (r1->call_ == Simcall::COMM_TEST &&
- (simcall_comm_test__get__comm(r1) == nullptr || synchro1->src_buff_ == nullptr || synchro1->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 (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 XBT_LOG_ISENABLED(Api, xbt_log_priority_verbose) ? std::to_string(buff_size) : "(verbose only)";
}
/* Search an enabled transition for the given process.
/* reset the outgoing transition */
simgrid::mc::ActorState* procstate = &state->actor_states_[actor->get_pid()];
state->transition_.pid_ = -1;
- state->transition_.argument_ = -1;
+ state->transition_.times_considered_ = -1;
+ state->transition_.textual[0] = '\0';
state->executed_req_.call_ = Simcall::NONE;
if (not simgrid::mc::actor_is_enabled(actor))
return nullptr; // Not executable in the application
smx_simcall_t req = nullptr;
- 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)) {
- state->transition_.argument_ = procstate->times_considered;
+ if (actor->simcall_.inspector_ != nullptr) {
+ state->transition_.times_considered_ = procstate->times_considered;
+ procstate->times_considered++;
+ if (actor->simcall_.mc_max_consider_ <= procstate->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;
+ break;
+ }
++procstate->times_considered;
- break;
}
- ++procstate->times_considered;
- }
-
- if (procstate->times_considered >= simcall_comm_waitany__get__count(&actor->simcall_))
- procstate->set_done();
- if (state->transition_.argument_ != -1)
- 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)) {
- state->transition_.argument_ = procstate->times_considered;
+ if (procstate->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;
+ 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;
+ break;
+ }
++procstate->times_considered;
- break;
}
- ++procstate->times_considered;
- }
- if (procstate->times_considered >= simcall_comm_testany__get__count(&actor->simcall_))
- procstate->set_done();
+ 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_;
+ if (state->transition_.times_considered_ != -1 || start_count == 0)
+ req = &actor->simcall_;
- break;
- }
+ break;
+ }
- case Simcall::COMM_WAIT: {
- simgrid::mc::RemotePtr<simgrid::kernel::activity::CommImpl> remote_act =
- remote(simcall_comm_wait__getraw__comm(&actor->simcall_));
- simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_act;
- 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 &&
- act->detached())
- state->transition_.argument_ = 0; // OK
- else
- state->transition_.argument_ = -1; // timeout
- procstate->set_done();
- 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_));
+ simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_act;
+ 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_.times_considered_ = 0; // OK
+ else if (act->src_actor_.get() == nullptr && act->state_ == simgrid::kernel::activity::State::READY &&
+ act->detached())
+ state->transition_.times_considered_ = 0; // OK
+ else
+ state->transition_.times_considered_ = -1; // timeout
+ procstate->set_done();
+ req = &actor->simcall_;
+ break;
+ }
- case Simcall::MC_RANDOM: {
- 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_))
+ default:
procstate->set_done();
- req = &actor->simcall_;
- break;
+ state->transition_.times_considered_ = 0;
+ req = &actor->simcall_;
+ break;
}
-
- default:
- procstate->set_done();
- state->transition_.argument_ = 0;
- req = &actor->simcall_;
- break;
- }
if (not req)
return nullptr;
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_.argument_));
+ 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_TESTANY:
state->internal_req_.call_ = Simcall::COMM_TEST;
- if (state->transition_.argument_ > 0) {
+ 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_.argument_));
+ 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_.argument_);
+ simcall_comm_test__set__result(&state->internal_req_, state->transition_.times_considered_);
break;
case Simcall::COMM_WAIT:
return req;
}
+simgrid::kernel::activity::CommImpl* Api::get_comm(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;
+ }
+}
+
+/** Statically "upcast" a s_smx_actor_t into an ActorInformation
+ *
+ * This gets 'actorInfo' from '&actorInfo->copy'. It upcasts in the
+ * sense that we could achieve the same thing by having ActorInformation
+ * inherit from s_smx_actor_t but we don't really want to do that.
+ */
+simgrid::mc::ActorInformation* Api::actor_info_cast(smx_actor_t actor) const
+{
+ simgrid::mc::ActorInformation temp;
+ std::size_t offset = (char*)temp.copy.get_buffer() - (char*)&temp;
+
+ auto* process_info = reinterpret_cast<simgrid::mc::ActorInformation*>((char*)actor - offset);
+ return process_info;
+}
+
+// Does half the job
+bool Api::request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const
+{
+ if (r1->call_ == Simcall::COMM_ISEND && r2->call_ == Simcall::COMM_IRECV)
+ return false;
+
+ if (r1->call_ == Simcall::COMM_IRECV && r2->call_ == Simcall::COMM_ISEND)
+ 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);
+
+ 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);
+
+ if (mbox != synchro2_mbox_cpy && simcall_comm_wait__get__timeout(r2) <= 0)
+ return false;
+
+ if ((r1->issuer_ != synchro2->src_actor_.get()) && (r1->issuer_ != synchro2->dst_actor_.get()) &&
+ simcall_comm_wait__get__timeout(r2) <= 0)
+ return false;
+
+ 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;
+
+ 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. */
+#if 0
+ if((r1->call == Simcall::COMM_ISEND || r1->call == Simcall::COMM_IRECV)
+ && r2->call == Simcall::COMM_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 (r1->call_ == Simcall::COMM_TEST &&
+ (simcall_comm_test__get__comm(r1) == nullptr || synchro1->src_buff_ == nullptr || synchro1->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 (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;
+}
+
+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();
+
+ // 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());
+ return *info->hostname;
+}
+
+std::string 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();
+
+ simgrid::mc::ActorInformation* info = actor_info_cast(actor);
+ if (info->name.empty()) {
+ 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;
+}
+
+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)) + " (" + get_actor_name(actor) + ")";
+ else
+ res += get_actor_name(actor);
+ } else
+ res = "(0) ()";
+ return res;
+}
+
+std::string Api::get_actor_dot_label(smx_actor_t actor) const
+{
+ std::string res = "(" + std::to_string(actor->get_pid()) + ")";
+ if (actor->get_host())
+ res += get_actor_host_name(actor);
+ return res;
+}
+
void Api::initialize(char** argv) const
{
simgrid::mc::session = new simgrid::mc::Session([argv] {
return mc_model_checker->get_remote_simulation().actors().size();
}
-bool Api::comm_addr_equal(const kernel::activity::CommImpl* comm_addr1,
- const kernel::activity::CommImpl* comm_addr2) const
+RemotePtr<kernel::activity::CommImpl> Api::get_comm_isend_raw_addr(smx_simcall_t request) const
{
- return remote(comm_addr1) == remote(comm_addr2);
+ 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));
}
-kernel::activity::CommImpl* Api::get_comm_isend_raw_addr(smx_simcall_t request) const
+RemotePtr<kernel::activity::CommImpl> Api::get_comm_irecv_raw_addr(smx_simcall_t request) const
{
- auto comm_addr = simcall_comm_isend__getraw__result(request);
- return static_cast<kernel::activity::CommImpl*>(comm_addr);
+ 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));
}
-kernel::activity::CommImpl* Api::get_comm_wait_raw_addr(smx_simcall_t request) const
+RemotePtr<kernel::activity::CommImpl> Api::get_comm_wait_raw_addr(smx_simcall_t request) const
{
- return simcall_comm_wait__getraw__comm(request);
+ auto comm_addr = simgrid::simix::unmarshal_raw<simgrid::kernel::activity::CommImpl*>(request->args_[0]);
+ return RemotePtr<kernel::activity::CommImpl>(comm_addr);
}
-kernel::activity::CommImpl* Api::get_comm_waitany_raw_addr(smx_simcall_t request, int value) const
+RemotePtr<kernel::activity::CommImpl> 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));
- return static_cast<simgrid::kernel::activity::CommImpl*>(addr);
+ 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));
+ return RemotePtr<kernel::activity::CommImpl>(static_cast<kernel::activity::CommImpl*>(comm_addr));
}
-std::string Api::get_pattern_comm_rdv(void* addr) const
+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, remote((simgrid::kernel::activity::CommImpl*)addr));
+ mc_model_checker->get_remote_simulation().read(temp_synchro, addr);
const kernel::activity::CommImpl* synchro = temp_synchro.get_buffer();
char* remote_name = mc_model_checker->get_remote_simulation().read<char*>(RemotePtr<char*>(
return rdv;
}
-unsigned long Api::get_pattern_comm_src_proc(void* addr) const
+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, remote((simgrid::kernel::activity::CommImpl*)addr));
+ mc_model_checker->get_remote_simulation().read(temp_synchro, 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();
return src_proc;
}
-unsigned long Api::get_pattern_comm_dst_proc(void* addr) const
+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, remote((simgrid::kernel::activity::CommImpl*)addr));
+ mc_model_checker->get_remote_simulation().read(temp_synchro, 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();
return src_proc;
}
-std::vector<char> Api::get_pattern_comm_data(void* addr) const
-{
- 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();
-
- 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_));
- }
- return buffer;
-}
-
-std::vector<char> Api::get_pattern_comm_data(const kernel::activity::CommImpl* comm_addr) const
+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, remote((kernel::activity::CommImpl*)comm_addr));
+ mc_model_checker->get_remote_simulation().read(temp_comm, addr);
const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer();
std::vector<char> buffer{};
return buffer;
}
-const char* Api::get_actor_host_name(smx_actor_t actor) const
-{
- const char* host_name = MC_smx_actor_get_host_name(actor);
- return host_name;
-}
-
#if HAVE_SMPI
bool Api::check_send_request_detached(smx_simcall_t const& simcall) const
{
}
#endif
-smx_actor_t Api::get_src_actor(const kernel::activity::CommImpl* comm_addr) const
+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, remote((kernel::activity::CommImpl*)comm_addr));
+ mc_model_checker->get_remote_simulation().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()));
return src_proc;
}
-smx_actor_t Api::get_dst_actor(const kernel::activity::CommImpl* comm_addr) const
+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, remote((kernel::activity::CommImpl*)comm_addr));
+ mc_model_checker->get_remote_simulation().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()));
return mc_model_checker->executed_transitions;
}
-bool Api::mc_check_deadlock() const
+void Api::mc_check_deadlock() const
{
- return mc_model_checker->checkDeadlock();
-}
-
-void Api::mc_show_deadlock() const
-{
- MC_show_deadlock();
+ if (mc_model_checker->checkDeadlock()) {
+ MC_show_deadlock();
+ throw DeadlockError();
+ }
}
+/** Get the issuer of a simcall (`req->issuer`)
+ *
+ * In split-process mode, it does the black magic necessary to get an address
+ * of a (shallow) copy of the data structure the issuer SIMIX actor in the local
+ * address space.
+ *
+ * @param process the MCed process
+ * @param req the simcall (copied in the local process)
+ */
smx_actor_t Api::simcall_get_issuer(s_smx_simcall const* req) const
{
- return MC_smx_simcall_get_issuer(req);
+ xbt_assert(mc_model_checker != nullptr);
+
+ // This is the address of the smx_actor in the MCed process:
+ auto address = simgrid::mc::remote(req->issuer_);
+
+ // Lookup by address:
+ for (auto& actor : mc_model_checker->get_remote_simulation().actors())
+ if (actor.address == address)
+ return actor.copy.get_buffer();
+ for (auto& actor : mc_model_checker->get_remote_simulation().dead_actors())
+ if (actor.address == address)
+ return actor.copy.get_buffer();
+
+ xbt_die("Issuer not found");
}
long Api::simcall_get_actor_id(s_smx_simcall const* req) const
{
- return MC_smx_simcall_get_issuer(req)->get_pid();
+ return simcall_get_issuer(req)->get_pid();
}
-smx_mailbox_t Api::simcall_get_mbox(smx_simcall_t const req) const
+RemotePtr<kernel::activity::MailboxImpl> Api::get_mbox_remote_addr(smx_simcall_t const req) const
{
- return get_mbox(req);
+ RemotePtr<kernel::activity::MailboxImpl> mbox_addr;
+ switch (req->call_) {
+ case Simcall::COMM_ISEND:
+ case Simcall::COMM_IRECV:
+ mbox_addr = remote(simix::unmarshal<smx_mailbox_t>(req->args_[1]));
+ break;
+ default:
+ mbox_addr = RemotePtr<kernel::activity::MailboxImpl>();
+ break;
+ }
+ return mbox_addr;
}
-simgrid::kernel::activity::CommImpl* Api::simcall_get_comm(smx_simcall_t const req) const
+RemotePtr<kernel::activity::ActivityImpl> Api::get_comm_remote_addr(smx_simcall_t const req) const
{
- return get_comm(req);
+ RemotePtr<kernel::activity::ActivityImpl> comm_addr;
+ switch (req->call_) {
+ case Simcall::COMM_ISEND:
+ case Simcall::COMM_IRECV:
+ comm_addr = remote(simgrid::simix::unmarshal_raw<simgrid::kernel::activity::ActivityImpl*>(req->result_));
+ break;
+ default:
+ comm_addr = RemotePtr<kernel::activity::ActivityImpl>();
+ break;
+ }
+ return comm_addr;
}
bool Api::mc_is_null() const
mc_model_checker->exit(status);
}
-std::string const& Api::mc_get_host_name(std::string const& hostname) const
-{
- return mc_model_checker->get_host_name(hostname);
-}
-
void Api::dump_record_path() const
{
simgrid::mc::dumpRecordPath();
return nullptr;
}
+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()) {
+ auto actor_pid = actor.copy.get_buffer()->get_pid();
+ auto actor_impl = actor.copy.get_buffer();
+
+ // Only consider the actors that were marked as interleaving by the checker algorithm
+ if (not state->actor_states_[actor_pid].is_todo())
+ continue;
+ // Not executable in the application
+ if (not simgrid::mc::actor_is_enabled(actor_impl))
+ continue;
+
+ 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:
+ 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 */
+ /* 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;
{
xbt_assert(mc_model_checker != nullptr, "Must be called from MCer");
- if (req->inspector_ != nullptr)
- return req->inspector_->to_string();
-
bool use_remote_comm = true;
switch (request_type) {
case simgrid::mc::RequestType::simix:
THROW_IMPOSSIBLE;
}
- const char* type = nullptr;
- char* args = nullptr;
+ std::string type;
+ std::string args;
- smx_actor_t issuer = MC_smx_simcall_get_issuer(req);
+ smx_actor_t issuer = simcall_get_issuer(req);
+
+ if (issuer->simcall_.inspector_ != nullptr)
+ return mc_model_checker->simcall_to_string(issuer->get_pid(), value);
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(), MC_smx_actor_get_host_name(issuer),
- MC_smx_actor_get_name(issuer), p, bs);
- else
- 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);
+ 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);
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(), MC_smx_actor_get_host_name(issuer),
- MC_smx_actor_get_name(issuer), p, bs);
- else
- 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);
+ 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);
+ args = "comm=" + pointer_to_string(remote_act);
} else {
type = "Wait";
- p = pointer_to_string(remote_act);
simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_synchro;
const simgrid::kernel::activity::CommImpl* act;
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 ? 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) : "");
+ args = "comm=" + pointer_to_string(remote_act);
+ args += " [" + get_actor_string(src_proc) + "-> " + get_actor_string(dst_proc) + "]";
}
- xbt_free(p);
break;
}
} 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);
+ args = "comm=" + pointer_to_string(remote_act);
} 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(),
- 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));
+ args = "comm=" + pointer_to_string(remote_act);
+ args += " [" + get_actor_string(src_proc) + " -> " + get_actor_string(dst_proc) + "]";
}
- xbt_free(p);
break;
}
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);
+ args = "comm=" + pointer_to_string(remote_sync) + xbt::string_printf("(%d of %zu)", value + 1, count);
} else
- args = bprintf("comm at idx %d", value);
+ args = "comm at idx " + std::to_string(value);
break;
}
case Simcall::COMM_TESTANY:
if (value == -1) {
type = "TestAny FALSE";
- args = xbt_strdup("-");
+ args = "-";
} else {
type = "TestAny";
- args = bprintf("(%d of %zu)", value + 1, simcall_comm_testany__get__count(req));
+ args = xbt::string_printf("(%d of %zu)", value + 1, simcall_comm_testany__get__count(req));
}
break;
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);
+ args = "locked = " + std::to_string(mutex.get_buffer()->is_locked()) + ", owner = ";
+ if (mutex.get_buffer()->get_owner() != nullptr)
+ args += std::to_string(mc_model_checker->get_remote_simulation()
+ .resolve_actor(simgrid::mc::remote(mutex.get_buffer()->get_owner()))
+ ->get_pid());
+ else
+ args += "-1";
+ args += ", sleeping = n/a";
break;
}
- case Simcall::MC_RANDOM:
- type = "MC_RANDOM";
- args = bprintf("%d", value);
- break;
-
default:
type = SIMIX_simcall_name(req->call_);
- args = bprintf("??");
+ args = "??";
break;
}
- std::string str;
- if (args != nullptr)
- 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
- 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 "[" + get_actor_string(issuer) + "] " + type + "(" + args + ")";
}
std::string Api::request_get_dot_output(smx_simcall_t req, int value) const
{
- const smx_actor_t issuer = MC_smx_simcall_get_issuer(req);
+ const smx_actor_t issuer = simcall_get_issuer(req);
const char* color = get_color(issuer->get_pid() - 1);
- if (req->inspector_ != nullptr)
- return simgrid::xbt::string_printf("label = \"%s\", color = %s, fontcolor = %s",
- req->inspector_->dot_label().c_str(), color, color);
-
std::string label;
- switch (req->call_) {
- case Simcall::COMM_ISEND:
- if (issuer->get_host())
- label = xbt::string_printf("[(%ld)%s] iSend", issuer->get_pid(), MC_smx_actor_get_host_name(issuer));
- else
- label = bprintf("[(%ld)] iSend", issuer->get_pid());
- break;
-
- case Simcall::COMM_IRECV:
- if (issuer->get_host())
- label = xbt::string_printf("[(%ld)%s] iRecv", issuer->get_pid(), MC_smx_actor_get_host_name(issuer));
- else
- label = xbt::string_printf("[(%ld)] iRecv", issuer->get_pid());
- break;
+ if (req->inspector_ != nullptr) {
+ label = mc_model_checker->simcall_dot_label(issuer->get_pid(), value);
+ } else
+ switch (req->call_) {
+ case Simcall::COMM_ISEND:
+ label = "[" + get_actor_dot_label(issuer) + "] iSend";
+ break;
+
+ case Simcall::COMM_IRECV:
+ label = "[" + get_actor_dot_label(issuer) + "] iRecv";
+ break;
+
+ case Simcall::COMM_WAIT:
+ if (value == -1) {
+ label = "[" + get_actor_dot_label(issuer) + "] WaitTimeout";
+ } else {
+ kernel::activity::ActivityImpl* remote_act = simcall_comm_wait__getraw__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)));
+ 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()));
+ const kernel::actor::ActorImpl* dst_proc =
+ mc_model_checker->get_remote_simulation().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_WAIT:
- if (value == -1) {
- if (issuer->get_host())
- label = xbt::string_printf("[(%ld)%s] WaitTimeout", issuer->get_pid(), MC_smx_actor_get_host_name(issuer));
- else
- label = xbt::string_printf("[(%ld)] WaitTimeout", issuer->get_pid());
- } else {
- kernel::activity::ActivityImpl* remote_act = simcall_comm_wait__getraw__comm(req);
- Remote<kernel::activity::CommImpl> temp_comm;
+ case Simcall::COMM_TEST: {
+ kernel::activity::ActivityImpl* remote_act = simcall_comm_test__getraw__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)));
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()));
- 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(), MC_smx_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);
- }
- break;
-
- case Simcall::COMM_TEST: {
- kernel::activity::ActivityImpl* remote_act = simcall_comm_test__getraw__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)));
- 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(), MC_smx_actor_get_host_name(issuer));
- else
- label = bprintf("[(%ld)] Test FALSE", issuer->get_pid());
- } else {
- if (issuer->get_host())
- label = xbt::string_printf("[(%ld)%s] Test TRUE", issuer->get_pid(), MC_smx_actor_get_host_name(issuer));
- else
- label = xbt::string_printf("[(%ld)] Test TRUE", issuer->get_pid());
- }
- 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(),
- MC_smx_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);
- break;
- }
-
- case Simcall::COMM_TESTANY:
- if (value == -1) {
- if (issuer->get_host())
- label = xbt::string_printf("[(%ld)%s] TestAny FALSE", issuer->get_pid(), MC_smx_actor_get_host_name(issuer));
- else
- label = xbt::string_printf("[(%ld)] TestAny FALSE", issuer->get_pid());
- } else {
- if (issuer->get_host())
- label =
- 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
- label = xbt::string_printf("[(%ld)] TestAny TRUE [%d of %lu]", issuer->get_pid(), value + 1,
- simcall_comm_testany__get__count(req));
+ if (comm->src_actor_.get() == nullptr || comm->dst_actor_.get() == nullptr) {
+ label = "[" + get_actor_dot_label(issuer) + "] Test FALSE";
+ } else {
+ label = "[" + get_actor_dot_label(issuer) + "] Test TRUE";
+ }
+ break;
}
- 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;
+ 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) {
+ label = "[" + get_actor_dot_label(issuer) + "] TestAny FALSE";
+ } else {
+ 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::MC_RANDOM:
- if (issuer->get_host())
- label = xbt::string_printf("[(%ld)%s] MC_RANDOM (%d)", issuer->get_pid(), MC_smx_actor_get_host_name(issuer),
- value);
- else
- label = xbt::string_printf("[(%ld)] MC_RANDOM (%d)", issuer->get_pid(), value);
- break;
+ case Simcall::MUTEX_TRYLOCK:
+ label = "[" + get_actor_dot_label(issuer) + "] Mutex TRYLOCK";
+ break;
- default:
- THROW_UNIMPLEMENTED;
- }
+ case Simcall::MUTEX_LOCK:
+ label = "[" + get_actor_dot_label(issuer) + "] Mutex LOCK";
+ break;
- return xbt::string_printf("label = \"%s\", color = %s, fontcolor = %s", label.c_str(), color, color);
-}
+ default:
+ THROW_UNIMPLEMENTED;
+ }
-const char* Api::simcall_get_name(simgrid::simix::Simcall kind) const
-{
- return SIMIX_simcall_name(kind);
+ return "label = \"" + label + "\", color = " + color + ", fontcolor = " + color;
}
#if HAVE_SMPI
session->restore_initial_state();
}
-void Api::execute(Transition const& transition) const
+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() */
+ transition.textual = request_to_string(simcall, transition.times_considered_, RequestType::executed);
session->execute(transition);
}
