projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into master
[collectd.git]
/
src
/
memory.c
diff --git
a/src/memory.c
b/src/memory.c
index
366ca1c
..
4a3a772
100644
(file)
--- a/
src/memory.c
+++ b/
src/memory.c
@@
-25,8
+25,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#ifdef HAVE_SYS_SYSCTL_H
#include <sys/sysctl.h>
#ifdef HAVE_SYS_SYSCTL_H
#include <sys/sysctl.h>
@@
-163,9
+163,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, DS_TYPE_GAUGE, __VA_ARGS__, NULL);
\
+ plugin_dispatch_multivalue(vl,
false, DS_TYPE_GAUGE, __VA_ARGS__, NULL);
\
if (values_percentage) \
if (values_percentage) \
- plugin_dispatch_multivalue(vl,
1, DS_TYPE_GAUGE, __VA_ARGS__, NULL);
\
+ plugin_dispatch_multivalue(vl,
true, 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) {
@@
-268,7
+268,7
@@
static int memory_read_internal(value_list_t *vl) {
char *fields[8];
int numfields;
char *fields[8];
int numfields;
- bool detailed_slab_info =
0
;
+ bool detailed_slab_info =
false
;
gauge_t mem_total = 0;
gauge_t mem_used = 0;
gauge_t mem_total = 0;
gauge_t mem_used = 0;
@@
-299,10
+299,10
@@
static int memory_read_internal(value_list_t *vl) {
val = &mem_slab_total;
else if (strncasecmp(buffer, "SReclaimable:", 13) == 0) {
val = &mem_slab_reclaimable;
val = &mem_slab_total;
else if (strncasecmp(buffer, "SReclaimable:", 13) == 0) {
val = &mem_slab_reclaimable;
- detailed_slab_info =
1
;
+ detailed_slab_info =
true
;
} else if (strncasecmp(buffer, "SUnreclaim:", 11) == 0) {
val = &mem_slab_unreclaimable;
} else if (strncasecmp(buffer, "SUnreclaim:", 11) == 0) {
val = &mem_slab_unreclaimable;
- detailed_slab_info =
1
;
+ detailed_slab_info =
true
;
} else
continue;
} else
continue;