X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fswap.c;h=508f9d54cccbc04bb6fe05ce696bda18ad1a9350;hb=9d2c4f87ab2ae4a4749dc48eabb0b780ecdd0a99;hp=46ba6652953726ce0b7d90aecea2345f681ec64b;hpb=9aedf9ea09cc1c0d7d8293894d03e0fcbaa7bada;p=collectd.git diff --git a/src/swap.c b/src/swap.c index 46ba6652..508f9d54 100644 --- a/src/swap.c +++ b/src/swap.c @@ -1,8 +1,9 @@ /** * collectd - src/swap.c - * Copyright (C) 2005-2009 Florian octo Forster + * Copyright (C) 2005-2014 Florian octo Forster * Copyright (C) 2009 Stefan Völkel * Copyright (C) 2009 Manuel Sanmartin + * Copyright (C) 2010 Aurélien Reynaud * * 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 @@ -18,8 +19,9 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * * Authors: - * Florian octo Forster + * Florian octo Forster * Manuel Sanmartin + * Aurélien Reynaud **/ #if HAVE_CONFIG_H @@ -68,17 +70,17 @@ #define MAX(x,y) ((x) > (y) ? (x) : (y)) #if KERNEL_LINUX -/* No global variables */ +# define SWAP_HAVE_REPORT_BY_DEVICE 1 +static derive_t pagesize; +static _Bool report_bytes = 0; +static _Bool report_by_device = 0; /* #endif KERNEL_LINUX */ -#elif HAVE_LIBKSTAT +#elif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS +# define SWAP_HAVE_REPORT_BY_DEVICE 1 static derive_t pagesize; -static kstat_t *ksp; -/* #endif HAVE_LIBKSTAT */ - -#elif HAVE_SWAPCTL -/* No global variables */ -/* #endif HAVE_SWAPCTL */ +static _Bool report_by_device = 0; +/* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */ #elif defined(VM_SWAPUSAGE) /* No global variables */ @@ -95,28 +97,59 @@ int kvm_pagesize; #elif HAVE_PERFSTAT static int pagesize; -static perfstat_memory_total_t pmemory; /*# endif HAVE_PERFSTAT */ #else # error "No applicable input method." #endif /* HAVE_LIBSTATGRAB */ -static int swap_init (void) +static _Bool values_absolute = 1; +static _Bool values_percentage = 0; + +static int swap_config (oconfig_item_t *ci) /* {{{ */ { + int i; + + for (i = 0; i < ci->children_num; i++) + { + oconfig_item_t *child = ci->children + i; + if (strcasecmp ("ReportBytes", child->key) == 0) #if KERNEL_LINUX - /* No init stuff */ + cf_util_get_boolean (child, &report_bytes); +#else + WARNING ("swap plugin: The \"ReportBytes\" option " + "is only valid under Linux. " + "The option is going to be ignored."); +#endif + else if (strcasecmp ("ReportByDevice", child->key) == 0) +#if SWAP_HAVE_REPORT_BY_DEVICE + cf_util_get_boolean (child, &report_by_device); +#else + WARNING ("swap plugin: The \"ReportByDevice\" option " + "is not supported on this platform. " + "The option is going to be ignored."); +#endif /* SWAP_HAVE_REPORT_BY_DEVICE */ + else if (strcasecmp ("ValuesAbsolute", child->key) == 0) + cf_util_get_boolean (child, &values_absolute); + else if (strcasecmp ("ValuesPercentage", child->key) == 0) + cf_util_get_boolean (child, &values_percentage); + else + WARNING ("swap plugin: Unknown config option: \"%s\"", + child->key); + } + + return (0); +} /* }}} int swap_config */ + +static int swap_init (void) /* {{{ */ +{ +#if KERNEL_LINUX + pagesize = (derive_t) sysconf (_SC_PAGESIZE); /* #endif KERNEL_LINUX */ -#elif HAVE_LIBKSTAT +#elif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS /* getpagesize(3C) tells me this does not fail.. */ pagesize = (derive_t) getpagesize (); - if (get_kstat (&ksp, "unix", 0, "system_pages")) - ksp = NULL; -/* #endif HAVE_LIBKSTAT */ - -#elif HAVE_SWAPCTL - /* No init stuff */ /* #endif HAVE_SWAPCTL */ #elif defined(VM_SWAPUSAGE) @@ -153,93 +186,189 @@ static int swap_init (void) #endif /* HAVE_PERFSTAT */ return (0); -} +} /* }}} int swap_init */ -static void swap_submit (const char *type_instance, derive_t value, unsigned type) +static void swap_submit_usage (char const *plugin_instance, /* {{{ */ + gauge_t used, gauge_t free, + char const *other_name, gauge_t other_value) { - value_t values[1]; + value_t v[1]; value_list_t vl = VALUE_LIST_INIT; - 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 = v; + vl.values_len = STATIC_ARRAY_SIZE (v); + 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, "swap", sizeof (vl.type)); + + if (values_absolute) + plugin_dispatch_multivalue (&vl, 0, + "used", used, "free", free, + other_name, other_value, NULL); + if (values_percentage) + plugin_dispatch_multivalue (&vl, 1, + "used", used, "free", free, + other_name, other_value, NULL); +} /* }}} void swap_submit_usage */ + +#if KERNEL_LINUX || HAVE_PERFSTAT +__attribute__((nonnull(1))) +static void swap_submit_derive (char const *type_instance, /* {{{ */ + derive_t value) +{ + value_list_t vl = VALUE_LIST_INIT; + value_t v[1]; - vl.values = values; - vl.values_len = 1; + 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 */ +} /* }}} void swap_submit_derive */ +#endif -static int swap_read (void) -{ #if KERNEL_LINUX +static int swap_read_separate (void) /* {{{ */ +{ FILE *fh; char buffer[1024]; - char *fields[8]; - int numfields; + fh = fopen ("/proc/swaps", "r"); + if (fh == NULL) + { + char errbuf[1024]; + WARNING ("swap plugin: fopen (/proc/swaps) failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); + return (-1); + } - _Bool old_kernel=0; + while (fgets (buffer, sizeof (buffer), fh) != NULL) + { + char *fields[8]; + int numfields; + char *endptr; - 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; + char path[PATH_MAX]; + gauge_t total; + gauge_t used; - if ((fh = fopen ("/proc/meminfo", "r")) == NULL) + numfields = strsplit (buffer, fields, STATIC_ARRAY_SIZE (fields)); + if (numfields != 5) + continue; + + sstrncpy (path, fields[0], sizeof (path)); + escape_slashes (path, sizeof (path)); + + errno = 0; + endptr = NULL; + total = strtod (fields[2], &endptr); + if ((endptr == fields[2]) || (errno != 0)) + continue; + + errno = 0; + endptr = NULL; + used = strtod (fields[3], &endptr); + if ((endptr == fields[3]) || (errno != 0)) + continue; + + if (total < used) + continue; + + swap_submit_usage (path, used, total - used, NULL, NAN); + } + + fclose (fh); + + return (0); +} /* }}} int swap_read_separate */ + +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; + + fh = fopen ("/proc/meminfo", "r"); + if (fh == NULL) { char errbuf[1024]; - WARNING ("memory: fopen: %s", + WARNING ("swap plugin: fopen (/proc/meminfo) failed: %s", sstrerror (errno, errbuf, sizeof (errbuf))); return (-1); } while (fgets (buffer, sizeof (buffer), fh) != NULL) { + char *fields[8]; + int numfields; + numfields = strsplit (buffer, fields, STATIC_ARRAY_SIZE (fields)); if (numfields < 2) continue; if (strcasecmp (fields[0], "SwapTotal:") == 0) - strtoderive (fields[1], &swap_total); + { + swap_total = strtod (fields[1], /* endptr = */ NULL); + have_data |= 0x01; + } else if (strcasecmp (fields[0], "SwapFree:") == 0) - strtoderive (fields[1], &swap_free); + { + swap_free = strtod (fields[1], /* endptr = */ NULL); + have_data |= 0x02; + } else if (strcasecmp (fields[0], "SwapCached:") == 0) - strtoderive (fields[1], &swap_cached); + { + swap_cached = strtod (fields[1], /* endptr = */ NULL); + have_data |= 0x04; + } } - if (fclose (fh)) - { - char errbuf[1024]; - WARNING ("memory: fclose: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); - } + fclose (fh); - if ((swap_total == 0LL) || ((swap_free + swap_cached) > swap_total)) - return (-1); + if (have_data != 0x07) + return (ENOENT); + + if (isnan (swap_total) + || (swap_total <= 0.0) + || ((swap_free + swap_cached) > swap_total)) + return (EINVAL); swap_used = swap_total - (swap_free + swap_cached); - if ((fh = fopen ("/proc/vmstat", "r")) == NULL) + swap_submit_usage (NULL, swap_used, swap_free, "cached", swap_cached); + return (0); +} /* }}} int swap_read_combined */ + +static int swap_read_io (void) /* {{{ */ +{ + FILE *fh; + char buffer[1024]; + + _Bool old_kernel = 0; + + uint8_t have_data = 0; + derive_t swap_in = 0; + derive_t swap_out = 0; + + fh = fopen ("/proc/vmstat", "r"); + if (fh == NULL) { - // /proc/vmstat does not exist in kernels <2.6 - if ((fh = fopen ("/proc/stat", "r")) == NULL ) + /* /proc/vmstat does not exist in kernels <2.6 */ + fh = fopen ("/proc/stat", "r"); + if (fh == NULL) { char errbuf[1024]; WARNING ("swap: fopen: %s", @@ -252,6 +381,9 @@ static int swap_read (void) while (fgets (buffer, sizeof (buffer), fh) != NULL) { + char *fields[8]; + int numfields; + numfields = strsplit (buffer, fields, STATIC_ARRAY_SIZE (fields)); if (!old_kernel) @@ -260,9 +392,15 @@ static int swap_read (void) continue; if (strcasecmp ("pswpin", fields[0]) == 0) + { strtoderive (fields[1], &swap_in); + have_data |= 0x01; + } else if (strcasecmp ("pswpout", fields[0]) == 0) + { strtoderive (fields[1], &swap_out); + have_data |= 0x02; + } } else /* if (old_kernel) */ { @@ -277,24 +415,52 @@ static int swap_read (void) } } /* while (fgets) */ - if (fclose (fh)) + fclose (fh); + + if (have_data != 0x03) + return (ENOENT); + + if (report_bytes) { - char errbuf[1024]; - WARNING ("swap: fclose: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); + swap_in = swap_in * pagesize; + swap_out = swap_out * pagesize; } - 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); + swap_submit_derive ("in", swap_in); + swap_submit_derive ("out", swap_out); + + return (0); +} /* }}} int swap_read_io */ + +static int swap_read (void) /* {{{ */ +{ + if (report_by_device) + swap_read_separate (); + else + swap_read_combined (); + + swap_read_io (); + + return (0); +} /* }}} int swap_read */ /* #endif KERNEL_LINUX */ -#elif HAVE_LIBKSTAT - derive_t swap_alloc; - derive_t swap_resv; - derive_t swap_avail; +/* + * Under Solaris, two mechanisms can be used to read swap statistics, swapctl + * and kstat. The former reads physical space used on a device, the latter + * reports the view from the virtual memory system. It was decided that the + * kstat-based information should be moved to the "vmem" plugin, but nobody + * with enough Solaris experience was available at that time to do this. The + * code below is still there for your reference but it won't be activated in + * *this* plugin again. --octo + */ +#elif 0 && HAVE_LIBKSTAT +/* kstat-based read function */ +static int swap_read_kstat (void) /* {{{ */ +{ + gauge_t swap_alloc; + gauge_t swap_resv; + gauge_t swap_avail; struct anoninfo ai; @@ -327,37 +493,144 @@ static int swap_read (void) * swap_alloc = pagesize * ( ai.ani_max - ai.ani_free ); * can suffer from a 32bit overflow. */ - 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_alloc = (gauge_t) ((ai.ani_max - ai.ani_free) * pagesize); + swap_resv = (gauge_t) ((ai.ani_resv + ai.ani_free - ai.ani_max) * pagesize); + swap_avail = (gauge_t) ((ai.ani_max - ai.ani_resv) * pagesize); + + swap_submit_usage (NULL, swap_alloc, swap_avail, "reserved", swap_resv); + return (0); +} /* }}} int swap_read_kstat */ +/* #endif 0 && HAVE_LIBKSTAT */ + +#elif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS +/* swapctl-based read function */ +static int swap_read (void) /* {{{ */ +{ + swaptbl_t *s; + char *s_paths; + int swap_num; + int status; + int i; + + gauge_t avail = 0; + gauge_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); + + /* Allocate and initialize the swaptbl_t structure */ + s = (swaptbl_t *) smalloc (swap_num * sizeof (swapent_t) + sizeof (struct swaptable)); + if (s == NULL) + { + ERROR ("swap plugin: smalloc failed."); + return (-1); + } + + /* Memory to store the path names. We only use these paths when the + * separate option has been configured, but it's easier to just + * allocate enough memory in any case. */ + s_paths = calloc (swap_num, PATH_MAX); + if (s_paths == NULL) + { + ERROR ("swap plugin: malloc failed."); + sfree (s); + return (-1); + } + for (i = 0; i < swap_num; i++) + s->swt_ent[i].ste_path = s_paths + (i * PATH_MAX); + s->swt_n = swap_num; + + status = swapctl (SC_LIST, s); + if (status < 0) + { + char errbuf[1024]; + ERROR ("swap plugin: swapctl (SC_LIST) failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); + sfree (s_paths); + sfree (s); + return (-1); + } + else if (swap_num < status) + { + /* more elements returned than requested */ + ERROR ("swap plugin: I allocated memory for %i structure%s, " + "but swapctl(2) claims to have returned %i. " + "I'm confused and will give up.", + swap_num, (swap_num == 1) ? "" : "s", + status); + sfree (s_paths); + sfree (s); + return (-1); + } + else if (swap_num > status) + /* less elements returned than requested */ + swap_num = status; - 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 */ + for (i = 0; i < swap_num; i++) + { + char path[PATH_MAX]; + gauge_t this_total; + gauge_t this_avail; -#elif HAVE_SWAPCTL + if ((s->swt_ent[i].ste_flags & ST_INDEL) != 0) + continue; + + this_total = (gauge_t) (s->swt_ent[i].ste_pages * pagesize); + this_avail = (gauge_t) (s->swt_ent[i].ste_free * pagesize); + + /* Shortcut for the "combined" setting (default) */ + if (!report_by_device) + { + avail += this_avail; + total += this_total; + continue; + } + + sstrncpy (path, s->swt_ent[i].ste_path, sizeof (path)); + escape_slashes (path, sizeof (path)); + + swap_submit_usage (path, this_total - this_avail, this_avail, + NULL, NAN); + } /* for (swap_num) */ + + if (total < avail) + { + ERROR ("swap plugin: Total swap space (%g) is less than free swap space (%g).", + total, avail); + sfree (s_paths); + sfree (s); + return (-1); + } + + /* If the "separate" option was specified (report_by_device == 1), all + * values have already been dispatched from within the loop. */ + if (!report_by_device) + swap_submit_usage (NULL, total - avail, avail, NULL, NAN); + + sfree (s_paths); + sfree (s); + return (0); +} /* }}} int swap_read */ +/* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */ + +#elif HAVE_SWAPCTL && HAVE_SWAPCTL_THREE_ARGS +static int swap_read (void) /* {{{ */ +{ struct swapent *swap_entries; int swap_num; int status; int i; - derive_t used = 0; - derive_t total = 0; + gauge_t used = 0; + gauge_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) { @@ -385,37 +658,39 @@ static int swap_read (void) } #if defined(DEV_BSIZE) && (DEV_BSIZE > 0) -# define C_SWAP_BLOCK_SIZE ((derive_t) DEV_BSIZE) +# define C_SWAP_BLOCK_SIZE ((gauge_t) DEV_BSIZE) #else -# define C_SWAP_BLOCK_SIZE ((derive_t) 512) +# define C_SWAP_BLOCK_SIZE 512.0 #endif + /* TODO: Report per-device stats. The path name is available from + * swap_entries[i].se_path */ for (i = 0; i < swap_num; i++) { if ((swap_entries[i].se_flags & SWF_ENABLE) == 0) continue; - used += ((derive_t) swap_entries[i].se_inuse) - * C_SWAP_BLOCK_SIZE; - total += ((derive_t) swap_entries[i].se_nblks) - * C_SWAP_BLOCK_SIZE; + used += ((gauge_t) swap_entries[i].se_inuse) * C_SWAP_BLOCK_SIZE; + total += ((gauge_t) swap_entries[i].se_nblks) * C_SWAP_BLOCK_SIZE; } if (total < used) { - ERROR ("swap plugin: Total swap space (%"PRIu64") " - "is less than used swap space (%"PRIu64").", + ERROR ("swap plugin: Total swap space (%g) is less than used swap space (%g).", total, used); return (-1); } - swap_submit ("used", used, DS_TYPE_GAUGE); - swap_submit ("free", total - used, DS_TYPE_GAUGE); + swap_submit_usage (NULL, used, total - used, NULL, NAN); sfree (swap_entries); -/* #endif HAVE_SWAPCTL */ + return (0); +} /* }}} int swap_read */ +/* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_THREE_ARGS */ #elif defined(VM_SWAPUSAGE) +static int swap_read (void) /* {{{ */ +{ int mib[3]; size_t mib_len; struct xsw_usage sw_usage; @@ -431,17 +706,22 @@ static int swap_read (void) return (-1); /* The returned values are bytes. */ - swap_submit ("used", (derive_t) sw_usage.xsu_used, DS_TYPE_GAUGE); - swap_submit ("free", (derive_t) sw_usage.xsu_avail, DS_TYPE_GAUGE); + swap_submit_usage (NULL, + (gauge_t) sw_usage.xsu_used, (gauge_t) sw_usage.xsu_avail, + NULL, NAN); + + return (0); +} /* }}} int swap_read */ /* #endif VM_SWAPUSAGE */ #elif HAVE_LIBKVM_GETSWAPINFO +static int swap_read (void) /* {{{ */ +{ struct kvm_swap data_s; int status; - derive_t used; - derive_t free; - derive_t total; + gauge_t used; + gauge_t total; if (kvm_obj == NULL) return (-1); @@ -451,47 +731,71 @@ static int swap_read (void) if (status == -1) return (-1); - total = (derive_t) data_s.ksw_total; - used = (derive_t) data_s.ksw_used; + total = (gauge_t) data_s.ksw_total; + used = (gauge_t) data_s.ksw_used; - total *= (derive_t) kvm_pagesize; - used *= (derive_t) kvm_pagesize; + total *= (gauge_t) kvm_pagesize; + used *= (gauge_t) kvm_pagesize; - free = total - used; + swap_submit_usage (NULL, used, total - used, NULL, NAN); - swap_submit ("used", used, DS_TYPE_GAUGE); - swap_submit ("free", free, DS_TYPE_GAUGE); + return (0); +} /* }}} int swap_read */ /* #endif HAVE_LIBKVM_GETSWAPINFO */ #elif HAVE_LIBSTATGRAB +static int swap_read (void) /* {{{ */ +{ sg_swap_stats *swap; swap = sg_get_swap_stats (); - if (swap == NULL) return (-1); - swap_submit ("used", (derive_t) swap->used, DS_TYPE_GAUGE); - swap_submit ("free", (derive_t) swap->free, DS_TYPE_GAUGE); + swap_submit_usage (NULL, (gauge_t) swap->used, (gauge_t) swap->free, + NULL, NAN); + + return (0); +} /* }}} int swap_read */ /* #endif HAVE_LIBSTATGRAB */ #elif HAVE_PERFSTAT - if(perfstat_memory_total(NULL, &pmemory, sizeof(perfstat_memory_total_t), 1) < 0) +static int swap_read (void) /* {{{ */ +{ + perfstat_memory_total_t pmemory; + int status; + + gauge_t total; + gauge_t free; + gauge_t reserved; + + memset (&pmemory, 0, sizeof (pmemory)); + status = perfstat_memory_total (NULL, &pmemory, sizeof(perfstat_memory_total_t), 1); + if (status < 0) { char errbuf[1024]; - WARNING ("memory plugin: perfstat_memory_total failed: %s", + WARNING ("swap 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 */ + + total = (gauge_t) (pmemory.pgsp_total * pagesize); + free = (gauge_t) (pmemory.pgsp_free * pagesize); + reserved = (gauge_t) (pmemory.pgsp_rsvd * pagesize); + + swap_submit_usage (NULL, total - free, free, "reserved", reserved); + swap_submit_derive ("in", (derive_t) pmemory.pgspins * pagesize); + swap_submit_derive ("out", (derive_t) pmemory.pgspouts * pagesize); return (0); -} /* int swap_read */ +} /* }}} int swap_read */ +#endif /* HAVE_PERFSTAT */ void module_register (void) { + plugin_register_complex_config ("swap", swap_config); plugin_register_init ("swap", swap_init); plugin_register_read ("swap", swap_read); } /* void module_register */ + +/* vim: set fdm=marker : */