X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d9a39dd49d59d7ef3a66727056ab3725e1ebcefc..8d0b1f2f1840a16bb9551f1cfd74f2488599f95b:/src/kernel/actor/SimcallObserver.cpp

diff --git a/src/kernel/actor/SimcallObserver.cpp b/src/kernel/actor/SimcallObserver.cpp
index 3809e1a14f..d7657a4bcd 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,50 +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 {
 
-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 << ' ';
   stream << min_ << ' ' << max_;
 }
-
-bool MutexSimcall::depends(SimcallObserver* other)
+std::string RandomSimcall::to_string() const
 {
-  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
+  return "Random(min:" + std::to_string(min_) + " max:" + std::to_string(max_) + ")";
 }
 
 void RandomSimcall::prepare(int times_considered)
@@ -67,47 +33,55 @@ void RandomSimcall::prepare(int times_considered)
   XBT_DEBUG("MC_RANDOM(%d, %d) will return %d after %d times", min_, max_, next_value_, times_considered);
 }
 
-int RandomSimcall::get_max_consider()
+int RandomSimcall::get_max_consider() const
 {
   return max_ - min_ + 1;
 }
 
-/*
-std::string MutexLockSimcall::to_string(int times_considered) const
+ActorJoinSimcall::ActorJoinSimcall(ActorImpl* actor, ActorImpl* other, double timeout)
+    : SimcallObserver(actor), other_(s4u::ActorPtr(other->get_iface())), timeout_(timeout)
 {
-  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()
+}
+bool ActorJoinSimcall::is_enabled()
 {
-  return not blocking_ || get_mutex()->get_owner() == nullptr || get_mutex()->get_owner() == get_issuer();
+  return other_->get_impl()->wannadie();
+}
+void ActorJoinSimcall::serialize(std::stringstream& stream) const
+{
+  stream << (short)mc::Transition::Type::ACTOR_JOIN << ' ';
+  stream << other_->get_pid() << ' ' << (timeout_ > 0);
+}
+std::string ActorJoinSimcall::to_string() const
+{
+  return "ActorJoin(pid:" + std::to_string(other_->get_pid()) + ")";
+}
+void ActorSleepSimcall::serialize(std::stringstream& stream) const
+{
+  stream << (short)mc::Transition::Type::ACTOR_SLEEP;
 }
 
-bool ConditionWaitSimcall::is_enabled()
+std::string ActorSleepSimcall::to_string() const
 {
-  static bool warned = false;
-  if (not warned) {
-    XBT_INFO("Using condition variables in model-checked code is still experimental. Use at your own risk");
-    warned = true;
-  }
-  return true;
+  return "ActorSleep()";
 }
 
-bool SemAcquireSimcall::is_enabled()
+void ObjectAccessSimcallObserver::serialize(std::stringstream& stream) const
+{
+  stream << (short)mc::Transition::Type::OBJECT_ACCESS << ' ';
+  stream << object_ << ' ' << get_owner()->get_pid();
+}
+std::string ObjectAccessSimcallObserver::to_string() const
+{
+  return "ObjectAccess(obj:" + ptr_to_id<ObjectAccessSimcallItem const>(object_) +
+         " owner:" + std::to_string(get_owner()->get_pid()) + ")";
+}
+bool ObjectAccessSimcallObserver::is_visible() const
+{
+  return get_owner() != get_issuer();
+}
+ActorImpl* ObjectAccessSimcallObserver::get_owner() 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;
+  return object_->simcall_owner_;
 }
 
-} // namespace actor
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::actor