Index: src/ch/TSubTaskContext.h =================================================================== diff -u -r6e8aa26e2428e3bc71099255c5911f57bc722100 -rab32897e61cc637a1e28d9dc3f0489b8d16a429c --- src/ch/TSubTaskContext.h (.../TSubTaskContext.h) (revision 6e8aa26e2428e3bc71099255c5911f57bc722100) +++ src/ch/TSubTaskContext.h (.../TSubTaskContext.h) (revision ab32897e61cc637a1e28d9dc3f0489b8d16a429c) @@ -25,27 +25,32 @@ #include "FileInfo.h" -class TTaskDefinition; -namespace chcore { class IFeedbackHandler; } -class TWorkerThreadController; +namespace chcore +{ + class IFeedbackHandler; + class TTaskDefinition; + class TWorkerThreadController; +} + class TBasePathDataContainer; class TTaskLocalStats; class TTaskConfigTracker; class TTaskBasicProgressInfo; +class TLocalFilesystem; /////////////////////////////////////////////////////////////////////////// // TSubTaskContext class TSubTaskContext { public: - TSubTaskContext(TTaskDefinition& rTaskDefinition, TBasePathDataContainer& rBasePathDataContainer, CFileInfoArray& rFilesCache, TTaskLocalStats& rTaskLocalStats, + TSubTaskContext(chcore::TTaskDefinition& rTaskDefinition, TBasePathDataContainer& rBasePathDataContainer, CFileInfoArray& rFilesCache, TTaskLocalStats& rTaskLocalStats, TTaskBasicProgressInfo& rTaskBasicProgressInfo, TTaskConfigTracker& rCfgTracker, icpf::log_file& rLog, - chcore::IFeedbackHandler* piFeedbackHandler, TWorkerThreadController& rThreadController); + chcore::IFeedbackHandler* piFeedbackHandler, chcore::TWorkerThreadController& rThreadController, TLocalFilesystem& rfsLocal); ~TSubTaskContext(); - TTaskDefinition& GetTaskDefinition() { return m_rTaskDefinition; } - const TTaskDefinition& GetTaskDefinition() const { return m_rTaskDefinition; } + chcore::TTaskDefinition& GetTaskDefinition() { return m_rTaskDefinition; } + const chcore::TTaskDefinition& GetTaskDefinition() const { return m_rTaskDefinition; } TBasePathDataContainer& GetBasePathDataContainer() { return m_rBasePathDataContainer; } const TBasePathDataContainer& GetBasePathDataContainer() const { return m_rBasePathDataContainer; } @@ -68,11 +73,14 @@ chcore::IFeedbackHandler* GetFeedbackHandler() { return m_piFeedbackHandler; } const chcore::IFeedbackHandler* GetFeedbackHandler() const { return m_piFeedbackHandler; } - TWorkerThreadController& GetThreadController() { return m_rThreadController; } - const TWorkerThreadController& GetThreadController() const { return m_rThreadController; } + chcore::TWorkerThreadController& GetThreadController() { return m_rThreadController; } + const chcore::TWorkerThreadController& GetThreadController() const { return m_rThreadController; } + TLocalFilesystem& GetLocalFilesystem() { return m_rfsLocal; } + const TLocalFilesystem& GetLocalFilesystem() const { return m_rfsLocal; } + private: - TTaskDefinition& m_rTaskDefinition; + chcore::TTaskDefinition& m_rTaskDefinition; // information about input paths TBasePathDataContainer& m_rBasePathDataContainer; @@ -87,14 +95,17 @@ // configuration changes tracking TTaskConfigTracker& m_rCfgTracker; + // local filesystem access functions + TLocalFilesystem& m_rfsLocal; + // additional data icpf::log_file& m_rLog; // feedback handling chcore::IFeedbackHandler* m_piFeedbackHandler; // thread control - TWorkerThreadController& m_rThreadController; + chcore::TWorkerThreadController& m_rThreadController; }; #endif // __TSUBTASKCONTEXT_H__ \ No newline at end of file