Index: src/ch/task.h =================================================================== diff -u -N -r722397d70c60d1699fd70024ffdfcee539fe45db -r644f7481fc638fc673e2f390e9f0172492279be5 --- src/ch/task.h (.../task.h) (revision 722397d70c60d1699fd70024ffdfcee539fe45db) +++ src/ch/task.h (.../task.h) (revision 644f7481fc638fc673e2f390e9f0172492279be5) @@ -226,13 +226,13 @@ TTasksGlobalStats(); ~TTasksGlobalStats(); - void IncreaseGlobalTasksSize(unsigned long long ullModify); - void DecreaseGlobalTasksSize(unsigned long long ullModify); - unsigned long long GetGlobalTasksSize() const; + void IncreaseGlobalTotalSize(unsigned long long ullModify); + void DecreaseGlobalTotalSize(unsigned long long ullModify); + unsigned long long GetGlobalTotalSize() const; - void IncreaseGlobalTasksPosition(unsigned long long ullModify); - void DecreaseGlobalTasksPosition(unsigned long long ullModify); - unsigned long long GetGlobalTasksPosition() const; + void IncreaseGlobalProcessedSize(unsigned long long ullModify); + void DecreaseGlobalProcessedSize(unsigned long long ullModify); + unsigned long long GetGlobalProcessedSize() const; void IncreaseGlobalProgressData(unsigned long long ullTasksPosition, unsigned long long ullTasksSize); void DecreaseGlobalProgressData(unsigned long long ullTasksPosition, unsigned long long ullTasksSize); @@ -244,8 +244,8 @@ size_t GetRunningTasksCount() const; private: - volatile unsigned long long m_ullGlobalTasksSize; - volatile unsigned long long m_ullGlobalTasksPosition; + volatile unsigned long long m_ullGlobalTotalSize; + volatile unsigned long long m_ullGlobalProcessedSize; volatile size_t m_stRunningTasks; // count of current operations mutable boost::shared_mutex m_lock;