Adapt platform code for the new Machine base class

Move host-centric data to new derived <Platform>Machine classes,
separate from process-list-centric data.

5 files changed, 433 insertions, 396 deletions

diff --git a/dragonflybsd/DragonFlyBSDMachine.c b/dragonflybsd/DragonFlyBSDMachine.c
new file mode 100644
index 00000000..fc7eb3b0
--- /dev/null
+++ b/dragonflybsd/DragonFlyBSDMachine.c
@@ -0,0 +1,341 @@
+/*
+htop - DragonFlyBSDMachine.c
+(C) 2014 Hisham H. Muhammad
+(C) 2017 Diederik de Groot
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "dragonflybsd/DragonFlyBSDMachine.h"
+
+#include <fcntl.h>
+#include <limits.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <sys/user.h>
+#include <sys/param.h>
+
+#include "CRT.h"
+#include "Macros.h"
+
+#include "dragonflybsd/DragonFlyBSDProcess.h"
+
+
+static int MIB_hw_physmem[2];
+static int MIB_vm_stats_vm_v_page_count[4];
+
+static int MIB_vm_stats_vm_v_wire_count[4];
+static int MIB_vm_stats_vm_v_active_count[4];
+static int MIB_vm_stats_vm_v_cache_count[4];
+static int MIB_vm_stats_vm_v_inactive_count[4];
+static int MIB_vm_stats_vm_v_free_count[4];
+
+static int MIB_vfs_bufspace[2];
+
+static int MIB_kern_cp_time[2];
+static int MIB_kern_cp_times[2];
+
+Machine* Machine_new(UsersTable* usersTable, uid_t userId) {
+   size_t len;
+   char errbuf[_POSIX2_LINE_MAX];
+   DragonFlyBSDMachine* this = xCalloc(1, sizeof(DragonFlyBSDMachine));
+   Machine* super = &this->super;
+
+   Machine_init(this, usersTable, userId);
+
+   // physical memory in system: hw.physmem
+   // physical page size: hw.pagesize
+   // usable pagesize : vm.stats.vm.v_page_size
+   len = 2; sysctlnametomib("hw.physmem", MIB_hw_physmem, &len);
+
+   len = sizeof(this->pageSize);
+   if (sysctlbyname("vm.stats.vm.v_page_size", &this->pageSize, &len, NULL, 0) == -1)
+      CRT_fatalError("Cannot get pagesize by sysctl");
+   this->pageSizeKb = this->pageSize / ONE_K;
+
+   // usable page count vm.stats.vm.v_page_count
+   // actually usable memory : vm.stats.vm.v_page_count * vm.stats.vm.v_page_size
+   len = 4; sysctlnametomib("vm.stats.vm.v_page_count", MIB_vm_stats_vm_v_page_count, &len);
+
+   len = 4; sysctlnametomib("vm.stats.vm.v_wire_count", MIB_vm_stats_vm_v_wire_count, &len);
+   len = 4; sysctlnametomib("vm.stats.vm.v_active_count", MIB_vm_stats_vm_v_active_count, &len);
+   len = 4; sysctlnametomib("vm.stats.vm.v_cache_count", MIB_vm_stats_vm_v_cache_count, &len);
+   len = 4; sysctlnametomib("vm.stats.vm.v_inactive_count", MIB_vm_stats_vm_v_inactive_count, &len);
+   len = 4; sysctlnametomib("vm.stats.vm.v_free_count", MIB_vm_stats_vm_v_free_count, &len);
+
+   len = 2; sysctlnametomib("vfs.bufspace", MIB_vfs_bufspace, &len);
+
+   int cpus = 1;
+   len = sizeof(cpus);
+   if (sysctlbyname("hw.ncpu", &cpus, &len, NULL, 0) != 0) {
+      cpus = 1;
+   }
+
+   size_t sizeof_cp_time_array = sizeof(unsigned long) * CPUSTATES;
+   len = 2; sysctlnametomib("kern.cp_time", MIB_kern_cp_time, &len);
+   this->cp_time_o = xCalloc(CPUSTATES, sizeof(unsigned long));
+   this->cp_time_n = xCalloc(CPUSTATES, sizeof(unsigned long));
+   len = sizeof_cp_time_array;
+
+   // fetch initial single (or average) CPU clicks from kernel
+   sysctl(MIB_kern_cp_time, 2, this->cp_time_o, &len, NULL, 0);
+
+   // on smp box, fetch rest of initial CPU's clicks
+   if (cpus > 1) {
+      len = 2; sysctlnametomib("kern.cp_times", MIB_kern_cp_times, &len);
+      this->cp_times_o = xCalloc(cpus, sizeof_cp_time_array);
+      this->cp_times_n = xCalloc(cpus, sizeof_cp_time_array);
+      len = cpus * sizeof_cp_time_array;
+      sysctl(MIB_kern_cp_times, 2, this->cp_times_o, &len, NULL, 0);
+   }
+
+   super->existingCPUs = MAXIMUM(cpus, 1);
+   // TODO: support offline CPUs and hot swapping
+   super->activeCPUs = super->existingCPUs;
+
+   if (cpus == 1 ) {
+      this->cpus = xRealloc(this->cpus, sizeof(CPUData));
+   } else {
+      // on smp we need CPUs + 1 to store averages too (as kernel kindly provides that as well)
+      this->cpus = xRealloc(this->cpus, (super->existingCPUs + 1) * sizeof(CPUData));
+   }
+
+   len = sizeof(kernelFScale);
+   if (sysctlbyname("kern.fscale", &kernelFScale, &len, NULL, 0) == -1) {
+      //sane default for kernel provided CPU percentage scaling, at least on x86 machines, in case this sysctl call failed
+      kernelFScale = 2048;
+   }
+
+   this->kd = kvm_openfiles(NULL, "/dev/null", NULL, 0, errbuf);
+   if (this->kd == NULL) {
+      CRT_fatalError("kvm_openfiles() failed");
+   }
+
+   return super;
+}
+
+void Machine_delete(Machine* super) {
+   const DragonFlyBSDMachine* this = (DragonFlyBSDProcessList*) super;
+
+   Machine_done(this);
+
+   if (this->kd) {
+      kvm_close(this->kd);
+   }
+
+   if (this->jails) {
+      Hashtable_delete(this->jails);
+   }
+
+   free(this->cp_time_o);
+   free(this->cp_time_n);
+   free(this->cp_times_o);
+   free(this->cp_times_n);
+   free(this->cpus);
+
+   free(this);
+}
+
+static void DragonFlyBSDMachine_scanCPUTime(Machine* super) {
+   const DragonFlyBSDMachine* this = (DragonFlyBSDMachine*) super;
+
+   unsigned int cpus   = super->existingCPUs;  // actual CPU count
+   unsigned int maxcpu = cpus;              // max iteration (in case we have average + smp)
+   int cp_times_offset;
+
+   assert(cpus > 0);
+
+   size_t sizeof_cp_time_array;
+
+   unsigned long* cp_time_n; // old clicks state
+   unsigned long* cp_time_o; // current clicks state
+
+   unsigned long cp_time_d[CPUSTATES];
+   double        cp_time_p[CPUSTATES];
+
+   // get averages or single CPU clicks
+   sizeof_cp_time_array = sizeof(unsigned long) * CPUSTATES;
+   sysctl(MIB_kern_cp_time, 2, this->cp_time_n, &sizeof_cp_time_array, NULL, 0);
+
+   // get rest of CPUs
+   if (cpus > 1) {
+      // on smp systems DragonFlyBSD kernel concats all CPU states into one long array in
+      // kern.cp_times sysctl OID
+      // we store averages in dfpl->cpus[0], and actual cores after that
+      maxcpu = cpus + 1;
+      sizeof_cp_time_array = cpus * sizeof(unsigned long) * CPUSTATES;
+      sysctl(MIB_kern_cp_times, 2, this->cp_times_n, &sizeof_cp_time_array, NULL, 0);
+   }
+
+   for (unsigned int i = 0; i < maxcpu; i++) {
+      if (cpus == 1) {
+         // single CPU box
+         cp_time_n = this->cp_time_n;
+         cp_time_o = this->cp_time_o;
+      } else {
+         if (i == 0 ) {
+            // average
+            cp_time_n = this->cp_time_n;
+            cp_time_o = this->cp_time_o;
+         } else {
+            // specific smp cores
+            cp_times_offset = i - 1;
+            cp_time_n = this->cp_times_n + (cp_times_offset * CPUSTATES);
+            cp_time_o = this->cp_times_o + (cp_times_offset * CPUSTATES);
+         }
+      }
+
+      // diff old vs new
+      unsigned long long total_o = 0;
+      unsigned long long total_n = 0;
+      unsigned long long total_d = 0;
+      for (int s = 0; s < CPUSTATES; s++) {
+         cp_time_d[s] = cp_time_n[s] - cp_time_o[s];
+         total_o += cp_time_o[s];
+         total_n += cp_time_n[s];
+      }
+
+      // totals
+      total_d = total_n - total_o;
+      if (total_d < 1 ) {
+         total_d = 1;
+      }
+
+      // save current state as old and calc percentages
+      for (int s = 0; s < CPUSTATES; ++s) {
+         cp_time_o[s] = cp_time_n[s];
+         cp_time_p[s] = ((double)cp_time_d[s]) / ((double)total_d) * 100;
+      }
+
+      CPUData* cpuData = &(this->cpus[i]);
+      cpuData->userPercent      = cp_time_p[CP_USER];
+      cpuData->nicePercent      = cp_time_p[CP_NICE];
+      cpuData->systemPercent    = cp_time_p[CP_SYS];
+      cpuData->irqPercent       = cp_time_p[CP_INTR];
+      cpuData->systemAllPercent = cp_time_p[CP_SYS] + cp_time_p[CP_INTR];
+      // this one is not really used, but we store it anyway
+      cpuData->idlePercent      = cp_time_p[CP_IDLE];
+   }
+}
+
+static void DragonFlyBSDMachine_scanMemoryInfo(Machine* super) {
+   DragonFlyBSDMachine* this = (DragonFlyBSDProcessList*) super;
+
+   // @etosan:
+   // memory counter relationships seem to be these:
+   //  total = active + wired + inactive + cache + free
+   //  htop_used (unavail to anybody) = active + wired
+   //  htop_cache (for cache meter)   = buffers + cache
+   //  user_free (avail to procs)     = buffers + inactive + cache + free
+   size_t len = sizeof(super->totalMem);
+
+   //disabled for now, as it is always smaller than phycal amount of memory...
+   //...to avoid "where is my memory?" questions
+   //sysctl(MIB_vm_stats_vm_v_page_count, 4, &(pl->totalMem), &len, NULL, 0);
+   //pl->totalMem *= pageSizeKb;
+   sysctl(MIB_hw_physmem, 2, &(super->totalMem), &len, NULL, 0);
+   pl->totalMem /= 1024;
+
+   sysctl(MIB_vm_stats_vm_v_active_count, 4, &(this->memActive), &len, NULL, 0);
+   this->memActive *= this->pageSizeKb;
+
+   sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(this->memWire), &len, NULL, 0);
+   this->memWire *= this->pageSizeKb;
+
+   sysctl(MIB_vfs_bufspace, 2, &(super->buffersMem), &len, NULL, 0);
+   super->buffersMem /= 1024;
+
+   sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(super->cachedMem), &len, NULL, 0);
+   super->cachedMem *= this->pageSizeKb;
+   super->usedMem = this->memActive + this->memWire;
+
+   struct kvm_swap swap[16];
+   int nswap = kvm_getswapinfo(this->kd, swap, ARRAYSIZE(swap), 0);
+   super->totalSwap = 0;
+   super->usedSwap = 0;
+   for (int i = 0; i < nswap; i++) {
+      super->totalSwap += swap[i].ksw_total;
+      super->usedSwap += swap[i].ksw_used;
+   }
+   super->totalSwap *= this->pageSizeKb;
+   super->usedSwap *= this->pageSizeKb;
+}
+
+static void DragonFlyBSDMachine_scanJails(DragonFlyBSDMachine* this) {
+   size_t len;
+   char* jails; /* Jail list */
+   char* curpos;
+   char* nextpos;
+
+   if (sysctlbyname("jail.list", NULL, &len, NULL, 0) == -1) {
+      CRT_fatalError("initial sysctlbyname / jail.list failed");
+   }
+
+retry:
+   if (len == 0)
+      return;
+
+   jails = xMalloc(len);
+
+   if (sysctlbyname("jail.list", jails, &len, NULL, 0) == -1) {
+      if (errno == ENOMEM) {
+         free(jails);
+         goto retry;
+      }
+      CRT_fatalError("sysctlbyname / jail.list failed");
+   }
+
+   if (this->jails) {
+      Hashtable_delete(this->jails);
+   }
+
+   this->jails = Hashtable_new(20, true);
+   curpos = jails;
+   while (curpos) {
+      int jailid;
+      char* str_hostname;
+
+      nextpos = strchr(curpos, '\n');
+      if (nextpos) {
+         *nextpos++ = 0;
+      }
+
+      jailid = atoi(strtok(curpos, " "));
+      str_hostname = strtok(NULL, " ");
+
+      char* jname = (char*) (Hashtable_get(this->jails, jailid));
+      if (jname == NULL) {
+         jname = xStrdup(str_hostname);
+         Hashtable_put(this->jails, jailid, jname);
+      }
+
+      curpos = nextpos;
+   }
+
+   free(jails);
+}
+
+char* DragonFlyBSDMachine_readJailName(DragonFlyBSDMachine* host, int jailid) {
+   char* hostname;
+   char* jname;
+
+   if (jailid != 0 && host->jails && (hostname = (char*)Hashtable_get(host->jails, jailid))) {
+      jname = xStrdup(hostname);
+   } else {
+      jname = xStrdup("-");
+   }
+
+   return jname;
+}
+
+void Machine_scan(Machine* super) {
+   DragonFlyBSDMachine* this = (DragonFlyBSDMachine*) super;
+
+   DragonFlyBSDMachine_scanMemoryInfo(super);
+   DragonFlyBSDMachine_scanCPUTime(super);
+   DragonFlyBSDMachine_scanJails(this);
+}
diff --git a/dragonflybsd/DragonFlyBSDMachine.h b/dragonflybsd/DragonFlyBSDMachine.h
new file mode 100644
index 00000000..276a73d7
--- /dev/null
+++ b/dragonflybsd/DragonFlyBSDMachine.h
@@ -0,0 +1,61 @@
+#ifndef HEADER_DragonFlyBSDMachine
+#define HEADER_DragonFlyBSDMachine
+/*
+htop - DragonFlyBSDMachine.h
+(C) 2014 Hisham H. Muhammad
+(C) 2017 Diederik de Groot
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <sys/types.h>  // required for kvm.h
+#include <kvm.h>
+#include <osreldate.h>
+#include <stdbool.h>
+#include <sys/jail.h>
+#include <sys/param.h>
+#include <sys/resource.h>
+#include <sys/uio.h>
+
+#include "Hashtable.h"
+#include "Machine.h"
+#include "ProcessList.h"
+#include "UsersTable.h"
+
+
+typedef struct CPUData_ {
+   double userPercent;
+   double nicePercent;
+   double systemPercent;
+   double irqPercent;
+   double idlePercent;
+   double systemAllPercent;
+} CPUData;
+
+typedef struct DragonFlyBSDMachine_ {
+   Machine super;
+   kvm_t* kd;
+
+   Hashtable* jails;
+
+   int pageSize;
+   int pageSizeKb;
+   int kernelFScale;
+
+   unsigned long long int memWire;
+   unsigned long long int memActive;
+   unsigned long long int memInactive;
+   unsigned long long int memFree;
+
+   CPUData* cpus;
+
+   unsigned long* cp_time_o;
+   unsigned long* cp_time_n;
+
+   unsigned long* cp_times_o;
+   unsigned long* cp_times_n;
+} DragonFlyBSDMachine;
+
+char* DragonFlyBSDMachine_readJailName(DragonFlyBSDMachine* host, int jailid);
+
+#endif
diff --git a/dragonflybsd/DragonFlyBSDProcessList.c b/dragonflybsd/DragonFlyBSDProcessList.c
index c66917fb..4ff17932 100644
--- a/dragonflybsd/DragonFlyBSDProcessList.c
+++ b/dragonflybsd/DragonFlyBSDProcessList.c
@@ -22,248 +22,25 @@ in the source distribution for its full text.
 #include "CRT.h"
 #include "Macros.h"
 
+#include "dragonflybsd/DragonFlyBSDMachine.h"
 #include "dragonflybsd/DragonFlyBSDProcess.h"
 
 
-static int MIB_hw_physmem[2];
-static int MIB_vm_stats_vm_v_page_count[4];
-static int pageSize;
-static int pageSizeKb;
-
-static int MIB_vm_stats_vm_v_wire_count[4];
-static int MIB_vm_stats_vm_v_active_count[4];
-static int MIB_vm_stats_vm_v_cache_count[4];
-static int MIB_vm_stats_vm_v_inactive_count[4];
-static int MIB_vm_stats_vm_v_free_count[4];
-
-static int MIB_vfs_bufspace[2];
-
-static int MIB_kern_cp_time[2];
-static int MIB_kern_cp_times[2];
-static int kernelFScale;
-
 ProcessList* ProcessList_new(Machine* host, Hashtable* pidMatchList) {
-   size_t len;
-   char errbuf[_POSIX2_LINE_MAX];
-   DragonFlyBSDProcessList* dfpl = xCalloc(1, sizeof(DragonFlyBSDProcessList));
-   ProcessList* pl = (ProcessList*) dfpl;
-   ProcessList_init(pl, Class(DragonFlyBSDProcess), host, pidMatchList);
-
-   // physical memory in system: hw.physmem
-   // physical page size: hw.pagesize
-   // usable pagesize : vm.stats.vm.v_page_size
-   len = 2; sysctlnametomib("hw.physmem", MIB_hw_physmem, &len);
-
-   len = sizeof(pageSize);
-   if (sysctlbyname("vm.stats.vm.v_page_size", &pageSize, &len, NULL, 0) == -1)
-      CRT_fatalError("Cannot get pagesize by sysctl");
-   pageSizeKb = pageSize / ONE_K;
-
-   // usable page count vm.stats.vm.v_page_count
-   // actually usable memory : vm.stats.vm.v_page_count * vm.stats.vm.v_page_size
-   len = 4; sysctlnametomib("vm.stats.vm.v_page_count", MIB_vm_stats_vm_v_page_count, &len);
-
-   len = 4; sysctlnametomib("vm.stats.vm.v_wire_count", MIB_vm_stats_vm_v_wire_count, &len);
-   len = 4; sysctlnametomib("vm.stats.vm.v_active_count", MIB_vm_stats_vm_v_active_count, &len);
-   len = 4; sysctlnametomib("vm.stats.vm.v_cache_count", MIB_vm_stats_vm_v_cache_count, &len);
-   len = 4; sysctlnametomib("vm.stats.vm.v_inactive_count", MIB_vm_stats_vm_v_inactive_count, &len);
-   len = 4; sysctlnametomib("vm.stats.vm.v_free_count", MIB_vm_stats_vm_v_free_count, &len);
-
-   len = 2; sysctlnametomib("vfs.bufspace", MIB_vfs_bufspace, &len);
-
-   int cpus = 1;
-   len = sizeof(cpus);
-   if (sysctlbyname("hw.ncpu", &cpus, &len, NULL, 0) != 0) {
-      cpus = 1;
-   }
+   DragonFlyBSDProcessList* this = xCalloc(1, sizeof(DragonFlyBSDProcessList));
+   ProcessList* super = (ProcessList*) this;
 
-   size_t sizeof_cp_time_array = sizeof(unsigned long) * CPUSTATES;
-   len = 2; sysctlnametomib("kern.cp_time", MIB_kern_cp_time, &len);
-   dfpl->cp_time_o = xCalloc(CPUSTATES, sizeof(unsigned long));
-   dfpl->cp_time_n = xCalloc(CPUSTATES, sizeof(unsigned long));
-   len = sizeof_cp_time_array;
-
-   // fetch initial single (or average) CPU clicks from kernel
-   sysctl(MIB_kern_cp_time, 2, dfpl->cp_time_o, &len, NULL, 0);
-
-   // on smp box, fetch rest of initial CPU's clicks
-   if (cpus > 1) {
-      len = 2; sysctlnametomib("kern.cp_times", MIB_kern_cp_times, &len);
-      dfpl->cp_times_o = xCalloc(cpus, sizeof_cp_time_array);
-      dfpl->cp_times_n = xCalloc(cpus, sizeof_cp_time_array);
-      len = cpus * sizeof_cp_time_array;
-      sysctl(MIB_kern_cp_times, 2, dfpl->cp_times_o, &len, NULL, 0);
-   }
-
-   host->existingCPUs = MAXIMUM(cpus, 1);
-   // TODO: support offline CPUs and hot swapping
-   host->activeCPUs = host->existingCPUs;
-
-   if (cpus == 1 ) {
-      dfpl->cpus = xRealloc(dfpl->cpus, sizeof(CPUData));
-   } else {
-      // on smp we need CPUs + 1 to store averages too (as kernel kindly provides that as well)
-      dfpl->cpus = xRealloc(dfpl->cpus, (host->existingCPUs + 1) * sizeof(CPUData));
-   }
-
-   len = sizeof(kernelFScale);
-   if (sysctlbyname("kern.fscale", &kernelFScale, &len, NULL, 0) == -1) {
-      //sane default for kernel provided CPU percentage scaling, at least on x86 machines, in case this sysctl call failed
-      kernelFScale = 2048;
-   }
+   ProcessList_init(super, Class(DragonFlyBSDProcess), host, pidMatchList);
 
-   dfpl->kd = kvm_openfiles(NULL, "/dev/null", NULL, 0, errbuf);
-   if (dfpl->kd == NULL) {
-      CRT_fatalError("kvm_openfiles() failed");
-   }
-
-   return pl;
+   return super;
 }
 
-void ProcessList_delete(ProcessList* this) {
-   const DragonFlyBSDProcessList* dfpl = (DragonFlyBSDProcessList*) this;
-   if (dfpl->kd) {
-      kvm_close(dfpl->kd);
-   }
-
-   if (dfpl->jails) {
-      Hashtable_delete(dfpl->jails);
-   }
-   free(dfpl->cp_time_o);
-   free(dfpl->cp_time_n);
-   free(dfpl->cp_times_o);
-   free(dfpl->cp_times_n);
-   free(dfpl->cpus);
-
-   ProcessList_done(this);
+void ProcessList_delete(ProcessList* super) {
+   const DragonFlyBSDProcessList* this = (DragonFlyBSDProcessList*) super;
+   ProcessList_done(super);
    free(this);
 }
 
-static inline void DragonFlyBSDProcessList_scanCPUTime(ProcessList* pl) {
-   const DragonFlyBSDProcessList* dfpl = (DragonFlyBSDProcessList*) pl;
-
-   unsigned int cpus   = pl->existingCPUs;  // actual CPU count
-   unsigned int maxcpu = cpus;              // max iteration (in case we have average + smp)
-   int cp_times_offset;
-
-   assert(cpus > 0);
-
-   size_t sizeof_cp_time_array;
-
-   unsigned long* cp_time_n; // old clicks state
-   unsigned long* cp_time_o; // current clicks state
-
-   unsigned long cp_time_d[CPUSTATES];
-   double        cp_time_p[CPUSTATES];
-
-   // get averages or single CPU clicks
-   sizeof_cp_time_array = sizeof(unsigned long) * CPUSTATES;
-   sysctl(MIB_kern_cp_time, 2, dfpl->cp_time_n, &sizeof_cp_time_array, NULL, 0);
-
-   // get rest of CPUs
-   if (cpus > 1) {
-      // on smp systems DragonFlyBSD kernel concats all CPU states into one long array in
-      // kern.cp_times sysctl OID
-      // we store averages in dfpl->cpus[0], and actual cores after that
-      maxcpu = cpus + 1;
-      sizeof_cp_time_array = cpus * sizeof(unsigned long) * CPUSTATES;
-      sysctl(MIB_kern_cp_times, 2, dfpl->cp_times_n, &sizeof_cp_time_array, NULL, 0);
-   }
-
-   for (unsigned int i = 0; i < maxcpu; i++) {
-      if (cpus == 1) {
-         // single CPU box
-         cp_time_n = dfpl->cp_time_n;
-         cp_time_o = dfpl->cp_time_o;
-      } else {
-         if (i == 0 ) {
-            // average
-            cp_time_n = dfpl->cp_time_n;
-            cp_time_o = dfpl->cp_time_o;
-         } else {
-            // specific smp cores
-            cp_times_offset = i - 1;
-            cp_time_n = dfpl->cp_times_n + (cp_times_offset * CPUSTATES);
-            cp_time_o = dfpl->cp_times_o + (cp_times_offset * CPUSTATES);
-         }
-      }
-
-      // diff old vs new
-      unsigned long long total_o = 0;
-      unsigned long long total_n = 0;
-      unsigned long long total_d = 0;
-      for (int s = 0; s < CPUSTATES; s++) {
-         cp_time_d[s] = cp_time_n[s] - cp_time_o[s];
-         total_o += cp_time_o[s];
-         total_n += cp_time_n[s];
-      }
-
-      // totals
-      total_d = total_n - total_o;
-      if (total_d < 1 ) {
-         total_d = 1;
-      }
-
-      // save current state as old and calc percentages
-      for (int s = 0; s < CPUSTATES; ++s) {
-         cp_time_o[s] = cp_time_n[s];
-         cp_time_p[s] = ((double)cp_time_d[s]) / ((double)total_d) * 100;
-      }
-
-      CPUData* cpuData = &(dfpl->cpus[i]);
-      cpuData->userPercent      = cp_time_p[CP_USER];
-      cpuData->nicePercent      = cp_time_p[CP_NICE];
-      cpuData->systemPercent    = cp_time_p[CP_SYS];
-      cpuData->irqPercent       = cp_time_p[CP_INTR];
-      cpuData->systemAllPercent = cp_time_p[CP_SYS] + cp_time_p[CP_INTR];
-      // this one is not really used, but we store it anyway
-      cpuData->idlePercent      = cp_time_p[CP_IDLE];
-   }
-}
-
-static inline void DragonFlyBSDProcessList_scanMemoryInfo(ProcessList* pl) {
-   DragonFlyBSDProcessList* dfpl = (DragonFlyBSDProcessList*) pl;
-
-   // @etosan:
-   // memory counter relationships seem to be these:
-   //  total = active + wired + inactive + cache + free
-   //  htop_used (unavail to anybody) = active + wired
-   //  htop_cache (for cache meter)   = buffers + cache
-   //  user_free (avail to procs)     = buffers + inactive + cache + free
-   size_t len = sizeof(pl->totalMem);
-
-   //disabled for now, as it is always smaller than phycal amount of memory...
-   //...to avoid "where is my memory?" questions
-   //sysctl(MIB_vm_stats_vm_v_page_count, 4, &(pl->totalMem), &len, NULL, 0);
-   //pl->totalMem *= pageSizeKb;
-   sysctl(MIB_hw_physmem, 2, &(pl->totalMem), &len, NULL, 0);
-   pl->totalMem /= 1024;
-
-   sysctl(MIB_vm_stats_vm_v_active_count, 4, &(dfpl->memActive), &len, NULL, 0);
-   dfpl->memActive *= pageSizeKb;
-
-   sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(dfpl->memWire), &len, NULL, 0);
-   dfpl->memWire *= pageSizeKb;
-
-   sysctl(MIB_vfs_bufspace, 2, &(pl->buffersMem), &len, NULL, 0);
-   pl->buffersMem /= 1024;
-
-   sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(pl->cachedMem), &len, NULL, 0);
-   pl->cachedMem *= pageSizeKb;
-   pl->usedMem = dfpl->memActive + dfpl->memWire;
-
-   struct kvm_swap swap[16];
-   int nswap = kvm_getswapinfo(dfpl->kd, swap, ARRAYSIZE(swap), 0);
-   pl->totalSwap = 0;
-   pl->usedSwap = 0;
-   for (int i = 0; i < nswap; i++) {
-      pl->totalSwap += swap[i].ksw_total;
-      pl->usedSwap += swap[i].ksw_used;
-   }
-   pl->totalSwap *= pageSizeKb;
-   pl->usedSwap *= pageSizeKb;
-}
-
 //static void DragonFlyBSDProcessList_updateExe(const struct kinfo_proc* kproc, Process* proc) {
 //   const int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, kproc->kp_pid };
 //   char buffer[2048];
@@ -351,92 +128,17 @@ static void DragonFlyBSDProcessList_updateProcessName(kvm_t* kd, const struct ki
    free(cmdline);
 }
 
-static inline void DragonFlyBSDProcessList_scanJails(DragonFlyBSDProcessList* dfpl) {
-   size_t len;
-   char* jls; /* Jail list */
-   char* curpos;
-   char* nextpos;
-
-   if (sysctlbyname("jail.list", NULL, &len, NULL, 0) == -1) {
-      CRT_fatalError("initial sysctlbyname / jail.list failed");
-   }
-
-retry:
-   if (len == 0)
-      return;
-
-   jls = xMalloc(len);
-
-   if (sysctlbyname("jail.list", jls, &len, NULL, 0) == -1) {
-      if (errno == ENOMEM) {
-         free(jls);
-         goto retry;
-      }
-      CRT_fatalError("sysctlbyname / jail.list failed");
-   }
-
-   if (dfpl->jails) {
-      Hashtable_delete(dfpl->jails);
-   }
-
-   dfpl->jails = Hashtable_new(20, true);
-   curpos = jls;
-   while (curpos) {
-      int jailid;
-      char* str_hostname;
-
-      nextpos = strchr(curpos, '\n');
-      if (nextpos) {
-         *nextpos++ = 0;
-      }
-
-      jailid = atoi(strtok(curpos, " "));
-      str_hostname = strtok(NULL, " ");
-
-      char* jname = (char*) (Hashtable_get(dfpl->jails, jailid));
-      if (jname == NULL) {
-         jname = xStrdup(str_hostname);
-         Hashtable_put(dfpl->jails, jailid, jname);
-      }
-
-      curpos = nextpos;
-   }
-
-   free(jls);
-}
-
-static char* DragonFlyBSDProcessList_readJailName(DragonFlyBSDProcessList* dfpl, int jailid) {
-   char*  hostname;
-   char*  jname;
-
-   if (jailid != 0 && dfpl->jails && (hostname = (char*)Hashtable_get(dfpl->jails, jailid))) {
-      jname = xStrdup(hostname);
-   } else {
-      jname = xStrdup("-");
-   }
-
-   return jname;
-}
-
-void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) {
-   DragonFlyBSDProcessList* dfpl = (DragonFlyBSDProcessList*) super;
+void ProcessList_goThroughEntries(ProcessList* super) {
    const Machine* host = super->host;
+   const DragonFlyMachine* dhost = (const DragonFlyMachine*) host;
    const Settings* settings = host->settings;
+
    bool hideKernelThreads = settings->hideKernelThreads;
    bool hideUserlandThreads = settings->hideUserlandThreads;
 
-   DragonFlyBSDProcessList_scanMemoryInfo(super);
-   DragonFlyBSDProcessList_scanCPUTime(super);
-   DragonFlyBSDProcessList_scanJails(dfpl);
-
-   // in pause mode only gather global data for meters (CPU/memory/...)
-   if (pauseProcessUpdate) {
-      return;
-   }
-
    int count = 0;
 
-   const struct kinfo_proc* kprocs = kvm_getprocs(dfpl->kd, KERN_PROC_ALL | (!hideUserlandThreads ? KERN_PROC_FLAG_LWP : 0), 0, &count);
+   const struct kinfo_proc* kprocs = kvm_getprocs(dhost->kd, KERN_PROC_ALL | (!hideUserlandThreads ? KERN_PROC_FLAG_LWP : 0), 0, &count);
 
    for (int i = 0; i < count; i++) {
       const struct kinfo_proc* kproc = &kprocs[i];
@@ -480,7 +182,7 @@ void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) {
          }
 
          DragonFlyBSDProcessList_updateExe(kproc, proc);
-         DragonFlyBSDProcessList_updateProcessName(dfpl->kd, kproc, proc);
+         DragonFlyBSDProcessList_updateProcessName(dhost->kd, kproc, proc);
 
          if (settings->ss->flags & PROCESS_FLAG_CWD) {
             DragonFlyBSDProcessList_updateCwd(kproc, proc);
@@ -488,13 +190,13 @@ void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) {
 
          ProcessList_add(super, proc);
 
-         dfp->jname = DragonFlyBSDProcessList_readJailName(dfpl, kproc->kp_jailid);
+         dfp->jname = DragonFlyBSDMachine_readJailName(dhost, kproc->kp_jailid);
       } else {
          proc->processor = kproc->kp_lwp.kl_cpuid;
          if (dfp->jid != kproc->kp_jailid) {	// process can enter jail anytime
             dfp->jid = kproc->kp_jailid;
             free(dfp->jname);
-            dfp->jname = DragonFlyBSDProcessList_readJailName(dfpl, kproc->kp_jailid);
+            dfp->jname = DragonFlyBSDMachine_readJailName(dhost, kproc->kp_jailid);
          }
          // if there are reapers in the system, process can get reparented anytime
          proc->ppid = kproc->kp_ppid;
@@ -503,16 +205,16 @@ void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) {
             proc->user = UsersTable_getRef(host->usersTable, proc->st_uid);
          }
          if (settings->updateProcessNames) {
-            DragonFlyBSDProcessList_updateProcessName(dfpl->kd, kproc, proc);
+            DragonFlyBSDProcessList_updateProcessName(dhost->kd, kproc, proc);
          }
       }
 
       proc->m_virt = kproc->kp_vm_map_size / ONE_K;
-      proc->m_resident = kproc->kp_vm_rssize * pageSizeKb;
+      proc->m_resident = kproc->kp_vm_rssize * dhost->pageSizeKb;
       proc->nlwp = kproc->kp_nthreads;		// number of lwp thread
       proc->time = (kproc->kp_lwp.kl_uticks + kproc->kp_lwp.kl_sticks + kproc->kp_lwp.kl_iticks) / 10000;
 
-      proc->percent_cpu = 100.0 * ((double)kproc->kp_lwp.kl_pctcpu / (double)kernelFScale);
+      proc->percent_cpu = 100.0 * ((double)kproc->kp_lwp.kl_pctcpu / (double)dhost->kernelFScale);
       proc->percent_mem = 100.0 * proc->m_resident / (double)(super->totalMem);
       Process_updateCPUFieldWidths(proc->percent_cpu);
 
@@ -605,22 +307,3 @@ void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) {
       proc->updated = true;
    }
 }
-
-Machine* Machine_new(UsersTable* usersTable, uid_t userId) {
-   Machine* this = xCalloc(1, sizeof(Machine));
-   Machine_init(this, usersTable, userId);
-   return this;
-}
-
-void Machine_delete(Machine* host) {
-   free(host);
-}
-
-bool Machine_isCPUonline(const Machine* host, unsigned int id) {
-   assert(id < host->existingCPUs);
-
-   // TODO: support offline CPUs and hot swapping
-   (void) host; (void) id;
-
-   return true;
-}
diff --git a/dragonflybsd/DragonFlyBSDProcessList.h b/dragonflybsd/DragonFlyBSDProcessList.h
index 406722e0..3f5cdc3e 100644
--- a/dragonflybsd/DragonFlyBSDProcessList.h
+++ b/dragonflybsd/DragonFlyBSDProcessList.h
@@ -8,61 +8,14 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include <sys/types.h>  // required for kvm.h
-#include <kvm.h>
-#include <osreldate.h>
 #include <stdbool.h>
-#include <sys/jail.h>
 #include <sys/param.h>
-#include <sys/resource.h>
-#include <sys/uio.h>
 
-#include "Hashtable.h"
 #include "ProcessList.h"
-#include "UsersTable.h"
 
-#include "dragonflybsd/DragonFlyBSDProcess.h"
-
-
-typedef struct CPUData_ {
-   double userPercent;
-   double nicePercent;
-   double systemPercent;
-   double irqPercent;
-   double idlePercent;
-   double systemAllPercent;
-} CPUData;
 
 typedef struct DragonFlyBSDProcessList_ {
    ProcessList super;
-   kvm_t* kd;
-
-   unsigned long long int memWire;
-   unsigned long long int memActive;
-   unsigned long long int memInactive;
-   unsigned long long int memFree;
-
-   CPUData* cpus;
-
-   unsigned long* cp_time_o;
-   unsigned long* cp_time_n;
-
-   unsigned long* cp_times_o;
-   unsigned long* cp_times_n;
-
-   Hashtable* jails;
 } DragonFlyBSDProcessList;
 
-ProcessList* ProcessList_new(Machine* host, Hashtable* pidMatchList);
-
-void ProcessList_delete(ProcessList* this);
-
-void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate);
-
-Machine* Machine_new(UsersTable* usersTable, uid_t userId);
-
-bool Machine_isCPUonline(const Machine* host, unsigned int id);
-
-void Machine_delete(Machine* host);
-
 #endif
diff --git a/dragonflybsd/Platform.c b/dragonflybsd/Platform.c
index 1c0ef0a4..36307e93 100644
--- a/dragonflybsd/Platform.c
+++ b/dragonflybsd/Platform.c
@@ -173,15 +173,15 @@ int Platform_getMaxPid(void) {
 
 double Platform_setCPUValues(Meter* this, unsigned int cpu) {
    const Machine* host = this->host;
-   const DragonFlyBSDProcessList* fpl = (const DragonFlyBSDProcessList*) host->pl;
-   unsigned int cpus = this->host->activeCPUs;
+   const DragonFlyBSDMachine* dhost = (const DragonFlyBSDMachine*) host;
+   unsigned int cpus = host->activeCPUs;
    const CPUData* cpuData;
 
    if (cpus == 1) {
       // single CPU box has everything in fpl->cpus[0]
-      cpuData = &(fpl->cpus[0]);
+      cpuData = &(dhost->cpus[0]);
    } else {
-      cpuData = &(fpl->cpus[cpu]);
+      cpuData = &(dhost->cpus[cpu]);
    }
 
    double  percent;
@@ -189,7 +189,7 @@ double Platform_setCPUValues(Meter* this, unsigned int cpu) {
 
    v[CPU_METER_NICE]   = cpuData->nicePercent;
    v[CPU_METER_NORMAL] = cpuData->userPercent;
-   if (host->settings->detailedCPUTime) {
+   if (super->settings->detailedCPUTime) {
       v[CPU_METER_KERNEL]  = cpuData->systemPercent;
       v[CPU_METER_IRQ]     = cpuData->irqPercent;
       this->curItems = 4;
@@ -209,22 +209,21 @@ double Platform_setCPUValues(Meter* this, unsigned int cpu) {
 }
 
 void Platform_setMemoryValues(Meter* this) {
-   // TODO
-   const ProcessList* pl = this->host->pl;
+   const Machine* host = this->host;
 
-   this->total = pl->totalMem;
-   this->values[MEMORY_METER_USED] = pl->usedMem;
-   this->values[MEMORY_METER_BUFFERS] = pl->buffersMem;
+   this->total = host->totalMem;
+   this->values[MEMORY_METER_USED] = host->usedMem;
+   this->values[MEMORY_METER_BUFFERS] = host->buffersMem;
    // this->values[MEMORY_METER_SHARED] = "shared memory, like tmpfs and shm"
    // mtr->values[MEMORY_METER_COMPRESSED] = "compressed memory, like zswap on linux"
-   this->values[MEMORY_METER_CACHE] = pl->cachedMem;
+   this->values[MEMORY_METER_CACHE] = host->cachedMem;
    // this->values[MEMORY_METER_AVAILABLE] = "available memory"
 }
 
 void Platform_setSwapValues(Meter* this) {
-   const ProcessList* pl = this->host->pl;
-   this->total = pl->totalSwap;
-   this->values[SWAP_METER_USED] = pl->usedSwap;
+   const Machine* host = this->host;
+   this->total = host->totalSwap;
+   this->values[SWAP_METER_USED] = host->usedSwap;
    // mtr->values[SWAP_METER_CACHE] = "pages that are both in swap and RAM, like SwapCached on linux"
    // mtr->values[SWAP_METER_FRONTSWAP] = "pages that are accounted to swap but stored elsewhere, like frontswap on linux"
 }