summaryrefslogtreecommitdiffstats
path: root/src/util.cc
diff options
context:
space:
mode:
authorkwesolowski <krzysztof.wesolowski@rainlabs.pl>2014-07-25 08:36:21 (GMT)
committerkwesolowski <krzysztof.wesolowski@rainlabs.pl>2014-07-25 08:37:04 (GMT)
commit9eca61629030613591a6b63052c2ccd0310c725b (patch)
tree8d06219ea9f83dd075388e92af8e56c7837888c7 /src/util.cc
parent2d377f62ea0a4989bc8a7f5ed2af53b6cd1cc17d (diff)
downloadNinja-9eca61629030613591a6b63052c2ccd0310c725b.zip
Ninja-9eca61629030613591a6b63052c2ccd0310c725b.tar.gz
Ninja-9eca61629030613591a6b63052c2ccd0310c725b.tar.bz2
Fixes for windows CalculateProcessorLoad
- Fixed bad logic condition, - Added comment to clarify
Diffstat (limited to 'src/util.cc')
-rw-r--r--src/util.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/util.cc b/src/util.cc
index 9d0282f..33cf204 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -424,7 +424,7 @@ static double CalculateProcessorLoad(uint64_t idleTicks, uint64_t totalTicks)
uint64_t totalTicksSinceLastTime = totalTicks - previousTotalTicks;
double load;
- if( previousTotalTicks > 0) {
+ if (previousTotalTicks == 0) {
//return error for first call
load = -0.0;
} else if(totalTicksSinceLastTime == 0) {
@@ -454,7 +454,10 @@ double GetLoadAverage() {
double result;
if (getSystemTimeSucceeded) {
uint64_t idleTicks = FileTimeToTickCount(idleTime);
+
+ //kernelTime from GetSystemTimes already includes idleTime
uint64_t totalTicks = FileTimeToTickCount(kernelTime) + FileTimeToTickCount(userTime);
+
result = CalculateProcessorLoad(idleTicks, totalTicks);
} else {
result = -0.0;