Scope file handles to BundleResource and BundleResourceStream life-times, resolves #309

framework/src/bundle/BundleArchive.cpp

@@ -37,7 +37,8 @@ const std::string BundleArchive::AUTOSTART_SETTING_ACTIVATION_POLICY =
   "activation_policy";
 
 BundleArchive::BundleArchive()
-  : storage(nullptr), numOpenResources(0)
+  : storage(nullptr)
+  , numOpenResources(0)
 {}
 
 BundleArchive::BundleArchive(
@@ -147,16 +148,16 @@ std::shared_ptr<BundleResourceContainer> BundleArchive::GetResourceContainer()
   return resourceContainer;
 }
 
-void BundleArchive::RegisterOpenedResource() const 
-{ 
-  std::lock_guard<std::mutex> lock(numOpenResourcesLock);
-  numOpenResources++; 
+void BundleArchive::RegisterOpenedResource() const
+{
+  uint32_t expected = 0;
+  while(!numOpenResources.compare_exchange_weak(expected, expected + 1));
 }
 
-void BundleArchive::UnregisterOpenedResource() const 
-{ 
-  std::lock_guard<std::mutex> lock(numOpenResourcesLock);
-  numOpenResources--;
+void BundleArchive::UnregisterOpenedResource() const
+{
+  uint32_t expected = 0;
+  while(!numOpenResources.compare_exchange_weak(expected, expected - 1));
   if (numOpenResources == 0) {
     resourceContainer->CloseContainer();
   }

framework/src/bundle/BundleArchive.h

@@ -23,9 +23,9 @@
 #ifndef CPPMICROSERVICES_BUNDLEARCHIVE_H
 #define CPPMICROSERVICES_BUNDLEARCHIVE_H
 
+#include <atomic>
 #include <chrono>
 #include <memory>
-#include <mutex>
 #include <string>
 #include <vector>
 
@@ -164,7 +164,7 @@ struct BundleArchive : std::enable_shared_from_this<BundleArchive>
 
   /**
    * Decrement the number of open resources by one.
-   * 
+   *
    * Note: If the number of opened resources is 0, then the ResourceContainer
    *       associated with this BundleArchive object is closed.
    */
@@ -175,8 +175,7 @@ struct BundleArchive : std::enable_shared_from_this<BundleArchive>
   const std::unique_ptr<Data> data;
   const std::shared_ptr<BundleResourceContainer> resourceContainer;
   const std::string resourcePrefix;
-  mutable uint32_t numOpenResources;
-  mutable std::mutex numOpenResourcesLock;
+  mutable std::atomic<uint32_t> numOpenResources;
   const std::string location;
 };
 }