Fixed critical bug where the popDestruct's destructor was not locking…

… while pop-ing from the deque.
SiddiqSoft · Oct 7, 2021 · 9295371 · 9295371
1 parent f7eb443
commit 9295371
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/nuget/SiddiqSoft.asynchrony-lib.nuspec b/nuget/SiddiqSoft.asynchrony-lib.nuspec
@@ -12,12 +12,12 @@
 		<version>$VERSION$</version>
 		<authors>SiddiqSoft</authors>
 		<description>Add asynchrony to your apps</description>
-		<tags>jthread thread async pool deque cpp20 native nativepackage cpp</tags>
+		<tags>jthread thread periodic timer async pool deque cpp20 native nativepackage cpp</tags>
 		<projectUrl>https://github.com/SiddiqSoft/asynchrony-lib</projectUrl>
 		<requireLicenseAcceptance>true</requireLicenseAcceptance>
 		<license type="expression">BSD-3-Clause</license>
-    <icon>docs\Siddiq-Software-Avatar.png</icon>
-    <readme>docs\README.md</readme>
+		<icon>docs\Siddiq-Software-Avatar.png</icon>
+		<readme>docs\README.md</readme>
 		<releaseNotes></releaseNotes>
 		<copyright>Copyright (c) 2021 Siddiq Software LLC</copyright>
 		<!-- Dependencies -->
@@ -36,7 +36,7 @@
 		<file src="..\src\*.hpp" target="build\native\include\siddiqsoft\" />
 		<file src="Siddiq-Software-Avatar.png" target="docs\" />
 		<file src="..\README.md" target="docs\" />
-    
+
 		<!-- MSBuild .targets files -->
 		<file src="SiddiqSoft.asynchrony-lib.targets" target="build\native" />
 	</files>

diff --git a/src/simple_pool.hpp b/src/simple_pool.hpp
@@ -148,11 +148,11 @@ namespace siddiqsoft
 #endif
 
     private:
-        std::vector<std::jthread>    workers {};
-        std::function<void(T&)>      callback;
-        std::counting_semaphore<512> signal {0};
-        std::deque<T>                items {};
-        std::shared_mutex            items_mutex;
+        std::vector<std::jthread> workers {};
+        std::function<void(T&)>   callback;
+        std::counting_semaphore<> signal {0};
+        std::deque<T>             items {};
+        std::shared_mutex         items_mutex;
         /// @brief This is the interval we wait on the signal. It starts off with 500ms and when the thread is to shutdown, it is
         /// set to 1ms.
         std::chrono::milliseconds signalWaitInterval {1500};

diff --git a/src/simple_worker.hpp b/src/simple_worker.hpp
@@ -79,6 +79,7 @@ namespace siddiqsoft
         /// @brief Pop the front of the queue upon destructor invocation
         ~popOnDestruct() noexcept
         {
+            std::unique_lock<std::shared_mutex> myWriterLock(parentMutex);
             if (!parentDeque.empty()) parentDeque.pop_front();
         }
 
@@ -172,8 +173,8 @@ namespace siddiqsoft
         std::deque<T> items {};
         /// @brief Mutex to protect the items
         std::shared_mutex items_mutex {};
-        /// @brief Semaphore with initial max of 128 items (backlog)
-        std::counting_semaphore<512> signal {0};
+        /// @brief Semaphore with default max signals.
+        std::counting_semaphore<> signal {0};
         /// @brief This is the interval we wait on the signal. It starts off with 500ms and when the thread is to shutdown, it is
         /// set to 1ms.
         std::chrono::milliseconds signalWaitInterval {1500};