MC: add an observer to sleep simcalls

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

diff --git a/src/kernel/actor/SimcallObserver.hpp b/src/kernel/actor/SimcallObserver.hpp
index 5032f38..d43ac00 100644 (file)
--- a/src/kernel/actor/SimcallObserver.hpp
+++ b/src/kernel/actor/SimcallObserver.hpp
@@ -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. */
@@ -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;
@@ -127,6 +127,14 @@ public:
   double get_timeout() const { return timeout_; }
 };
 
+class ActorSleepSimcall final : public SimcallObserver {
+
+public:
+  ActorSleepSimcall(ActorImpl* actor) : SimcallObserver(actor) {}
+  void serialize(std::stringstream& stream) const override;
+  std::string to_string() const override;
+};
+
 class ObjectAccessSimcallObserver final : public SimcallObserver {
   ObjectAccessSimcallItem* const object_;
 
@@ -146,10 +154,11 @@ 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;
-  if (map.find(ptr) == map.end())
-    map.insert(std::make_pair(ptr, std::to_string(map.size() + 1)));
-  return map[ptr];
+  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() - 1);
+  return elm->second;
 }
 
 } // namespace simgrid::kernel::actor