++

Author: Zainullin Damir

include/ipfixprobe/outputPlugin/outputStorage/bucketAllocator.hpp

@@ -10,19 +10,19 @@ class CacheAlligned {
 public:
 	template<typename... Args>
 	explicit CacheAlligned(Args&&... args) noexcept
-		: data(std::forward<Args>(args)...)
+		: m_data(std::forward<Args>(args)...)
 	{
 	}
 
 	CacheAlligned<Type>& operator=(const Type& other) noexcept
 	{
-		data = other;
+		m_data = other;
 		return *this;
 	}
 
-	constexpr auto& get(this auto& self) noexcept { return self.data; }
+	constexpr auto& get(this auto& self) noexcept { return self.m_data; }
 
-	constexpr auto operator->(this auto& self) noexcept { return &self.data; }
+	constexpr auto operator->(this auto& self) noexcept { return &self.m_data; }
 
 private:
 #pragma GCC diagnostic push
@@ -33,7 +33,7 @@ class CacheAlligned {
 	static constexpr std::size_t PADDING_SIZE
 		= (sizeof(Type) < EXPECTED_CACHE_LINE_SIZE) ? (EXPECTED_CACHE_LINE_SIZE - sizeof(Type)) : 0;
 
-	alignas(EXPECTED_CACHE_LINE_SIZE) Type data;
+	alignas(EXPECTED_CACHE_LINE_SIZE) Type m_data;
 	const std::array<std::byte, PADDING_SIZE> m_padding {};
 };
 

include/ipfixprobe/outputPlugin/outputStorage/cacheAlligned.hpp

@@ -7,8 +7,8 @@ namespace ipxp::output {
 
 template<typename ElementType>
 class FFQ2OutputStorage : public FFQOutputStorage<ElementType> {
-	constexpr static uint32_t SHORT_TRIES = 5;
-	constexpr static uint32_t LONG_TRIES = 3;
+	// constexpr static uint32_t SHORT_TRIES = 5;
+	// constexpr static uint32_t LONG_TRIES = 3;
 
 public:
 	explicit FFQ2OutputStorage(
@@ -30,6 +30,7 @@ class FFQ2OutputStorage : public FFQOutputStorage<ElementType> {
 		BackoffScheme backoffScheme(70, std::numeric_limits<std::size_t>::max());
 		const uint64_t writeRank = this->m_writeRank->fetch_add(1, std::memory_order_acq_rel);
 		const uint64_t writeIndex = remap(writeRank) % OutputStorage<ElementType>::STORAGE_CAPACITY;
+		__builtin_prefetch(&this->m_cells[writeIndex + 1], PrefetchMode::Write, Locality::High);
 		while (!this->m_cells[writeIndex].state.tryToSetWriter()) {
 			backoffScheme.backoff();
 		}
@@ -52,6 +53,7 @@ class FFQ2OutputStorage : public FFQOutputStorage<ElementType> {
 		}
 		const uint64_t readRank = this->m_readRank->fetch_add(1, std::memory_order_acq_rel);
 		const uint64_t readIndex = remap(readRank) % OutputStorage<ElementType>::STORAGE_CAPACITY;
+		__builtin_prefetch(&this->m_cells[readIndex + 1], PrefetchMode::Write, Locality::High);
 		while (readRank >= this->m_writeRank->load(std::memory_order_acquire)
 			   && this->writersPresent()) {
 			backoffScheme.backoff();