From 7ee1c6d9619fa9dc66939ccd8756c393a18117f8 Mon Sep 17 00:00:00 2001
From: Mike Stroyan <stroyan@google.com>
Date: Mon, 8 Feb 2016 10:27:55 -0700
Subject: layers: lock use of threading layer cmd pool map

Access to command_pool_map data structure in threading validation layer
needs a mutex.
---
 layers/threading.cpp |  4 ++++
 layers/threading.h   | 20 ++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/layers/threading.cpp b/layers/threading.cpp
index fcdd38b1..db59aa95 100644
--- a/layers/threading.cpp
+++ b/layers/threading.cpp
@@ -357,7 +357,9 @@ VkResult VKAPI_CALL vkAllocateCommandBuffers(
     // Record mapping from command buffer to command pool
     if (VK_SUCCESS == result) {
         for (int index=0;index<pAllocateInfo->commandBufferCount;index++) {
+            loader_platform_thread_lock_mutex(&threadingLock);
             command_pool_map[pCommandBuffers[index]] = pAllocateInfo->commandPool;
+            loader_platform_thread_unlock_mutex(&threadingLock);
         }
     }
 
@@ -385,7 +387,9 @@ void VKAPI_CALL vkFreeCommandBuffers(
     finishWriteObject(my_data, commandPool);
     for (int index=0;index<commandBufferCount;index++) {
         finishWriteObject(my_data, pCommandBuffers[index], lockCommandPool);
+        loader_platform_thread_lock_mutex(&threadingLock);
         command_pool_map.erase(pCommandBuffers[index]);
+        loader_platform_thread_unlock_mutex(&threadingLock);
     }
 }
 
diff --git a/layers/threading.h b/layers/threading.h
index a0b025f7..c6315d2a 100644
--- a/layers/threading.h
+++ b/layers/threading.h
@@ -313,7 +313,10 @@ static std::unordered_map<VkCommandBuffer, VkCommandPool> command_pool_map;
 static void startWriteObject(struct layer_data *my_data, VkCommandBuffer object, bool lockPool=true)
 {
     if (lockPool) {
-        startWriteObject(my_data, command_pool_map[object]);
+        loader_platform_thread_lock_mutex(&threadingLock);
+        VkCommandPool pool = command_pool_map[object];
+        loader_platform_thread_unlock_mutex(&threadingLock);
+        startWriteObject(my_data, pool);
     }
     my_data->c_VkCommandBuffer.startWrite(my_data->report_data, object);
 }
@@ -321,17 +324,26 @@ static void finishWriteObject(struct layer_data *my_data, VkCommandBuffer object
 {
     my_data->c_VkCommandBuffer.finishWrite(object);
     if (lockPool) {
-        finishWriteObject(my_data, command_pool_map[object]);
+        loader_platform_thread_lock_mutex(&threadingLock);
+        VkCommandPool pool = command_pool_map[object];
+        loader_platform_thread_unlock_mutex(&threadingLock);
+        finishWriteObject(my_data, pool);
     }
 }
 static void startReadObject(struct layer_data *my_data, VkCommandBuffer object)
 {
-    startReadObject(my_data, command_pool_map[object]);
+    loader_platform_thread_lock_mutex(&threadingLock);
+    VkCommandPool pool = command_pool_map[object];
+    loader_platform_thread_unlock_mutex(&threadingLock);
+    startReadObject(my_data, pool);
     my_data->c_VkCommandBuffer.startRead(my_data->report_data, object);
 }
 static void finishReadObject(struct layer_data *my_data, VkCommandBuffer object)
 {
     my_data->c_VkCommandBuffer.finishRead(object);
-    finishReadObject(my_data, command_pool_map[object]);
+    loader_platform_thread_lock_mutex(&threadingLock);
+    VkCommandPool pool = command_pool_map[object];
+    loader_platform_thread_unlock_mutex(&threadingLock);
+    finishReadObject(my_data, pool);
 }
 #endif // THREADING_H
-- 
cgit v1.2.3