Index: src/libchcore/TFailedBufferQueue.cpp =================================================================== diff -u -N --- src/libchcore/TFailedBufferQueue.cpp (revision bef894e38e5c1486824787cf8c47a87a0828b228) +++ src/libchcore/TFailedBufferQueue.cpp (revision 0) @@ -1,99 +0,0 @@ -// ============================================================================ -// Copyright (C) 2001-2016 by Jozef Starosczyk -// ixen@copyhandler.com -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// (version 2) as published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// ============================================================================ -#include "stdafx.h" -#include "TFailedBufferQueue.h" -#include "TOverlappedDataBuffer.h" - -namespace chcore -{ - TFailedBufferQueue::TFailedBufferQueue() : - m_eventHasBuffers(true, false) - { - } - - TOverlappedDataBuffer* TFailedBufferQueue::Pop() - { - if(!IsBufferReady()) - return nullptr; - - TOverlappedDataBuffer* pBuffer = *m_setBuffers.begin(); - m_setBuffers.erase(m_setBuffers.begin()); - - if(pBuffer->GetFilePosition() == m_ullErrorPosition) - { - // removed the element marked as 'error', calculate the new error position - m_ullErrorPosition = NoPosition; - for(TOverlappedDataBuffer* pBuf : m_setBuffers) - { - if(pBuf->HasError()) - { - m_ullErrorPosition = pBuf->GetFilePosition(); - break; - } - } - } - - UpdateHasBuffers(); - - return pBuffer; - } - - bool TFailedBufferQueue::IsBufferReady() const - { - return !m_setBuffers.empty(); - } - - void TFailedBufferQueue::Clear() - { - m_setBuffers.clear(); - m_eventHasBuffers.ResetEvent(); - } - - size_t TFailedBufferQueue::GetCount() const - { - return m_setBuffers.size(); - } - - bool TFailedBufferQueue::IsEmpty() const - { - return m_setBuffers.empty(); - } - - HANDLE TFailedBufferQueue::GetHasBuffersEvent() const - { - return m_eventHasBuffers.Handle(); - } - - void TFailedBufferQueue::ReleaseBuffers(const TBufferListPtr& spBuffers) - { - for(TOverlappedDataBuffer* pBuffer : m_setBuffers) - { - spBuffers->Push(pBuffer); - } - m_setBuffers.clear(); - } - - void TFailedBufferQueue::UpdateHasBuffers() - { - if(IsBufferReady()) - m_eventHasBuffers.SetEvent(); - else - m_eventHasBuffers.ResetEvent(); - } -} Index: src/libchcore/TFailedBufferQueue.h =================================================================== diff -u -N --- src/libchcore/TFailedBufferQueue.h (revision b6a48931b8155a01d871d050f52d915abb2df8ca) +++ src/libchcore/TFailedBufferQueue.h (revision 0) @@ -1,105 +0,0 @@ -// ============================================================================ -// Copyright (C) 2001-2016 by Jozef Starosczyk -// ixen@copyhandler.com -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU Library General Public License -// (version 2) as published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// ============================================================================ -#ifndef __TFAILEDBUFFERQUEUE_H__ -#define __TFAILEDBUFFERQUEUE_H__ - -#include -#include "TEvent.h" -#include "TOverlappedDataBuffer.h" -#include "TCoreException.h" -#include "TBufferList.h" - -namespace chcore -{ - class TFailedBufferQueue - { - public: - static const unsigned long long NoPosition = 0xffffffffffffffff; - - public: - TFailedBufferQueue(); - - template - void PushWithFallback(TOverlappedDataBuffer* pBuffer, T& rRetryQueue) - { - if (!pBuffer->HasError()) - throw TCoreException(eErr_InvalidArgument, L"Cannot push successful buffer to failed queue", LOCATION); - if(pBuffer->GetFilePosition() < m_ullErrorPosition) - { - // case: new buffer failed at even earlier position in file than the one that failed previously (should also work for numeric_limits::max()) - // - move existing buffers with errors to failed read buffers, add current one to full queue - m_ullErrorPosition = pBuffer->GetFilePosition(); - - BufferCollection newQueue; - - for(TOverlappedDataBuffer* pBuf : m_setBuffers) - { - if(pBuf->HasError()) - rRetryQueue.Push(pBuf, true); - else - { - auto pairInsert = newQueue.insert(pBuf); - if (!pairInsert.second) - throw TCoreException(eErr_InvalidArgument, L"Tried to insert duplicate buffer into the collection", LOCATION); - } - } - - if(newQueue.size() != m_setBuffers.size()) - std::swap(m_setBuffers, newQueue); - } - else if(pBuffer->GetFilePosition() > m_ullErrorPosition) - { - // case: new buffer failed at position later than the one that failed before - add to failed buffers - // for retry - rRetryQueue.Push(pBuffer, true); - return; - } - //else throw TCoreException (will be thrown by insert() below) - - auto pairInsert = m_setBuffers.insert(pBuffer); - if (!pairInsert.second) - throw TCoreException(eErr_InvalidArgument, L"Tried to insert duplicate buffer into the collection", LOCATION); - - UpdateHasBuffers(); - } - - TOverlappedDataBuffer* Pop(); - - void Clear(); - - size_t GetCount() const; - bool IsEmpty() const; - - HANDLE GetHasBuffersEvent() const; - void ReleaseBuffers(const TBufferListPtr& spBuffers); - - private: - bool IsBufferReady() const; - void UpdateHasBuffers(); - - private: - using BufferCollection = std::set; - - BufferCollection m_setBuffers; - TEvent m_eventHasBuffers; - unsigned long long m_ullErrorPosition = NoPosition; - }; -} - -#endif Index: src/libchcore/TOrderedBufferQueue.cpp =================================================================== diff -u -N -rda7737de7046ba0ecd255240fb36b4a46584ebf2 -rc4cbf6cd567821f9a981586ab5d8294a26f873be --- src/libchcore/TOrderedBufferQueue.cpp (.../TOrderedBufferQueue.cpp) (revision da7737de7046ba0ecd255240fb36b4a46584ebf2) +++ src/libchcore/TOrderedBufferQueue.cpp (.../TOrderedBufferQueue.cpp) (revision c4cbf6cd567821f9a981586ab5d8294a26f873be) @@ -25,16 +25,28 @@ { TOrderedBufferQueue::TOrderedBufferQueue(unsigned long long ullExpectedPosition) : m_eventHasBuffers(true, false), + m_eventHasError(true, false), m_ullExpectedBufferPosition(ullExpectedPosition) { } void TOrderedBufferQueue::Push(TOverlappedDataBuffer* pBuffer) { + if(pBuffer->HasError()) + throw TCoreException(eErr_InvalidArgument, L"Cannot push buffer with error", LOCATION); + auto pairInsert = m_setBuffers.insert(pBuffer); if (!pairInsert.second) throw TCoreException(eErr_InvalidArgument, L"Tried to insert duplicate buffer into the collection", LOCATION); + if(pBuffer->GetFilePosition() == m_ullErrorPosition) + { + if(m_pFirstErrorBuffer != nullptr) + throw TCoreException(eErr_InternalProblem, L"Buffer with error was not retrieved prior to adding same-by-position buffer without error", LOCATION); + m_ullErrorPosition = NoPosition; + UpdateHasErrors(); + } + UpdateHasBuffers(); } @@ -54,6 +66,18 @@ return pBuffer; } + TOverlappedDataBuffer* TOrderedBufferQueue::PopError() + { + if(!m_pFirstErrorBuffer) + return nullptr; + + TOverlappedDataBuffer* pBuffer = m_pFirstErrorBuffer; + m_pFirstErrorBuffer = nullptr; + UpdateHasErrors(); + + return pBuffer; + } + const TOverlappedDataBuffer* const TOrderedBufferQueue::Peek() const { if(!m_setBuffers.empty()) @@ -68,7 +92,7 @@ size_t TOrderedBufferQueue::GetCount() const { - return m_setBuffers.size(); + return m_setBuffers.size() + (m_pFirstErrorBuffer ? 1 : 0); } bool TOrderedBufferQueue::IsEmpty() const @@ -81,13 +105,28 @@ return m_eventHasBuffers.Handle(); } + HANDLE TOrderedBufferQueue::GetHasErrorEvent() const + { + return m_eventHasError.Handle(); + } + void TOrderedBufferQueue::ReleaseBuffers(const TBufferListPtr& spBuffers) { for(TOverlappedDataBuffer* pBuffer : m_setBuffers) { spBuffers->Push(pBuffer); } m_setBuffers.clear(); + + if(m_pFirstErrorBuffer) + { + spBuffers->Push(m_pFirstErrorBuffer); + m_pFirstErrorBuffer = nullptr; + m_ullErrorPosition = NoPosition; + } + + UpdateHasBuffers(); + UpdateHasErrors(); } void TOrderedBufferQueue::UpdateHasBuffers() @@ -97,4 +136,9 @@ else m_eventHasBuffers.ResetEvent(); } + + void TOrderedBufferQueue::UpdateHasErrors() + { + m_eventHasError.SetEvent(m_pFirstErrorBuffer != nullptr); + } } Index: src/libchcore/TOrderedBufferQueue.h =================================================================== diff -u -N -rda7737de7046ba0ecd255240fb36b4a46584ebf2 -rc4cbf6cd567821f9a981586ab5d8294a26f873be --- src/libchcore/TOrderedBufferQueue.h (.../TOrderedBufferQueue.h) (revision da7737de7046ba0ecd255240fb36b4a46584ebf2) +++ src/libchcore/TOrderedBufferQueue.h (.../TOrderedBufferQueue.h) (revision c4cbf6cd567821f9a981586ab5d8294a26f873be) @@ -23,6 +23,7 @@ #include "TEvent.h" #include "TOverlappedDataBuffer.h" #include "TBufferList.h" +#include "TCoreException.h" namespace chcore { @@ -35,27 +36,70 @@ TOrderedBufferQueue(unsigned long long ullExpectedPosition); void Push(TOverlappedDataBuffer* pBuffer); + + template + void PushError(TOverlappedDataBuffer* pBuffer, T& rRetryQueue); + TOverlappedDataBuffer* Pop(); + TOverlappedDataBuffer* PopError(); + const TOverlappedDataBuffer* const Peek() const; size_t GetCount() const; + bool IsEmpty() const; HANDLE GetHasBuffersEvent() const; + HANDLE GetHasErrorEvent() const; + void ReleaseBuffers(const TBufferListPtr& spBuffers); private: bool IsBufferReady() const; void UpdateHasBuffers(); + void UpdateHasErrors(); private: using BufferCollection = std::set; - BufferCollection m_setBuffers; + + TOverlappedDataBuffer* m_pFirstErrorBuffer = nullptr; + unsigned long long m_ullErrorPosition = NoPosition; + TEvent m_eventHasBuffers; - unsigned long long m_ullExpectedBufferPosition = NoPosition; + TEvent m_eventHasError; + + unsigned long long m_ullExpectedBufferPosition = 0; }; + template + void TOrderedBufferQueue::PushError(TOverlappedDataBuffer* pBuffer, T& rRetryQueue) + { + if(!pBuffer->HasError()) + throw TCoreException(eErr_InvalidArgument, L"Cannot push successful buffer to failed queue", LOCATION); + + if(!m_pFirstErrorBuffer && m_ullErrorPosition == NoPosition) + { + m_pFirstErrorBuffer = pBuffer; + m_ullErrorPosition = pBuffer->GetFilePosition(); + UpdateHasErrors(); + return; + } + + if(pBuffer->GetFilePosition() < m_ullErrorPosition) + { + rRetryQueue.Push(m_pFirstErrorBuffer, true); + m_pFirstErrorBuffer = pBuffer; + m_ullErrorPosition = pBuffer->GetFilePosition(); + } + else if(pBuffer->GetFilePosition() > m_ullErrorPosition) + rRetryQueue.Push(pBuffer, true); + else + throw TCoreException(eErr_InvalidArgument, L"Trying to push the same buffer again", LOCATION); + + UpdateHasErrors(); + } + using TOrderedBufferQueuePtr = std::shared_ptr; } Index: src/libchcore/TOverlappedReader.cpp =================================================================== diff -u -N -r6e4ac7776b68464371cd8522a2a8d79fbcab3b28 -rc4cbf6cd567821f9a981586ab5d8294a26f873be --- src/libchcore/TOverlappedReader.cpp (.../TOverlappedReader.cpp) (revision 6e4ac7776b68464371cd8522a2a8d79fbcab3b28) +++ src/libchcore/TOverlappedReader.cpp (.../TOverlappedReader.cpp) (revision c4cbf6cd567821f9a981586ab5d8294a26f873be) @@ -28,7 +28,6 @@ unsigned long long ullFilePos, DWORD dwChunkSize) : m_spLog(logger::MakeLogger(spLogFileData, L"DataBuffer")), m_tEmptyBuffers(spEmptyBuffers, ullFilePos, dwChunkSize), - m_tFailedReadBuffers(), m_spFullBuffers(std::make_shared(ullFilePos)) { if(!spEmptyBuffers) @@ -63,12 +62,12 @@ LOG_TRACE(m_spLog) << L"Queuing buffer for re-read; buffer-order: " << pBuffer->GetFilePosition(); - m_tFailedReadBuffers.PushWithFallback(pBuffer, m_tEmptyBuffers); + m_spFullBuffers->PushError(pBuffer, m_tEmptyBuffers); } TOverlappedDataBuffer* TOverlappedReader::GetFailedReadBuffer() { - return m_tFailedReadBuffers.Pop(); + return m_spFullBuffers->PopError(); } void TOverlappedReader::AddFullBuffer(TOverlappedDataBuffer* pBuffer) @@ -97,13 +96,12 @@ size_t TOverlappedReader::GetBufferCount() const { - return m_tEmptyBuffers.GetCount() + m_tFailedReadBuffers.GetCount() + m_spFullBuffers->GetCount(); + return m_tEmptyBuffers.GetCount() + m_spFullBuffers->GetCount(); } void TOverlappedReader::ReleaseBuffers(const TBufferListPtr& spBuffers) { m_tEmptyBuffers.ReleaseBuffers(spBuffers); - m_tFailedReadBuffers.ReleaseBuffers(spBuffers); m_spFullBuffers->ReleaseBuffers(spBuffers); } } Index: src/libchcore/TOverlappedReader.h =================================================================== diff -u -N -r6e4ac7776b68464371cd8522a2a8d79fbcab3b28 -rc4cbf6cd567821f9a981586ab5d8294a26f873be --- src/libchcore/TOverlappedReader.h (.../TOverlappedReader.h) (revision 6e4ac7776b68464371cd8522a2a8d79fbcab3b28) +++ src/libchcore/TOverlappedReader.h (.../TOverlappedReader.h) (revision c4cbf6cd567821f9a981586ab5d8294a26f873be) @@ -23,7 +23,6 @@ #include "../liblogger/TLogger.h" #include "TOrderedBufferQueue.h" #include "TReadBufferQueueWrapper.h" -#include "TFailedBufferQueue.h" namespace chcore { @@ -56,7 +55,7 @@ // event access HANDLE GetEventReadPossibleHandle() const { return m_tEmptyBuffers.GetHasBuffersEvent(); } - HANDLE GetEventReadFailedHandle() const { return m_tFailedReadBuffers.GetHasBuffersEvent(); } + HANDLE GetEventReadFailedHandle() const { return m_spFullBuffers->GetHasErrorEvent(); } HANDLE GetEventReadFinishedHandle() const { return m_spFullBuffers->GetHasBuffersEvent(); } size_t GetBufferCount() const; @@ -67,7 +66,6 @@ // queues TReadBufferQueueWrapper m_tEmptyBuffers; - TFailedBufferQueue m_tFailedReadBuffers; // initialized empty buffers TOrderedBufferQueuePtr m_spFullBuffers; // buffers with data }; } Index: src/libchcore/TOverlappedWriter.cpp =================================================================== diff -u -N -rb6a48931b8155a01d871d050f52d915abb2df8ca -rc4cbf6cd567821f9a981586ab5d8294a26f873be --- src/libchcore/TOverlappedWriter.cpp (.../TOverlappedWriter.cpp) (revision b6a48931b8155a01d871d050f52d915abb2df8ca) +++ src/libchcore/TOverlappedWriter.cpp (.../TOverlappedWriter.cpp) (revision c4cbf6cd567821f9a981586ab5d8294a26f873be) @@ -28,7 +28,6 @@ unsigned long long ullFilePos) : m_spLog(logger::MakeLogger(spLogFileData, L"DataBuffer")), m_tBuffersToWrite(spBuffersToWrite), - m_tFailedWriteBuffers(), m_tFinishedBuffers(ullFilePos), m_bDataWritingFinished(false) { @@ -61,12 +60,12 @@ // overwrite error code (to avoid treating the buffer as failed read) pBuffer->SetErrorCode(ERROR_SUCCESS); - m_tFailedWriteBuffers.PushWithFallback(pBuffer, m_tBuffersToWrite); + m_tFinishedBuffers.PushError(pBuffer, m_tBuffersToWrite); } TOverlappedDataBuffer* TOverlappedWriter::GetFailedWriteBuffer() { - return m_tFailedWriteBuffers.Pop(); + return m_tFinishedBuffers.PopError(); } TOverlappedDataBuffer* TOverlappedWriter::GetFinishedBuffer() @@ -113,13 +112,12 @@ size_t TOverlappedWriter::GetBufferCount() const { - return m_tFailedWriteBuffers.GetCount() + m_tFinishedBuffers.GetCount(); + return m_tFinishedBuffers.GetCount(); } void TOverlappedWriter::ReleaseBuffers(const TBufferListPtr& spList) { m_tBuffersToWrite.ReleaseBuffers(spList); - m_tFailedWriteBuffers.ReleaseBuffers(spList); m_tFinishedBuffers.ReleaseBuffers(spList); } } Index: src/libchcore/TOverlappedWriter.h =================================================================== diff -u -N -rb6a48931b8155a01d871d050f52d915abb2df8ca -rc4cbf6cd567821f9a981586ab5d8294a26f873be --- src/libchcore/TOverlappedWriter.h (.../TOverlappedWriter.h) (revision b6a48931b8155a01d871d050f52d915abb2df8ca) +++ src/libchcore/TOverlappedWriter.h (.../TOverlappedWriter.h) (revision c4cbf6cd567821f9a981586ab5d8294a26f873be) @@ -22,7 +22,6 @@ #include "../liblogger/TLogFileData.h" #include "../liblogger/TLogger.h" #include "TOrderedBufferQueue.h" -#include "TFailedBufferQueue.h" #include "TWriteBufferQueueWrapper.h" #include "TBufferList.h" @@ -56,7 +55,7 @@ // event access HANDLE GetEventWritePossibleHandle() const { return m_tBuffersToWrite.GetHasBuffersEvent(); } - HANDLE GetEventWriteFailedHandle() const { return m_tFailedWriteBuffers.GetHasBuffersEvent(); } + HANDLE GetEventWriteFailedHandle() const { return m_tFinishedBuffers.GetHasErrorEvent(); } HANDLE GetEventWriteFinishedHandle() const { return m_tFinishedBuffers.GetHasBuffersEvent(); } size_t GetBufferCount() const; @@ -66,8 +65,6 @@ logger::TLoggerPtr m_spLog; TWriteBufferQueueWrapper m_tBuffersToWrite; - - TFailedBufferQueue m_tFailedWriteBuffers; TOrderedBufferQueue m_tFinishedBuffers; bool m_bDataWritingFinished = false; // output file was already written to the end Index: src/libchcore/TSimpleOrderedBufferQueue.h =================================================================== diff -u -N -r41ec2475aac7f653bac96300af7b1bd111640134 -rc4cbf6cd567821f9a981586ab5d8294a26f873be --- src/libchcore/TSimpleOrderedBufferQueue.h (.../TSimpleOrderedBufferQueue.h) (revision 41ec2475aac7f653bac96300af7b1bd111640134) +++ src/libchcore/TSimpleOrderedBufferQueue.h (.../TSimpleOrderedBufferQueue.h) (revision c4cbf6cd567821f9a981586ab5d8294a26f873be) @@ -33,7 +33,8 @@ { if(!pBuffer) throw TCoreException(eErr_InvalidArgument, L"pBuffer is NULL", LOCATION); - insert(pBuffer); + if(!insert(pBuffer).second) + throw TCoreException(eErr_InvalidArgument, L"Buffer already exists in the collection", LOCATION); } TOverlappedDataBuffer* Pop() Index: src/libchcore/Tests/TFailedBufferQueueTests.cpp =================================================================== diff -u -N --- src/libchcore/Tests/TFailedBufferQueueTests.cpp (revision bef894e38e5c1486824787cf8c47a87a0828b228) +++ src/libchcore/Tests/TFailedBufferQueueTests.cpp (revision 0) @@ -1,194 +0,0 @@ -#include "stdafx.h" -#include "gtest/gtest.h" -#include "gmock/gmock.h" -#include "../TFailedBufferQueue.h" -#include "../GTestMacros.h" -#include "../TOverlappedDataBuffer.h" -#include - -using namespace chcore; - -class FallbackCollection : public std::vector -{ -public: - void Push(TOverlappedDataBuffer* pBuffer, bool /*bKeepPos*/) - { - push_back(pBuffer); - } -}; - -/////////////////////////////////////////////////////////////////////////////// -// Construction tests - -TEST(TFailedBufferQueueTests, ConstructionSanityTest) -{ - TFailedBufferQueue queue; - - EXPECT_EQ(0, queue.GetCount()); - EXPECT_TIMEOUT(queue.GetHasBuffersEvent()); - EXPECT_EQ(true, queue.IsEmpty()); -} - -/////////////////////////////////////////////////////////////////////////////// -// PushBuffer tests - -TEST(TFailedBufferQueueTests, PushBuffer_FirstFailure) -{ - TFailedBufferQueue queue; - TOverlappedDataBuffer buffer(4096, nullptr); - buffer.SetErrorCode(123); - - FallbackCollection collection; - - queue.PushWithFallback(&buffer, collection); - EXPECT_EQ(false, queue.IsEmpty()); - EXPECT_EQ(1, queue.GetCount()); - EXPECT_SIGNALED(queue.GetHasBuffersEvent()); - EXPECT_EQ(true, collection.empty()); -} - -TEST(TFailedBufferQueueTests, PushBuffer_TwoSubsequentFailures) -{ - TFailedBufferQueue queue; - TOverlappedDataBuffer buffer1(4096, nullptr); - TOverlappedDataBuffer buffer2(4096, nullptr); - buffer1.SetFilePosition(0); - buffer1.SetErrorCode(123); - buffer2.SetFilePosition(1000); - buffer2.SetErrorCode(234); - - FallbackCollection collection; - - queue.PushWithFallback(&buffer1, collection); - queue.PushWithFallback(&buffer2, collection); - - EXPECT_EQ(false, queue.IsEmpty()); - EXPECT_EQ(1, queue.GetCount()); - EXPECT_SIGNALED(queue.GetHasBuffersEvent()); - EXPECT_EQ(1, collection.size()); - EXPECT_EQ(&buffer2, collection.front()); - EXPECT_EQ(1000, collection.front()->GetFilePosition()); - EXPECT_EQ(234, collection.front()->GetErrorCode()); -} - -TEST(TFailedBufferQueueTests, PushBuffer_TwoFailuresOutOfOrder) -{ - TFailedBufferQueue queue; - TOverlappedDataBuffer buffer1(4096, nullptr); - TOverlappedDataBuffer buffer2(4096, nullptr); - buffer1.SetFilePosition(0); - buffer1.SetErrorCode(123); - buffer2.SetFilePosition(1000); - buffer2.SetErrorCode(234); - - FallbackCollection collection; - - queue.PushWithFallback(&buffer2, collection); - queue.PushWithFallback(&buffer1, collection); - - EXPECT_EQ(false, queue.IsEmpty()); - EXPECT_EQ(1, queue.GetCount()); - EXPECT_SIGNALED(queue.GetHasBuffersEvent()); - EXPECT_EQ(1, collection.size()); - EXPECT_EQ(&buffer2, collection.front()); - EXPECT_EQ(1000, collection.front()->GetFilePosition()); - EXPECT_EQ(234, collection.front()->GetErrorCode()); -} - -TEST(TFailedBufferQueueTests, PushBuffer_ThrowOnNonErrorBuffer) -{ - TFailedBufferQueue queue; - TOverlappedDataBuffer buffer1(4096, nullptr); - buffer1.SetFilePosition(0); - buffer1.SetErrorCode(ERROR_SUCCESS); - - FallbackCollection collection; - - EXPECT_THROW(queue.PushWithFallback(&buffer1, collection), TCoreException); -} - -TEST(TFailedBufferQueueTests, PushBuffer_WithSamePosition) -{ - TFailedBufferQueue queue; - TOverlappedDataBuffer buffer1(4096, nullptr); - TOverlappedDataBuffer buffer2(4096, nullptr); - buffer1.SetFilePosition(1000); - buffer1.SetErrorCode(123); - buffer2.SetFilePosition(1000); - buffer2.SetErrorCode(234); - - FallbackCollection collection; - - queue.PushWithFallback(&buffer1, collection); - EXPECT_THROW(queue.PushWithFallback(&buffer2, collection), TCoreException); -} - -///////////////////////////////////////////////////////////////////////////////////////// -// Pop tests - -TEST(TFailedBufferQueueTests, PopBuffer_EmptyContainer) -{ - TFailedBufferQueue queue; - EXPECT_EQ(nullptr, queue.Pop()); -} - -TEST(TFailedBufferQueueTests, PopBuffer_WithSamePosition) -{ - TFailedBufferQueue queue; - TOverlappedDataBuffer buffer1(4096, nullptr); - TOverlappedDataBuffer buffer2(4096, nullptr); - TOverlappedDataBuffer buffer3(4096, nullptr); - buffer1.SetFilePosition(0); - buffer1.SetErrorCode(123); - buffer2.SetFilePosition(1000); - buffer2.SetErrorCode(234); - - FallbackCollection collection; - - queue.PushWithFallback(&buffer1, collection); - queue.Pop(); - - EXPECT_EQ(0, collection.size()); - EXPECT_TIMEOUT(queue.GetHasBuffersEvent()); - - queue.PushWithFallback(&buffer2, collection); - EXPECT_EQ(1, queue.GetCount()); -} - -/////////////////////////////////////////////////////////////////////////////////////////// -// Clear tests - -TEST(TFailedBufferQueueTests, Clear) -{ - TFailedBufferQueue queue; - TOverlappedDataBuffer buffer1(4096, nullptr); - buffer1.SetFilePosition(0); - buffer1.SetErrorCode(123); - - FallbackCollection collection; - - queue.PushWithFallback(&buffer1, collection); - queue.Clear(); - - EXPECT_EQ(0, queue.GetCount()); -} - -////////////////////////////////////////////////////////////////////////////////////////// -// ReleaseBuffers - -TEST(TFailedBufferQueueTests, ReleaseBuffers) -{ - TFailedBufferQueue queue; - TOverlappedDataBuffer buffer1(4096, nullptr); - buffer1.SetFilePosition(0); - buffer1.SetErrorCode(123); - - FallbackCollection collection; - - queue.PushWithFallback(&buffer1, collection); - - TBufferListPtr spReturnedBuffers(std::make_shared()); - queue.ReleaseBuffers(spReturnedBuffers); - - EXPECT_EQ(1, spReturnedBuffers->GetCount()); -} Index: src/libchcore/Tests/TOrderedBufferQueueTests.cpp =================================================================== diff -u -N -rda7737de7046ba0ecd255240fb36b4a46584ebf2 -rc4cbf6cd567821f9a981586ab5d8294a26f873be --- src/libchcore/Tests/TOrderedBufferQueueTests.cpp (.../TOrderedBufferQueueTests.cpp) (revision da7737de7046ba0ecd255240fb36b4a46584ebf2) +++ src/libchcore/Tests/TOrderedBufferQueueTests.cpp (.../TOrderedBufferQueueTests.cpp) (revision c4cbf6cd567821f9a981586ab5d8294a26f873be) @@ -5,6 +5,15 @@ #include "../GTestMacros.h" #include "../TCoreException.h" +class FallbackCollection : public std::vector +{ +public: + void Push(chcore::TOverlappedDataBuffer* pBuffer, bool /*bKeepPos*/) + { + push_back(pBuffer); + } +}; + using namespace chcore; /////////////////////////////////////////////////////////////////////////////////////////// @@ -107,3 +116,142 @@ EXPECT_EQ(1, spReleaseList->GetCount()); } + +/////////////////////////////////////////////////////////////////////////////////////////// +// failed buffers + +/////////////////////////////////////////////////////////////////////////////// +// Construction tests + +TEST(TOrderedBufferQueueTests, ConstructionSanityTest) +{ + TOrderedBufferQueue queue(0); + + EXPECT_EQ(0, queue.GetCount()); + EXPECT_TIMEOUT(queue.GetHasErrorEvent()); + EXPECT_EQ(true, queue.IsEmpty()); +} + +/////////////////////////////////////////////////////////////////////////////// +// PushBuffer tests + +TEST(TOrderedBufferQueueTests, PushBuffer_FirstFailure) +{ + TOrderedBufferQueue queue(0); + TOverlappedDataBuffer buffer(4096, nullptr); + buffer.SetErrorCode(123); + + FallbackCollection collection; + + queue.PushError(&buffer, collection); + EXPECT_EQ(1, queue.GetCount()); + EXPECT_SIGNALED(queue.GetHasErrorEvent()); + EXPECT_EQ(true, collection.empty()); +} + +TEST(TOrderedBufferQueueTests, PushBuffer_TwoSubsequentFailures) +{ + TOrderedBufferQueue queue(0); + TOverlappedDataBuffer buffer1(4096, nullptr); + TOverlappedDataBuffer buffer2(4096, nullptr); + buffer1.SetFilePosition(0); + buffer1.SetErrorCode(123); + buffer2.SetFilePosition(1000); + buffer2.SetErrorCode(234); + + FallbackCollection collection; + + queue.PushError(&buffer1, collection); + queue.PushError(&buffer2, collection); + + EXPECT_EQ(1, queue.GetCount()); + EXPECT_SIGNALED(queue.GetHasErrorEvent()); + EXPECT_EQ(1, collection.size()); + EXPECT_EQ(&buffer2, collection.front()); + EXPECT_EQ(1000, collection.front()->GetFilePosition()); + EXPECT_EQ(234, collection.front()->GetErrorCode()); +} + +TEST(TOrderedBufferQueueTests, PushBuffer_TwoFailuresOutOfOrder) +{ + TOrderedBufferQueue queue(0); + TOverlappedDataBuffer buffer1(4096, nullptr); + TOverlappedDataBuffer buffer2(4096, nullptr); + buffer1.SetFilePosition(0); + buffer1.SetErrorCode(123); + buffer2.SetFilePosition(1000); + buffer2.SetErrorCode(234); + + FallbackCollection collection; + + queue.PushError(&buffer2, collection); + queue.PushError(&buffer1, collection); + + EXPECT_EQ(1, queue.GetCount()); + EXPECT_SIGNALED(queue.GetHasErrorEvent()); + EXPECT_EQ(1, collection.size()); + EXPECT_EQ(&buffer2, collection.front()); + EXPECT_EQ(1000, collection.front()->GetFilePosition()); + EXPECT_EQ(234, collection.front()->GetErrorCode()); +} + +TEST(TOrderedBufferQueueTests, PushBuffer_ThrowOnNonErrorBuffer) +{ + TOrderedBufferQueue queue(0); + TOverlappedDataBuffer buffer1(4096, nullptr); + buffer1.SetFilePosition(0); + buffer1.SetErrorCode(ERROR_SUCCESS); + + FallbackCollection collection; + + EXPECT_THROW(queue.PushError(&buffer1, collection), TCoreException); +} + +TEST(TOrderedBufferQueueTests, PushBuffer_WithSamePosition) +{ + TOrderedBufferQueue queue(0); + TOverlappedDataBuffer buffer1(4096, nullptr); + TOverlappedDataBuffer buffer2(4096, nullptr); + buffer1.SetFilePosition(1000); + buffer1.SetErrorCode(123); + buffer2.SetFilePosition(1000); + buffer2.SetErrorCode(234); + + FallbackCollection collection; + + queue.PushError(&buffer1, collection); + EXPECT_THROW(queue.PushError(&buffer2, collection), TCoreException); +} + +///////////////////////////////////////////////////////////////////////////////////////// +// Pop tests + +TEST(TOrderedBufferQueueTests, PopBuffer_EmptyContainer) +{ + TOrderedBufferQueue queue(0); + EXPECT_EQ(nullptr, queue.Pop()); +} + +TEST(TOrderedBufferQueueTests, PopBuffer_WithSamePosition) +{ + TOrderedBufferQueue queue(0); + TOverlappedDataBuffer buffer1(4096, nullptr); + TOverlappedDataBuffer buffer2(4096, nullptr); + TOverlappedDataBuffer buffer3(4096, nullptr); + buffer1.SetFilePosition(0); + buffer1.SetErrorCode(123); + buffer2.SetFilePosition(1000); + buffer2.SetErrorCode(234); + + FallbackCollection collection; + + queue.PushError(&buffer1, collection); + queue.PopError(); + + EXPECT_EQ(0, collection.size()); + EXPECT_TIMEOUT(queue.GetHasErrorEvent()); + + queue.PushError(&buffer2, collection); + EXPECT_EQ(0, queue.GetCount()); + EXPECT_EQ(1, collection.size()); +} Index: src/libchcore/Tests/TSimpleOrderedBufferQueueTests.cpp =================================================================== diff -u -N -rda7737de7046ba0ecd255240fb36b4a46584ebf2 -rc4cbf6cd567821f9a981586ab5d8294a26f873be --- src/libchcore/Tests/TSimpleOrderedBufferQueueTests.cpp (.../TSimpleOrderedBufferQueueTests.cpp) (revision da7737de7046ba0ecd255240fb36b4a46584ebf2) +++ src/libchcore/Tests/TSimpleOrderedBufferQueueTests.cpp (.../TSimpleOrderedBufferQueueTests.cpp) (revision c4cbf6cd567821f9a981586ab5d8294a26f873be) @@ -7,7 +7,7 @@ using namespace chcore; // no expected position mode -TEST(TSimpleOrderedBufferQueueTests, NoExpectedPos_ConstructionSanityTest) +TEST(TSimpleOrderedBufferQueueTests, ConstructionSanityTest) { TSimpleOrderedBufferQueue queue; @@ -16,7 +16,7 @@ EXPECT_EQ(nullptr, queue.Peek()); } -TEST(TSimpleOrderedBufferQueueTests, NoExpectedPos_Push) +TEST(TSimpleOrderedBufferQueueTests, Push) { TSimpleOrderedBufferQueue queue; TOverlappedDataBuffer buffer(1024, nullptr); @@ -28,20 +28,29 @@ EXPECT_EQ(&buffer, queue.Peek()); } -TEST(TSimpleOrderedBufferQueueTests, NoExpectedPos_Pop) +TEST(TSimpleOrderedBufferQueueTests, PushDuplicate) { TSimpleOrderedBufferQueue queue; TOverlappedDataBuffer buffer(1024, nullptr); queue.Push(&buffer); + EXPECT_THROW(queue.Push(&buffer), TCoreException); +} + +TEST(TSimpleOrderedBufferQueueTests, Pop) +{ + TSimpleOrderedBufferQueue queue; + TOverlappedDataBuffer buffer(1024, nullptr); + + queue.Push(&buffer); EXPECT_EQ(&buffer, queue.Pop()); EXPECT_EQ(0, queue.size()); EXPECT_EQ(true, queue.empty()); EXPECT_EQ(nullptr, queue.Peek()); } -TEST(TSimpleOrderedBufferQueueTests, NoExpectedPos_Clear) +TEST(TSimpleOrderedBufferQueueTests, Clear) { TSimpleOrderedBufferQueue queue; TOverlappedDataBuffer buffer(1024, nullptr); @@ -54,7 +63,7 @@ EXPECT_EQ(nullptr, queue.Peek()); } -TEST(TSimpleOrderedBufferQueueTests, NoExpectedPos_ReleaseBuffers) +TEST(TSimpleOrderedBufferQueueTests, ReleaseBuffers) { TSimpleOrderedBufferQueue queue; TBufferListPtr spReleaseList(std::make_shared()); Index: src/libchcore/libchcore.vc140.vcxproj =================================================================== diff -u -N -rda7737de7046ba0ecd255240fb36b4a46584ebf2 -rc4cbf6cd567821f9a981586ab5d8294a26f873be --- src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision da7737de7046ba0ecd255240fb36b4a46584ebf2) +++ src/libchcore/libchcore.vc140.vcxproj (.../libchcore.vc140.vcxproj) (revision c4cbf6cd567821f9a981586ab5d8294a26f873be) @@ -494,7 +494,6 @@ - @@ -744,12 +743,6 @@ true true - - true - true - true - true - true true @@ -805,7 +798,6 @@ true - Index: src/libchcore/libchcore.vc140.vcxproj.filters =================================================================== diff -u -N -rda7737de7046ba0ecd255240fb36b4a46584ebf2 -rc4cbf6cd567821f9a981586ab5d8294a26f873be --- src/libchcore/libchcore.vc140.vcxproj.filters (.../libchcore.vc140.vcxproj.filters) (revision da7737de7046ba0ecd255240fb36b4a46584ebf2) +++ src/libchcore/libchcore.vc140.vcxproj.filters (.../libchcore.vc140.vcxproj.filters) (revision c4cbf6cd567821f9a981586ab5d8294a26f873be) @@ -479,9 +479,6 @@ Source Files\Tools\Data Buffer\Queues - - Source Files\Tools\Data Buffer\Queues - Source Files\Tools\Data Buffer\Queues @@ -880,9 +877,6 @@ Source Files\Tools\Data Buffer\Queues - - Source Files\Tools\Data Buffer\Queues - Source Files\Tools\Data Buffer\Queues @@ -913,9 +907,6 @@ Tests\DataBuffer - - Tests\DataBuffer - Tests\DataBuffer