CopyHandler

Clone
ixen
committed
726d907
on 12 Dec 20
Removed unnecessary check when collecting stats (CH-368)
/libchengine/TTaskManagerStatsSnapshot.cpp (+2 -5)
103 103                 m_ullTotalSize = 0;
104 104                 m_dCountSpeed = 0.0;
105 105                 m_dSizeSpeed = 0.0;
106 106                 m_dCombinedProgress = 0.0;
107 107                 m_dAvgCountSpeed = 0.0;
108 108                 m_dAvgSizeSpeed = 0.0;
109 109
110 110                 for(TTaskStatsSnapshotPtr spTaskStats : m_vTasksSnapshots)
111 111                 {
112 112                         if(spTaskStats->GetTaskState() == eTaskState_Waiting ||
113 113                                 spTaskStats->GetTaskState() == eTaskState_Processing ||
114 114                                 spTaskStats->GetTaskState() == eTaskState_Paused ||
115 115                                 spTaskStats->GetTaskState() == eTaskState_Finished)
116 116                         {
117 117                                 m_ullProcessedCount += spTaskStats->GetProcessedCount();
118 118                                 m_ullTotalCount += spTaskStats->GetTotalCount();
119 119
120 120                                 m_ullProcessedSize += spTaskStats->GetProcessedSize();
121 121                                 m_ullTotalSize += spTaskStats->GetTotalSize();
122 122                         
123                                   if(spTaskStats->IsTaskRunning())
124                                   {
125 123                                 m_dCountSpeed += spTaskStats->GetCountSpeed();
126 124                                 m_dSizeSpeed += spTaskStats->GetSizeSpeed();
127                                   }
128 125
129 126                                 m_dAvgCountSpeed += spTaskStats->GetAvgCountSpeed();
130 127                                 m_dAvgSizeSpeed += spTaskStats->GetAvgSizeSpeed();
131 128                         }
132 129                 }
133 130
134 131                 // we're treating each of the items as 4k object to process
135 132                 // to have some balance between items' count and items' size in
136 133                 // progress information
137 134                 unsigned long long ullProcessed = AssumedFileMinDataSize * m_ullProcessedCount + m_ullProcessedSize;
138 135                 unsigned long long ullTotal = AssumedFileMinDataSize * m_ullTotalCount + m_ullTotalSize;
139 136
140 137                 if (ullTotal != 0)
141 138                         m_dCombinedProgress = Math::Div64(ullProcessed, ullTotal);
142 139
143 140                 m_bCacheFilled = true;
144 141         }
145 142
146 143         unsigned long long TTaskManagerStatsSnapshot::GetProcessedCount() const
147 144         {