Move the conditionVariable observer to the right file

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

diff --git a/src/kernel/actor/SimcallObserver.cpp b/src/kernel/actor/SimcallObserver.cpp
index 0246d5a..d7657a4 100644 (file)
--- 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. */
@@ -7,6 +7,7 @@
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
 #include "src/kernel/activity/MailboxImpl.hpp"
+#include "src/kernel/activity/MutexImpl.hpp"
 #include "src/kernel/actor/ActorImpl.hpp"
 #include "src/mc/mc_config.hpp"
 
@@ -23,7 +24,7 @@ void RandomSimcall::serialize(std::stringstream& stream) const
 }
 std::string RandomSimcall::to_string() const
 {
-  return std::string("Random(min:") + std::to_string(min_) + " max:" + std::to_string(max_) + ")";
+  return "Random(min:" + std::to_string(min_) + " max:" + std::to_string(max_) + ")";
 }
 
 void RandomSimcall::prepare(int times_considered)
@@ -37,23 +38,6 @@ int RandomSimcall::get_max_consider() const
   return max_ - min_ + 1;
 }
 
-bool ConditionWaitSimcall::is_enabled()
-{
-  if (static bool warned = false; not warned) {
-    XBT_INFO("Using condition variables in model-checked code is still experimental. Use at your own risk");
-    warned = true;
-  }
-  return true;
-}
-void ConditionWaitSimcall::serialize(std::stringstream& stream) const
-{
-  THROW_UNIMPLEMENTED;
-}
-std::string ConditionWaitSimcall::to_string() const
-{
-  THROW_UNIMPLEMENTED;
-}
-
 ActorJoinSimcall::ActorJoinSimcall(ActorImpl* actor, ActorImpl* other, double timeout)
     : SimcallObserver(actor), other_(s4u::ActorPtr(other->get_iface())), timeout_(timeout)
 {
@@ -69,7 +53,16 @@ void ActorJoinSimcall::serialize(std::stringstream& stream) const
 }
 std::string ActorJoinSimcall::to_string() const
 {
-  return std::string("ActorJoin(pid:") + std::to_string(other_->get_pid()) + ")";
+  return "ActorJoin(pid:" + std::to_string(other_->get_pid()) + ")";
+}
+void ActorSleepSimcall::serialize(std::stringstream& stream) const
+{
+  stream << (short)mc::Transition::Type::ACTOR_SLEEP;
+}
+
+std::string ActorSleepSimcall::to_string() const
+{
+  return "ActorSleep()";
 }
 
 void ObjectAccessSimcallObserver::serialize(std::stringstream& stream) const
@@ -79,7 +72,7 @@ void ObjectAccessSimcallObserver::serialize(std::stringstream& stream) const
 }
 std::string ObjectAccessSimcallObserver::to_string() const
 {
-  return std::string("ObjectAccess(obj:") + ptr_to_id<ObjectAccessSimcallItem const>(object_) +
+  return "ObjectAccess(obj:" + ptr_to_id<ObjectAccessSimcallItem const>(object_) +
          " owner:" + std::to_string(get_owner()->get_pid()) + ")";
 }
 bool ObjectAccessSimcallObserver::is_visible() const