From 55f08c202624fdd141b586fecab07410961874a1 Mon Sep 17 00:00:00 2001 From: Stoyan Bogdanov Date: Mon, 6 Jan 2025 22:15:37 +0200 Subject: [PATCH] Update all Platforms to support FlexMeter Signed-off-by: Stoyan Bogdanov --- darwin/Platform.c | 3 ++- darwin/Platform.h | 2 +- dragonflybsd/Platform.c | 4 ++-- dragonflybsd/Platform.h | 2 +- freebsd/Platform.c | 3 ++- freebsd/Platform.h | 2 +- linux/Platform.c | 3 ++- linux/Platform.h | 3 ++- netbsd/Platform.c | 3 ++- netbsd/Platform.h | 2 +- openbsd/Platform.c | 4 ++-- openbsd/Platform.h | 2 +- pcp/Platform.c | 4 ++-- pcp/Platform.h | 2 +- solaris/Platform.c | 4 ++-- solaris/Platform.h | 2 +- unsupported/Platform.c | 4 ++-- unsupported/Platform.h | 2 +- 18 files changed, 28 insertions(+), 23 deletions(-) diff --git a/darwin/Platform.c b/darwin/Platform.c index ba31a59f8..5dbf5f3eb 100644 --- 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 index f67db8ff4..bac3187fc 100644 --- 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 index f3412ef9e..cd7623850 100644 --- 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 index 606b004c0..343f67849 100644 --- 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 index 9be7195e5..da321bf6c 100644 --- 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 index c358d85d3..5604b8111 100644 --- 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 index 3316d1dba..e8e4732d1 100644 --- 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 index e99d1a226..a8fcb1594 100644 --- 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 index f458c239f..27efd2ac8 100644 --- 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 index a543f52dd..509e324e8 100644 --- 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 index a8b5d212d..54158d27e 100644 --- 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 index 339616c11..3e8527201 100644 --- 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 index d50edd254..f9ef2db89 100644 --- 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 index f43ed54f2..53dfcce25 100644 --- 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 index 3934f7896..40ec1343b 100644 --- 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 index 1a31c2e7a..a2008c4ab 100644 --- 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 index dbfddd916..eadfbcd76 100644 --- 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 index c4cd06a04..c36de74d4 100644 --- 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);