/**
* collectd - src/swap.c
- * Copyright (C) 2005 Florian octo Forster
+ * Copyright (C) 2005,2006 Florian octo Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
# define SWAP_HAVE_READ 0
#endif
-#ifdef KERNEL_SOLARIS
-#include <sys/swap.h>
-#endif /* KERNEL_SOLARIS */
+#if HAVE_SYS_SWAP_H
+# include <sys/swap.h>
+#endif
#undef MAX
#define MAX(x,y) ((x) > (y) ? (x) : (y))
/* 1099511627776 == 1TB ought to be enough for anyone ;) */
static char *ds_def[] =
{
- "DS:used:GAUGE:25:0:1099511627776",
- "DS:free:GAUGE:25:0:1099511627776",
- "DS:cached:GAUGE:25:0:1099511627776",
- "DS:resv:GAUGE:25:0:1099511627776",
+ "DS:used:GAUGE:"COLLECTD_HEARTBEAT":0:1099511627776",
+ "DS:free:GAUGE:"COLLECTD_HEARTBEAT":0:1099511627776",
+ "DS:cached:GAUGE:"COLLECTD_HEARTBEAT":0:1099511627776",
+ "DS:resv:GAUGE:"COLLECTD_HEARTBEAT":0:1099511627776",
NULL
};
static int ds_num = 4;
static kstat_t *ksp;
#endif /* KERNEL_SOLARIS */
-static void module_init (void)
+static void swap_init (void)
{
#ifdef KERNEL_SOLARIS
/* getpagesize(3C) tells me this does not fail.. */
return;
}
-static void module_write (char *host, char *inst, char *val)
+static void swap_write (char *host, char *inst, char *val)
{
rrd_update_file (host, swap_file, val, ds_def, ds_num);
}
-static void module_submit (unsigned long long swap_used,
+#if SWAP_HAVE_READ
+static void swap_submit (unsigned long long swap_used,
unsigned long long swap_free,
unsigned long long swap_cached,
unsigned long long swap_resv)
{
char buffer[512];
- if (snprintf (buffer, 512, "N:%llu:%llu:%llu:%llu", swap_used,
- swap_free, swap_cached, swap_resv) >= 512)
+ if (snprintf (buffer, 512, "%u:%llu:%llu:%llu:%llu", (unsigned int) curtime,
+ swap_used, swap_free, swap_cached, swap_resv) >= 512)
return;
plugin_submit (MODULE_NAME, "-", buffer);
}
-#if SWAP_HAVE_READ
-static void module_read (void)
+static void swap_read (void)
{
#ifdef KERNEL_LINUX
FILE *fh;
swap_used = swap_total - (swap_free + swap_cached);
- module_submit (swap_used, swap_free, swap_cached, -1LL);
+ swap_submit (swap_used, swap_free, swap_cached, -1LL);
/* #endif defined(KERNEL_LINUX) */
#elif defined(KERNEL_SOLARIS)
swap_avail = pagesize * (MAX(ai.ani_max - ai.ani_resv, 0) + (availrmem - swapfs_minfree));
/* swap_free = pagesize * (ai.ani_free + (availrmem - swapfs_minfree)); */
- module_submit (swap_alloc, swap_avail, -1LL, swap_resv - swap_alloc);
+ swap_submit (swap_alloc, swap_avail, -1LL, swap_resv - swap_alloc);
/* #endif defined(KERNEL_SOLARIS) */
#elif defined(HAVE_LIBSTATGRAB)
sg_swap_stats *swap;
if ((swap = sg_get_swap_stats ()) != NULL)
- module_submit (swap->used, swap->free, -1LL, -1LL);
+ swap_submit (swap->used, swap->free, -1LL, -1LL);
#endif /* HAVE_LIBSTATGRAB */
}
#else
-# define module_read NULL
+# define swap_read NULL
#endif /* SWAP_HAVE_READ */
void module_register (void)
{
- plugin_register (MODULE_NAME, module_init, module_read, module_write);
+ plugin_register (MODULE_NAME, swap_init, swap_read, swap_write);
}
#undef MODULE_NAME