X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fzfs_arc.c;h=d18a93f76136fda29a5ab2e395921e14a59990f8;hb=25824c65721f0f21cadf1607fad367c7e7831816;hp=c9abdd5f03c008914a4bd5d5283bd6d06b9db5b3;hpb=b2ce05053cc602f0b8599e8a6c0de80063647ba4;p=collectd.git diff --git a/src/zfs_arc.c b/src/zfs_arc.c index c9abdd5f..d18a93f7 100644 --- a/src/zfs_arc.c +++ b/src/zfs_arc.c @@ -29,8 +29,8 @@ #include "collectd.h" -#include "common.h" #include "plugin.h" +#include "utils/common/common.h" /* * Global variables @@ -231,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;