X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fswap.c;h=86df6f753c589166ec92ddf02e62176c45c8f319;hb=ee1113650b0b565776fc3d62162d84741e234f05;hp=c3e399d83fd5e3d13d0fb3f072cc974eb48f3e24;hpb=7fa270a1fb517c7fbed55d9f5f70bb28516b6229;p=collectd.git diff --git a/src/swap.c b/src/swap.c index c3e399d8..86df6f75 100644 --- a/src/swap.c +++ b/src/swap.c @@ -1,6 +1,6 @@ /** * 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 @@ -20,17 +20,21 @@ * Florian octo Forster **/ -#include "swap.h" +#include "collectd.h" +#include "common.h" +#include "plugin.h" -#if COLLECT_SWAP #define MODULE_NAME "swap" -#ifdef KERNEL_SOLARIS -#include -#endif /* KERNEL_SOLARIS */ +#if defined(KERNEL_LINUX) || defined(KERNEL_SOLARIS) || defined(HAVE_LIBSTATGRAB) +# define SWAP_HAVE_READ 1 +#else +# define SWAP_HAVE_READ 0 +#endif -#include "plugin.h" -#include "common.h" +#if HAVE_SYS_SWAP_H +# include +#endif #undef MAX #define MAX(x,y) ((x) > (y) ? (x) : (y)) @@ -40,10 +44,10 @@ static char *swap_file = "swap.rrd"; /* 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; @@ -53,7 +57,7 @@ static int pagesize; static kstat_t *ksp; #endif /* KERNEL_SOLARIS */ -void module_init (void) +static void swap_init (void) { #ifdef KERNEL_SOLARIS /* getpagesize(3C) tells me this does not fail.. */ @@ -65,26 +69,27 @@ void module_init (void) return; } -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); } -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); } -void module_read (void) +static void swap_read (void) { #ifdef KERNEL_LINUX FILE *fh; @@ -133,64 +138,64 @@ void module_read (void) 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) unsigned long long swap_alloc; unsigned long long swap_resv; unsigned long long swap_avail; - /* unsigned long long swap_free; */ - - long long availrmem; - long long swapfs_minfree; struct anoninfo ai; if (swapctl (SC_AINFO, &ai) == -1) return; - availrmem = get_kstat_value (ksp, "availrmem"); - swapfs_minfree = get_kstat_value (ksp, "minfree"); - - if ((availrmem < 0LL) || (swapfs_minfree < 0LL)) - return; - - /* - * Calculations learned by reading - * http://www.itworld.com/Comp/2377/UIR980701perf/ + /* + * Calculations from: + * http://cvs.opensolaris.org/source/xref/on/usr/src/cmd/swap/swap.c + * Also see: + * http://www.itworld.com/Comp/2377/UIR980701perf/ (outdated?) + * /usr/include/vm/anon.h * - * swap_resv += ani_resv - * swap_alloc += MAX(ani_resv, ani_max) - ani_free - * swap_avail += MAX(ani_max - ani_resv, 0) + (availrmem - swapfs_minfree) - * swap_free += ani_free + (availrmem - swapfs_minfree) + * In short, swap -s shows: allocated + reserved = used, available * - * To clear up the terminology a bit: - * resv = reserved (but not neccessarily used) - * alloc = used (neccessarily reserved) - * avail = not reserved (neccessarily free) - * free = not allocates (possibly reserved) + * However, Solaris does not allow to allocated/reserved more than the + * available swap (physical memory + disk swap), so the pedant may + * prefer: allocated + unallocated = reserved, available + * + * We map the above to: used + resv = n/a, free + * + * Does your brain hurt yet? - Christophe Kalt + * + * Oh, and in case you wonder, + * swap_alloc = pagesize * ( ai.ani_max - ai.ani_free ); + * can suffer from a 32bit overflow. */ - swap_resv = pagesize * ai.ani_resv; - swap_alloc = pagesize * (MAX(ai.ani_resv, ai.ani_max) - ai.ani_free); - 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_alloc = ai.ani_max - ai.ani_free; + swap_alloc *= pagesize; + swap_resv = ai.ani_resv + ai.ani_free - ai.ani_max; + swap_resv *= pagesize; + swap_avail = ai.ani_max - ai.ani_resv; + swap_avail *= pagesize; + + swap_submit (swap_alloc, swap_avail, -1LL, swap_resv); /* #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 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 -#endif /* COLLECT_SWAP */