#include "src/mc/remote/RemoteSimulation.hpp"
#include <xbt/asserts.h>
#include <xbt/log.h>
-// #include <xbt/dynar.h>
#if HAVE_SMPI
#include "src/smpi/include/smpi_request.hpp"
return xbt_strdup("(verbose only)");
}
-inline
-smx_mailbox_t get_mbox(smx_simcall_t const r)
-{
- 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;
- }
-}
-
-inline simgrid::kernel::activity::CommImpl* get_comm(smx_simcall_t const r)
-{
- 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;
-}
-
/* Search an enabled transition for the given process.
*
* This can be seen as an iterator returning the next transition of the process.
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 &&
+ else if (act->src_actor_.get() == nullptr && act->state_ == simgrid::kernel::activity::State::READY &&
act->detached())
state->transition_.argument_ = 0; // OK
else
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;
+ }
+}
+
+// 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;
+}
+
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>(static_cast<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{};
}
#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()));
MC_show_deadlock();
}
+/** 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: {
+ 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;
}
-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: {
+ 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;
}
bool Api::mc_is_null() 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;
const char* type = nullptr;
char* args = nullptr;
- smx_actor_t issuer = MC_smx_simcall_get_issuer(req);
+ smx_actor_t issuer = simcall_get_issuer(req);
switch (req->call_) {
case Simcall::COMM_ISEND: {
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)
const char* Api::simcall_get_name(simgrid::simix::Simcall kind) const
{
- return SIMIX_simcall_name(kind);
+ return simcall_names[static_cast<int>(kind)];
}
#if HAVE_SMPI
