X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fzfs_arc.c;h=6c66fb1390d9afe8493aaa9fb992cabd7bf4ed2c;hp=5d37f9f1e0078ab73d3581138c55a1c18fc7be77;hb=7111bb6df7628edce3a8e538b386fbe27633a191;hpb=a44b08a5204c52e231d78a43a08a1aeab356c758 diff --git a/src/zfs_arc.c b/src/zfs_arc.c index 5d37f9f1..6c66fb13 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) { @@ -227,6 +232,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;