Merge branch 'hishamhm-pull-920'

This commit is contained in:
Nathan Scott
2020-08-20 18:24:35 +10:00
27 changed files with 727 additions and 26 deletions

View File

@ -18,6 +18,7 @@ in the source distribution for its full text.
#include "ProcessList.h"
#include "zfs/ZfsArcStats.h"
extern long long btime;
@ -69,6 +70,8 @@ typedef struct LinuxProcessList_ {
struct nl_sock *netlink_socket;
int netlink_family;
#endif
ZfsArcStats zfs;
} LinuxProcessList;
#ifndef PROCDIR
@ -87,6 +90,10 @@ typedef struct LinuxProcessList_ {
#define PROCMEMINFOFILE PROCDIR "/meminfo"
#endif
#ifndef PROCARCSTATSFILE
#define PROCARCSTATSFILE PROCDIR "/spl/kstat/zfs/arcstats"
#endif
#ifndef PROCTTYDRIVERSFILE
#define PROCTTYDRIVERSFILE PROCDIR "/tty/drivers"
#endif