Add SystemdMeter

htop-dev · Oct 31, 2020 · 2a9e8ca · 2a9e8ca
1 parent ab17ef4
commit 2a9e8ca
Show file tree

Hide file tree

Showing 7 changed files with 364 additions and 7 deletions.
diff --git a/CRT.c b/CRT.c
@@ -95,9 +95,10 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [METER_TEXT] = ColorPair(Cyan,Black),
       [METER_VALUE] = A_BOLD | ColorPair(Cyan,Black),
       [METER_VALUE_ERROR] = A_BOLD | ColorPair(Red,Black),
-      [METER_VALUE_NOTICE] = A_BOLD | ColorPair(White,Black),
       [METER_VALUE_IOREAD] = ColorPair(Green,Black),
       [METER_VALUE_IOWRITE] = ColorPair(Blue,Black),
+      [METER_VALUE_NOTICE] = A_BOLD | ColorPair(White,Black),
+      [METER_VALUE_OK] = ColorPair(Green,Black),
       [LED_COLOR] = ColorPair(Green,Black),
       [TASKS_RUNNING] = A_BOLD | ColorPair(Green,Black),
       [PROCESS] = A_NORMAL,
@@ -173,9 +174,10 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [METER_TEXT] = A_NORMAL,
       [METER_VALUE] = A_BOLD,
       [METER_VALUE_ERROR] = A_BOLD,
-      [METER_VALUE_NOTICE] = A_BOLD,
       [METER_VALUE_IOREAD] = A_NORMAL,
       [METER_VALUE_IOWRITE] = A_NORMAL,
+      [METER_VALUE_NOTICE] = A_BOLD,
+      [METER_VALUE_OK] = A_NORMAL,
       [LED_COLOR] = A_NORMAL,
       [TASKS_RUNNING] = A_BOLD,
       [PROCESS] = A_NORMAL,
@@ -251,9 +253,10 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [METER_TEXT] = ColorPair(Blue,White),
       [METER_VALUE] = ColorPair(Black,White),
       [METER_VALUE_ERROR] = A_BOLD | ColorPair(Red,White),
-      [METER_VALUE_NOTICE] = A_BOLD | ColorPair(Yellow,White),
       [METER_VALUE_IOREAD] = ColorPair(Green,White),
       [METER_VALUE_IOWRITE] = ColorPair(Yellow,White),
+      [METER_VALUE_NOTICE] = A_BOLD | ColorPair(Yellow,White),
+      [METER_VALUE_OK] = ColorPair(Green,White),
       [LED_COLOR] = ColorPair(Green,White),
       [TASKS_RUNNING] = ColorPair(Green,White),
       [PROCESS] = ColorPair(Black,White),
@@ -329,9 +332,10 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [METER_TEXT] = ColorPair(Blue,Black),
       [METER_VALUE] = ColorPair(Blue,Black),
       [METER_VALUE_ERROR] = A_BOLD | ColorPair(Red,Black),
-      [METER_VALUE_NOTICE] = A_BOLD | ColorPair(Yellow,Black),
       [METER_VALUE_IOREAD] = ColorPair(Green,Black),
       [METER_VALUE_IOWRITE] = ColorPair(Yellow,Black),
+      [METER_VALUE_NOTICE] = A_BOLD | ColorPair(Yellow,Black),
+      [METER_VALUE_OK] = ColorPair(Green,Black),
       [LED_COLOR] = ColorPair(Green,Black),
       [TASKS_RUNNING] = ColorPair(Green,Black),
       [PROCESS] = ColorPair(Blue,Black),
@@ -407,9 +411,10 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [METER_TEXT] = ColorPair(Cyan,Blue),
       [METER_VALUE] = A_BOLD | ColorPair(Cyan,Blue),
       [METER_VALUE_ERROR] = A_BOLD | ColorPair(Red,Blue),
-      [METER_VALUE_NOTICE] = A_BOLD | ColorPair(White,Blue),
       [METER_VALUE_IOREAD] = ColorPair(Green,Blue),
       [METER_VALUE_IOWRITE] = ColorPair(Black,Blue),
+      [METER_VALUE_NOTICE] = A_BOLD | ColorPair(White,Blue),
+      [METER_VALUE_OK] = ColorPair(Green,Blue),
       [LED_COLOR] = ColorPair(Green,Blue),
       [TASKS_RUNNING] = A_BOLD | ColorPair(Green,Blue),
       [PROCESS] = ColorPair(White,Blue),
@@ -485,9 +490,10 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [METER_TEXT] = ColorPair(Cyan,Black),
       [METER_VALUE] = ColorPair(Green,Black),
       [METER_VALUE_ERROR] = A_BOLD | ColorPair(Red,Black),
-      [METER_VALUE_NOTICE] = A_BOLD | ColorPair(Yellow,Black),
       [METER_VALUE_IOREAD] = ColorPair(Green,Black),
       [METER_VALUE_IOWRITE] = ColorPair(Blue,Black),
+      [METER_VALUE_NOTICE] = A_BOLD | ColorPair(Yellow,Black),
+      [METER_VALUE_OK] = ColorPair(Green,Black),
       [LED_COLOR] = ColorPair(Green,Black),
       [TASKS_RUNNING] = A_BOLD | ColorPair(Green,Black),
       [PROCESS] = ColorPair(Cyan,Black),

diff --git a/CRT.h b/CRT.h
@@ -53,9 +53,10 @@ typedef enum ColorElements_ {
    METER_TEXT,
    METER_VALUE,
    METER_VALUE_ERROR,
-   METER_VALUE_NOTICE,
    METER_VALUE_IOREAD,
    METER_VALUE_IOWRITE,
+   METER_VALUE_NOTICE,
+   METER_VALUE_OK,
    LED_COLOR,
    UPTIME,
    BATTERY,

diff --git a/Makefile.am b/Makefile.am
@@ -130,6 +130,7 @@ linux_platform_headers = \
 	linux/Platform.h \
 	linux/PressureStallMeter.h \
 	linux/SELinuxMeter.h \
+	linux/SystemdMeter.h \
 	linux/ZramMeter.h \
 	linux/ZramStats.h \
 	zfs/ZfsArcMeter.h \
@@ -146,6 +147,7 @@ myhtopplatsources = \
 	linux/Platform.c \
 	linux/PressureStallMeter.c \
 	linux/SELinuxMeter.c \
+	linux/SystemdMeter.c \
 	linux/ZramMeter.c \
 	zfs/ZfsArcMeter.c \
 	zfs/ZfsArcStats.c \

diff --git a/configure.ac b/configure.ac
@@ -90,6 +90,8 @@ AC_FUNC_CLOSEDIR_VOID
 AC_FUNC_STAT
 AC_CHECK_FUNCS([fstatat memmove strncasecmp strstr strdup])
 
+AC_SEARCH_LIBS([dlopen], [dl dld])
+
 save_cflags="${CFLAGS}"
 CFLAGS="${CFLAGS} -std=c99"
 AC_MSG_CHECKING([whether cc -std=c99 option works])

diff --git a/linux/Platform.c b/linux/Platform.c
@@ -39,6 +39,7 @@ in the source distribution for its full text.
 #include "SELinuxMeter.h"
 #include "Settings.h"
 #include "SwapMeter.h"
+#include "SystemdMeter.h"
 #include "TasksMeter.h"
 #include "UptimeMeter.h"
 #include "XUtils.h"
@@ -153,6 +154,7 @@ const MeterClass* const Platform_meterTypes[] = {
    &DiskIOMeter_class,
    &NetworkIOMeter_class,
    &SELinuxMeter_class,
+   &SystemdMeter_class,
    NULL
 };