Index: src/libchcore/Tests/TOverlappedReaderTests.cpp
===================================================================
diff -u -N -rc719644bb4360fcf7ccf6f1139bcae852bd6effd -rd99302fce795dbb5139659016a5da7948f141fb4
--- src/libchcore/Tests/TOverlappedReaderTests.cpp	(.../TOverlappedReaderTests.cpp)	(revision c719644bb4360fcf7ccf6f1139bcae852bd6effd)
+++ src/libchcore/Tests/TOverlappedReaderTests.cpp	(.../TOverlappedReaderTests.cpp)	(revision d99302fce795dbb5139659016a5da7948f141fb4)
@@ -16,7 +16,8 @@
 
 	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
 	TOverlappedProcessorRangePtr spRange(std::make_shared<TOverlappedProcessorRange>(0));
-	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096);
+	TSharedCountPtr<size_t> spOtfBufferCount(std::make_shared<TSharedCount<size_t>>());
+	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096, 1, 1, spOtfBufferCount);
 
 	EXPECT_EQ(nullptr, tReader.GetEmptyBuffer());
 	EXPECT_EQ(nullptr, tReader.GetFailedReadBuffer());
@@ -36,7 +37,8 @@
 
 	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>(3, 32768));
 	TOverlappedProcessorRangePtr spRange(std::make_shared<TOverlappedProcessorRange>(0));
-	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096);
+	TSharedCountPtr<size_t> spOtfBufferCount(std::make_shared<TSharedCount<size_t>>());
+	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096, 1, 1, spOtfBufferCount);
 
 	EXPECT_SIGNALED(tReader.GetEventReadPossibleHandle());
 	EXPECT_TIMEOUT(tReader.GetEventReadFailedHandle());
@@ -57,7 +59,8 @@
 
 	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>(3, 32768));
 	TOverlappedProcessorRangePtr spRange(std::make_shared<TOverlappedProcessorRange>(0));
-	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096);
+	TSharedCountPtr<size_t> spOtfBufferCount(std::make_shared<TSharedCount<size_t>>());
+	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096, 1, 1, spOtfBufferCount);
 
 	EXPECT_SIGNALED(tReader.GetEventReadPossibleHandle());
 
@@ -79,7 +82,8 @@
 
 	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>(3, 32768));
 	TOverlappedProcessorRangePtr spRange(std::make_shared<TOverlappedProcessorRange>(0));
-	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096);
+	TSharedCountPtr<size_t> spOtfBufferCount(std::make_shared<TSharedCount<size_t>>());
+	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096, 1, 1, spOtfBufferCount);
 
 	TOverlappedDataBuffer* pBuffers[ 3 ] = { tReader.GetEmptyBuffer(), tReader.GetEmptyBuffer(), tReader.GetEmptyBuffer() };
 
@@ -101,7 +105,8 @@
 
 	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>(3, 32768));
 	TOverlappedProcessorRangePtr spRange(std::make_shared<TOverlappedProcessorRange>(0));
-	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096);
+	TSharedCountPtr<size_t> spOtfBufferCount(std::make_shared<TSharedCount<size_t>>());
+	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096, 1, 1, spOtfBufferCount);
 
 	EXPECT_THROW(tReader.AddEmptyBuffer(nullptr), TCoreException);
 	EXPECT_THROW(tReader.AddRetryBuffer(nullptr), TCoreException);
@@ -114,7 +119,9 @@
 
 	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>(3, 32768));
 	TOverlappedProcessorRangePtr spRange(std::make_shared<TOverlappedProcessorRange>(0));
-	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096);
+	TSharedCountPtr<size_t> spOtfBufferCount(std::make_shared<TSharedCount<size_t>>());
+	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096, 1, 1, spOtfBufferCount);
+
 	TOverlappedDataBuffer* pBuffer = tReader.GetEmptyBuffer();
 
 	tReader.AddFinishedReadBuffer(pBuffer);
@@ -127,7 +134,9 @@
 
 	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>(3, 32768));
 	TOverlappedProcessorRangePtr spRange(std::make_shared<TOverlappedProcessorRange>(0));
-	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096);
+	TSharedCountPtr<size_t> spOtfBufferCount(std::make_shared<TSharedCount<size_t>>());
+	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096, 1, 1, spOtfBufferCount);
+
 	TOverlappedDataBuffer* pBuffers[ 3 ] = { tReader.GetEmptyBuffer(), tReader.GetEmptyBuffer(), tReader.GetEmptyBuffer() };
 
 	tReader.AddFinishedReadBuffer(pBuffers[ 1 ]);
@@ -146,7 +155,9 @@
 
 	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>(3, 32768));
 	TOverlappedProcessorRangePtr spRange(std::make_shared<TOverlappedProcessorRange>(0));
-	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096);
+	TSharedCountPtr<size_t> spOtfBufferCount(std::make_shared<TSharedCount<size_t>>());
+	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096, 1, 1, spOtfBufferCount);
+
 	TOverlappedDataBuffer* pBuffers[ 3 ] = { tReader.GetEmptyBuffer(), tReader.GetEmptyBuffer(), tReader.GetEmptyBuffer() };
 
 	pBuffers[ 1 ]->SetLastPart(true);
@@ -164,7 +175,8 @@
 
 	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>(3, 32768));
 	TOverlappedProcessorRangePtr spRange(std::make_shared<TOverlappedProcessorRange>(0));
-	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096);
+	TSharedCountPtr<size_t> spOtfBufferCount(std::make_shared<TSharedCount<size_t>>());
+	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096, 1, 1, spOtfBufferCount);
 
 	EXPECT_THROW(tReader.AddFinishedReadBuffer(nullptr), TCoreException);
 }
@@ -175,7 +187,9 @@
 
 	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>(3, 32768));
 	TOverlappedProcessorRangePtr spRange(std::make_shared<TOverlappedProcessorRange>(0));
-	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096);
+	TSharedCountPtr<size_t> spOtfBufferCount(std::make_shared<TSharedCount<size_t>>());
+	TOverlappedReader tReader(spLogData, spBuffers->GetBufferList(), spRange, 4096, 1, 1, spOtfBufferCount);
+
 	TOverlappedDataBuffer* pBuffer = tReader.GetEmptyBuffer();
 
 	pBuffer->InitForRead(0, 1280);