Index: src/libchcore/TTaskStatsSnapshot.h =================================================================== diff -u -N -ra5f396da5ed5ffb3fcd9fdf22afb5a7fd07e1ab8 -rb1ecc12ba4c1f2a7b4acd6e82fc4193535e55ff0 --- src/libchcore/TTaskStatsSnapshot.h (.../TTaskStatsSnapshot.h) (revision a5f396da5ed5ffb3fcd9fdf22afb5a7fd07e1ab8) +++ src/libchcore/TTaskStatsSnapshot.h (.../TTaskStatsSnapshot.h) (revision b1ecc12ba4c1f2a7b4acd6e82fc4193535e55ff0) @@ -30,6 +30,7 @@ #include "TFileFiltersArray.h" #include "EOperationTypes.h" #include "ETaskCurrentState.h" +#include "TaskID.h" BEGIN_CHCORE_NAMESPACE @@ -40,6 +41,10 @@ void Clear(); + // task ID + taskid_t GetTaskID() const { return m_tTaskID; } + void SetTaskID(taskid_t val) { m_tTaskID = val; } + // subtasks' stats const TSubTaskArrayStatsSnapshot& GetSubTasksStats() const { return m_tSubTasksStats; } TSubTaskArrayStatsSnapshot& GetSubTasksStats() { return m_tSubTasksStats; } @@ -79,8 +84,8 @@ ETaskCurrentState GetTaskState() const { return m_eTaskState; } void SetTaskState(ETaskCurrentState val) { m_eTaskState = val; } - TString GetTaskID() const { return m_strTaskID; } - void SetTaskID(const TString& val) { m_strTaskID = val; } + TString GetTaskName() const { return m_strTaskID; } + void SetTaskName(const TString& val) { m_strTaskID = val; } EOperationType GetOperationType() const { return m_eOperationType; } void SetOperationType(EOperationType val) { m_eOperationType = val; } @@ -94,15 +99,14 @@ void SetCurrentBufferSize(unsigned long long ullSize) { m_ullCurrentBufferSize = ullSize; } unsigned long long GetCurrentBufferSize() const { return m_ullCurrentBufferSize; } - size_t GetSessionUniqueID() const { return m_stSessionUniqueID; } - void SetSessionUniqueID(size_t val) { m_stSessionUniqueID = val; } - private: void CalculateProgressAndSpeeds() const; private: TSubTaskArrayStatsSnapshot m_tSubTasksStats; + taskid_t m_tTaskID; + bool m_bTaskIsRunning; unsigned long long m_ullTimeElapsed; @@ -115,7 +119,6 @@ bool m_bIgnoreDirectories; bool m_bCreateEmptyFiles; unsigned long long m_ullCurrentBufferSize; - size_t m_stSessionUniqueID; // cache for items calculated on-demand mutable bool m_bCacheFilled;