X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a1582190179181bdfaf597d7a08fefa66c996cbe..d89ca681772fdaafdd69049d4d66676a4e98de38:/src/kernel/actor/SimcallObserver.cpp diff --git a/src/kernel/actor/SimcallObserver.cpp b/src/kernel/actor/SimcallObserver.cpp index 76de9ec90c..8d13441662 100644 --- a/src/kernel/actor/SimcallObserver.cpp +++ b/src/kernel/actor/SimcallObserver.cpp @@ -169,7 +169,7 @@ int ActivityTestanySimcall::get_max_consider() const void ActivityTestanySimcall::prepare(int times_considered) { - next_value_ = times_considered + 1; + next_value_ = times_considered; } std::string ActivityTestanySimcall::to_string(int times_considered) const @@ -195,6 +195,48 @@ std::string ActivityTestanySimcall::dot_label(int times_considered) const return res; } +bool ActivityTestSimcall::depends(SimcallObserver* other) +{ + if (get_issuer() == other->get_issuer()) + return false; + + if (dynamic_cast(other)) + return true; + + auto* comm1 = dynamic_cast(activity_); + if (comm1 == nullptr) + return false; + + if (dynamic_cast(other) != nullptr && + (comm1->src_actor_.get() == nullptr || comm1->dst_actor_.get() == nullptr)) + return false; + + if (comm1->src_buff_ == nullptr || comm1->dst_buff_ == nullptr) + return false; + + if (auto* test = dynamic_cast(other)) { + auto* comm2 = dynamic_cast(test->get_activity()); + if (comm2 == nullptr) + return false; + else if (comm2->src_buff_ == nullptr || comm2->dst_buff_ == nullptr) + return false; + } + + if (auto* wait = dynamic_cast(other)) { + auto* comm2 = dynamic_cast(wait->get_activity()); + if (comm2 == nullptr) + return false; + 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; +} + std::string ActivityTestSimcall::to_string(int times_considered) const { std::string res = SimcallObserver::to_string(times_considered) + "Test "; @@ -215,7 +257,8 @@ std::string ActivityTestSimcall::to_string(int times_considered) const "-> " + xbt::string_printf("(%ld)%s (%s)])", dst->get_pid(), dst->get_host()->get_cname(), dst->get_cname()); } - } + } else + xbt_die("Only Comms are supported here for now"); return res; } @@ -231,12 +274,60 @@ std::string ActivityTestSimcall::dot_label(int times_considered) const return res; } +bool ActivityWaitSimcall::is_enabled() const +{ + /* FIXME: check also that src and dst processes are not suspended */ + const auto* comm = dynamic_cast(activity_); + if (comm == nullptr) + xbt_die("Only Comms are supported here for now"); + + if (comm->src_timeout_ || comm->dst_timeout_) { + /* If it has a timeout it will be always be enabled (regardless of who declared the timeout), + * because even if the communication is not ready, it can timeout and won't block. */ + if (_sg_mc_timeout == 1) + return true; + } + /* On the other hand if it hasn't a timeout, check if the comm is ready.*/ + else if (comm->detached() && comm->src_actor_ == nullptr && comm->get_state() == activity::State::READY) + return (comm->dst_actor_ != nullptr); + return (comm->src_actor_ && comm->dst_actor_); +} + +bool ActivityWaitSimcall::depends(SimcallObserver* other) +{ + if (get_issuer() == other->get_issuer()) + return false; + + /* Timeouts in wait transitions are not considered by the independence theorem, thus assumed dependent */ + if (auto* wait = dynamic_cast(other)) { + if (timeout_ > 0 || wait->get_timeout() > 0) + return true; + auto* comm1 = dynamic_cast(activity_); + auto* comm2 = dynamic_cast(wait->get_activity()); + + if (comm1 == nullptr || comm2 == nullptr) // One wait at least in not on a Comm + return true; + + 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; +} + std::string ActivityWaitSimcall::to_string(int times_considered) const { std::string res = SimcallObserver::to_string(times_considered); auto* comm = dynamic_cast(activity_); - if (comm == nullptr) + if (comm == nullptr) { + res += "ActivityWait on non-Comm (FIXME)"; // FIXME return res; + } + if (times_considered == -1) { res += "WaitTimeout(comm=" + (XBT_LOG_ISENABLED(mc_observer, xbt_log_priority_verbose) ? xbt::string_printf("%p)", comm) @@ -265,17 +356,24 @@ std::string ActivityWaitSimcall::dot_label(int times_considered) const auto dst = comm->dst_actor_; res += " [(" + std::to_string(src ? src->get_pid() : 0) + ")"; res += "->(" + std::to_string(dst ? dst->get_pid() : 0) + ")]"; - } + } else + xbt_die("Only Comms are supported here for now"); return res; } -bool ActivityWaitSimcall::is_enabled() const +std::string ActivityWaitanySimcall::dot_label(int times_considered) const { - /* FIXME: check also that src and dst processes are not suspended */ - const auto* comm = dynamic_cast(activity_); - if (comm == nullptr) - return true; + return SimcallObserver::dot_label(times_considered) + + xbt::string_printf("WaitAny [%d of %zu]", times_considered + 1, activities_.size()); +} +bool ActivityWaitanySimcall::is_enabled() const +{ + // FIXME: deal with other kind of activities (Exec and I/Os) + // FIXME: Can be factored with ActivityWaitSimcall::is_enabled() + const auto* comm = dynamic_cast(activities_[next_value_]); + if (comm == nullptr) + xbt_die("Only Comms are supported here for now"); if (comm->src_timeout_ || comm->dst_timeout_) { /* If it has a timeout it will be always be enabled (regardless of who declared the timeout), * because even if the communication is not ready, it can timeout and won't block. */ @@ -288,37 +386,14 @@ bool ActivityWaitSimcall::is_enabled() const return (comm->src_actor_ && comm->dst_actor_); } -std::string ActivityWaitanySimcall::dot_label(int times_considered) const -{ - return SimcallObserver::dot_label(times_considered) + - xbt::string_printf("WaitAny [%d of %zu]", times_considered + 1, activities_.size()); -} - -bool ActivityWaitanySimcall::is_enabled() const -{ - // FIXME: deal with other kind of activities (Exec and I/Os) - for (auto act : activities_) { - const auto* comm = dynamic_cast(act); - if (comm != nullptr && comm->src_actor_ && comm->dst_actor_) - return true; - } - return false; -} - int ActivityWaitanySimcall::get_max_consider() const { - // Only Comms are of interest to MC for now. When all types of activities can be consider, this function can simply - // return the size of activities_. - int count = 0; - for (const auto& act : activities_) - if (dynamic_cast(act) != nullptr) - count++; - return count; + return static_cast(activities_.size()); } void ActivityWaitanySimcall::prepare(int times_considered) { - next_value_ = times_considered + 1; + next_value_ = times_considered; } std::string ActivityWaitanySimcall::to_string(int times_considered) const @@ -331,11 +406,119 @@ std::string ActivityWaitanySimcall::to_string(int times_considered) const (XBT_LOG_ISENABLED(mc_observer, xbt_log_priority_verbose) ? xbt::string_printf("%p", comm) : "(verbose only)") + xbt::string_printf("(%d of %zu))", times_considered + 1, count); + else + xbt_die("Only Comms are supported here for now"); } else res += "comm at idx " + std::to_string(times_considered) + ")"; return res; } +bool CommIsendSimcall::depends(SimcallObserver* other) +{ + if (get_issuer() == other->get_issuer()) + return false; + + if (auto* other_isend = dynamic_cast(other)) + return mbox_ == other_isend->get_mailbox(); + + // FIXME: Not in the former dependency check because of the ordering but seems logical to add it + if (dynamic_cast(other) != nullptr) + return false; + +#if SIMGRID_HAVE_MC // FIXME needed to access mbox_cpy + if (auto* wait = dynamic_cast(other)) { + if (auto* comm2 = dynamic_cast(wait->get_activity())) { // this is a Comm::wait_for + auto* mbox1 = mbox_; + auto* mbox2 = comm2->mbox_cpy; + + if (mbox1 != mbox2 && wait->get_timeout() <= 0) + return false; + + if ((get_issuer() != comm2->src_actor_.get()) && (get_issuer() != comm2->dst_actor_.get()) && + wait->get_timeout() <= 0) + return false; + + if (comm2->type_ == activity::CommImpl::Type::SEND && comm2->src_buff_ != src_buff_ && wait->get_timeout() <= 0) + return false; + } + } +#endif + /* 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 (dynamic_cast(other)) + return false; +#endif + + return true; +} + +std::string CommIsendSimcall::to_string(int times_considered) const +{ + std::string res = SimcallObserver::to_string(times_considered) + "iSend("; + res += xbt::string_printf("src=[(%ld)%s (%s)]", get_issuer()->get_pid(), get_issuer()->get_host()->get_cname(), + get_issuer()->get_cname()); + res += XBT_LOG_ISENABLED(mc_observer, xbt_log_priority_verbose) ? xbt::string_printf(", buff=%p", src_buff_) + : "(verbose only)"; + res += ", size=" + + (XBT_LOG_ISENABLED(mc_observer, xbt_log_priority_verbose) ? std::to_string(src_buff_size_) : "(verbose only)"); + res += ")"; + return res; +} + +bool CommIrecvSimcall::depends(SimcallObserver* other) +{ + if (get_issuer() == other->get_issuer()) + return false; + + if (auto* other_irecv = dynamic_cast(other)) + return mbox_ == other_irecv->get_mailbox(); + + if (dynamic_cast(other) != nullptr) + return false; + +#if SIMGRID_HAVE_MC // FIXME needed to access mbox_cpy + if (auto* wait = dynamic_cast(other)) { + if (auto* comm2 = dynamic_cast(wait->get_activity())) { // this is a Comm::wait_for + auto* mbox1 = mbox_; + auto* mbox2 = comm2->mbox_cpy; + + if (mbox1 != mbox2 && wait->get_timeout() <= 0) + return false; + + if ((get_issuer() != comm2->src_actor_.get()) && (get_issuer() != comm2->dst_actor_.get()) && + wait->get_timeout() <= 0) + return false; + + if (comm2->type_ == activity::CommImpl::Type::RECEIVE && comm2->dst_buff_ != dst_buff_ && + wait->get_timeout() <= 0) + return false; + } + } +#endif + /* 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 (dynamic_cast(other)) + return false; +#endif + + return true; +} + +std::string CommIrecvSimcall::to_string(int times_considered) const +{ + std::string res = SimcallObserver::to_string(times_considered) + "iRecv("; + res += xbt::string_printf("dst=[(%ld)%s (%s)]", get_issuer()->get_pid(), get_issuer()->get_host()->get_cname(), + get_issuer()->get_cname()); + res += XBT_LOG_ISENABLED(mc_observer, xbt_log_priority_verbose) ? xbt::string_printf(", buff=%p", dst_buff_) + : "(verbose only)"; + res += ", size=" + (XBT_LOG_ISENABLED(mc_observer, xbt_log_priority_verbose) ? std::to_string(*dst_buff_size_) + : "(verbose only)"); + res += ")"; + return res; +} + } // namespace actor } // namespace kernel } // namespace simgrid