X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fzfs_arc.c;h=a3c24516b846b8f690764a49529d0e76bdf94d22;hp=3ef3e562c79e91c6aa78cb63a464588bcc589c4f;hb=8f6aa6970bf787e6a11e095322af3338ec781d78;hpb=42c95164f7c6bcc5fe831c3d9844aca0e69faf4d diff --git a/src/zfs_arc.c b/src/zfs_arc.c index 3ef3e562..a3c24516 100644 --- a/src/zfs_arc.c +++ b/src/zfs_arc.c @@ -29,12 +29,16 @@ #include "collectd.h" -#include "common.h" #include "plugin.h" +#include "utils/common/common.h" /* * Global variables */ +static value_to_rate_state_t arc_hits_state; +static value_to_rate_state_t arc_misses_state; +static value_to_rate_state_t l2_hits_state; +static value_to_rate_state_t l2_misses_state; #if defined(KERNEL_LINUX) #include "utils_llist.h" @@ -95,6 +99,11 @@ static void free_zfs_values(kstat_t *ksp) { } #elif defined(KERNEL_SOLARIS) + +#if HAVE_KSTAT_H +#include +#endif + extern kstat_ctl_t *kc; static long long get_zfs_value(kstat_t *ksp, char *name) { @@ -118,7 +127,7 @@ static long long get_zfs_value(kstat_t *dummy __attribute__((unused)), size_t valuelen = sizeof(value); int rv; - snprintf(buffer, sizeof(buffer), "%s%s", zfs_arcstat, name); + ssnprintf(buffer, sizeof(buffer), "%s%s", zfs_arcstat, name); rv = sysctlbyname(buffer, (void *)&value, &valuelen, /* new value = */ NULL, /* new length = */ (size_t)0); if (rv == 0) @@ -188,9 +197,6 @@ static void za_submit_ratio(const char *type_instance, gauge_t hits, za_submit_gauge("cache_ratio", type_instance, ratio); } -static value_to_rate_state_t arc_hits_state, arc_misses_state, l2_hits_state, - l2_misses_state; - static int za_read(void) { gauge_t arc_hits, arc_misses, l2_hits, l2_misses; kstat_t *ksp = NULL; @@ -201,9 +207,20 @@ static int za_read(void) { fh = fopen(ZOL_ARCSTATS_FILE, "r"); if (fh == NULL) { - char errbuf[1024]; ERROR("zfs_arc plugin: Opening \"%s\" failed: %s", ZOL_ARCSTATS_FILE, - sstrerror(errno, errbuf, sizeof(errbuf))); + STRERRNO); + return -1; + } + + /* Ignore the first two lines because they contain information about the rest + * of the file. + * See kstat_seq_show_headers module/spl/spl-kstat.c of the spl kernel module. + */ + if ((fgets(buffer, sizeof(buffer), fh) == NULL) || + (fgets(buffer, sizeof(buffer), fh) == NULL)) { + ERROR("zfs_arc plugin: \"%s\" does not contain at least two lines.", + ZOL_ARCSTATS_FILE); + fclose(fh); return -1; } @@ -222,13 +239,13 @@ static int za_read(void) { ERROR("zfs_arc plugin: \"%s\" does not contain a single line.", ZOL_ARCSTATS_FILE); fclose(fh); - return -1; + return (-1); } if (fgets(buffer, sizeof(buffer), fh) == NULL) { ERROR("zfs_arc plugin: \"%s\" does not contain at least two lines.", ZOL_ARCSTATS_FILE); fclose(fh); - return -1; + return (-1); } while (fgets(buffer, sizeof(buffer), fh) != NULL) { @@ -361,11 +378,6 @@ static int za_init(void) /* {{{ */ } #endif - memset(&arc_hits_state, 0, sizeof(arc_hits_state)); - memset(&arc_misses_state, 0, sizeof(arc_misses_state)); - memset(&l2_hits_state, 0, sizeof(l2_hits_state)); - memset(&l2_misses_state, 0, sizeof(l2_misses_state)); - return 0; } /* }}} int za_init */