X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fswap.c;h=2025533eae298ee59048913eb4f69e2b466ad5ab;hb=853b3da5d4c6614d7db4093f57b1ca4f57b6c485;hp=e467818db4ca01f65af8fd66eb0c7780d571fec3;hpb=a158940fd85bbef59a65f593cd8130896f5c44d0;p=collectd.git diff --git a/src/swap.c b/src/swap.c index e467818d..2025533e 100644 --- a/src/swap.c +++ b/src/swap.c @@ -76,8 +76,8 @@ 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) @@ -115,8 +115,9 @@ static int swap_init (void) 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) @@ -210,25 +211,18 @@ static int swap_read (void) return (-1); } - while (fgets (buffer, 1024, fh) != NULL) + while (fgets (buffer, sizeof (buffer), fh) != NULL) { - derive_t *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 = (derive_t) 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)) @@ -257,7 +251,7 @@ static int swap_read (void) old_kernel = 1; } - while (fgets (buffer, 1024, fh) != NULL) + while (fgets (buffer, sizeof (buffer), fh) != NULL) { numfields = strsplit (buffer, fields, STATIC_ARRAY_SIZE (fields)); @@ -266,7 +260,7 @@ static int swap_read (void) if (numfields != 2) continue; - if (strcasecmp ("pswpin", fields[0]) != 0) + if (strcasecmp ("pswpin", fields[0]) == 0) strtoderive (fields[1], &swap_in); else if (strcasecmp ("pswpout", fields[0]) == 0) strtoderive (fields[1], &swap_out); @@ -291,10 +285,10 @@ static int swap_read (void) sstrerror (errno, errbuf, sizeof (errbuf))); } - swap_submit ("used", swap_used, DS_TYPE_GAUGE); - swap_submit ("free", swap_free, DS_TYPE_GAUGE); - swap_submit ("cached", swap_cached, DS_TYPE_GAUGE); - swap_submit ("in", swap_in, DS_TYPE_DERIVE); + 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 */ @@ -345,6 +339,74 @@ static int swap_read (void) /* #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; @@ -353,18 +415,6 @@ static int swap_read (void) 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) { @@ -420,6 +470,7 @@ static int swap_read (void) swap_submit ("free", total - used, DS_TYPE_GAUGE); sfree (swap_entries); + #endif /* HAVE_SWAPCTL_THREE_ARGS */ /* #endif HAVE_SWAPCTL */ #elif defined(VM_SWAPUSAGE)