Fixed|libcore: Data races

skyjake · Sep 1, 2019 · 66ba6a1 · 66ba6a1
1 parent a7c2bcf
commit 66ba6a1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/doomsday/libs/core/src/data/bank.cpp b/doomsday/libs/core/src/data/bank.cpp
@@ -78,10 +78,12 @@ class Cache : public Lockable
     int itemCount() const { return _items.size(); }
 
     virtual void add(ItemType &data) {
+        DE_GUARD(this);
         _items.insert(&data);
     }
 
     virtual void remove(ItemType &data) {
+        DE_GUARD(this);
         _items.remove(&data);
     }
 

diff --git a/doomsday/libs/core/src/net/beacon.cpp b/doomsday/libs/core/src/net/beacon.cpp
@@ -92,7 +92,7 @@ DE_PIMPL(Beacon)
     }
 
     static void readIncoming(iAny *, iDatagram *sock)
-{
+    {
         Loop::mainCall([sock]() {
             LOG_AS("Beacon");
             auto *d = reinterpret_cast<Beacon::Impl *>(userData_Object(sock));

diff --git a/doomsday/libs/core/src/widgets/animation.cpp b/doomsday/libs/core/src/widgets/animation.cpp
@@ -68,9 +68,9 @@ using AnimationFlags = Flags;
 
 /// Thread-safe current time for animations.
 struct AnimationTime : DE_OBSERVES(Clock, TimeChange) {
-    double now;
+    std::atomic<double> now;
     void timeChanged(Clock const &clock) override {
-        now = clock.time().highPerformanceTime();
+        now.store(clock.time().highPerformanceTime());
     }
 };
 static AnimationTime theTime;
@@ -276,7 +276,7 @@ float Animation::value() const
     {
         return d->target;
     }
-    return d->valueAt(theTime.now);
+    return d->valueAt(theTime.now.load());
 }
 
 bool Animation::done() const