libcore: Improved Observers for multithreading

skyjake · Sep 1, 2019 · bac9874 · bac9874
1 parent 1cbdc4d
commit bac9874
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/doomsday/libs/core/include/de/data/observers.h b/doomsday/libs/core/include/de/data/observers.h
@@ -378,14 +378,11 @@ class Observers : public Lockable, public IAudience
     virtual ~Observers()
     {
         _disassociateAllMembers();
-        DE_GUARD(this);
     }
 
     void clear()
     {
-        DE_GUARD(this);
         _disassociateAllMembers();
-        _members.clear();
     }
 
     Observers<Type> &operator=(Observers<Type> const &other)
@@ -522,8 +519,14 @@ class Observers : public Lockable, public IAudience
 private:
     void _disassociateAllMembers()
     {
-        for (Type *observer : _members)
+        for (;;)
         {
+            Type *observer;
+            {
+                DE_GUARD(this);
+                if (_members.isEmpty()) break;
+                observer = _members.take();
+            }
             observer->removeMemberOf(*this);
         }
     }