#include "collectd.h"
-#include "common.h"
#include "plugin.h"
+#include "utils/common/common.h"
#if KERNEL_LINUX
static const char *config_keys[] = {"Verbose"};
static int config_keys_num = STATIC_ARRAY_SIZE(config_keys);
-static int verbose_output = 0;
+static int verbose_output;
/* #endif KERNEL_LINUX */
#else
vl.values = values;
vl.values_len = values_len;
- sstrncpy(vl.host, hostname_g, sizeof(vl.host));
sstrncpy(vl.plugin, "vmem", sizeof(vl.plugin));
if (plugin_instance != NULL)
sstrncpy(vl.plugin_instance, plugin_instance, sizeof(vl.plugin_instance));
static void submit_two(const char *plugin_instance, const char *type,
const char *type_instance, derive_t c0, derive_t c1) {
- value_t values[2];
+ value_t values[] = {
+ {.derive = c0},
+ {.derive = c1},
+ };
- values[0].derive = c0;
- values[1].derive = c1;
-
- submit(plugin_instance, type, type_instance, values, 2);
+ submit(plugin_instance, type, type_instance, values,
+ STATIC_ARRAY_SIZE(values));
} /* void submit_one */
static void submit_one(const char *plugin_instance, const char *type,
else
verbose_output = 0;
} else {
- return (-1);
+ return -1;
}
- return (0);
+ return 0;
} /* int vmem_config */
static int vmem_read(void) {
fh = fopen("/proc/vmstat", "r");
if (fh == NULL) {
- char errbuf[1024];
- ERROR("vmem plugin: fopen (/proc/vmstat) failed: %s",
- sstrerror(errno, errbuf, sizeof(errbuf)));
- return (-1);
+ ERROR("vmem plugin: fopen (/proc/vmstat) failed: %s", STRERRNO);
+ return -1;
}
while (fgets(buffer, sizeof(buffer), fh) != NULL) {
submit_two(NULL, "vmpage_io", "swap", pswpin, pswpout);
#endif /* KERNEL_LINUX */
- return (0);
+ return 0;
} /* int vmem_read */
void module_register(void) {
plugin_register_config("vmem", vmem_config, config_keys, config_keys_num);
plugin_register_read("vmem", vmem_read);
} /* void module_register */
-
-/* vim: set sw=2 sts=2 ts=8 : */