++

Author: Zainullin Damir

include/ipfixprobe/outputPlugin/outputStorage/b2OutputStorage.hpp

@@ -72,7 +72,7 @@ class B2OutputStorage : public BOutputStorage<ElementType> {
 					>= writerData.cachedLowestReaderGeneration
 				|| !BOutputStorage<ElementType>::BucketAllocation::isValidBucketIndex(
 					this->m_buckets[writerData.writePosition].bucketIndex)
-				|| !this->m_buckets[writerData.writePosition].lock.try_lock()) {
+				|| !this->m_buckets[writerData.writePosition].lock.tryLock()) {
 				continue;
 			}
 			if (this->m_buckets[writerData.writePosition].generation.load(std::memory_order_acquire)

include/ipfixprobe/outputPlugin/outputStorage/bOutputStorage.hpp

@@ -141,7 +141,7 @@ class BOutputStorage : public OutputStorage<ElementType> {
 					>= writerData.cachedLowestReaderGeneration
 				|| !BucketAllocation::isValidBucketIndex(
 					m_buckets[writerData.writePosition].bucketIndex)
-				|| !m_buckets[writerData.writePosition].lock.try_lock()) {
+				|| !m_buckets[writerData.writePosition].lock.tryLock()) {
 				continue;
 			}
 			if (m_buckets[writerData.writePosition].generation.load(std::memory_order_acquire)

include/ipfixprobe/outputPlugin/outputStorage/outputStorage.hpp

@@ -9,6 +9,7 @@
 #include "dummyAllocationBuffer.hpp"
 #include "outputContainer.hpp"
 #include "referenceCounter.hpp"
+#include "spinlock.hpp"
 
 #include <atomic>
 #include <condition_variable>
@@ -45,18 +46,31 @@ class OutputStorage {
 
 	virtual void registerReader([[maybe_unused]] const uint8_t readerIndex) noexcept
 	{
-		std::unique_lock<std::mutex> lock(m_registrationMutex);
 		m_readersCount++;
+		while (!m_registrationLock.tryLock()) {
+			if (m_writersCount.load(std::memory_order_acquire) != 0) {
+				m_registrationLock.unlock();
+				return;
+			}
+		}
+		/*std::unique_lock<std::mutex> lock(m_registrationMutex);
 		m_registrationCondition.notify_all();
-		m_registrationCondition.wait(lock, [&]() { return m_writersCount > 0; });
+		m_registrationCondition.wait(lock, [&]() { return m_writersCount > 0; });*/
 	}
 
 	virtual void registerWriter([[maybe_unused]] const uint8_t writerIndex) noexcept
 	{
-		std::unique_lock<std::mutex> lock(m_registrationMutex);
+		m_writersCount++;
+		while (!m_registrationLock.tryLock()) {
+			if (m_readersCount.load(std::memory_order_acquire) != 0) {
+				m_registrationLock.unlock();
+				return;
+			}
+		}
+		/*std::unique_lock<std::mutex> lock(m_registrationMutex);
 		m_writersCount++;
 		m_registrationCondition.notify_all();
-		m_registrationCondition.wait(lock, [&]() { return m_readersCount > 0; });
+		m_registrationCondition.wait(lock, [&]() { return m_readersCount > 0; });*/
 	}
 
 	virtual void unregisterWriter([[maybe_unused]] const uint8_t writerId) noexcept
@@ -118,6 +132,7 @@ class OutputStorage {
 private:
 	std::condition_variable m_registrationCondition;
 	std::mutex m_registrationMutex;
+	Spinlock m_registrationLock;
 };
 
 } // namespace ipxp::output

include/ipfixprobe/outputPlugin/outputStorage/spinlock.hpp

@@ -19,7 +19,7 @@ class Spinlock {
 		}
 	}
 
-	bool try_lock() noexcept { return !flag.test_and_set(std::memory_order_acquire); }
+	bool tryLock() noexcept { return !flag.test_and_set(std::memory_order_acquire); }
 
 	void unlock() noexcept { flag.clear(std::memory_order_release); }
 };