commit a6229749aeef225803c6a5411be9e8a40637454d
author Chia-I Wu <olv@google.com> Tue Apr 26 07:37:44 2016 +0800
committer Chia-I Wu <olv@google.com> Tue Apr 26 07:40:46 2016 +0800
tree a93dcc1e93e07ff1d4cbc5a1fdfa3058f8dbc2bc
parent 6693f5cd2238fe08b382bf762e33b701312c7038

vulkan: make g_library_mutex per-LayerLibrary

All that need to be protected are LayerLibrary::Open and
LayerLibrary::Close.

Change-Id: I81b2e7cc36d8c260ddcba69074c71a5244f5b443

vulkan/libvulkan/layers_extensions.cpp

diff --git a/vulkan/libvulkan/layers_extensions.cpp b/vulkan/libvulkan/layers_extensions.cpp
index d8ea2da..08038b7 100644
--- a/vulkan/libvulkan/layers_extensions.cpp
+++ b/vulkan/libvulkan/layers_extensions.cpp
@@ -74,6 +74,7 @@
     LayerLibrary(const LayerLibrary&) = delete;
     LayerLibrary& operator=(const LayerLibrary&) = delete;
 
+    // these are thread-safe
     bool Open();
     void Close();
 
@@ -87,11 +88,15 @@
 
    private:
     const std::string path_;
+
+    std::mutex mutex_;
     void* dlhandle_;
     size_t refcount_;
 };
 
 bool LayerLibrary::Open() {
+    std::lock_guard<std::mutex> lock(mutex_);
+
     if (refcount_++ == 0) {
         dlhandle_ = dlopen(path_.c_str(), RTLD_NOW | RTLD_LOCAL);
         ALOGV("Opening library %s", path_.c_str());
@@ -107,6 +112,8 @@
 }
 
 void LayerLibrary::Close() {
+    std::lock_guard<std::mutex> lock(mutex_);
+
     if (--refcount_ == 0) {
         ALOGV("Closing library %s", path_.c_str());
         dlclose(dlhandle_);
@@ -283,7 +290,6 @@
     return gpa;
 }
 
-std::mutex g_library_mutex;
 std::vector<LayerLibrary> g_layer_libraries;
 std::vector<Layer> g_instance_layers;
 std::vector<Layer> g_device_layers;
@@ -374,7 +380,6 @@
     for (uint32_t id = 0; id < layers.size(); id++) {
         if (strcmp(name, layers[id].properties.layerName) == 0) {
             LayerLibrary& library = g_layer_libraries[layers[id].library_idx];
-            std::lock_guard<std::mutex> lock(g_library_mutex);
             return LayerRef((library.Open()) ? &layers[id] : nullptr);
         }
     }
@@ -424,7 +429,6 @@
 LayerRef::~LayerRef() {
     if (layer_) {
         LayerLibrary& library = g_layer_libraries[layer_->library_idx];
-        std::lock_guard<std::mutex> lock(g_library_mutex);
         library.Close();
     }
 }