hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use std:🧵:hardware_concurrency

Browse Source 
Using a standard-defined value is better than a system specific one.
This commit is contained in:
Markus Mäkelä
2018-10-01 21:33:10 +03:00
parent e10f34d6aa
commit 4216ffa384
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/core/utils.cc
View File

@ -41,6 +41,7 @@
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <openssl/sha.h> #include <openssl/sha.h>
#include <curl/curl.h> #include <curl/curl.h>
#include <thread>
#include <maxscale/alloc.h> #include <maxscale/alloc.h>
#include <maxscale/config.h> #include <maxscale/config.h>
@ -1172,17 +1173,8 @@ int open_unix_socket(enum mxs_socket_type type, struct sockaddr_un* addr, const
long get_processor_count() long get_processor_count()
{ {
long processors = 1; mxb_assert(sysconf(_SC_NPROCESSORS_ONLN) == std::thread::hardware_concurrency());
#ifdef _SC_NPROCESSORS_ONLN return std::max(std::thread::hardware_concurrency(), 1U);
if ((processors = sysconf(_SC_NPROCESSORS_ONLN)) <= 0)
{
MXS_WARNING("Unable to establish the number of available cores. Defaulting to 1.");
processors = 1;
}
#else
#error _SC_NPROCESSORS_ONLN not available.
#endif
return processors;
} }
int64_t get_total_memory() int64_t get_total_memory()