Various sonar cleanups

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

diff --git a/src/kernel/actor/SimcallObserver.hpp b/src/kernel/actor/SimcallObserver.hpp
index 1dfc713..de3f4fc 100644 (file)
--- a/src/kernel/actor/SimcallObserver.hpp
+++ b/src/kernel/actor/SimcallObserver.hpp
@@ -85,7 +85,7 @@ class RandomSimcall final : public SimcallObserver {
 public:
   RandomSimcall(ActorImpl* actor, int min, int max) : SimcallObserver(actor), min_(min), max_(max)
   {
-    xbt_assert(min < max);
+    xbt_assert(min <= max);
   }
   void serialize(std::stringstream& stream) const override;
   std::string to_string() const override;
@@ -94,37 +94,26 @@ public:
   int get_value() const { return next_value_; }
 };
 
-class ConditionWaitSimcall final : public ResultingSimcall<bool> {
-  activity::ConditionVariableImpl* const cond_;
-  activity::MutexImpl* const mutex_;
+class ActorJoinSimcall final : public SimcallObserver {
+  s4u::ActorPtr const other_; // We need a Ptr to ensure access to the actor after its end, but Ptr requires s4u
   const double timeout_;
 
 public:
-  ConditionWaitSimcall(ActorImpl* actor, activity::ConditionVariableImpl* cond, activity::MutexImpl* mutex,
-                       double timeout = -1.0)
-      : ResultingSimcall(actor, false), cond_(cond), mutex_(mutex), timeout_(timeout)
-  {
-  }
+  ActorJoinSimcall(ActorImpl* actor, ActorImpl* other, double timeout = -1.0);
   void serialize(std::stringstream& stream) const override;
   std::string to_string() const override;
   bool is_enabled() override;
-  activity::ConditionVariableImpl* get_cond() const { return cond_; }
-  activity::MutexImpl* get_mutex() const { return mutex_; }
+
+  s4u::ActorPtr get_other_actor() const { return other_; }
   double get_timeout() const { return timeout_; }
 };
 
-class ActorJoinSimcall final : public SimcallObserver {
-  s4u::ActorPtr const other_; // We need a Ptr to ensure access to the actor after its end, but Ptr requires s4u
-  const double timeout_;
+class ActorSleepSimcall final : public SimcallObserver {
 
 public:
-  ActorJoinSimcall(ActorImpl* actor, ActorImpl* other, double timeout = -1.0);
+  explicit ActorSleepSimcall(ActorImpl* actor) : SimcallObserver(actor) {}
   void serialize(std::stringstream& stream) const override;
   std::string to_string() const override;
-  bool is_enabled() override;
-
-  s4u::ActorPtr get_other_actor() const { return other_; }
-  double get_timeout() const { return timeout_; }
 };
 
 class ObjectAccessSimcallObserver final : public SimcallObserver {
@@ -146,10 +135,10 @@ public:
 /* Semi private template used by the to_string methods of various observer classes */
 template <typename A> static std::string ptr_to_id(A* ptr)
 {
-  static std::unordered_map<A*, std::string> map;
+  static std::unordered_map<A*, std::string> map({{nullptr, "-"}});
   auto [elm, inserted] = map.try_emplace(ptr);
   if (inserted)
-    elm->second = std::to_string(map.size());
+    elm->second = std::to_string(map.size() - 1);
   return elm->second;
 }