X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e9c73ac1921d00147c2f1f1da71ca78697159d9e..a46c5fd66bc7ae999da8b278feab650c02e3adcf:/src/kernel/actor/SimcallObserver.hpp diff --git a/src/kernel/actor/SimcallObserver.hpp b/src/kernel/actor/SimcallObserver.hpp index 988075f0b4..ed9a500aac 100644 --- a/src/kernel/actor/SimcallObserver.hpp +++ b/src/kernel/actor/SimcallObserver.hpp @@ -7,6 +7,7 @@ #define SIMGRID_MC_SIMCALL_OBSERVER_HPP #include "simgrid/forward.h" +#include "src/mc/transition/Transition.hpp" #include "xbt/asserts.h" #include @@ -26,15 +27,16 @@ public: * For example, a mutex_lock is not enabled when the mutex is not free. * A comm_receive is not enabled before the corresponding send has been issued. */ - virtual bool is_enabled() const { return true; } + virtual bool is_enabled() { return true; } /** Returns the amount of time that this transition can be used. * + * If it's 0, the transition is not enabled. * If it's 1 (as with send/wait), there is no need to fork the state space exploration on this point. * If it's more than one (as with mc_random or waitany), we need to consider this transition several times to start * differing branches */ - virtual int get_max_consider() const { return 1; } + virtual int get_max_consider() { return 1; } /** Prepares the simcall to be used. * @@ -49,24 +51,22 @@ public: { /* Nothing to do by default */ } - /** We need to save the observer of simcalls as they get executed to later compute their dependencies in classical - * DPOR */ - virtual SimcallObserver* clone() = 0; - /** Computes the dependency relation */ virtual bool depends(SimcallObserver* other); + /** Serialize to the given string buffer */ + virtual void serialize(std::stringstream& stream) const; + /** Some simcalls may only be observable under some conditions. * Most simcalls are not visible from the MC because they don't have an observer at all. */ virtual bool is_visible() const { return true; } - virtual std::string to_string(int times_considered) const = 0; - virtual std::string dot_label(int times_considered) const = 0; }; template class ResultingSimcall : public SimcallObserver { T result_; public: + ResultingSimcall() = default; ResultingSimcall(ActorImpl* actor, T default_result) : SimcallObserver(actor), result_(default_result) {} void set_result(T res) { result_ = res; } T get_result() const { return result_; } @@ -82,52 +82,13 @@ public: { xbt_assert(min < max); } - SimcallObserver* clone() override - { - auto res = new RandomSimcall(get_issuer(), min_, max_); - res->next_value_ = next_value_; - return res; - } - int get_max_consider() const override; + void serialize(std::stringstream& stream) const override; + int get_max_consider() override; void prepare(int times_considered) override; - std::string to_string(int times_considered) const override; - std::string dot_label(int times_considered) const override; int get_value() const { return next_value_; } bool depends(SimcallObserver* other) override; }; -class MutexSimcall : public SimcallObserver { - activity::MutexImpl* const mutex_; - -public: - MutexSimcall(ActorImpl* actor, activity::MutexImpl* mutex) : SimcallObserver(actor), mutex_(mutex) {} - activity::MutexImpl* get_mutex() const { return mutex_; } - bool depends(SimcallObserver* other) override; -}; - -class MutexUnlockSimcall : public MutexSimcall { - using MutexSimcall::MutexSimcall; - -public: - SimcallObserver* clone() override { return new MutexUnlockSimcall(get_issuer(), get_mutex()); } - std::string to_string(int times_considered) const override; - std::string dot_label(int times_considered) const override; -}; - -class MutexLockSimcall : public MutexSimcall { - const bool blocking_; - -public: - MutexLockSimcall(ActorImpl* actor, activity::MutexImpl* mutex, bool blocking = true) - : MutexSimcall(actor, mutex), blocking_(blocking) - { - } - SimcallObserver* clone() override { return new MutexLockSimcall(get_issuer(), get_mutex(), blocking_); } - bool is_enabled() const override; - std::string to_string(int times_considered) const override; - std::string dot_label(int times_considered) const override; -}; - class ConditionWaitSimcall : public ResultingSimcall { activity::ConditionVariableImpl* const cond_; activity::MutexImpl* const mutex_; @@ -139,11 +100,8 @@ public: : ResultingSimcall(actor, false), cond_(cond), mutex_(mutex), timeout_(timeout) { } - SimcallObserver* clone() override { return new ConditionWaitSimcall(get_issuer(), cond_, mutex_, timeout_); } - bool is_enabled() const override; + bool is_enabled() override; bool is_visible() const override { return false; } - std::string to_string(int times_considered) const override; - std::string dot_label(int times_considered) const override; activity::ConditionVariableImpl* get_cond() const { return cond_; } activity::MutexImpl* get_mutex() const { return mutex_; } double get_timeout() const { return timeout_; } @@ -158,90 +116,12 @@ public: : ResultingSimcall(actor, false), sem_(sem), timeout_(timeout) { } - SimcallObserver* clone() override { return new SemAcquireSimcall(get_issuer(), sem_, timeout_); } - bool is_enabled() const override; + bool is_enabled() override; bool is_visible() const override { return false; } - std::string to_string(int times_considered) const override; - std::string dot_label(int times_considered) const override; activity::SemaphoreImpl* get_sem() const { return sem_; } double get_timeout() const { return timeout_; } }; -class ActivityTestSimcall : public ResultingSimcall { - activity::ActivityImpl* const activity_; - -public: - ActivityTestSimcall(ActorImpl* actor, activity::ActivityImpl* activity) - : ResultingSimcall(actor, true), activity_(activity) - { - } - SimcallObserver* clone() override { return new ActivityTestSimcall(get_issuer(), activity_); } - bool is_visible() const override { return true; } - std::string to_string(int times_considered) const override; - std::string dot_label(int times_considered) const override; - activity::ActivityImpl* get_activity() const { return activity_; } -}; - -class ActivityTestanySimcall : public ResultingSimcall { - const std::vector& activities_; - activity::ActivityImpl* next_activity_; - -public: - ActivityTestanySimcall(ActorImpl* actor, const std::vector& activities) - : ResultingSimcall(actor, -1), activities_(activities) - { - } - SimcallObserver* clone() override { return new ActivityTestanySimcall(get_issuer(), activities_); } - bool is_visible() const override { return true; } - int get_max_consider() const override; - void prepare(int times_considered) override; - std::string to_string(int times_considered) const override; - std::string dot_label(int times_considered) const override; - const std::vector& get_activities() const { return activities_; } - activity::ActivityImpl* get_next_activity() const { return next_activity_; } -}; - -class ActivityWaitSimcall : public ResultingSimcall { - activity::ActivityImpl* activity_; - const double timeout_; - -public: - ActivityWaitSimcall(ActorImpl* actor, activity::ActivityImpl* activity, double timeout) - : ResultingSimcall(actor, false), activity_(activity), timeout_(timeout) - { - } - SimcallObserver* clone() override { return new ActivityWaitSimcall(get_issuer(), activity_, timeout_); } - bool is_visible() const override { return true; } - bool is_enabled() const override; - std::string to_string(int times_considered) const override; - std::string dot_label(int times_considered) const override; - activity::ActivityImpl* get_activity() const { return activity_; } - void set_activity(activity::ActivityImpl* activity) { activity_ = activity; } - double get_timeout() const { return timeout_; } -}; - -class ActivityWaitanySimcall : public ResultingSimcall { - const std::vector& activities_; - activity::ActivityImpl* next_activity_; - const double timeout_; - -public: - ActivityWaitanySimcall(ActorImpl* actor, const std::vector& activities, double timeout) - : ResultingSimcall(actor, -1), activities_(activities), timeout_(timeout) - { - } - SimcallObserver* clone() override { return new ActivityWaitanySimcall(get_issuer(), activities_, timeout_); } - bool is_enabled() const override; - bool is_visible() const override { return true; } - void prepare(int times_considered) override; - int get_max_consider() const override; - std::string to_string(int times_considered) const override; - std::string dot_label(int times_considered) const override; - const std::vector& get_activities() const { return activities_; } - double get_timeout() const { return timeout_; } - activity::ActivityImpl* get_next_activity() const { return next_activity_; } -}; - } // namespace actor } // namespace kernel } // namespace simgrid