From b6a402f46231688f7684dcb8c8e4ef5f4579b011 Mon Sep 17 00:00:00 2001 From: Finn Williams Date: Tue, 24 Mar 2020 13:46:22 +0000 Subject: IVGCVSW-4596 Fix BufferManager's packet order Signed-off-by: Finn Williams Change-Id: I35e0a891cd69f2c130b8886460089c441d8e666d --- src/profiling/BufferManager.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/profiling/BufferManager.cpp') diff --git a/src/profiling/BufferManager.cpp b/src/profiling/BufferManager.cpp index f5ab729259..a7b71e5fa1 100644 --- a/src/profiling/BufferManager.cpp +++ b/src/profiling/BufferManager.cpp @@ -45,7 +45,7 @@ void BufferManager::Commit(IPacketBufferPtr& packetBuffer, unsigned int size, bo std::unique_lock readableListLock(m_ReadableMutex, std::defer_lock); packetBuffer->Commit(size); readableListLock.lock(); - m_ReadableList.push_back(std::move(packetBuffer)); + m_ReadableList.push(std::move(packetBuffer)); readableListLock.unlock(); if (notifyConsumer) @@ -62,7 +62,6 @@ void BufferManager::Initialize() IPacketBufferPtr buffer = std::make_unique(m_MaxBufferSize); m_AvailableList.emplace_back(std::move(buffer)); } - m_ReadableList.reserve(m_NumberOfBuffers); } void BufferManager::Release(IPacketBufferPtr& packetBuffer) @@ -81,7 +80,7 @@ void BufferManager::Reset() std::lock_guard availableListLock(m_AvailableMutex); m_AvailableList.clear(); - m_ReadableList.clear(); + std::queue().swap(m_ReadableList); Initialize(); } @@ -91,8 +90,8 @@ IPacketBufferPtr BufferManager::GetReadableBuffer() std::unique_lock readableListLock(m_ReadableMutex); if (!m_ReadableList.empty()) { - IPacketBufferPtr buffer = std::move(m_ReadableList.back()); - m_ReadableList.pop_back(); + IPacketBufferPtr buffer = std::move(m_ReadableList.front()); + m_ReadableList.pop(); readableListLock.unlock(); return buffer; } -- cgit v1.2.1