X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fswap.c;h=cfde4ea6d2bd9d194abbab16d4d2269e7347e114;hb=1b4d95b869063e619bd7aae54cf37c5a1b91fbee;hp=91f6a19f4c4b2d0e3824061b3b153b4a09e3e2a3;hpb=a3fc00b7408fa0111e92afd2328fbfab20edbb8f;p=collectd.git diff --git a/src/swap.c b/src/swap.c index 91f6a19f..cfde4ea6 100644 --- a/src/swap.c +++ b/src/swap.c @@ -157,6 +157,8 @@ static int swap_init (void) /* {{{ */ /* #endif defined(VM_SWAPUSAGE) */ #elif HAVE_LIBKVM_GETSWAPINFO + char errbuf[_POSIX2_LINE_MAX]; + if (kvm_obj != NULL) { kvm_close (kvm_obj); @@ -165,14 +167,11 @@ static int swap_init (void) /* {{{ */ kvm_pagesize = getpagesize (); - if ((kvm_obj = kvm_open (NULL, /* execfile */ - NULL, /* corefile */ - NULL, /* swapfile */ - O_RDONLY, /* flags */ - NULL)) /* errstr */ - == NULL) + kvm_obj = kvm_openfiles (NULL, "/dev/null", NULL, O_RDONLY, errbuf); + + if (kvm_obj == NULL) { - ERROR ("swap plugin: kvm_open failed."); + ERROR ("swap plugin: kvm_openfiles failed, %s", errbuf); return (-1); } /* #endif HAVE_LIBKVM_GETSWAPINFO */ @@ -188,27 +187,6 @@ static int swap_init (void) /* {{{ */ return (0); } /* }}} int swap_init */ -static void swap_submit (const char *plugin_instance, /* {{{ */ - const char *type, const char *type_instance, - value_t value) -{ - value_list_t vl = VALUE_LIST_INIT; - - assert (type != NULL); - - vl.values = &value; - vl.values_len = 1; - sstrncpy (vl.host, hostname_g, sizeof (vl.host)); - sstrncpy (vl.plugin, "swap", sizeof (vl.plugin)); - if (plugin_instance != NULL) - sstrncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance)); - sstrncpy (vl.type, type, sizeof (vl.type)); - if (type_instance != NULL) - sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); - - plugin_dispatch_values (&vl); -} /* }}} void swap_submit_inst */ - static void swap_submit_usage (char const *plugin_instance, /* {{{ */ gauge_t used, gauge_t free, char const *other_name, gauge_t other_value) @@ -226,23 +204,33 @@ static void swap_submit_usage (char const *plugin_instance, /* {{{ */ 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) - 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 */ #if KERNEL_LINUX || HAVE_PERFSTAT -static void swap_submit_derive (const char *plugin_instance, /* {{{ */ - const char *type_instance, derive_t value) +__attribute__((nonnull(1))) +static void swap_submit_derive (char const *type_instance, /* {{{ */ + derive_t value) { - value_t v; + value_list_t vl = VALUE_LIST_INIT; + value_t v[1]; - v.derive = value; - swap_submit (plugin_instance, "swap_io", type_instance, v); + v[0].derive = value; + + vl.values = v; + vl.values_len = STATIC_ARRAY_SIZE (v); + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "swap", sizeof (vl.plugin)); + sstrncpy (vl.type, "swap_io", sizeof (vl.type)); + sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); + + plugin_dispatch_values (&vl); } /* }}} void swap_submit_derive */ #endif @@ -293,7 +281,8 @@ static int swap_read_separate (void) /* {{{ */ if (total < used) continue; - swap_submit_usage (path, used, total - used, NULL, NAN); + swap_submit_usage (path, used * 1024.0, (total - used) * 1024.0, + NULL, NAN); } fclose (fh); @@ -306,11 +295,10 @@ static int swap_read_combined (void) /* {{{ */ 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) @@ -331,35 +319,31 @@ static int swap_read_combined (void) /* {{{ */ 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) - { - swap_free = strtod (fields[1], /* endptr = */ NULL); - have_data |= 0x02; - } + strtogauge (fields[1], &swap_free); else if (strcasecmp (fields[0], "SwapCached:") == 0) - { - swap_cached = strtod (fields[1], /* endptr = */ NULL); - have_data |= 0x04; - } + strtogauge (fields[1], &swap_cached); } fclose (fh); - if (have_data != 0x07) + if (isnan (swap_total) || isnan (swap_free)) 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 * 1024.0, swap_free * 1024.0, + isnan (swap_cached) ? NULL : "cached", + isnan (swap_cached) ? NAN : swap_cached * 1024.0); return (0); } /* }}} int swap_read_combined */ @@ -437,8 +421,8 @@ static int swap_read_io (void) /* {{{ */ swap_out = swap_out * pagesize; } - swap_submit_derive (NULL, "in", swap_in); - swap_submit_derive (NULL, "out", swap_out); + swap_submit_derive ("in", swap_in); + swap_submit_derive ("out", swap_out); return (0); } /* }}} int swap_read_io */ @@ -795,8 +779,8 @@ static int swap_read (void) /* {{{ */ reserved = (gauge_t) (pmemory.pgsp_rsvd * pagesize); swap_submit_usage (NULL, total - free, free, "reserved", reserved); - swap_submit_derive (NULL, "in", (derive_t) pmemory.pgspins * pagesize); - swap_submit_derive (NULL, "out", (derive_t) pmemory.pgspouts * pagesize); + swap_submit_derive ("in", (derive_t) pmemory.pgspins * pagesize); + swap_submit_derive ("out", (derive_t) pmemory.pgspouts * pagesize); return (0); } /* }}} int swap_read */