Update all Platforms to support FlexMeter

Signed-off-by: Stoyan Bogdanov <[email protected]>
htop-dev · Jan 9, 2025 · 71eed8e · 71eed8e
1 parent f10d435
commit 71eed8e
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 23 deletions.
diff --git a/darwin/Platform.c b/darwin/Platform.c
@@ -38,6 +38,7 @@ in the source distribution for its full text.
 #include "DateMeter.h"
 #include "DateTimeMeter.h"
 #include "FileDescriptorMeter.h"
+#include "FlexMeter.h"
 #include "HostnameMeter.h"
 #include "LoadAverageMeter.h"
 #include "Macros.h"
@@ -112,7 +113,7 @@ const SignalItem Platform_signals[] = {
 
 const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
 
-const MeterClass* const Platform_meterTypes[] = {
+const MeterClass* Platform_meterTypes[MAX_PLATFORM_METERS] = {
    &CPUMeter_class,
    &ClockMeter_class,
    &DateMeter_class,

diff --git a/darwin/Platform.h b/darwin/Platform.h
@@ -34,7 +34,7 @@ extern const SignalItem Platform_signals[];
 
 extern const unsigned int Platform_numberOfSignals;
 
-extern const MeterClass* const Platform_meterTypes[];
+extern const MeterClass* Platform_meterTypes[MAX_PLATFORM_METERS];
 
 bool Platform_init(void);
 

diff --git a/dragonflybsd/Platform.c b/dragonflybsd/Platform.c
@@ -27,6 +27,7 @@ in the source distribution for its full text.
 #include "DateMeter.h"
 #include "DateTimeMeter.h"
 #include "FileDescriptorMeter.h"
+#include "FlexMeter.h"
 #include "HostnameMeter.h"
 #include "LoadAverageMeter.h"
 #include "Macros.h"
@@ -43,7 +44,6 @@ in the source distribution for its full text.
 #include "dragonflybsd/DragonFlyBSDProcessTable.h"
 #include "generic/fdstat_sysctl.h"
 
-
 const ScreenDefaults Platform_defaultScreens[] = {
    {
       .name = "Main",
@@ -93,7 +93,7 @@ const SignalItem Platform_signals[] = {
 
 const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
 
-const MeterClass* const Platform_meterTypes[] = {
+const MeterClass* Platform_meterTypes[MAX_PLATFORM_METERS] = {
    &CPUMeter_class,
    &ClockMeter_class,
    &DateMeter_class,

diff --git a/dragonflybsd/Platform.h b/dragonflybsd/Platform.h
@@ -37,7 +37,7 @@ extern const SignalItem Platform_signals[];
 
 extern const unsigned int Platform_numberOfSignals;
 
-extern const MeterClass* const Platform_meterTypes[];
+extern const MeterClass* Platform_meterTypes[MAX_PLATFORM_METERS];
 
 bool Platform_init(void);
 

diff --git a/freebsd/Platform.c b/freebsd/Platform.c
@@ -32,6 +32,7 @@ in the source distribution for its full text.
 #include "DateTimeMeter.h"
 #include "DiskIOMeter.h"
 #include "FileDescriptorMeter.h"
+#include "FlexMeter.h"
 #include "HostnameMeter.h"
 #include "LoadAverageMeter.h"
 #include "Machine.h"
@@ -100,7 +101,7 @@ const SignalItem Platform_signals[] = {
 
 const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
 
-const MeterClass* const Platform_meterTypes[] = {
+const MeterClass* Platform_meterTypes[MAX_PLATFORM_METERS] = {
    &CPUMeter_class,
    &ClockMeter_class,
    &DateMeter_class,

diff --git a/freebsd/Platform.h b/freebsd/Platform.h
@@ -33,7 +33,7 @@ extern const SignalItem Platform_signals[];
 
 extern const unsigned int Platform_numberOfSignals;
 
-extern const MeterClass* const Platform_meterTypes[];
+extern const MeterClass* Platform_meterTypes[MAX_PLATFORM_METERS];
 
 bool Platform_init(void);
 

diff --git a/linux/Platform.c b/linux/Platform.c
@@ -31,6 +31,7 @@ in the source distribution for its full text.
 #include "DateTimeMeter.h"
 #include "DiskIOMeter.h"
 #include "FileDescriptorMeter.h"
+#include "FlexMeter.h"
 #include "HostnameMeter.h"
 #include "HugePageMeter.h"
 #include "LoadAverageMeter.h"
@@ -209,7 +210,7 @@ void Platform_setBindings(Htop_Action* keys) {
    keys[KEY_F(20)] = Platform_actionHigherAutogroupPriority; // Shift-F8
 }
 
-const MeterClass* const Platform_meterTypes[] = {
+const MeterClass* Platform_meterTypes[MAX_PLATFORM_METERS] = {
    &CPUMeter_class,
    &ClockMeter_class,
    &DateMeter_class,

diff --git a/linux/Platform.h b/linux/Platform.h
@@ -47,7 +47,8 @@ extern const SignalItem Platform_signals[];
 
 extern const unsigned int Platform_numberOfSignals;
 
-extern const MeterClass* const Platform_meterTypes[];
+extern const MeterClass* Platform_meterTypes[MAX_PLATFORM_METERS];
+
 
 bool Platform_init(void);
 void Platform_done(void);

diff --git a/netbsd/Platform.c b/netbsd/Platform.c
@@ -41,6 +41,7 @@ in the source distribution for its full text.
 #include "DateMeter.h"
 #include "DateTimeMeter.h"
 #include "FileDescriptorMeter.h"
+#include "FlexMeter.h"
 #include "HostnameMeter.h"
 #include "LoadAverageMeter.h"
 #include "Macros.h"
@@ -152,7 +153,7 @@ const SignalItem Platform_signals[] = {
 
 const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
 
-const MeterClass* const Platform_meterTypes[] = {
+const MeterClass* Platform_meterTypes[MAX_PLATFORM_METERS] = {
    &CPUMeter_class,
    &ClockMeter_class,
    &DateMeter_class,

diff --git a/netbsd/Platform.h b/netbsd/Platform.h
@@ -43,7 +43,7 @@ extern const SignalItem Platform_signals[];
 
 extern const unsigned int Platform_numberOfSignals;
 
-extern const MeterClass* const Platform_meterTypes[];
+extern const MeterClass* Platform_meterTypes[MAX_PLATFORM_METERS];
 
 bool Platform_init(void);
 

diff --git a/openbsd/Platform.c b/openbsd/Platform.c
@@ -31,6 +31,7 @@ in the source distribution for its full text.
 #include "DateMeter.h"
 #include "DateTimeMeter.h"
 #include "FileDescriptorMeter.h"
+#include "FlexMeter.h"
 #include "HostnameMeter.h"
 #include "LoadAverageMeter.h"
 #include "Macros.h"
@@ -47,7 +48,6 @@ in the source distribution for its full text.
 #include "openbsd/OpenBSDMachine.h"
 #include "openbsd/OpenBSDProcess.h"
 
-
 const ScreenDefaults Platform_defaultScreens[] = {
    {
       .name = "Main",
@@ -100,7 +100,7 @@ const SignalItem Platform_signals[] = {
 
 const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
 
-const MeterClass* const Platform_meterTypes[] = {
+const MeterClass* Platform_meterTypes[MAX_PLATFORM_METERS] = {
    &CPUMeter_class,
    &ClockMeter_class,
    &DateMeter_class,

diff --git a/openbsd/Platform.h b/openbsd/Platform.h
@@ -35,7 +35,7 @@ extern const SignalItem Platform_signals[];
 
 extern const unsigned int Platform_numberOfSignals;
 
-extern const MeterClass* const Platform_meterTypes[];
+extern const MeterClass* Platform_meterTypes[MAX_PLATFORM_METERS];
 
 bool Platform_init(void);
 

diff --git a/pcp/Platform.c b/pcp/Platform.c
@@ -27,6 +27,7 @@ in the source distribution for its full text.
 #include "DynamicMeter.h"
 #include "DynamicScreen.h"
 #include "FileDescriptorMeter.h"
+#include "FlexMeter.h"
 #include "HostnameMeter.h"
 #include "LoadAverageMeter.h"
 #include "Macros.h"
@@ -55,7 +56,6 @@ in the source distribution for its full text.
 #include "zfs/ZfsArcStats.h"
 #include "zfs/ZfsCompressedArcMeter.h"
 
-
 Platform* pcp;
 
 const ScreenDefaults Platform_defaultScreens[] = {
@@ -79,7 +79,7 @@ const SignalItem Platform_signals[] = {
 
 const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
 
-const MeterClass* const Platform_meterTypes[] = {
+const MeterClass* Platform_meterTypes[MAX_PLATFORM_METERS] = {
    &CPUMeter_class,
    &DynamicMeter_class,
    &ClockMeter_class,

diff --git a/pcp/Platform.h b/pcp/Platform.h
@@ -68,7 +68,7 @@ extern const SignalItem Platform_signals[];
 
 extern const unsigned int Platform_numberOfSignals;
 
-extern const MeterClass* const Platform_meterTypes[];
+extern const MeterClass* Platform_meterTypes[MAX_PLATFORM_METERS];
 
 bool Platform_init(void);
 

diff --git a/solaris/Platform.c b/solaris/Platform.c
@@ -33,6 +33,7 @@ in the source distribution for its full text.
 #include "ClockMeter.h"
 #include "DateMeter.h"
 #include "DateTimeMeter.h"
+#include "FlexMeter.h"
 #include "HostnameMeter.h"
 #include "SysArchMeter.h"
 #include "UptimeMeter.h"
@@ -43,7 +44,6 @@ in the source distribution for its full text.
 #include "zfs/ZfsArcMeter.h"
 #include "zfs/ZfsCompressedArcMeter.h"
 
-
 const ScreenDefaults Platform_defaultScreens[] = {
    {
       .name = "Default",
@@ -101,7 +101,7 @@ const SignalItem Platform_signals[] = {
 
 const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
 
-const MeterClass* const Platform_meterTypes[] = {
+const MeterClass* Platform_meterTypes[MAX_PLATFORM_METERS] = {
    &CPUMeter_class,
    &ClockMeter_class,
    &DateMeter_class,

diff --git a/solaris/Platform.h b/solaris/Platform.h
@@ -58,7 +58,7 @@ extern const SignalItem Platform_signals[];
 
 extern const unsigned int Platform_numberOfSignals;
 
-extern const MeterClass* const Platform_meterTypes[];
+extern const MeterClass* Platform_meterTypes[MAX_PLATFORM_METERS];
 
 bool Platform_init(void);
 

diff --git a/unsupported/Platform.c b/unsupported/Platform.c
@@ -17,6 +17,7 @@ in the source distribution for its full text.
 #include "DateMeter.h"
 #include "DateTimeMeter.h"
 #include "FileDescriptorMeter.h"
+#include "FlexMeter.h"
 #include "HostnameMeter.h"
 #include "LoadAverageMeter.h"
 #include "Macros.h"
@@ -27,7 +28,6 @@ in the source distribution for its full text.
 #include "TasksMeter.h"
 #include "UptimeMeter.h"
 
-
 const ScreenDefaults Platform_defaultScreens[] = {
    {
       .name = "Main",
@@ -44,7 +44,7 @@ const SignalItem Platform_signals[] = {
 
 const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
 
-const MeterClass* const Platform_meterTypes[] = {
+const MeterClass* Platform_meterTypes[MAX_PLATFORM_METERS] = {
    &CPUMeter_class,
    &ClockMeter_class,
    &DateMeter_class,

diff --git a/unsupported/Platform.h b/unsupported/Platform.h
@@ -31,7 +31,7 @@ extern const SignalItem Platform_signals[];
 
 extern const unsigned int Platform_numberOfSignals;
 
-extern const MeterClass* const Platform_meterTypes[];
+extern const MeterClass* Platform_meterTypes[MAX_PLATFORM_METERS];
 
 bool Platform_init(void);