tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix incorrect detection of the 'Concurrency' variable" 

This reverts commit 585f0537d2.

refs #12456
This commit is contained in:
Gunnar Beutner 2016-08-19 11:58:40 +02:00
parent b5637a2d16
commit aeaca5e803
5 changed files with 2 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icinga-app/icinga.cpp
View File

@ -152,7 +152,7 @@ int Main(void)
Application::DeclareZonesDir(Application::GetSysconfDir() + "/icinga2/zones.d");
Application::DeclareRunAsUser(ICINGA_USER);
Application::DeclareRunAsGroup(ICINGA_GROUP);
Application::DeclareConcurrency(Utility::PhysicalConcurrency());
Application::DeclareConcurrency(boost::thread::hardware_concurrency());
if (!ScriptGlobal::Exists("UseVfork"))
#ifdef __APPLE__

2
lib/base/application.cpp
View File

@ -1344,7 +1344,7 @@ void Application::DeclareConcurrency(int ncpus)
*/
int Application::GetConcurrency(void)
{
static Value defaultConcurrency = Utility::PhysicalConcurrency();
Value defaultConcurrency = boost::thread::hardware_concurrency();
return ScriptGlobal::Get("Concurrency", &defaultConcurrency);
}

1
lib/base/unix.hpp
View File

@ -41,7 +41,6 @@
#include <sys/time.h>
#include <sys/resource.h>
#include <strings.h>
#include <sys/sysctl.h>
typedef int SOCKET;
#define INVALID_SOCKET (-1)

66
lib/base/utility.cpp
View File

@ -1936,69 +1936,3 @@ String Utility::GetIcingaDataPath(void)
}
#endif /* _WIN32 */
int Utility::PhysicalConcurrency(void)
{
#if BOOST_VERSION >= 106100
return boost::thread::physical_concurrency();
#elif defined(__linux__)
std::ifstream fp("/proc/cpuinfo");
std::string line;
bool htFlag = false;
while (std::getline(fp, line)) {
std::vector<String> tokens;
boost::algorithm::split(tokens, line, boost::is_any_of(":"));
if (tokens.size() != 2)
continue;
String key = tokens[0].Trim();
String value = tokens[1].Trim();
if (key != "flags")
continue;
std::vector<String> flags;
boost::algorithm::split(flags, value, boost::is_any_of(" "));
if (std::find(flags.begin(), flags.end(), "ht") != flags.end()) {
htFlag = true;
break;
}
}
return boost::thread::hardware_concurrency() / (htFlag ? 2 : 1);
#elif defined(_WIN32)
DWORD size = 0;
GetLogicalProcessorInformation(NULL, &size);
if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
return boost::thread::hardware_concurrency();
std::vector<SYSTEM_LOGICAL_PROCESSOR_INFORMATION> info(size / sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION));
if (GetLogicalProcessorInformation(&info.front(), &size) == FALSE)
return boost::thread::hardware_concurrency();
int ncpus = 0;
BOOST_FOREACH(const SYSTEM_LOGICAL_PROCESSOR_INFORMATION& slpi, info) {
if (slpi.Relationship == RelationProcessorCore)
ncpus++;
}
return ncpus;
#elif defined(__APPLE__)
int ncpus;
size_t size = sizeof(ncpus);
if (sysctlbyname("hw.physicalcpu", &ncpus, &size, NULL, 0) == 0)
return ncpus;
else
return boost::thread::hardware_concurrency();
#else /* __APPLE__ */
return boost::thread::hardware_concurrency();
#endif /* __APPLE__ */
}

2
lib/base/utility.hpp
View File

@ -153,8 +153,6 @@ public:
static void IncrementTime(double);
#endif /* I2_DEBUG */
static int PhysicalConcurrency(void);
private:
Utility(void);
static void CollectPaths(const String& path, std::vector<String>& paths);