X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/00b5e6bff7b5ddc1d2830e1d1c39e1b192502464..5843ccab4e336d47ca34f54e68760ac78d242f36:/src/kernel/actor/SimcallObserver.cpp?ds=sidebyside diff --git a/src/kernel/actor/SimcallObserver.cpp b/src/kernel/actor/SimcallObserver.cpp index 569eca1212..3bd6ab97f1 100644 --- a/src/kernel/actor/SimcallObserver.cpp +++ b/src/kernel/actor/SimcallObserver.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2019-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2019-2023. 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. */ @@ -15,46 +15,16 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_observer, mc, "Logging specific to MC simcall observation"); -namespace simgrid { -namespace kernel { -namespace actor { +namespace simgrid::kernel::actor { -bool SimcallObserver::depends(SimcallObserver* other) +void RandomSimcall::serialize(std::stringstream& stream) const { - THROW_UNIMPLEMENTED; -} -/* Random is only dependent when issued by the same actor (ie, always independent) */ -bool RandomSimcall::depends(SimcallObserver* other) -{ - return get_issuer() == other->get_issuer(); -} -void RandomSimcall::serialize(mc::Transition::Type& type, std::stringstream& stream) -{ - type = mc::Transition::Type::RANDOM; + stream << (short)mc::Transition::Type::RANDOM << ' '; stream << min_ << ' ' << max_; } - -bool MutexSimcall::depends(SimcallObserver* other) +std::string RandomSimcall::to_string() const { - if (dynamic_cast(other) != nullptr) - return other->depends(this); /* Other is random, that is very permissive. Use that relation instead. */ - -#if 0 /* This code is currently broken and shouldn't be used. We must implement asynchronous locks before */ - MutexSimcall* that = dynamic_cast(other); - if (that == nullptr) - return true; // Depends on anything we don't know - - /* Theorem 4.4.7: Any pair of synchronization actions of distinct actors concerning distinct mutexes are independent */ - if (this->get_issuer() != that->get_issuer() && this->get_mutex() != that->get_mutex()) - return false; - - /* Theorem 4.4.8 An AsyncMutexLock is independent with a MutexUnlock of another actor */ - if (((dynamic_cast(this) != nullptr && dynamic_cast(that)) || - (dynamic_cast(that) != nullptr && dynamic_cast(this))) && - get_issuer() != other->get_issuer()) - return false; -#endif - return true; // Depend on things we don't know for sure that they are independent + return "Random(min:" + std::to_string(min_) + " max:" + std::to_string(max_) + ")"; } void RandomSimcall::prepare(int times_considered) @@ -68,157 +38,68 @@ int RandomSimcall::get_max_consider() const return max_ - min_ + 1; } -/* -std::string MutexLockSimcall::to_string(int times_considered) const -{ - auto mutex = get_mutex(); - std::string res = SimcallObserver::to_string(times_considered) + (blocking_ ? "Mutex LOCK" : "Mutex TRYLOCK"); - res += "(locked = " + std::to_string(mutex->is_locked()); - res += ", owner = " + std::to_string(mutex->get_owner() ? mutex->get_owner()->get_pid() : -1); - res += ", sleeping = n/a)"; - return res; -}*/ - -bool MutexLockSimcall::is_enabled() const +bool ConditionWaitSimcall::is_enabled() { - return not blocking_ || get_mutex()->get_owner() == nullptr || get_mutex()->get_owner() == get_issuer(); -} - -bool ConditionWaitSimcall::is_enabled() const -{ - static bool warned = false; - if (not warned) { + if (static bool warned = false; not warned) { XBT_INFO("Using condition variables in model-checked code is still experimental. Use at your own risk"); warned = true; } return true; } - -bool SemAcquireSimcall::is_enabled() const +void ConditionWaitSimcall::serialize(std::stringstream& stream) const { - static bool warned = false; - if (not warned) { - XBT_INFO("Using semaphore in model-checked code is still experimental. Use at your own risk"); - warned = true; - } - return true; + THROW_UNIMPLEMENTED; } - -int ActivityTestanySimcall::get_max_consider() const +std::string ConditionWaitSimcall::to_string() 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 "ConditionWait(cond_id:" + ptr_to_id(get_cond()) + + " mutex_id:" + std::to_string(get_mutex()->get_id()) + ")"; } -void ActivityTestanySimcall::prepare(int times_considered) +ActorJoinSimcall::ActorJoinSimcall(ActorImpl* actor, ActorImpl* other, double timeout) + : SimcallObserver(actor), other_(s4u::ActorPtr(other->get_iface())), timeout_(timeout) { - next_value_ = times_considered; } - -/* -std::string ActivityTestanySimcall::to_string(int times_considered) const -{ - std::string res = SimcallObserver::to_string(times_considered); - if (times_considered == -1) { - res += "TestAny FALSE(-)"; - } else { - res += "TestAny(" + xbt::string_printf("(%d of %zu)", times_considered + 1, activities_.size()); - } - - return res; -}*/ -void ActivityWaitSimcall::serialize(mc::Transition::Type& type, std::stringstream& stream) -{ - if (auto* comm = dynamic_cast(activity_)) { - type = mc::Transition::Type::COMM_WAIT; - stream << (timeout_ > 0) << ' ' << comm; - stream << ' ' << (comm->src_actor_ != nullptr ? comm->src_actor_->get_pid() : -1); - stream << ' ' << (comm->dst_actor_ != nullptr ? comm->dst_actor_->get_pid() : -1); - stream << ' ' << comm->get_mailbox_id(); - stream << ' ' << (void*)comm->src_buff_ << ' ' << (void*)comm->dst_buff_ << ' ' << comm->src_buff_size_; - } else { - type = mc::Transition::Type::UNKNOWN; - } +bool ActorJoinSimcall::is_enabled() +{ + return other_->get_impl()->wannadie(); } -void ActivityTestSimcall::serialize(mc::Transition::Type& type, std::stringstream& stream) +void ActorJoinSimcall::serialize(std::stringstream& stream) const { - if (auto* comm = dynamic_cast(activity_)) { - type = mc::Transition::Type::COMM_TEST; - stream << ' ' << (comm->src_actor_ != nullptr ? comm->src_actor_->get_pid() : -1); - stream << ' ' << (comm->dst_actor_ != nullptr ? comm->dst_actor_->get_pid() : -1); - stream << ' ' << comm->get_mailbox_id(); - stream << ' ' << (void*)comm->src_buff_ << ' ' << (void*)comm->dst_buff_ << ' ' << comm->src_buff_size_; - } else { - type = mc::Transition::Type::UNKNOWN; - } + stream << (short)mc::Transition::Type::ACTOR_JOIN << ' '; + stream << other_->get_pid() << ' ' << (timeout_ > 0); } - -bool ActivityWaitSimcall::is_enabled() const +std::string ActorJoinSimcall::to_string() 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_); + return "ActorJoin(pid:" + std::to_string(other_->get_pid()) + ")"; } - -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. */ - 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_); +void ActorSleepSimcall::serialize(std::stringstream& stream) const +{ + stream << (short)mc::Transition::Type::ACTOR_SLEEP; } -int ActivityWaitanySimcall::get_max_consider() const +std::string ActorSleepSimcall::to_string() const { - return static_cast(activities_.size()); + return "ActorSleep()"; } -void ActivityWaitanySimcall::prepare(int times_considered) +void ObjectAccessSimcallObserver::serialize(std::stringstream& stream) const { - next_value_ = times_considered; + stream << (short)mc::Transition::Type::OBJECT_ACCESS << ' '; + stream << object_ << ' ' << get_owner()->get_pid(); } - -void CommIsendSimcall::serialize(mc::Transition::Type& type, std::stringstream& stream) +std::string ObjectAccessSimcallObserver::to_string() const { - type = mc::Transition::Type::COMM_SEND; - stream << mbox_->get_id() << ' ' << (void*)src_buff_ << ' ' << src_buff_size_; - XBT_DEBUG("SendObserver mbox:%u buff:%p size:%zu", mbox_->get_id(), src_buff_, src_buff_size_); + return "ObjectAccess(obj:" + ptr_to_id(object_) + + " owner:" + std::to_string(get_owner()->get_pid()) + ")"; } - -void CommIrecvSimcall::serialize(mc::Transition::Type& type, std::stringstream& stream) +bool ObjectAccessSimcallObserver::is_visible() const +{ + return get_owner() != get_issuer(); +} +ActorImpl* ObjectAccessSimcallObserver::get_owner() const { - type = mc::Transition::Type::COMM_RECV; - stream << mbox_->get_id() << dst_buff_; + return object_->simcall_owner_; } -} // namespace actor -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel::actor