summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2012-07-28 20:27:27 (GMT)
committerEvan Martin <martine@danga.com>2012-07-28 20:27:27 (GMT)
commit48bd2f2b997b26ac187757a65936619969d15ddb (patch)
tree3e8ba51362fcf63714064db818ed78842b2a1c97 /src
parent809b8d7e04af7811c3be49987ff6c680fe289b57 (diff)
downloadNinja-48bd2f2b997b26ac187757a65936619969d15ddb.zip
Ninja-48bd2f2b997b26ac187757a65936619969d15ddb.tar.gz
Ninja-48bd2f2b997b26ac187757a65936619969d15ddb.tar.bz2
simplify load-average code
Diffstat (limited to 'src')
-rw-r--r--src/util.cc18
1 files changed, 3 insertions, 15 deletions
diff --git a/src/util.cc b/src/util.cc
index ca05292..2277a82 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -284,17 +284,14 @@ string StripAnsiEscapeCodes(const string& in) {
}
#ifdef _WIN32
-static double GetLoadAverage_win32()
-{
+double GetLoadAverage() {
// TODO(nicolas.despres@gmail.com): Find a way to implement it on Windows.
return -0.0f;
}
#else
-static double GetLoadAverage_unix()
-{
+double GetLoadAverage() {
double loadavg[3] = { 0.0f, 0.0f, 0.0f };
- if (getloadavg(loadavg, 3) < 0)
- {
+ if (getloadavg(loadavg, 3) < 0) {
// Maybe we should return an error here or the availability of
// getloadavg(3) should be checked when ninja is configured.
return -0.0f;
@@ -302,12 +299,3 @@ static double GetLoadAverage_unix()
return loadavg[0];
}
#endif // _WIN32
-
-double GetLoadAverage()
-{
-#ifdef _WIN32
- return GetLoadAverage_win32();
-#else
- return GetLoadAverage_unix();
-#endif // _WIN32
-}