Index: src/libchcore/TOverlappedReaderWriterFB.h =================================================================== diff -u -N -r8aa9ecb7ccb06d721b9717a4bb664651b0b8b10e -rf1d25f23712f5de7459f690ab51b2640d0f81b91 --- src/libchcore/TOverlappedReaderWriterFB.h (.../TOverlappedReaderWriterFB.h) (revision 8aa9ecb7ccb06d721b9717a4bb664651b0b8b10e) +++ src/libchcore/TOverlappedReaderWriterFB.h (.../TOverlappedReaderWriterFB.h) (revision f1d25f23712f5de7459f690ab51b2640d0f81b91) @@ -30,17 +30,25 @@ class TOverlappedReaderWriterFB { public: - explicit TOverlappedReaderWriterFB(const TFilesystemFileFeedbackWrapperPtr& spSrcFile, const TFileInfoPtr& spSrcFileInfo, - const TFilesystemFileFeedbackWrapperPtr& spDstFile, + explicit TOverlappedReaderWriterFB(const IFilesystemPtr& spFilesystem, + const IFeedbackHandlerPtr& spFeedbackHandler, + TWorkerThreadController& rThreadController, + const TFileInfoPtr& spSrcFileInfo, + const TSmartPath& pathDst, const TSubTaskStatsInfoPtr& spStats, - const logger::TLogFileDataPtr& spLogFileData, const TOverlappedMemoryPoolPtr& spBuffers, - unsigned long long ullFilePos, DWORD dwChunkSize); + const logger::TLogFileDataPtr& spLogFileData, + const TOverlappedMemoryPoolPtr& spBuffers, + unsigned long long ullResumePosition, + DWORD dwChunkSize, + bool bNoBuffering, + bool bProtectReadOnlyFiles, + bool bOnlyCreate); TOverlappedReaderWriterFB(const TOverlappedReaderWriterFB&) = delete; ~TOverlappedReaderWriterFB(); TOverlappedReaderWriterFB& operator=(const TOverlappedReaderWriterFB&) = delete; - TSubTaskBase::ESubOperationResult Start(HANDLE hKill, bool bCreateOnly); + TSubTaskBase::ESubOperationResult Start(); // reader/writer TOverlappedReaderFBPtr GetReader() const { return m_spReader; } @@ -51,7 +59,10 @@ private: logger::TLoggerPtr m_spLog; + TWorkerThreadController& m_rThreadController; + TOverlappedProcessorRangePtr m_spRange; + TOverlappedMemoryPoolPtr m_spMemoryPool; TOverlappedReaderFBPtr m_spReader; TOverlappedWriterFBPtr m_spWriter;