++

Author: Zainullin Damir

include/ipfixprobe/outputPlugin/outputStorage/bOutputStorage.hpp

@@ -15,6 +15,7 @@
 namespace ipxp::output {
 
 class BOutputStorage : public OutputStorage {
+protected:
 	constexpr static std::size_t BUCKET_SIZE = 128;
 	constexpr static std::size_t BUCKET_COUNT
 		= OutputStorage::ALLOCATION_BUFFER_CAPACITY / BUCKET_SIZE;
@@ -222,7 +223,7 @@ class BOutputStorage : public OutputStorage {
 		return !writersPresent() && getHighestWriterGeneration() < m_lowestReaderGeneration;
 	}
 
-private:
+protected:
 	uint16_t remap(const uint16_t index) noexcept
 	{
 		return index;
@@ -268,7 +269,6 @@ class BOutputStorage : public OutputStorage {
 		m_highestReaderGeneration = highestReaderGeneration;
 		const uint64_t lowestReaderGeneration = *std::ranges::min_element(readerGenerations);
 		m_lowestReaderGeneration = lowestReaderGeneration;
-		return;
 	}
 
 	uint64_t getHighestWriterGeneration() const noexcept

tests/performance/outputStorage/testOutputStorage.cpp

@@ -8,6 +8,7 @@
 #include <vector>
 
 #include <gtest/gtest.h>
+#include <outputStorage/b2OutputStorage.hpp>
 #include <outputStorage/bOutputStorage.hpp>
 #include <outputStorage/ffq2OutputStorage.hpp>
 #include <outputStorage/ffqOutputStorage.hpp>
@@ -139,7 +140,7 @@ void stressTest(const bool immitateWork)
 {
 	std::cout << "Stress Test: X Writers, X Group X Readers"
 			  << (immitateWork ? " With Work" : " No Work") << "\n";
-	makeTest<OutputStorageType>(32, {8, 8, 8, 8}, immitateWork, 400'000);
+	makeTest<OutputStorageType>(32, {1}, immitateWork, 100'000);
 }
 
 template<typename OutputStorageType>
@@ -182,9 +183,10 @@ void makePerformanceTest(std::string_view storageName)
 
 TEST(TestOutputStorage, XXX)
 {
+	makePerformanceTest<ipxp::output::B2OutputStorage>("B2OutputStorage");
+	makePerformanceTest<ipxp::output::BOutputStorage>("BOutputStorage");
 	makePerformanceTest<ipxp::output::FFQ2OutputStorage>("FFQ2OutputStorage");
 	makePerformanceTest<ipxp::output::MCOutputStorage>("MCOutputStorage");
-	makePerformanceTest<ipxp::output::BOutputStorage>("BOutputStorage");
 	makePerformanceTest<ipxp::output::LFNBOutputStorage>("LFNBOutputStorage");
 	makePerformanceTest<ipxp::output::FFQOutputStorage>("FFQOutputStorage");
 
@@ -220,7 +222,7 @@ TEST(TestOutputStorage, Debug)
 	for (const auto testIndex : std::views::iota(0, 100)) {
 		std::cout << " Debug Loop Iteration " << testIndex << "\n";
 		// makePerformanceTest<ipxp::output::MCOutputStorage>("MCOutputStorage");
-		stressTest<ipxp::output::FFQ2OutputStorage>(false);
+		stressTest<ipxp::output::FFQOutputStorage>(false);
 	}
 }