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.4'
[collectd.git]
/
src
/
swap.c
diff --git
a/src/swap.c
b/src/swap.c
index
508f9d5
..
8af18f4
100644
(file)
--- a/
src/swap.c
+++ b/
src/swap.c
@@
-205,11
+205,11
@@
static void swap_submit_usage (char const *plugin_instance, /* {{{ */
sstrncpy (vl.type, "swap", sizeof (vl.type));
if (values_absolute)
sstrncpy (vl.type, "swap", sizeof (vl.type));
if (values_absolute)
- plugin_dispatch_multivalue (&vl, 0,
+ plugin_dispatch_multivalue (&vl, 0,
DS_TYPE_GAUGE,
"used", used, "free", free,
other_name, other_value, NULL);
if (values_percentage)
"used", used, "free", free,
other_name, other_value, NULL);
if (values_percentage)
- plugin_dispatch_multivalue (&vl, 1,
+ plugin_dispatch_multivalue (&vl, 1,
DS_TYPE_GAUGE,
"used", used, "free", free,
other_name, other_value, NULL);
} /* }}} void swap_submit_usage */
"used", used, "free", free,
other_name, other_value, NULL);
} /* }}} void swap_submit_usage */
@@
-295,11
+295,10
@@
static int swap_read_combined (void) /* {{{ */
FILE *fh;
char buffer[1024];
FILE *fh;
char buffer[1024];
- uint8_t have_data = 0;
- gauge_t swap_used = 0.0;
- gauge_t swap_cached = 0.0;
- gauge_t swap_free = 0.0;
- gauge_t swap_total = 0.0;
+ gauge_t swap_used = NAN;
+ gauge_t swap_cached = NAN;
+ gauge_t swap_free = NAN;
+ gauge_t swap_total = NAN;
fh = fopen ("/proc/meminfo", "r");
if (fh == NULL)
fh = fopen ("/proc/meminfo", "r");
if (fh == NULL)
@@
-320,35
+319,30
@@
static int swap_read_combined (void) /* {{{ */
continue;
if (strcasecmp (fields[0], "SwapTotal:") == 0)
continue;
if (strcasecmp (fields[0], "SwapTotal:") == 0)
- {
- swap_total = strtod (fields[1], /* endptr = */ NULL);
- have_data |= 0x01;
- }
+ strtogauge (fields[1], &swap_total);
else if (strcasecmp (fields[0], "SwapFree:") == 0)
else if (strcasecmp (fields[0], "SwapFree:") == 0)
- {
- swap_free = strtod (fields[1], /* endptr = */ NULL);
- have_data |= 0x02;
- }
+ strtogauge (fields[1], &swap_free);
else if (strcasecmp (fields[0], "SwapCached:") == 0)
else if (strcasecmp (fields[0], "SwapCached:") == 0)
- {
- swap_cached = strtod (fields[1], /* endptr = */ NULL);
- have_data |= 0x04;
- }
+ strtogauge (fields[1], &swap_cached);
}
fclose (fh);
}
fclose (fh);
- if (
have_data != 0x07
)
+ if (
isnan (swap_total) || isnan (swap_free)
)
return (ENOENT);
return (ENOENT);
- if (isnan (swap_total)
- || (swap_total <= 0.0)
- || ((swap_free + swap_cached) > swap_total))
- return (EINVAL);
+ /* Some systems, OpenVZ for example, don't provide SwapCached. */
+ if (isnan (swap_cached))
+ swap_used = swap_total - swap_free;
+ else
+ swap_used = swap_total - (swap_free + swap_cached);
+ assert (!isnan (swap_used));
- swap_used = swap_total - (swap_free + swap_cached);
+ if (swap_used < 0.0)
+ return (EINVAL);
- swap_submit_usage (NULL, swap_used, swap_free, "cached", swap_cached);
+ swap_submit_usage (NULL, swap_used, swap_free,
+ isnan (swap_cached) ? NULL : "cached", swap_cached);
return (0);
} /* }}} int swap_read_combined */
return (0);
} /* }}} int swap_read_combined */