X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ed9565ed57e9c8ff4f244c0cd0a5af96c947f14f..33ab927a5c7716530d8cadec7f1200976713453c:/src/sthread/ObjectAccess.cpp?ds=sidebyside

diff --git a/src/sthread/ObjectAccess.cpp b/src/sthread/ObjectAccess.cpp
index 35994bdeeb..6e38668af8 100644
--- a/src/sthread/ObjectAccess.cpp
+++ b/src/sthread/ObjectAccess.cpp
@@ -35,7 +35,6 @@ public:
   }
   void serialize(std::stringstream& stream) const override;
   std::string to_string() const override;
-  bool is_visible() const override { return true; }
 };
 void ObjectAccessObserver::serialize(std::stringstream& stream) const
 {
@@ -52,7 +51,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;
@@ -67,8 +66,7 @@ static ObjectOwner* get_owner(void* object)
 {
   if (owners.empty())
     std::atexit(clean_owners);
-  auto it = owners.find(object);
-  if (it != owners.end())
+  if (auto it = owners.find(object); it != owners.end())
     return it->second;
   auto* o = new ObjectOwner(nullptr);
   owners.emplace(object, o);
@@ -118,7 +116,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);