MC: add a clone() method to all Observers

[simgrid.git] / src / kernel / actor / SimcallObserver.hpp

diff --git a/src/kernel/actor/SimcallObserver.hpp b/src/kernel/actor/SimcallObserver.hpp
index 3410c56..f2fea44 100644 (file)
--- a/src/kernel/actor/SimcallObserver.hpp
+++ b/src/kernel/actor/SimcallObserver.hpp
@@ -48,6 +48,8 @@ public:
   { /* Nothing to do by default */
   }
 
+  virtual SimcallObserver* clone() = 0;
+
   /** Some simcalls may only be observable under some circumstances.
    * Most simcalls are not visible from the MC because they don't have an observer at all. */
   virtual bool is_visible() const { return true; }
@@ -55,6 +57,15 @@ public:
   virtual std::string dot_label() const                     = 0;
 };
 
+template <class T> class ResultingSimcall : public SimcallObserver {
+  T result_;
+
+public:
+  ResultingSimcall(smx_actor_t actor, T default_result) : SimcallObserver(actor), result_(default_result) {}
+  void set_result(T res) { result_ = res; }
+  T get_result() const { return result_; }
+};
+
 class RandomSimcall : public SimcallObserver {
   const int min_;
   const int max_;
@@ -67,12 +78,19 @@ public:
   std::string to_string(int times_considered) const override;
   std::string dot_label() const override;
   int get_value() const { return next_value_; }
+  SimcallObserver* clone() override
+  {
+    auto res         = new RandomSimcall(get_issuer(), min_, max_);
+    res->next_value_ = next_value_;
+    return res;
+  }
 };
 
 class MutexUnlockSimcall : public SimcallObserver {
   using SimcallObserver::SimcallObserver;
 
 public:
+  SimcallObserver* clone() override { return new MutexUnlockSimcall(get_issuer()); }
   std::string to_string(int times_considered) const override;
   std::string dot_label() const override;
 };
@@ -86,28 +104,25 @@ public:
       : SimcallObserver(actor), mutex_(mutex), blocking_(blocking)
   {
   }
+  SimcallObserver* clone() override { return new MutexLockSimcall(get_issuer(), mutex_, blocking_); }
   bool is_enabled() const override;
   std::string to_string(int times_considered) const override;
   std::string dot_label() const override;
   activity::MutexImpl* get_mutex() const { return mutex_; }
 };
 
-class ConditionWaitSimcall : public SimcallObserver {
-  friend activity::ConditionVariableImpl;
-
+class ConditionWaitSimcall : public ResultingSimcall<bool> {
   activity::ConditionVariableImpl* const cond_;
   activity::MutexImpl* const mutex_;
   const double timeout_;
-  bool result_ = false; // default result for simcall, will be set to 'true' on timeout
-
-  void set_result(bool res) { result_ = res; }
 
 public:
   ConditionWaitSimcall(smx_actor_t actor, activity::ConditionVariableImpl* cond, activity::MutexImpl* mutex,
                        double timeout = -1.0)
-      : SimcallObserver(actor), cond_(cond), mutex_(mutex), timeout_(timeout)
+      : 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_visible() const override { return false; }
   std::string to_string(int times_considered) const override;
@@ -115,55 +130,75 @@ public:
   activity::ConditionVariableImpl* get_cond() const { return cond_; }
   activity::MutexImpl* get_mutex() const { return mutex_; }
   double get_timeout() const { return timeout_; }
-
-  bool get_result() const { return result_; }
 };
 
-class SemAcquireSimcall : public SimcallObserver {
-  friend activity::SemaphoreImpl;
-
+class SemAcquireSimcall : public ResultingSimcall<bool> {
   activity::SemaphoreImpl* const sem_;
   const double timeout_;
-  bool result_ = false; // default result for simcall, will be set to 'true' on timeout
-
-  void set_result(bool res) { result_ = res; }
 
 public:
   SemAcquireSimcall(smx_actor_t actor, activity::SemaphoreImpl* sem, double timeout = -1.0)
-      : SimcallObserver(actor), sem_(sem), timeout_(timeout)
+      : ResultingSimcall(actor, false), sem_(sem), timeout_(timeout)
   {
   }
+  SimcallObserver* clone() override { return new SemAcquireSimcall(get_issuer(), sem_, timeout_); }
   bool is_enabled() const override;
   bool is_visible() const override { return false; }
   std::string to_string(int times_considered) const override;
   std::string dot_label() const override;
   activity::SemaphoreImpl* get_sem() const { return sem_; }
   double get_timeout() const { return timeout_; }
-
-  bool get_result() const { return result_; }
 };
 
-class ExecutionWaitanySimcall : public SimcallObserver {
-  friend activity::ExecImpl;
+class ActivityWaitSimcall : public ResultingSimcall<bool> {
+  activity::ActivityImpl* const activity_;
+  const double timeout_;
+
+public:
+  ActivityWaitSimcall(smx_actor_t 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 false; }
+  std::string to_string(int times_considered) const override { return SimcallObserver::to_string(times_considered); }
+  std::string dot_label() const override { return SimcallObserver::dot_label(); }
+  activity::ActivityImpl* get_activity() const { return activity_; }
+  double get_timeout() const { return timeout_; }
+};
 
+class ExecutionWaitanySimcall : public ResultingSimcall<int> {
   const std::vector<activity::ExecImpl*>& execs_;
   const double timeout_;
-  int result_ = -1; // default result for simcall
-
-  void set_result(int res) { result_ = res; }
 
 public:
   ExecutionWaitanySimcall(smx_actor_t actor, const std::vector<activity::ExecImpl*>& execs, double timeout)
-      : SimcallObserver(actor), execs_(execs), timeout_(timeout)
+      : ResultingSimcall(actor, -1), execs_(execs), timeout_(timeout)
   {
   }
+  SimcallObserver* clone() override { return new ExecutionWaitanySimcall(get_issuer(), execs_, timeout_); }
   bool is_visible() const override { return false; }
   std::string to_string(int times_considered) const override;
   std::string dot_label() const override;
   const std::vector<activity::ExecImpl*>& get_execs() const { return execs_; }
   double get_timeout() const { return timeout_; }
+};
+
+class IoWaitanySimcall : public ResultingSimcall<int> {
+  const std::vector<activity::IoImpl*>& ios_;
+  const double timeout_;
 
-  int get_result() const { return result_; }
+public:
+  IoWaitanySimcall(smx_actor_t actor, const std::vector<activity::IoImpl*>& ios, double timeout)
+      : ResultingSimcall(actor, -1), ios_(ios), timeout_(timeout)
+  {
+  }
+  SimcallObserver* clone() override { return new IoWaitanySimcall(get_issuer(), ios_, timeout_); }
+  bool is_visible() const override { return false; }
+  std::string to_string(int times_considered) const override;
+  std::string dot_label() const override;
+  const std::vector<activity::IoImpl*>& get_ios() const { return ios_; }
+  double get_timeout() const { return timeout_; }
 };
 } // namespace actor
 } // namespace kernel