tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-23 17:57:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Initialize Configuration#Concurrency also from /sys/fs/cgroup/cpu/cpu.cfs_quota_us

Browse Source 
refs #7842
This commit is contained in:
Alexander A. Klimov 2020-08-24 13:32:50 +02:00
parent 435b54ebbe
commit 4c6bb2cea8
1 changed files with 53 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
lib/base/configuration.cpp
View File

@ -4,10 +4,11 @@
#include "base/configuration-ti.cpp" #include "base/configuration-ti.cpp"
#include "base/exception.hpp" #include "base/exception.hpp"
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/asio.hpp> #include <boost/iostreams/device/file_descriptor.hpp>
#include <boost/iostreams/stream.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/system/error_code.hpp> #include <algorithm>
#include <boost/system/system_error.hpp> #include <cmath>
#include <cstdint> #include <cstdint>
#include <iostream> #include <iostream>
#include <set> #include <set>
@ -43,40 +44,46 @@ String Configuration::CacheDir;
int Configuration::Concurrency{1}; int Configuration::Concurrency{1};
bool Configuration::ConcurrencyWasModified{false}; bool Configuration::ConcurrencyWasModified{false};
int Configuration::GetDefaultConcurrency()
{
#ifdef __linux__ #ifdef __linux__
static std::string ReadSysLine(const char *file)
{ {
using namespace boost::algorithm; namespace io = boost::iostreams;
using namespace boost::asio;
using namespace boost::system;
int f = open("/sys/fs/cgroup/cpuset/cpuset.cpus", O_RDONLY); std::string content;
io::stream<io::file_descriptor> stream;
int f = open(file, O_RDONLY);
if (f < 0) { if (f < 0) {
if (errno != ENOENT) { if (errno == ENOENT) {
throw system_error(error_code(errno, system_category())); return "";
} }
} else {
std::string rawCpus;
BOOST_THROW_EXCEPTION(posix_error()
<< boost::errinfo_api_function("open")
<< boost::errinfo_errno(errno)
<< boost::errinfo_file_name(file));
}
stream.exceptions(decltype(stream)::failbit | decltype(stream)::badbit);
stream.open(io::file_descriptor(f, boost::iostreams::close_handle));
stream.set_auto_close(true);
std::getline(stream, content);
return content;
}
#endif /* __linux__ */
int Configuration::GetDefaultConcurrency()
{ {
io_context io; using namespace boost::algorithm;
buffered_read_stream<posix::stream_descriptor> stream (io);
stream.next_layer() = posix::stream_descriptor(io, f); auto concurrency (std::thread::hardware_concurrency());
try { #ifdef __linux__
read(stream, dynamic_buffer(rawCpus)); {
} catch (const system_error& se) { auto rawCpus (ReadSysLine("/sys/fs/cgroup/cpuset/cpuset.cpus"));
if (se.code() != error::make_error_code(error::eof)) {
throw;
}
}
}
rawCpus.erase(rawCpus.find_last_not_of('\n') + 1u);
if (rawCpus.length()) {
std::vector<std::string> ranges; std::vector<std::string> ranges;
boost::split(ranges, rawCpus, is_any_of(",")); boost::split(ranges, rawCpus, is_any_of(","));
@ -97,12 +104,24 @@ int Configuration::GetDefaultConcurrency()
} }
} }
return cpus.size(); concurrency = cpus.size();
}
}
{
auto cfsQuotaUs (ReadSysLine("/sys/fs/cgroup/cpu/cpu.cfs_quota_us"));
if (cfsQuotaUs.length()) {
auto quota (boost::lexical_cast<intmax_t>(cfsQuotaUs));
if (quota > 0) {
concurrency = std::min(std::max((decltype(concurrency))std::round(quota / 100000.0), 1u), concurrency);
}
} }
} }
#endif /* __linux__ */ #endif /* __linux__ */
return std::thread::hardware_concurrency(); return concurrency;
} }
String Configuration::ConfigDir; String Configuration::ConfigDir;