Index: src/libchcore/Tests/TOverlappedDataBufferTests.cpp
===================================================================
diff -u -N -rd23ed007b8142c6faf6d8cad4a421ac243ef0146 -r1506d51ff1c0a5d156dab398051efc0c87473e81
--- src/libchcore/Tests/TOverlappedDataBufferTests.cpp	(.../TOverlappedDataBufferTests.cpp)	(revision d23ed007b8142c6faf6d8cad4a421ac243ef0146)
+++ src/libchcore/Tests/TOverlappedDataBufferTests.cpp	(.../TOverlappedDataBufferTests.cpp)	(revision 1506d51ff1c0a5d156dab398051efc0c87473e81)
@@ -28,11 +28,10 @@
 {
 	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
 
-	TOverlappedDataBufferQueuePtr spBuffers(std::make_shared<TOverlappedDataBufferQueue>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers);
+	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
+	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
 	TOverlappedDataBuffer buffer(32768, &queue);
 
-	EXPECT_EQ(0, buffer.GetBufferOrder());
 	EXPECT_NE(nullptr, buffer.GetBufferPtr());
 	EXPECT_EQ(32768, buffer.GetBufferSize());
 	EXPECT_EQ(0, buffer.GetBytesTransferred());
@@ -48,8 +47,8 @@
 {
 	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
 
-	TOverlappedDataBufferQueuePtr spBuffers(std::make_shared<TOverlappedDataBufferQueue>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers);
+	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
+	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
 	TOverlappedDataBuffer buffer(32768, &queue);
 
 	buffer.ReinitializeBuffer(16384);
@@ -62,8 +61,8 @@
 {
 	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
 
-	TOverlappedDataBufferQueuePtr spBuffers(std::make_shared<TOverlappedDataBufferQueue>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers);
+	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
+	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
 	TOverlappedDataBuffer buffer(16384, &queue);
 
 	buffer.ReinitializeBuffer(32768);
@@ -76,8 +75,8 @@
 {
 	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
 
-	TOverlappedDataBufferQueuePtr spBuffers(std::make_shared<TOverlappedDataBufferQueue>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers);
+	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
+	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
 	TOverlappedDataBuffer buffer(16384, &queue);
 
 	buffer.SetRequestedDataSize(123);
@@ -89,8 +88,8 @@
 {
 	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
 
-	TOverlappedDataBufferQueuePtr spBuffers(std::make_shared<TOverlappedDataBufferQueue>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers);
+	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
+	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
 	TOverlappedDataBuffer buffer(16384, &queue);
 
 	buffer.SetRealDataSize(123);
@@ -102,34 +101,21 @@
 {
 	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
 
-	TOverlappedDataBufferQueuePtr spBuffers(std::make_shared<TOverlappedDataBufferQueue>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers);
+	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
+	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
 	TOverlappedDataBuffer buffer(16384, &queue);
 
 	buffer.SetLastPart(true);
 
 	EXPECT_TRUE(buffer.IsLastPart());
 }
 
-TEST(TOverlappedDataBufferTests, SetBufferOrder_GetBufferOrder)
-{
-	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
-
-	TOverlappedDataBufferQueuePtr spBuffers(std::make_shared<TOverlappedDataBufferQueue>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers);
-	TOverlappedDataBuffer buffer(16384, &queue);
-
-	buffer.SetBufferOrder(123);
-
-	EXPECT_EQ(123, buffer.GetBufferOrder());
-}
-
 TEST(TOverlappedDataBufferTests, SetErrorCode_GetErrorCode)
 {
 	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
 
-	TOverlappedDataBufferQueuePtr spBuffers(std::make_shared<TOverlappedDataBufferQueue>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers);
+	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
+	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
 	TOverlappedDataBuffer buffer(16384, &queue);
 
 	buffer.SetErrorCode(123);
@@ -141,8 +127,8 @@
 {
 	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
 
-	TOverlappedDataBufferQueuePtr spBuffers(std::make_shared<TOverlappedDataBufferQueue>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers);
+	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
+	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
 	TOverlappedDataBuffer buffer(16384, &queue);
 
 	buffer.SetStatusCode(123);
@@ -154,8 +140,8 @@
 {
 	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
 
-	TOverlappedDataBufferQueuePtr spBuffers(std::make_shared<TOverlappedDataBufferQueue>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers);
+	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
+	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
 	TOverlappedDataBuffer buffer(16384, &queue);
 
 	buffer.SetBytesTransferred(123);
@@ -167,8 +153,8 @@
 {
 	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
 
-	TOverlappedDataBufferQueuePtr spBuffers(std::make_shared<TOverlappedDataBufferQueue>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers);
+	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
+	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
 	TOverlappedDataBuffer buffer(16384, &queue);
 
 	buffer.SetFilePosition(123);
@@ -181,8 +167,8 @@
 {
 	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
 
-	TOverlappedDataBufferQueuePtr spBuffers(std::make_shared<TOverlappedDataBufferQueue>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers);
+	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
+	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
 	TOverlappedDataBuffer buffer(16384, &queue);
 
 	buffer.SetRequestedDataSize(123);
@@ -208,8 +194,8 @@
 {
 	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
 
-	TOverlappedDataBufferQueuePtr spBuffers(std::make_shared<TOverlappedDataBufferQueue>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers);
+	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
+	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
 	TOverlappedDataBuffer buffer(16384, &queue);
 
 	buffer.SetRequestedDataSize(123);
@@ -231,8 +217,8 @@
 {
 	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
 
-	TOverlappedDataBufferQueuePtr spBuffers(std::make_shared<TOverlappedDataBufferQueue>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers);
+	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
+	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
 	TOverlappedDataBuffer buffer(16384, &queue);
 
 	buffer.SetRequestedDataSize(123);
@@ -259,8 +245,8 @@
 {
 	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
 
-	TOverlappedDataBufferQueuePtr spBuffers(std::make_shared<TOverlappedDataBufferQueue>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers);
+	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
+	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
 	TOverlappedDataBuffer buffer(16384, &queue);
 
 	buffer.InitForRead(0, 1024);
@@ -280,8 +266,8 @@
 {
 	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
 
-	TOverlappedDataBufferQueuePtr spBuffers(std::make_shared<TOverlappedDataBufferQueue>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers);
+	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
+	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
 	TOverlappedDataBuffer buffer(16384, &queue);
 
 	buffer.InitForRead(0, 1024);
@@ -301,8 +287,8 @@
 {
 	logger::TLogFileDataPtr spLogData(std::make_shared<logger::TLogFileData>());
 
-	TOverlappedDataBufferQueuePtr spBuffers(std::make_shared<TOverlappedDataBufferQueue>());
-	TOverlappedReaderWriter queue(spLogData, spBuffers);
+	TOverlappedMemoryPoolPtr spBuffers(std::make_shared<TOverlappedMemoryPool>());
+	TOverlappedReaderWriter queue(spLogData, spBuffers, 0, 4096);
 	TOverlappedDataBuffer buffer(16384, &queue);
 
 	buffer.InitForRead(0, 1024);