diff options
author | Evan Martin <martine@danga.com> | 2012-07-28 20:32:23 (GMT) |
---|---|---|
committer | Evan Martin <martine@danga.com> | 2012-07-28 20:32:23 (GMT) |
commit | dcaa573cc2e6f30d346262b3c42d4497a539d90d (patch) | |
tree | 5c324652fcbd25b97e5f993693517f2172062668 /src/ninja.cc | |
parent | 0f56b0e5ebe20eccefe064875d15acb3b9378e2a (diff) | |
download | Ninja-dcaa573cc2e6f30d346262b3c42d4497a539d90d.zip Ninja-dcaa573cc2e6f30d346262b3c42d4497a539d90d.tar.gz Ninja-dcaa573cc2e6f30d346262b3c42d4497a539d90d.tar.bz2 |
move processor-count code to util.cc
Diffstat (limited to 'src/ninja.cc')
-rw-r--r-- | src/ninja.cc | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/ninja.cc b/src/ninja.cc index 7929e68..ca45ab1 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -19,12 +19,6 @@ #include <sys/stat.h> #include <sys/types.h> -#if defined(__APPLE__) || defined(__FreeBSD__) -#include <sys/sysctl.h> -#elif defined(linux) -#include <sys/sysinfo.h> -#endif - #ifdef _WIN32 #include "getopt.h" #include <direct.h> @@ -107,25 +101,7 @@ void Usage(const BuildConfig& config) { /// Choose a default value for the -j (parallelism) flag. int GuessParallelism() { - int processors = 0; - -#if defined(linux) - processors = get_nprocs(); -#elif defined(__APPLE__) || defined(__FreeBSD__) - size_t processors_size = sizeof(processors); - int name[] = {CTL_HW, HW_NCPU}; - if (sysctl(name, sizeof(name) / sizeof(int), - &processors, &processors_size, - NULL, 0) < 0) { - processors = 1; - } -#elif defined(_WIN32) - SYSTEM_INFO info; - GetSystemInfo(&info); - processors = info.dwNumberOfProcessors; -#endif - - switch (processors) { + switch (int processors = GetProcessorCount()) { case 0: case 1: return 2; |