Semaphore made observable from the Checker side

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

diff --git a/src/kernel/actor/SimcallObserver.hpp b/src/kernel/actor/SimcallObserver.hpp
index 0bba980..7be562c 100644 (file)
--- a/src/kernel/actor/SimcallObserver.hpp
+++ b/src/kernel/actor/SimcallObserver.hpp
@@ -51,9 +51,6 @@ public:
   { /* Nothing to do by default */
   }
 
-  /** Computes the dependency relation */
-  virtual bool depends(SimcallObserver* other);
-
   /** Serialize to the given string buffer */
   virtual void serialize(std::stringstream& stream) const;
 
@@ -86,31 +83,6 @@ public:
   int get_max_consider() override;
   void prepare(int times_considered) 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;
-};
-
-class MutexLockSimcall : public MutexSimcall {
-  const bool blocking_;
-
-public:
-  MutexLockSimcall(ActorImpl* actor, activity::MutexImpl* mutex, bool blocking = true)
-      : MutexSimcall(actor, mutex), blocking_(blocking)
-  {
-  }
-  bool is_enabled() override;
 };
 
 class ConditionWaitSimcall : public ResultingSimcall<bool> {
@@ -131,21 +103,6 @@ public:
   double get_timeout() const { return timeout_; }
 };
 
-class SemAcquireSimcall : public ResultingSimcall<bool> {
-  activity::SemaphoreImpl* const sem_;
-  const double timeout_;
-
-public:
-  SemAcquireSimcall(ActorImpl* actor, activity::SemaphoreImpl* sem, double timeout = -1.0)
-      : ResultingSimcall(actor, false), sem_(sem), timeout_(timeout)
-  {
-  }
-  bool is_enabled() override;
-  bool is_visible() const override { return false; }
-  activity::SemaphoreImpl* get_sem() const { return sem_; }
-  double get_timeout() const { return timeout_; }
-};
-
 } // namespace actor
 } // namespace kernel
 } // namespace simgrid