From 4047cccc5adc03383112eba0f74582a27e247d56 Mon Sep 17 00:00:00 2001 From: maier Date: Sun, 7 Oct 2012 20:19:02 +0000 Subject: [PATCH] Quest for platform independence: [4] fixup multithread_info.cc git-svn-id: https://svn.dealii.org/branches/branch_cmake@26985 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/base/multithread_info.cc | 49 +------------------------ 1 file changed, 2 insertions(+), 47 deletions(-) diff --git a/deal.II/source/base/multithread_info.cc b/deal.II/source/base/multithread_info.cc index 9945728338..6c2afe0643 100644 --- a/deal.II/source/base/multithread_info.cc +++ b/deal.II/source/base/multithread_info.cc @@ -14,16 +14,7 @@ #include -#if defined(__linux__) -# include -# include -#endif - -#if defined(__sun__) || defined(__osf__) || defined(_AIX) -# include -#endif - -#if defined(__sgi__) +#ifdef HAVE_UNISTD_H # include #endif @@ -46,48 +37,13 @@ DEAL_II_NAMESPACE_OPEN */ -# if defined(__linux__) - -unsigned int MultithreadInfo::get_n_cpus() -{ - // on linux, we simply count the - // number of lines listing - // individual processors when - // reading from /proc/cpuinfo - std::ifstream cpuinfo; - std::string search; - unsigned int nCPU = 0; - - cpuinfo.open("/proc/cpuinfo"); - - AssertThrow(cpuinfo,ExcProcNotPresent()); - - while(cpuinfo) - { - cpuinfo >> search; - if (search.find("processor") != std::string::npos) - nCPU++; - } - cpuinfo.close(); - - return nCPU; -} - -# elif defined(__sun__) || defined(__osf__) || defined(_AIX) +# if defined(__linux__) || defined(__sun__) || defined(__osf__) || defined(_AIX) unsigned int MultithreadInfo::get_n_cpus() { return sysconf(_SC_NPROCESSORS_ONLN); } - -# elif defined(__sgi__) - -unsigned int MultithreadInfo::get_n_cpus() -{ - return sysconf(_SC_NPROC_ONLN); -} - # elif defined(__MACH__) && defined(__APPLE__) // This is only tested on a dual G5 2.5GHz running MacOSX 10.3.6 // and on an Intel Mac Book Pro. @@ -106,7 +62,6 @@ unsigned int MultithreadInfo::get_n_cpus() return n_cpus; } - # else // If you get n_cpus=1 although you are on a multi-processor machine, -- 2.39.5