Added network monitor support for Linux platform

CommandLine.c

@@ -497,7 +497,7 @@ int CommandLine_run(int argc, char** argv) {
 
    ScreenManager_run(scr, NULL, NULL, NULL);
 
-   Platform_done();
+   Platform_done(host);
 
    CRT_done();
 

Makefile.am

@@ -198,6 +198,7 @@ linux_platform_headers = \
 	linux/LinuxMachine.h \
 	linux/LinuxProcess.h \
 	linux/LinuxProcessTable.h \
+	linux/NetSpeed.h \
 	linux/OpenRCMeter.h \
 	linux/Platform.h \
 	linux/PressureStallMeter.h \
@@ -226,6 +227,7 @@ linux_platform_sources = \
 	linux/LinuxMachine.c \
 	linux/LinuxProcess.c \
 	linux/LinuxProcessTable.c \
+	linux/NetSpeed.c \
 	linux/OpenRCMeter.c \
 	linux/Platform.c \
 	linux/PressureStallMeter.c \

darwin/Platform.c

@@ -260,7 +260,8 @@ double Platform_schedulerTicksToNanoseconds(const double scheduler_ticks) {
    return scheduler_ticks * Platform_nanosecondsPerSchedulerTick;
 }
 
-void Platform_done(void) {
+void Platform_done(Machine* host) {
+   (void)host;
    /* no platform-specific cleanup needed */
 }
 

darwin/Platform.h

@@ -51,7 +51,7 @@ uint64_t Platform_machTicksToNanoseconds(uint64_t mach_ticks);
 // See `sysconf(_SC_CLK_TCK)`, as used to define the `Platform_nanosecondsPerSchedulerTick` constant.
 double Platform_schedulerTicksToNanoseconds(const double scheduler_ticks);
 
-void Platform_done(void);
+void Platform_done(Machine* host);
 
 void Platform_setBindings(Htop_Action* keys);
 

dragonflybsd/Platform.c

@@ -151,7 +151,8 @@ bool Platform_init(void) {
    return true;
 }
 
-void Platform_done(void) {
+void Platform_done(Machine* host) {
+   (void)host;
    /* no platform-specific cleanup needed */
 }
 

dragonflybsd/Platform.h

@@ -45,7 +45,7 @@ extern const MeterClass* const Platform_meterTypes[];
 
 bool Platform_init(void);
 
-void Platform_done(void);
+void Platform_done(Machine* host);
 
 void Platform_setBindings(Htop_Action* keys);
 

freebsd/Platform.c

@@ -160,7 +160,8 @@ bool Platform_init(void) {
    return true;
 }
 
-void Platform_done(void) {
+void Platform_done(Machine* host) {
+   (void) host;
    /* no platform-specific cleanup needed */
 }
 

freebsd/Platform.h

@@ -41,7 +41,7 @@ extern const MeterClass* const Platform_meterTypes[];
 
 bool Platform_init(void);
 
-void Platform_done(void);
+void Platform_done(Machine* host);
 
 void Platform_setBindings(Htop_Action* keys);
 

linux/LinuxMachine.c

@@ -25,13 +25,14 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 #include "Macros.h"
-#include "ProcessTable.h"
+#include "NetSpeed.h"
 #include "Row.h"
 #include "Settings.h"
 #include "UsersTable.h"
 
 #include "linux/Compat.h"
 #include "linux/Platform.h" // needed for GNU/hurd to get PATH_MAX  // IWYU pragma: keep
+#include "linux/NetSpeed.h"
 
 #ifdef HAVE_SENSORS_SENSORS_H
 #include "LibSensors.h"
@@ -861,6 +862,10 @@ static void LinuxMachine_scanCPUFrequency(LinuxMachine* this) {
    scanCPUFrequencyFromCPUinfo(this);
 }
 
+static void LinuxMachine_scanNetworkSpeed(LinuxMachine* this) {
+   NetSpeed_monitor(this);
+}
+
 void Machine_scan(Machine* super) {
    LinuxMachine* this = (LinuxMachine*) super;
 
@@ -870,6 +875,7 @@ void Machine_scan(Machine* super) {
    LinuxMachine_scanZfsArcstats(this);
    LinuxMachine_scanZramInfo(this);
    LinuxMachine_scanCPUTime(this);
+   LinuxMachine_scanNetworkSpeed(this);
 
    const Settings* settings = super->settings;
    if (settings->showCPUFrequency

linux/LinuxMachine.h

@@ -10,6 +10,7 @@ in the source distribution for its full text.
 #include <stdbool.h>
 #include <stddef.h>
 
+#include "linux/NetSpeed.h"
 #include "Machine.h"
 #include "linux/ZramStats.h"
 #include "linux/ZswapStats.h"
@@ -60,6 +61,12 @@ typedef struct CPUData_ {
    bool online;
 } CPUData;
 
+typedef struct NetMonitoringData_ {
+   int socket;
+   uint32_t seq;
+   NetworkSpeedMeterData networkSpeedMeterData;
+} NetMonitoringData;
+
 typedef struct GPUEngineData_ {
    unsigned long long int prevTime, curTime;  /* absolute GPU time in nano seconds */
    char* key;                                 /* engine name */
@@ -95,6 +102,7 @@ typedef struct LinuxMachine_ {
 
    unsigned long long int prevGpuTime, curGpuTime;  /* total absolute GPU time in nano seconds */
    GPUEngineData* gpuEngineData;
+   NetMonitoringData* netMonitoringData;
 
    ZfsArcStats zfs;
    ZramStats zram;

linux/LinuxProcess.c

@@ -107,6 +107,8 @@ const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
 #endif
    [GPU_TIME] = { .name = "GPU_TIME", .title = "GPU_TIME ", .description = "Total GPU time", .flags = PROCESS_FLAG_LINUX_GPU, .defaultSortDesc = true, },
    [GPU_PERCENT] = { .name = "GPU_PERCENT", .title = " GPU% ", .description = "Percentage of the GPU time the process used in the last sampling", .flags = PROCESS_FLAG_LINUX_GPU, .defaultSortDesc = true, },
+   [TCP_UPLOAD_RATE] = { .name = "TCP_UPLOAD_RATE", .title = " TCP UPLOAD ", .description = "Upload rate of the TCP in seconds", .flags = PROCESS_FLAG_LINUX_NET_MONITOR, .defaultSortDesc = true },
+   [TCP_DOWNLOAD_RATE] = { .name = "TCP_DOWNLOAD_RATE", .title = " TCP DOWNLOAD ", .description = "Download rate of the TCP in seconds", .flags = PROCESS_FLAG_LINUX_NET_MONITOR, .defaultSortDesc = true },
 };
 
 Process* LinuxProcess_new(const Machine* host) {
@@ -355,6 +357,12 @@ static void LinuxProcess_rowWriteField(const Row* super, RichString* str, Proces
          xSnprintf(buffer, n, "N/A  ");
       }
       break;
+      case TCP_DOWNLOAD_RATE:
+         Row_printRate(str, lp->tcp_rate.download, coloring);
+         return;
+      case TCP_UPLOAD_RATE:
+         Row_printRate(str, lp->tcp_rate.upload, coloring);
+         return;
    default:
       Process_writeField(this, str, field);
       return;
@@ -451,6 +459,10 @@ static int LinuxProcess_compareByKey(const Process* v1, const Process* v2, Proce
       return SPACESHIP_NUMBER(p1->gpu_time, p2->gpu_time);
    case ISCONTAINER:
       return SPACESHIP_NUMBER(v1->isRunningInContainer, v2->isRunningInContainer);
+   case TCP_DOWNLOAD_RATE:
+      return compareRealNumbers(p1->tcp_rate.download, p2->tcp_rate.download);
+   case TCP_UPLOAD_RATE:
+      return compareRealNumbers(p1->tcp_rate.upload, p2->tcp_rate.upload);
    default:
       return Process_compareByKey_Base(v1, v2, key);
    }

linux/LinuxProcess.h

@@ -29,6 +29,15 @@ in the source distribution for its full text.
 #define PROCESS_FLAG_LINUX_AUTOGROUP 0x00080000
 #define PROCESS_FLAG_LINUX_GPU       0x00100000
 #define PROCESS_FLAG_LINUX_CONTAINER 0x00200000
+#define PROCESS_FLAG_LINUX_NET_MONITOR 0x00400000
+
+
+struct TransceptionRate {
+   double upload;
+   double download;
+   uint64_t last_updated;
+   size_t generation;
+};
 
 typedef struct LinuxProcess_ {
    Process super;
@@ -110,6 +119,8 @@ typedef struct LinuxProcess_ {
    /* Autogroup scheduling (CFS) information */
    long int autogroup_id;
    int autogroup_nice;
+
+   struct TransceptionRate tcp_rate;
 } LinuxProcess;
 
 extern int pageSize;

linux/LinuxProcessTable.c

@@ -31,6 +31,7 @@ in the source distribution for its full text.
 #include "Hashtable.h"
 #include "Machine.h"
 #include "Macros.h"
+#include "NetSpeed.h"
 #include "Object.h"
 #include "Process.h"
 #include "Row.h"
@@ -1779,6 +1780,10 @@ static bool LinuxProcessTable_recurseProcTree(LinuxProcessTable* this, openat_ar
          }
       }
 
+      if (ss->flags & PROCESS_FLAG_LINUX_NET_MONITOR) {
+         NetSpeed_dirty(lp);
+      }
+
       /*
        * Final section after all data has been gathered
        */