AutoPacket::Get and AutoPacket::HasSubscribers need to be synchronized

leapmotion · Jul 30, 2014 · 69f2300 · 69f2300
1 parent c8813e6
commit 69f2300
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/autowiring/AutoPacket.h b/autowiring/AutoPacket.h
@@ -148,6 +148,7 @@ class AutoPacket:
   /// </summary>
   template<class T>
   bool Get(const T*& out) const {
+    std::lock_guard<std::mutex> lk(m_lock);
     static_assert(!std::is_same<T, AutoPacket>::value, "Cannot decorate a packet with another packet");
 
     auto q = m_decorations.find(typeid(T));
@@ -178,6 +179,7 @@ class AutoPacket:
   /// </summary>
   template<class T>
   bool Get(const std::shared_ptr<T>*& out) const {
+    std::lock_guard<std::mutex> lk(m_lock);
     auto q = m_decorations.find(typeid(T));
     if(q != m_decorations.end() && q->second.satisfied) {
       auto& disposition = q->second;
@@ -216,13 +218,9 @@ class AutoPacket:
         throw std::runtime_error("Cannot decorate this packet with type T, the requested decoration already exists");
       if(entry.isCheckedOut)
         throw std::runtime_error("Cannot check out this decoration, it's already checked out elsewhere");
+
       entry.isCheckedOut = true;
       entry.wasCheckedOut = true;
-    }
-
-    // Have to find the entry _again_ within the context of a lock and satisfy it here:
-    {
-      std::lock_guard<std::mutex> lk(m_lock);
       m_decorations[typeid(type)].m_decoration = ptr;
     }
 

diff --git a/src/autowiring/AutoPacket.cpp b/src/autowiring/AutoPacket.cpp
@@ -185,5 +185,6 @@ void AutoPacket::Initialize(void) {
 }
 
 bool AutoPacket::HasSubscribers(const std::type_info& ti) const {
+  std::lock_guard<std::mutex> lk(m_lock);
   return m_decorations.count(ti) != 0;
 }