Ignore empty replay path + hide a global (to avoid init fiasco)

[simgrid.git] / src / sthread / ObjectAccess.cpp

diff --git a/src/sthread/ObjectAccess.cpp b/src/sthread/ObjectAccess.cpp
index 35994bdeeb26bde5cb3eb02d584a4459f333012e..6e19b61279df9f9cb4d94ec7db30bec683c6feab 100644 (file)
--- a/src/sthread/ObjectAccess.cpp
+++ b/src/sthread/ObjectAccess.cpp
@@ -52,7 +52,7 @@ struct ObjectOwner {
   simgrid::kernel::actor::ActorImpl* owner = nullptr;
   const char* file                         = nullptr;
   int line                                 = -1;
-  ObjectOwner(simgrid::kernel::actor::ActorImpl* o) : owner(o) {}
+  explicit ObjectOwner(simgrid::kernel::actor::ActorImpl* o) : owner(o) {}
 };
 
 std::unordered_map<void*, ObjectOwner*> owners;
@@ -71,7 +71,7 @@ static ObjectOwner* get_owner(void* object)
   if (it != owners.end())
     return it->second;
   auto* o = new ObjectOwner(nullptr);
-  owners.emplace(object, o);
+  owners.insert({object, o});
   return o;
 }
 
@@ -118,7 +118,8 @@ void sthread_access_end(void* objaddr, const char* objname, const char* file, in
       [self, objaddr, objname]() -> void {
         XBT_INFO("%s releases %s", self->get_cname(), objname);
         auto* ownership = get_owner(objaddr);
-        xbt_assert(ownership->owner == self, "safety check failed: I'm not owner of the object I'm releasing.");
+        xbt_assert(ownership->owner == self, "safety check failed: %s is not owner of the object it's releasing.",
+                   self->get_cname());
         ownership->owner = nullptr;
       },
       &observer);