projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.5'
[collectd.git]
/
src
/
memory.c
diff --git
a/src/memory.c
b/src/memory.c
index
0f5e1a0
..
fb2f3d3
100644
(file)
--- a/
src/memory.c
+++ b/
src/memory.c
@@
-30,6
+30,9
@@
#ifdef HAVE_SYS_SYSCTL_H
# include <sys/sysctl.h>
#endif
#ifdef HAVE_SYS_SYSCTL_H
# include <sys/sysctl.h>
#endif
+#ifdef HAVE_SYS_VMMETER_H
+# include <sys/vmmeter.h>
+#endif
#ifdef HAVE_MACH_KERN_RETURN_H
# include <mach/kern_return.h>
#ifdef HAVE_MACH_KERN_RETURN_H
# include <mach/kern_return.h>
@@
-157,9
+160,9
@@
static int memory_init (void)
#define MEMORY_SUBMIT(...) do { \
if (values_absolute) \
#define MEMORY_SUBMIT(...) do { \
if (values_absolute) \
- plugin_dispatch_multivalue (vl, 0, __VA_ARGS__, NULL); \
+ plugin_dispatch_multivalue (vl, 0,
DS_TYPE_GAUGE,
__VA_ARGS__, NULL); \
if (values_percentage) \
if (values_percentage) \
- plugin_dispatch_multivalue (vl, 1, __VA_ARGS__, NULL); \
+ plugin_dispatch_multivalue (vl, 1,
DS_TYPE_GAUGE,
__VA_ARGS__, NULL); \
} while (0)
static int memory_read_internal (value_list_t *vl)
} while (0)
static int memory_read_internal (value_list_t *vl)