X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fzfs_arc.c;h=d1ee111bb637f70db05bf8fd5b3186bdb4995c87;hb=711f5b6c86f51061c21bedcaa46214a01de0125c;hp=af4bfccb467baf84cd48f27b25f92e52d875972f;hpb=a18496a4ac759552fd4dac1d2c661fb50285b1a1;p=collectd.git diff --git a/src/zfs_arc.c b/src/zfs_arc.c index af4bfccb..d1ee111b 100644 --- a/src/zfs_arc.c +++ b/src/zfs_arc.c @@ -99,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) { @@ -226,6 +231,23 @@ static int za_read(void) { 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) { + ERROR("zfs_arc plugin: \"%s\" does not contain a single line.", + ZOL_ARCSTATS_FILE); + fclose(fh); + 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); + } + while (fgets(buffer, sizeof(buffer), fh) != NULL) { char *fields[3]; value_t v;