Index: src/libchcore/Tests/TOverlappedReaderWriterTests.cpp =================================================================== diff -u -N -rb89aea376d35ce4b0d6506f7d04dba73830d9268 -r1506d51ff1c0a5d156dab398051efc0c87473e81 --- src/libchcore/Tests/TOverlappedReaderWriterTests.cpp (.../TOverlappedReaderWriterTests.cpp) (revision b89aea376d35ce4b0d6506f7d04dba73830d9268) +++ src/libchcore/Tests/TOverlappedReaderWriterTests.cpp (.../TOverlappedReaderWriterTests.cpp) (revision 1506d51ff1c0a5d156dab398051efc0c87473e81) @@ -25,8 +25,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared()); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared()); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); EXPECT_EQ(nullptr, tReaderWriter.GetEmptyBuffer()); EXPECT_EQ(nullptr, tReaderWriter.GetFullBuffer()); @@ -51,8 +51,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); EXPECT_NE(nullptr, tReaderWriter.GetEmptyBuffer()); EXPECT_EQ(nullptr, tReaderWriter.GetFullBuffer()); @@ -74,8 +74,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); TOverlappedDataBuffer* pBuffers[3] = { tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer() }; EXPECT_EQ(3, spBuffers->GetTotalBufferCount()); @@ -91,8 +91,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); tReaderWriter.GetEmptyBuffer(); @@ -103,8 +103,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); EXPECT_THROW(spBuffers->ReinitializeBuffers(3, 0), TCoreException); } @@ -113,8 +113,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); spBuffers->ReinitializeBuffers(3, 32768); TOverlappedDataBuffer* pBuffers[3] = { tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer() }; @@ -131,8 +131,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); spBuffers->ReinitializeBuffers(3, 65536); TOverlappedDataBuffer* pBuffers[3] = { tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer() }; @@ -149,8 +149,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 65536)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 65536)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); spBuffers->ReinitializeBuffers(3, 32768); TOverlappedDataBuffer* pBuffers[3] = { tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer() }; @@ -167,8 +167,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); spBuffers->ReinitializeBuffers(5, 32768); EXPECT_EQ(5, spBuffers->GetTotalBufferCount()); @@ -187,8 +187,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(5, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(5, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); spBuffers->ReinitializeBuffers(3, 32768); EXPECT_EQ(3, spBuffers->GetTotalBufferCount()); @@ -206,8 +206,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); EXPECT_SIGNALED(tReaderWriter.GetEventReadPossibleHandle()); @@ -227,8 +227,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); TOverlappedDataBuffer* pBuffers[3] = { tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer() }; @@ -248,8 +248,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); EXPECT_THROW(tReaderWriter.AddEmptyBuffer(nullptr), TCoreException); } @@ -259,8 +259,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); TOverlappedDataBuffer* pBuffer = tReaderWriter.GetEmptyBuffer(); tReaderWriter.AddFullBuffer(pBuffer); @@ -274,8 +274,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); TOverlappedDataBuffer* pBuffers[3] = { tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer() }; tReaderWriter.AddFullBuffer(pBuffers[1]); @@ -292,8 +292,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); TOverlappedDataBuffer* pBuffers[3] = { tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer() }; pBuffers[1]->SetLastPart(true); @@ -309,8 +309,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); TOverlappedDataBuffer* pBuffers[3] = { tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer() }; pBuffers[2]->SetLastPart(true); @@ -334,8 +334,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); EXPECT_THROW(tReaderWriter.AddFullBuffer(nullptr), TCoreException); } @@ -344,8 +344,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); TOverlappedDataBuffer* pBuffer = tReaderWriter.GetEmptyBuffer(); pBuffer->InitForRead(0, 1280); @@ -360,19 +360,19 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); TOverlappedDataBuffer* pBuffers[3] = { tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer() }; pBuffers[0]->InitForRead(0, 1000); pBuffers[0]->SetBytesTransferred(1000); pBuffers[0]->SetStatusCode(0); - pBuffers[1]->InitForRead(0, 1200); + pBuffers[1]->InitForRead(1000, 1200); pBuffers[1]->SetBytesTransferred(1200); pBuffers[1]->SetStatusCode(0); - pBuffers[2]->InitForRead(0, 1400); + pBuffers[2]->InitForRead(2200, 1400); pBuffers[2]->SetBytesTransferred(800); pBuffers[2]->SetStatusCode(0); pBuffers[2]->SetLastPart(true); @@ -394,19 +394,19 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); TOverlappedDataBuffer* pBuffers[3] = { tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer() }; pBuffers[0]->InitForRead(0, 1000); pBuffers[0]->SetBytesTransferred(1000); pBuffers[0]->SetStatusCode(0); - pBuffers[1]->InitForRead(0, 1200); + pBuffers[1]->InitForRead(1000, 1200); pBuffers[1]->SetBytesTransferred(1200); pBuffers[1]->SetStatusCode(0); - pBuffers[2]->InitForRead(0, 1400); + pBuffers[2]->InitForRead(2200, 1400); pBuffers[2]->SetBytesTransferred(800); pBuffers[2]->SetStatusCode(0); pBuffers[2]->SetLastPart(true); @@ -423,19 +423,19 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); TOverlappedDataBuffer* pBuffers[3] = { tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer() }; - pBuffers[0]->InitForRead(0, 1000); - pBuffers[0]->SetBytesTransferred(1000); + pBuffers[0]->InitForRead(0, 4096); + pBuffers[0]->SetBytesTransferred(4096); pBuffers[0]->SetStatusCode(0); - pBuffers[1]->InitForRead(0, 1200); - pBuffers[1]->SetBytesTransferred(1200); + pBuffers[1]->InitForRead(4096, 4096); + pBuffers[1]->SetBytesTransferred(4096); pBuffers[1]->SetStatusCode(0); - pBuffers[2]->InitForRead(0, 1400); + pBuffers[2]->InitForRead(8192, 4096); pBuffers[2]->SetBytesTransferred(800); pBuffers[2]->SetStatusCode(0); pBuffers[2]->SetLastPart(true); @@ -464,19 +464,19 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); TOverlappedDataBuffer* pBuffers[3] = { tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer() }; pBuffers[0]->InitForRead(0, 1000); pBuffers[0]->SetBytesTransferred(1000); pBuffers[0]->SetStatusCode(0); - pBuffers[1]->InitForRead(0, 1200); + pBuffers[1]->InitForRead(1000, 1200); pBuffers[1]->SetBytesTransferred(1200); pBuffers[1]->SetStatusCode(0); - pBuffers[2]->InitForRead(0, 1400); + pBuffers[2]->InitForRead(2200, 1400); pBuffers[2]->SetBytesTransferred(800); pBuffers[2]->SetStatusCode(0); pBuffers[2]->SetLastPart(true); @@ -495,8 +495,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); EXPECT_THROW(tReaderWriter.AddFinishedBuffer(nullptr), TCoreException); } @@ -505,8 +505,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); TOverlappedDataBuffer* pBuffer = tReaderWriter.GetEmptyBuffer(); tReaderWriter.AddFinishedBuffer(pBuffer); EXPECT_THROW(tReaderWriter.AddFinishedBuffer(pBuffer), TCoreException); @@ -517,8 +517,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); TOverlappedDataBuffer* pBuffers[3] = { tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer() }; pBuffers[0]->SetLastPart(true); @@ -537,8 +537,8 @@ { logger::TLogFileDataPtr spLogData(std::make_shared()); - TOverlappedDataBufferQueuePtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers); + TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); + TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096); tReaderWriter.GetEmptyBuffer();