X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d1cc4ac74e97a899457dc71d16b4fe734ac1403c..e9198879b07a40f01d00fc80eed78cebb328a2bd:/src/mc/api.cpp diff --git a/src/mc/api.cpp b/src/mc/api.cpp index e4677623f7..68310531c6 100644 --- a/src/mc/api.cpp +++ b/src/mc/api.cpp @@ -3,6 +3,7 @@ #include "src/kernel/activity/MailboxImpl.hpp" #include "src/kernel/activity/MutexImpl.hpp" #include "src/mc/Session.hpp" +#include "src/mc/checker/Checker.hpp" #include "src/mc/checker/SimcallObserver.hpp" #include "src/mc/mc_comm_pattern.hpp" #include "src/mc/mc_exit.hpp" @@ -115,7 +116,7 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta case Simcall::COMM_WAIT: { simgrid::mc::RemotePtr remote_act = - remote(simcall_comm_wait__getraw__comm(&actor->simcall_)); + remote(simcall_comm_wait__get__comm(&actor->simcall_)); simgrid::mc::Remote temp_act; mc_model_checker->get_remote_simulation().read(temp_act, remote_act); const simgrid::kernel::activity::CommImpl* act = temp_act.get_buffer(); @@ -180,13 +181,13 @@ static void simcall_translate(smx_simcall_t req, break; case Simcall::COMM_WAIT: - chosen_comm = simcall_comm_wait__getraw__comm(req); + chosen_comm = simcall_comm_wait__get__comm(req); mc_model_checker->get_remote_simulation().read(buffered_comm, remote(chosen_comm)); simcall_comm_wait__set__comm(req, buffered_comm.get_buffer()); break; case Simcall::COMM_TEST: - chosen_comm = simcall_comm_test__getraw__comm(req); + chosen_comm = simcall_comm_test__get__comm(req); mc_model_checker->get_remote_simulation().read(buffered_comm, remote(chosen_comm)); simcall_comm_test__set__comm(req, buffered_comm.get_buffer()); break; @@ -200,9 +201,9 @@ static void simcall_translate(smx_simcall_t req, simgrid::kernel::activity::CommImpl* Api::get_comm_or_nullptr(smx_simcall_t const r) const { if (r->call_ == Simcall::COMM_WAIT) - return simcall_comm_wait__getraw__comm(r); + return simcall_comm_wait__get__comm(r); if (r->call_ == Simcall::COMM_TEST) - return simcall_comm_test__getraw__comm(r); + return simcall_comm_test__get__comm(r); return nullptr; } @@ -221,69 +222,10 @@ simgrid::mc::ActorInformation* Api::actor_info_cast(smx_actor_t actor) const 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_IRECV && r2->call_ == Simcall::COMM_ISEND) - return false; - - // Those are internal requests, we do not need indirection because those objects are copies: - auto comm1 = get_comm_or_nullptr(r1); - auto comm2 = get_comm_or_nullptr(r2); - - if ((r1->call_ == Simcall::COMM_ISEND || r1->call_ == Simcall::COMM_IRECV) && r2->call_ == Simcall::COMM_WAIT) { - auto mbox1 = get_mbox_remote_addr(r1); - auto mbox2 = remote(comm2->mbox_cpy); - - if (mbox1 != mbox2 && simcall_comm_wait__get__timeout(r2) <= 0) - return false; - - if ((r1->issuer_ != comm2->src_actor_.get()) && (r1->issuer_ != comm2->dst_actor_.get()) && - simcall_comm_wait__get__timeout(r2) <= 0) - return false; - - if ((r1->call_ == Simcall::COMM_ISEND) && (comm2->type_ == kernel::activity::CommImpl::Type::SEND) && - (comm2->src_buff_ != simcall_comm_isend__get__src_buff(r1)) && simcall_comm_wait__get__timeout(r2) <= 0) - return false; - - if ((r1->call_ == Simcall::COMM_IRECV) && (comm2->type_ == kernel::activity::CommImpl::Type::RECEIVE) && - (comm2->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_TEST && r2->call_ == Simcall::COMM_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 || comm1->src_buff_ == nullptr || comm1->dst_buff_ == nullptr)) - return false; - - if (r1->call_ == Simcall::COMM_TEST && r2->call_ == Simcall::COMM_WAIT && comm1->src_buff_ == comm2->src_buff_ && - comm1->dst_buff_ == comm2->dst_buff_) - return false; - - if (r1->call_ == Simcall::COMM_TEST && r2->call_ == Simcall::COMM_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; -} - bool Api::simcall_check_dependency(smx_simcall_t req1, smx_simcall_t req2) const { - const auto ISEND = Simcall::COMM_ISEND; const auto IRECV = Simcall::COMM_IRECV; + const auto ISEND = Simcall::COMM_ISEND; const auto TEST = Simcall::COMM_TEST; const auto WAIT = Simcall::COMM_WAIT; @@ -301,24 +243,79 @@ bool Api::simcall_check_dependency(smx_simcall_t req1, smx_simcall_t req2) const (req2->call_ == WAIT && simcall_comm_wait__get__timeout(req2) > 0)) return true; - if (req1->call_ < req2->call_) { + /* Make sure that req1 and req2 are in alphabetic order */ + if (req1->call_ > req2->call_) { auto temp = req1; - req1 = req2; - req2 = temp; + req1 = req2; + req2 = temp; } - 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 auto comm1 = get_comm_or_nullptr(req1); - const auto comm2 = get_comm_or_nullptr(req2); + auto comm1 = get_comm_or_nullptr(req1); + auto comm2 = get_comm_or_nullptr(req2); + + /* 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 ((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; + 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((req1->call == ISEND || req1->call == IRECV) + && req2->call == TEST) + return false; +#endif + + if (req1->call_ == TEST && req2->call_ == WAIT && + (comm1->src_actor_.get() == nullptr || comm1->dst_actor_.get() == 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 (req1->call_ == TEST && req2->call_ == WAIT && comm1->src_buff_ == comm2->src_buff_ && + comm1->dst_buff_ == comm2->dst_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; + } + + /* Second case: req1 and req2 are of the same call type */ switch (req1->call_) { - case Simcall::COMM_ISEND: + case ISEND: return simcall_comm_isend__get__mbox(req1) == simcall_comm_isend__get__mbox(req2); - case Simcall::COMM_IRECV: + case IRECV: return simcall_comm_irecv__get__mbox(req1) == simcall_comm_irecv__get__mbox(req2); - case Simcall::COMM_WAIT: + 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 && @@ -387,7 +384,7 @@ std::string Api::get_actor_dot_label(smx_actor_t actor) const return res; } -void Api::initialize(char** argv) const +simgrid::mc::Checker* Api::initialize(char** argv, simgrid::mc::CheckerAlgorithm algo) const { simgrid::mc::session = new simgrid::mc::Session([argv] { int i = 1; @@ -398,6 +395,31 @@ void Api::initialize(char** argv) const execvp(argv[i], argv + i); xbt_die("The model-checked process failed to exec(): %s", strerror(errno)); }); + + simgrid::mc::Checker* checker; + switch (algo) { + case CheckerAlgorithm::CommDeterminism: + checker = simgrid::mc::createCommunicationDeterminismChecker(); + break; + + case CheckerAlgorithm::UDPOR: + checker = simgrid::mc::createUdporChecker(); + break; + + case CheckerAlgorithm::Safety: + checker = simgrid::mc::createSafetyChecker(); + break; + + case CheckerAlgorithm::Liveness: + checker = simgrid::mc::createLivenessChecker(); + break; + + default: + THROW_IMPOSSIBLE; + } + + mc_model_checker->setChecker(checker); + return checker; } std::vector& Api::get_actors() const @@ -617,13 +639,6 @@ Checker* Api::mc_get_checker() 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); @@ -727,7 +742,7 @@ std::string Api::request_to_string(smx_simcall_t req, int value) const } case Simcall::COMM_WAIT: { - simgrid::kernel::activity::CommImpl* remote_act = simcall_comm_wait__getraw__comm(req); + simgrid::kernel::activity::CommImpl* remote_act = simcall_comm_wait__get__comm(req); if (value == -1) { type = "WaitTimeout"; args = "comm=" + pointer_to_string(remote_act); @@ -750,7 +765,7 @@ std::string Api::request_to_string(smx_simcall_t req, int value) const } case Simcall::COMM_TEST: { - simgrid::kernel::activity::CommImpl* remote_act = simcall_comm_test__getraw__comm(req); + simgrid::kernel::activity::CommImpl* remote_act = simcall_comm_test__get__comm(req); simgrid::mc::Remote temp_activity; const simgrid::kernel::activity::CommImpl* act; mc_model_checker->get_remote_simulation().read(temp_activity, remote(remote_act)); @@ -827,7 +842,7 @@ std::string Api::request_get_dot_output(smx_simcall_t req, int value) const if (value == -1) { 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 temp_comm; mc_model_checker->get_remote_simulation().read(temp_comm, remote(static_cast(remote_act))); @@ -844,7 +859,7 @@ std::string Api::request_get_dot_output(smx_simcall_t req, int value) const 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 temp_comm; mc_model_checker->get_remote_simulation().read(temp_comm, remote(static_cast(remote_act)));