ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable a bit more stats for BSD systems. (#3833)

Browse Source
This commit is contained in:
David CARLIER 2019-04-11 00:01:35 +01:00 committed by auriamg
parent 3c8c5eb3c4
commit c905447a4b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/config/hardware_stats.cpp
View File

@ -31,10 +31,6 @@
#include "online/http_request.hpp" #include "online/http_request.hpp"
#include "utils/random_generator.hpp" #include "utils/random_generator.hpp"
#ifdef __APPLE__
# include <sys/sysctl.h>
#endif
#include <fstream> #include <fstream>
#include <set> #include <set>
#include <sstream> #include <sstream>
@ -43,6 +39,10 @@
# include <sys/param.h> // To get BSD macro # include <sys/param.h> // To get BSD macro
# include <sys/utsname.h> # include <sys/utsname.h>
#endif #endif
#if defined(__APPLE__) || defined(BSD)
# include <sys/sysctl.h>
#endif
#include <vector> #include <vector>
@ -83,7 +83,7 @@ int getRAM()
return (int)ceil(memory_size/mbyte); return (int)ceil(memory_size/mbyte);
#endif #endif
#ifdef __APPLE__ #if defined(__APPLE__) || defined(BSD)
size_t memory_size = 0; size_t memory_size = 0;
size_t len = sizeof(memory_size); size_t len = sizeof(memory_size);
// Argh, the API doesn't seem to be const-correct // Argh, the API doesn't seem to be const-correct
@ -103,7 +103,7 @@ int getRAM()
*/ */
int getNumProcessors() int getNumProcessors()
{ {
#if defined(__linux__) || defined(__CYGWIN__) #if defined(__linux__) || defined(__CYGWIN__) || (defined(BSD) && !defined(__APPLE__))
return sysconf(_SC_NPROCESSORS_CONF); return sysconf(_SC_NPROCESSORS_CONF);
#endif #endif
#ifdef WIN32 #ifdef WIN32
@ -111,7 +111,7 @@ int getNumProcessors()
GetSystemInfo(&si); // guaranteed to succeed GetSystemInfo(&si); // guaranteed to succeed
return si.dwNumberOfProcessors; return si.dwNumberOfProcessors;
#endif #endif
#ifdef __APPLE__ #if defined(__APPLE__)
// Mac OS X doesn't have sysconf(_SC_NPROCESSORS_CONF) // Mac OS X doesn't have sysconf(_SC_NPROCESSORS_CONF)
int mib[] = { CTL_HW, HW_NCPU }; int mib[] = { CTL_HW, HW_NCPU };
int ncpus; int ncpus;