From 676d18cd5453ba2fe18dc896ab00792bc615fdee Mon Sep 17 00:00:00 2001 From: Travis Taylor Date: Tue, 23 Dec 2014 13:37:16 -0700 Subject: [PATCH] Add ZFS cache awareness to memory meters. Enable with --enable-zfs-cache-awareness (Only tested with ZFS on linux) --- configure.ac | 5 +++++ linux/LinuxProcessList.c | 28 ++++++++++++++++++++++++++++ linux/LinuxProcessList.h | 3 +++ 3 files changed, 36 insertions(+) diff --git a/configure.ac b/configure.ac index bc586d997..58d969cec 100644 --- a/configure.ac +++ b/configure.ac @@ -138,6 +138,11 @@ else [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) fi +AC_ARG_ENABLE(zfs_cache_awareness, [AC_HELP_STRING([--enable-zfs-cache-awareness],[enable ZFS cache awareness for memory usage])], enable_zfs_cache_awareness="yes",enable_zfs_cache_awareness="no") +if test "x$enable_zfs_cache_awareness" = xyes; then + AC_DEFINE(HAVE_ZFS, 1, [Define if we want the memory meter to be aware of the ZFS cache]) +fi + AC_ARG_ENABLE(native_affinity, [AC_HELP_STRING([--enable-native-affinity], [enable native sched_setaffinity and sched_getaffinity for affinity support, disables hwloc])], ,enable_native_affinity="yes") if test "x$enable_native_affinity" = xyes -a "x$cross_compiling" = xno; then AC_MSG_CHECKING([for usable sched_setaffinity]) diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c index 0b46d1197..93a78b1b5 100644 --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -43,6 +43,9 @@ in the source distribution for its full text. #define PROCMEMINFOFILE PROCDIR "/meminfo" #endif +#ifndef ZFSINFOFILE +#define ZFSINFOFILE "/proc/spl/kstat/zfs/arcstats" +#endif }*/ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList) { @@ -612,6 +615,31 @@ static inline void LinuxProcessList_scanMemoryInfo(ProcessList* this) { } } +#ifdef HAVE_ZFS + FILE* zfsFile = fopen(ZFSINFOFILE,"r"); + if( zfsFile != NULL) + { + unsigned long long int zfsMem = 0; + while(fgets(buffer,128,zfsFile) && zfsMem == 0) + { + switch(buffer[0]) + { + case 's': + if(String_startsWith(buffer, "size")) + sscanf(buffer,"size %*i %32llu",&zfsMem); + zfsMem /= 1024; + break; + default: + break; + } + } + this->cachedMem += zfsMem; + fclose(zfsFile); + } +#endif + + + this->usedMem = this->totalMem - this->freeMem; this->usedSwap = this->totalSwap - swapFree; fclose(file); diff --git a/linux/LinuxProcessList.h b/linux/LinuxProcessList.h index 4f9482fa2..fe7079af9 100644 --- a/linux/LinuxProcessList.h +++ b/linux/LinuxProcessList.h @@ -24,6 +24,9 @@ in the source distribution for its full text. #define PROCMEMINFOFILE PROCDIR "/meminfo" #endif +#ifndef ZFSINFOFILE +#define ZFSINFOFILE "/proc/spl/kstat/zfs/arcstats" +#endif ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList);