MC: no need for a depends() method in Observers

These things are on the checker side now

diff --git a/src/kernel/actor/MutexObserver.cpp b/src/kernel/actor/MutexObserver.cpp
index 763ab54..33be57d 100644 (file)
--- a/src/kernel/actor/MutexObserver.cpp
+++ b/src/kernel/actor/MutexObserver.cpp
@@ -17,31 +17,6 @@ namespace simgrid {
 namespace kernel {
 namespace actor {
 
-#if 0
-bool MutexSimcall::depends(SimcallObserver* other)
-{
-  if (dynamic_cast<RandomSimcall*>(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<MutexSimcall*>(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<MutexLockSimcall*>(this) != nullptr && dynamic_cast<MutexUnlockSimcall*>(that)) ||
-       (dynamic_cast<MutexLockSimcall*>(that) != nullptr && dynamic_cast<MutexUnlockSimcall*>(this))) &&
-      get_issuer() != other->get_issuer())
-    return false;
-#endif
-  return true; // Depend on things we don't know for sure that they are independent
-}
-#endif
-
 MutexObserver::MutexObserver(ActorImpl* actor, mc::Transition::Type type, activity::MutexImpl* mutex)
     : SimcallObserver(actor), type_(type), mutex_(mutex)
 {

diff --git a/src/kernel/actor/SimcallObserver.cpp b/src/kernel/actor/SimcallObserver.cpp
index 80d8326..11c5330 100644 (file)
--- a/src/kernel/actor/SimcallObserver.cpp
+++ b/src/kernel/actor/SimcallObserver.cpp
@@ -22,15 +22,6 @@ void SimcallObserver::serialize(std::stringstream& stream) const
 {
   stream << (short)mc::Transition::Type::UNKNOWN;
 }
-bool SimcallObserver::depends(SimcallObserver* other)
-{
-  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(std::stringstream& stream) const
 {
   stream << (short)mc::Transition::Type::RANDOM << ' ';

diff --git a/src/kernel/actor/SimcallObserver.hpp b/src/kernel/actor/SimcallObserver.hpp
index ed9a500..54a3184 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,7 +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 ConditionWaitSimcall : public ResultingSimcall<bool> {