projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3339 from jkohen/patch-1
[collectd.git]
/
src
/
memory.c
diff --git
a/src/memory.c
b/src/memory.c
index
10bccde
..
107e867
100644
(file)
--- a/
src/memory.c
+++ b/
src/memory.c
@@
-28,7
+28,9
@@
#include "plugin.h"
#include "utils/common/common.h"
#include "plugin.h"
#include "utils/common/common.h"
-#ifdef HAVE_SYS_SYSCTL_H
+#if (defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTLBYNAME)) || \
+ defined(__OpenBSD__)
+/* Implies BSD variant */
#include <sys/sysctl.h>
#endif
#ifdef HAVE_SYS_VMMETER_H
#include <sys/sysctl.h>
#endif
#ifdef HAVE_SYS_VMMETER_H
@@
-80,9
+82,10
@@
static kstat_t *ksp;
static kstat_t *ksz;
/* #endif HAVE_LIBKSTAT */
static kstat_t *ksz;
/* #endif HAVE_LIBKSTAT */
-#elif HAVE_SYSCTL
+#elif HAVE_SYSCTL && __OpenBSD__
+/* OpenBSD variant does not have sysctlbyname */
static int pagesize;
static int pagesize;
-/* #endif HAVE_SYSCTL */
+/* #endif HAVE_SYSCTL
&& __OpenBSD__
*/
#elif HAVE_LIBSTATGRAB
/* no global variables */
#elif HAVE_LIBSTATGRAB
/* no global variables */
@@
-142,13
+145,14
@@
static int memory_init(void) {
/* #endif HAVE_LIBKSTAT */
/* #endif HAVE_LIBKSTAT */
-#elif HAVE_SYSCTL
+#elif HAVE_SYSCTL && __OpenBSD__
+ /* OpenBSD variant does not have sysctlbyname */
pagesize = getpagesize();
if (pagesize <= 0) {
ERROR("memory plugin: Invalid pagesize: %i", pagesize);
return -1;
}
pagesize = getpagesize();
if (pagesize <= 0) {
ERROR("memory plugin: Invalid pagesize: %i", pagesize);
return -1;
}
- /* #endif HAVE_SYSCTL */
+ /* #endif HAVE_SYSCTL
&& __OpenBSD__
*/
#elif HAVE_LIBSTATGRAB
/* no init stuff */
#elif HAVE_LIBSTATGRAB
/* no init stuff */
@@
-408,7
+412,8
@@
static int memory_read_internal(value_list_t *vl) {
(gauge_t)arcsize, "unusable", (gauge_t)mem_unus);
/* #endif HAVE_LIBKSTAT */
(gauge_t)arcsize, "unusable", (gauge_t)mem_unus);
/* #endif HAVE_LIBKSTAT */
-#elif HAVE_SYSCTL
+#elif HAVE_SYSCTL && __OpenBSD__
+ /* OpenBSD variant does not have HAVE_SYSCTLBYNAME */
int mib[] = {CTL_VM, VM_METER};
struct vmtotal vmtotal = {0};
gauge_t mem_active;
int mib[] = {CTL_VM, VM_METER};
struct vmtotal vmtotal = {0};
gauge_t mem_active;
@@
-430,7
+435,7
@@
static int memory_read_internal(value_list_t *vl) {
MEMORY_SUBMIT("active", mem_active, "inactive", mem_inactive, "free",
mem_free);
MEMORY_SUBMIT("active", mem_active, "inactive", mem_inactive, "free",
mem_free);
- /* #endif HAVE_SYSCTL */
+ /* #endif HAVE_SYSCTL
&& __OpenBSD__
*/
#elif HAVE_LIBSTATGRAB
sg_mem_stats *ios;
#elif HAVE_LIBSTATGRAB
sg_mem_stats *ios;