Index: src/libchcore/Tests/TOverlappedReaderTests.cpp =================================================================== diff -u -N -ra1f5b3d99f2f175b102d81379698ea1f08e42cce -rf1d25f23712f5de7459f690ab51b2640d0f81b91 --- src/libchcore/Tests/TOverlappedReaderTests.cpp (.../TOverlappedReaderTests.cpp) (revision a1f5b3d99f2f175b102d81379698ea1f08e42cce) +++ src/libchcore/Tests/TOverlappedReaderTests.cpp (.../TOverlappedReaderTests.cpp) (revision f1d25f23712f5de7459f690ab51b2640d0f81b91) @@ -15,7 +15,8 @@ logger::TLogFileDataPtr spLogData(std::make_shared()); TOverlappedMemoryPoolPtr spBuffers(std::make_shared()); - TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), 0, 4096); + TOverlappedProcessorRangePtr spRange(std::make_shared(0)); + TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096); EXPECT_EQ(nullptr, tReader.GetEmptyBuffer()); EXPECT_EQ(nullptr, tReader.GetFailedReadBuffer()); @@ -36,7 +37,8 @@ logger::TLogFileDataPtr spLogData(std::make_shared()); TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), 0, 4096); + TOverlappedProcessorRangePtr spRange(std::make_shared(0)); + TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096); EXPECT_SIGNALED(tReader.GetEventReadPossibleHandle()); EXPECT_TIMEOUT(tReader.GetEventReadFailedHandle()); @@ -57,7 +59,8 @@ logger::TLogFileDataPtr spLogData(std::make_shared()); TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), 0, 4096); + TOverlappedProcessorRangePtr spRange(std::make_shared(0)); + TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096); EXPECT_SIGNALED(tReader.GetEventReadPossibleHandle()); @@ -78,7 +81,8 @@ logger::TLogFileDataPtr spLogData(std::make_shared()); TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), 0, 4096); + TOverlappedProcessorRangePtr spRange(std::make_shared(0)); + TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096); TOverlappedDataBuffer* pBuffers[ 3 ] = { tReader.GetEmptyBuffer(), tReader.GetEmptyBuffer(), tReader.GetEmptyBuffer() }; @@ -99,7 +103,8 @@ logger::TLogFileDataPtr spLogData(std::make_shared()); TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), 0, 4096); + TOverlappedProcessorRangePtr spRange(std::make_shared(0)); + TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096); EXPECT_THROW(tReader.AddEmptyBuffer(nullptr), TCoreException); EXPECT_THROW(tReader.AddRetryBuffer(nullptr), TCoreException); @@ -111,7 +116,8 @@ logger::TLogFileDataPtr spLogData(std::make_shared()); TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), 0, 4096); + TOverlappedProcessorRangePtr spRange(std::make_shared(0)); + TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096); TOverlappedDataBuffer* pBuffer = tReader.GetEmptyBuffer(); tReader.AddFinishedReadBuffer(pBuffer); @@ -126,7 +132,8 @@ logger::TLogFileDataPtr spLogData(std::make_shared()); TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), 0, 4096); + TOverlappedProcessorRangePtr spRange(std::make_shared(0)); + TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096); TOverlappedDataBuffer* pBuffers[ 3 ] = { tReader.GetEmptyBuffer(), tReader.GetEmptyBuffer(), tReader.GetEmptyBuffer() }; tReader.AddFinishedReadBuffer(pBuffers[ 1 ]); @@ -144,7 +151,8 @@ logger::TLogFileDataPtr spLogData(std::make_shared()); TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), 0, 4096); + TOverlappedProcessorRangePtr spRange(std::make_shared(0)); + TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096); TOverlappedDataBuffer* pBuffers[ 3 ] = { tReader.GetEmptyBuffer(), tReader.GetEmptyBuffer(), tReader.GetEmptyBuffer() }; pBuffers[ 1 ]->SetLastPart(true); @@ -161,7 +169,8 @@ logger::TLogFileDataPtr spLogData(std::make_shared()); TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), 0, 4096); + TOverlappedProcessorRangePtr spRange(std::make_shared(0)); + TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096); EXPECT_THROW(tReader.AddFinishedReadBuffer(nullptr), TCoreException); } @@ -171,7 +180,8 @@ logger::TLogFileDataPtr spLogData(std::make_shared()); TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), 0, 4096); + TOverlappedProcessorRangePtr spRange(std::make_shared(0)); + TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096); TOverlappedDataBuffer* pBuffer = tReader.GetEmptyBuffer(); pBuffer->InitForRead(0, 1280); @@ -187,7 +197,8 @@ logger::TLogFileDataPtr spLogData(std::make_shared()); TOverlappedMemoryPoolPtr spBuffers(std::make_shared(3, 32768)); - TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), 0, 4096); + TOverlappedProcessorRangePtr spRange(std::make_shared(0)); + TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096); TOverlappedDataBuffer* pBuffers[ 3 ] = { tReader.GetEmptyBuffer(), tReader.GetEmptyBuffer(), tReader.GetEmptyBuffer() }; pBuffers[ 0 ]->InitForRead(0, 1000);