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.

1 files changed, 0 insertions, 92 deletions

diff --git a/linux/LinuxProcessList.h b/linux/LinuxProcessList.h
index 69bae5c0..824de482 100644
--- a/linux/LinuxProcessList.h
+++ b/linux/LinuxProcessList.h
@@ -15,48 +15,7 @@ in the source distribution for its full text.
 #include "Hashtable.h"
 #include "ProcessList.h"
 #include "UsersTable.h"
-#include "linux/ZramStats.h"
-#include "linux/ZswapStats.h"
-#include "zfs/ZfsArcStats.h"
 
-#define HTOP_HUGEPAGE_BASE_SHIFT 16
-#define HTOP_HUGEPAGE_COUNT 24
-
-typedef struct CPUData_ {
-   unsigned long long int totalTime;
-   unsigned long long int userTime;
-   unsigned long long int systemTime;
-   unsigned long long int systemAllTime;
-   unsigned long long int idleAllTime;
-   unsigned long long int idleTime;
-   unsigned long long int niceTime;
-   unsigned long long int ioWaitTime;
-   unsigned long long int irqTime;
-   unsigned long long int softIrqTime;
-   unsigned long long int stealTime;
-   unsigned long long int guestTime;
-
-   unsigned long long int totalPeriod;
-   unsigned long long int userPeriod;
-   unsigned long long int systemPeriod;
-   unsigned long long int systemAllPeriod;
-   unsigned long long int idleAllPeriod;
-   unsigned long long int idlePeriod;
-   unsigned long long int nicePeriod;
-   unsigned long long int ioWaitPeriod;
-   unsigned long long int irqPeriod;
-   unsigned long long int softIrqPeriod;
-   unsigned long long int stealPeriod;
-   unsigned long long int guestPeriod;
-
-   double frequency;
-
-   #ifdef HAVE_SENSORS_SENSORS_H
-   double temperature;
-   #endif
-
-   bool online;
-} CPUData;
 
 typedef struct TtyDriver_ {
    char* path;
@@ -68,8 +27,6 @@ typedef struct TtyDriver_ {
 typedef struct LinuxProcessList_ {
    ProcessList super;
 
-   CPUData* cpuData;
-
    TtyDriver* ttyDrivers;
    bool haveSmapsRollup;
    bool haveAutogroup;
@@ -78,55 +35,6 @@ typedef struct LinuxProcessList_ {
    struct nl_sock* netlink_socket;
    int netlink_family;
    #endif
-
-   memory_t totalHugePageMem;
-   memory_t usedHugePageMem[HTOP_HUGEPAGE_COUNT];
-
-   memory_t availableMem;
-
-   ZfsArcStats zfs;
-   ZramStats zram;
-   ZswapStats zswap;
 } LinuxProcessList;
 
-#ifndef PROCDIR
-#define PROCDIR "/proc"
-#endif
-
-#ifndef PROCCPUINFOFILE
-#define PROCCPUINFOFILE PROCDIR "/cpuinfo"
-#endif
-
-#ifndef PROCSTATFILE
-#define PROCSTATFILE PROCDIR "/stat"
-#endif
-
-#ifndef PROCMEMINFOFILE
-#define PROCMEMINFOFILE PROCDIR "/meminfo"
-#endif
-
-#ifndef PROCARCSTATSFILE
-#define PROCARCSTATSFILE PROCDIR "/spl/kstat/zfs/arcstats"
-#endif
-
-#ifndef PROCTTYDRIVERSFILE
-#define PROCTTYDRIVERSFILE PROCDIR "/tty/drivers"
-#endif
-
-#ifndef PROC_LINE_LENGTH
-#define PROC_LINE_LENGTH 4096
-#endif
-
-ProcessList* ProcessList_new(Machine* host, Hashtable* pidMatchList);
-
-void ProcessList_delete(ProcessList* pl);
-
-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