X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fswap.c;h=2025533eae298ee59048913eb4f69e2b466ad5ab;hb=853b3da5d4c6614d7db4093f57b1ca4f57b6c485;hp=ca3b5efa342da9bc66abaf78513699a655966b8b;hpb=e8999694aac7184ac4eea29564a2892f188c4171;p=collectd.git diff --git a/src/swap.c b/src/swap.c index ca3b5efa..2025533e 100644 --- a/src/swap.c +++ b/src/swap.c @@ -1,6 +1,8 @@ /** * collectd - src/swap.c * Copyright (C) 2005-2009 Florian octo Forster + * Copyright (C) 2009 Stefan Völkel + * Copyright (C) 2009 Manuel Sanmartin * * 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 @@ -17,8 +19,19 @@ * * Authors: * Florian octo Forster + * Manuel Sanmartin **/ +#if HAVE_CONFIG_H +# include "config.h" +# undef HAVE_CONFIG_H +#endif +/* avoid swap.h error "Cannot use swapctl in the large files compilation environment" */ +#if HAVE_SYS_SWAP_H && !defined(_LP64) && _FILE_OFFSET_BITS == 64 +# undef _FILE_OFFSET_BITS +# undef _LARGEFILE64_SOURCE +#endif + #include "collectd.h" #include "common.h" #include "plugin.h" @@ -26,6 +39,9 @@ #if HAVE_SYS_SWAP_H # include #endif +#if HAVE_VM_ANON_H +# include +#endif #if HAVE_SYS_PARAM_H # include #endif @@ -43,6 +59,11 @@ # include #endif +#if HAVE_PERFSTAT +# include +# include +#endif + #undef MAX #define MAX(x,y) ((x) > (y) ? (x) : (y)) @@ -51,12 +72,12 @@ /* #endif KERNEL_LINUX */ #elif HAVE_LIBKSTAT -static unsigned long long pagesize; +static derive_t pagesize; static kstat_t *ksp; /* #endif HAVE_LIBKSTAT */ -#elif HAVE_SWAPCTL -/* No global variables */ +#elif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS +static derive_t pagesize; /* #endif HAVE_SWAPCTL */ #elif defined(VM_SWAPUSAGE) @@ -72,6 +93,11 @@ int kvm_pagesize; /* No global variables */ /* #endif HAVE_LIBSTATGRAB */ +#elif HAVE_PERFSTAT +static int pagesize; +static perfstat_memory_total_t pmemory; +/*# endif HAVE_PERFSTAT */ + #else # error "No applicable input method." #endif /* HAVE_LIBSTATGRAB */ @@ -84,13 +110,14 @@ static int swap_init (void) #elif HAVE_LIBKSTAT /* getpagesize(3C) tells me this does not fail.. */ - pagesize = (unsigned long long) getpagesize (); + pagesize = (derive_t) getpagesize (); if (get_kstat (&ksp, "unix", 0, "system_pages")) ksp = NULL; /* #endif HAVE_LIBKSTAT */ -#elif HAVE_SWAPCTL - /* No init stuff */ +#elif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS + /* getpagesize(3C) tells me this does not fail.. */ + pagesize = (derive_t) getpagesize (); /* #endif HAVE_SWAPCTL */ #elif defined(VM_SWAPUSAGE) @@ -120,23 +147,39 @@ static int swap_init (void) #elif HAVE_LIBSTATGRAB /* No init stuff */ -#endif /* HAVE_LIBSTATGRAB */ +/* #endif HAVE_LIBSTATGRAB */ + +#elif HAVE_PERFSTAT + pagesize = getpagesize(); +#endif /* HAVE_PERFSTAT */ return (0); } -static void swap_submit (const char *type_instance, double value) +static void swap_submit (const char *type_instance, derive_t value, unsigned type) { value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - values[0].gauge = value; + switch (type) + { + case DS_TYPE_GAUGE: + values[0].gauge = (gauge_t) value; + sstrncpy (vl.type, "swap", sizeof (vl.type)); + break; + case DS_TYPE_DERIVE: + values[0].derive = value; + sstrncpy (vl.type, "swap_io", sizeof (vl.type)); + break; + default: + ERROR ("swap plugin: swap_submit called with wrong" + " type"); + } vl.values = values; vl.values_len = 1; sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "swap", sizeof (vl.plugin)); - sstrncpy (vl.type, "swap", sizeof (vl.type)); sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); plugin_dispatch_values (&vl); @@ -147,14 +190,18 @@ static int swap_read (void) #if KERNEL_LINUX FILE *fh; char buffer[1024]; - + char *fields[8]; int numfields; - unsigned long long swap_used = 0LL; - unsigned long long swap_cached = 0LL; - unsigned long long swap_free = 0LL; - unsigned long long swap_total = 0LL; + _Bool old_kernel=0; + + derive_t swap_used = 0; + derive_t swap_cached = 0; + derive_t swap_free = 0; + derive_t swap_total = 0; + derive_t swap_in = 0; + derive_t swap_out = 0; if ((fh = fopen ("/proc/meminfo", "r")) == NULL) { @@ -164,25 +211,18 @@ static int swap_read (void) return (-1); } - while (fgets (buffer, 1024, fh) != NULL) + while (fgets (buffer, sizeof (buffer), fh) != NULL) { - unsigned long long *val = NULL; - - if (strncasecmp (buffer, "SwapTotal:", 10) == 0) - val = &swap_total; - else if (strncasecmp (buffer, "SwapFree:", 9) == 0) - val = &swap_free; - else if (strncasecmp (buffer, "SwapCached:", 11) == 0) - val = &swap_cached; - else - continue; - - numfields = strsplit (buffer, fields, 8); - + numfields = strsplit (buffer, fields, STATIC_ARRAY_SIZE (fields)); if (numfields < 2) continue; - *val = atoll (fields[1]) * 1024LL; + if (strcasecmp (fields[0], "SwapTotal:") == 0) + strtoderive (fields[1], &swap_total); + else if (strcasecmp (fields[0], "SwapFree:") == 0) + strtoderive (fields[1], &swap_free); + else if (strcasecmp (fields[0], "SwapCached:") == 0) + strtoderive (fields[1], &swap_cached); } if (fclose (fh)) @@ -197,15 +237,65 @@ static int swap_read (void) swap_used = swap_total - (swap_free + swap_cached); - swap_submit ("used", swap_used); - swap_submit ("free", swap_free); - swap_submit ("cached", swap_cached); + if ((fh = fopen ("/proc/vmstat", "r")) == NULL) + { + // /proc/vmstat does not exist in kernels <2.6 + if ((fh = fopen ("/proc/stat", "r")) == NULL ) + { + char errbuf[1024]; + WARNING ("swap: fopen: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); + return (-1); + } + else + old_kernel = 1; + } + + while (fgets (buffer, sizeof (buffer), fh) != NULL) + { + numfields = strsplit (buffer, fields, STATIC_ARRAY_SIZE (fields)); + + if (!old_kernel) + { + if (numfields != 2) + continue; + + if (strcasecmp ("pswpin", fields[0]) == 0) + strtoderive (fields[1], &swap_in); + else if (strcasecmp ("pswpout", fields[0]) == 0) + strtoderive (fields[1], &swap_out); + } + else /* if (old_kernel) */ + { + if (numfields != 3) + continue; + + if (strcasecmp ("page", fields[0]) == 0) + { + strtoderive (fields[1], &swap_in); + strtoderive (fields[2], &swap_out); + } + } + } /* while (fgets) */ + + if (fclose (fh)) + { + char errbuf[1024]; + WARNING ("swap: fclose: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); + } + + swap_submit ("used", 1024 * swap_used, DS_TYPE_GAUGE); + swap_submit ("free", 1024 * swap_free, DS_TYPE_GAUGE); + swap_submit ("cached", 1024 * swap_cached, DS_TYPE_GAUGE); + swap_submit ("in", swap_in, DS_TYPE_DERIVE); + swap_submit ("out", swap_out, DS_TYPE_DERIVE); /* #endif KERNEL_LINUX */ #elif HAVE_LIBKSTAT - unsigned long long swap_alloc; - unsigned long long swap_resv; - unsigned long long swap_avail; + derive_t swap_alloc; + derive_t swap_resv; + derive_t swap_avail; struct anoninfo ai; @@ -229,7 +319,7 @@ static int swap_read (void) * 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 @@ -238,39 +328,93 @@ static int swap_read (void) * swap_alloc = pagesize * ( ai.ani_max - ai.ani_free ); * can suffer from a 32bit overflow. */ - 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 ("used", swap_alloc); - swap_submit ("free", swap_avail); - swap_submit ("reserved", swap_resv); + swap_alloc = (derive_t) ((ai.ani_max - ai.ani_free) * pagesize); + swap_resv = (derive_t) ((ai.ani_resv + ai.ani_free - ai.ani_max) + * pagesize); + swap_avail = (derive_t) ((ai.ani_max - ai.ani_resv) * pagesize); + + swap_submit ("used", swap_alloc, DS_TYPE_GAUGE); + swap_submit ("free", swap_avail, DS_TYPE_GAUGE); + swap_submit ("reserved", swap_resv, DS_TYPE_GAUGE); /* #endif HAVE_LIBKSTAT */ #elif HAVE_SWAPCTL + #if HAVE_SWAPCTL_TWO_ARGS + swaptbl_t *s; + char strtab[255]; + int swap_num; + int status; + int i; + + derive_t avail = 0; + derive_t total = 0; + + swap_num = swapctl (SC_GETNSWP, NULL); + if (swap_num < 0) + { + ERROR ("swap plugin: swapctl (SC_GETNSWP) failed with status %i.", + swap_num); + return (-1); + } + else if (swap_num == 0) + return (0); + + s = (swaptbl_t *) smalloc (swap_num * sizeof (swapent_t) + sizeof (struct swaptable)); + if (s == NULL) + { + ERROR ("swap plugin: smalloc failed."); + return (-1); + } + /* Initialize string pointers. We have them share the same buffer as we don't care + * about the device's name, only its size. This saves memory and alloc/free ops */ + for (i = 0; i < (swap_num + 1); i++) { + s->swt_ent[i].ste_path = strtab; + } + s->swt_n = swap_num + 1; + status = swapctl (SC_LIST, s); + if (status != swap_num) + { + ERROR ("swap plugin: swapctl (SC_LIST) failed with status %i.", + status); + sfree (s); + return (-1); + } + + for (i = 0; i < swap_num; i++) + { + if ((s->swt_ent[i].ste_flags & ST_INDEL) != 0) + continue; + + avail += ((derive_t) s->swt_ent[i].ste_free) + * pagesize; + total += ((derive_t) s->swt_ent[i].ste_pages) + * pagesize; + } + + if (total < avail) + { + ERROR ("swap plugin: Total swap space (%"PRIi64") " + "is less than free swap space (%"PRIi64").", + total, avail); + sfree (s); + return (-1); + } + + swap_submit ("used", total - avail, DS_TYPE_GAUGE); + swap_submit ("free", avail, DS_TYPE_GAUGE); + + sfree (s); + /* #endif HAVE_SWAPCTL_TWO_ARGS */ + #elif HAVE_SWAPCTL_THREE_ARGS + struct swapent *swap_entries; int swap_num; int status; int i; - uint64_t used = 0; - uint64_t total = 0; + derive_t used = 0; + derive_t total = 0; - /* - * XXX: This is the syntax for the *BSD `swapctl', which has the - * following prototype: - * swapctl (int cmd, void *arg, int misc); - * - * HP-UX and Solaris (and possibly other UNIXes) provide `swapctl', - * too, but with the following prototype: - * swapctl (int cmd, void *arg); - * - * Solaris is usually handled in the KSTAT case above. For other UNIXes - * a separate case for the other version of `swapctl' may be necessary. - */ swap_num = swapctl (SWAP_NSWAP, NULL, 0); if (swap_num < 0) { @@ -298,9 +442,9 @@ static int swap_read (void) } #if defined(DEV_BSIZE) && (DEV_BSIZE > 0) -# define C_SWAP_BLOCK_SIZE ((uint64_t) DEV_BSIZE) +# define C_SWAP_BLOCK_SIZE ((derive_t) DEV_BSIZE) #else -# define C_SWAP_BLOCK_SIZE ((uint64_t) 512) +# define C_SWAP_BLOCK_SIZE ((derive_t) 512) #endif for (i = 0; i < swap_num; i++) @@ -308,9 +452,9 @@ static int swap_read (void) if ((swap_entries[i].se_flags & SWF_ENABLE) == 0) continue; - used += ((uint64_t) swap_entries[i].se_inuse) + used += ((derive_t) swap_entries[i].se_inuse) * C_SWAP_BLOCK_SIZE; - total += ((uint64_t) swap_entries[i].se_nblks) + total += ((derive_t) swap_entries[i].se_nblks) * C_SWAP_BLOCK_SIZE; } @@ -322,10 +466,11 @@ static int swap_read (void) return (-1); } - swap_submit ("used", (gauge_t) used); - swap_submit ("free", (gauge_t) (total - used)); + swap_submit ("used", used, DS_TYPE_GAUGE); + swap_submit ("free", total - used, DS_TYPE_GAUGE); sfree (swap_entries); + #endif /* HAVE_SWAPCTL_THREE_ARGS */ /* #endif HAVE_SWAPCTL */ #elif defined(VM_SWAPUSAGE) @@ -344,17 +489,17 @@ static int swap_read (void) return (-1); /* The returned values are bytes. */ - swap_submit ("used", sw_usage.xsu_used); - swap_submit ("free", sw_usage.xsu_avail); + swap_submit ("used", (derive_t) sw_usage.xsu_used, DS_TYPE_GAUGE); + swap_submit ("free", (derive_t) sw_usage.xsu_avail, DS_TYPE_GAUGE); /* #endif VM_SWAPUSAGE */ #elif HAVE_LIBKVM_GETSWAPINFO struct kvm_swap data_s; int status; - unsigned long long used; - unsigned long long free; - unsigned long long total; + derive_t used; + derive_t free; + derive_t total; if (kvm_obj == NULL) return (-1); @@ -364,16 +509,16 @@ static int swap_read (void) if (status == -1) return (-1); - total = (unsigned long long) data_s.ksw_total; - used = (unsigned long long) data_s.ksw_used; + total = (derive_t) data_s.ksw_total; + used = (derive_t) data_s.ksw_used; - total *= (unsigned long long) kvm_pagesize; - used *= (unsigned long long) kvm_pagesize; + total *= (derive_t) kvm_pagesize; + used *= (derive_t) kvm_pagesize; free = total - used; - swap_submit ("used", used); - swap_submit ("free", free); + swap_submit ("used", used, DS_TYPE_GAUGE); + swap_submit ("free", free, DS_TYPE_GAUGE); /* #endif HAVE_LIBKVM_GETSWAPINFO */ #elif HAVE_LIBSTATGRAB @@ -384,9 +529,21 @@ static int swap_read (void) if (swap == NULL) return (-1); - swap_submit ("used", swap->used); - swap_submit ("free", swap->free); -#endif /* HAVE_LIBSTATGRAB */ + swap_submit ("used", (derive_t) swap->used, DS_TYPE_GAUGE); + swap_submit ("free", (derive_t) swap->free, DS_TYPE_GAUGE); +/* #endif HAVE_LIBSTATGRAB */ + +#elif HAVE_PERFSTAT + if(perfstat_memory_total(NULL, &pmemory, sizeof(perfstat_memory_total_t), 1) < 0) + { + char errbuf[1024]; + WARNING ("memory plugin: perfstat_memory_total failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); + return (-1); + } + swap_submit ("used", (derive_t) (pmemory.pgsp_total - pmemory.pgsp_free) * pagesize, DS_TYPE_GAUGE); + swap_submit ("free", (derive_t) pmemory.pgsp_free * pagesize , DS_TYPE_GAUGE); +#endif /* HAVE_PERFSTAT */ return (0); } /* int swap_read */