summaryrefslogtreecommitdiffstats
path: root/plugins/common.h
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2013-08-19 22:47:00 +0200
committerHolger Weiss <holger@zedat.fu-berlin.de>2013-08-19 22:47:00 +0200
commita0640011730d830c562c87ca0bc6237c404146ea (patch)
tree9f18f239eb6fe6efe95e9dca32c428830418868f /plugins/common.h
parent30aa7a63f1993ea09ba6ce84819d783f027ed516 (diff)
parentf12edfd07384be4060d5c724ac38ee212adc9028 (diff)
downloadmonitoring-plugins-a0640011730d830c562c87ca0bc6237c404146ea.tar.gz
Merge branch 'master' of https://github.com/bbense/nagios-plugins
* 'master' of https://github.com/bbense/nagios-plugins: Bug fix for ncpus if hyperthreading turned off in linux
Diffstat (limited to 'plugins/common.h')
-rw-r--r--plugins/common.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/plugins/common.h b/plugins/common.h
index c0dc2f41..858329fd 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -82,10 +82,14 @@
82 getting that data 82 getting that data
83 Will return -1 if cannot get data 83 Will return -1 if cannot get data
84*/ 84*/
85#ifdef HAVE_SYSCONF__SC_NPROCESSORS_CONF 85#ifdef HAVE_SYSCONF__SC_NPROCESSORS_ONLN
86#define GET_NUMBER_OF_CPUS() sysconf(_SC_NPROCESSORS_CONF) 86#define GET_NUMBER_OF_CPUS() sysconf(_SC_NPROCESSORS_ONLN)
87#else 87#else
88#define GET_NUMBER_OF_CPUS() -1 88# ifdef HAVE_SYSCONF__SC_NPROCESSORS_CONF
89# define GET_NUMBER_OF_CPUS() sysconf(_SC_NPROCESSORS_CONF)
90# else
91# define GET_NUMBER_OF_CPUS() -1
92# endif
89#endif 93#endif
90 94
91#ifdef TIME_WITH_SYS_TIME 95#ifdef TIME_WITH_SYS_TIME