Merge branch 'main' of github.com:htop-dev/htop

Author: natoscott

ChangeLog

@@ -1,5 +1,6 @@
 What's new in version 3.5.1
 
+* Consolidate ClockMeter code into DateTimeMeter code
 * Darwin: Fix unsigned underflow in memory meter on ARM64 (Apple Silicon 16K pages showing ~64TB used)
 * Linux/PCP: Replace M_SHARE (SHR) with M_PRIV (PRIV) in default Main screen columns
 * PCP: Fix dynamic screen column (instance) sorting (incorrect cast and field offsets)

ClockMeter.c

@@ -17,6 +17,10 @@ in the source distribution for its full text.
 #include "Object.h"
 
 
+static const int ClockMeter_attributes[] = {
+   CLOCK
+};
+
 static const int DateMeter_attributes[] = {
    DATE
 };
@@ -25,28 +29,42 @@ static const int DateTimeMeter_attributes[] = {
    DATETIME
 };
 
-static void DateMeter_updateValues(Meter* this) {
-   const Machine* host = this->host;
-
-   struct tm result;
-   const struct tm* lt = localtime_r(&host->realtime.tv_sec, &result);
-   strftime(this->txtBuffer, sizeof(this->txtBuffer), "%F", lt);
-}
-
 static void DateTimeMeter_updateValues(Meter* this) {
    const Machine* host = this->host;
 
    struct tm result;
    const struct tm* lt = localtime_r(&host->realtime.tv_sec, &result);
-   strftime(this->txtBuffer, sizeof(this->txtBuffer), "%F %H:%M:%S", lt);
+   if (As_Meter(this) == &ClockMeter_class) {
+      strftime(this->txtBuffer, sizeof(this->txtBuffer), "%H:%M:%S", lt);
+   } else if (As_Meter(this) == &DateMeter_class) {
+      strftime(this->txtBuffer, sizeof(this->txtBuffer), "%F", lt);
+   } else {
+      strftime(this->txtBuffer, sizeof(this->txtBuffer), "%F %H:%M:%S", lt);
+   }
 }
 
+const MeterClass ClockMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete
+   },
+   .updateValues = DateTimeMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .supportedModes = (1 << TEXT_METERMODE) | (1 << LED_METERMODE),
+   .maxItems = 0,
+   .total = 0.0,
+   .attributes = ClockMeter_attributes,
+   .name = "Clock",
+   .uiName = "Clock",
+   .caption = "Time: ",
+};
+
 const MeterClass DateMeter_class = {
    .super = {
       .extends = Class(Meter),
       .delete = Meter_delete
    },
-   .updateValues = DateMeter_updateValues,
+   .updateValues = DateTimeMeter_updateValues,
    .defaultMode = TEXT_METERMODE,
    .supportedModes = (1 << TEXT_METERMODE) | (1 << LED_METERMODE),
    .maxItems = 0,

ClockMeter.h

@@ -10,6 +10,8 @@ in the source distribution for its full text.
 #include "Meter.h"
 
 
+extern const MeterClass ClockMeter_class;
+
 extern const MeterClass DateMeter_class;
 
 extern const MeterClass DateTimeMeter_class;

DateTimeMeter.c

@@ -35,7 +35,6 @@ myhtopsources = \
 	AvailableMetersPanel.c \
 	BatteryMeter.c \
 	CategoriesPanel.c \
-	ClockMeter.c \
 	ColorsPanel.c \
 	ColumnsPanel.c \
 	CommandLine.c \
@@ -103,7 +102,6 @@ myhtopheaders = \
 	CPUMeter.h \
 	CRT.h \
 	CategoriesPanel.h \
-	ClockMeter.h \
 	ColorsPanel.h \
 	ColumnsPanel.h \
 	CommandLine.h \

DateTimeMeter.h

@@ -7,7 +7,7 @@
 
 m4_define([htop_git_version],
    m4_normalize(m4_esyscmd([git describe --abbrev=7 --dirty --always --tags 2> /dev/null || echo ''])))
-m4_define([htop_release_version], [3.5.1-dev])
+m4_define([htop_release_version], [3.6.0-dev])
 
 # ----------------------------------------------------------------------
 # Autoconf initialization.

Makefile.am

@@ -34,7 +34,6 @@ in the source distribution for its full text.
 #include <IOKit/ps/IOPSKeys.h>
 #include <IOKit/storage/IOBlockStorageDriver.h>
 
-#include "ClockMeter.h"
 #include "CPUMeter.h"
 #include "CRT.h"
 #include "DateTimeMeter.h"

configure.ac

@@ -22,7 +22,6 @@ in the source distribution for its full text.
 #include <sys/types.h>
 #include <vm/vm_param.h>
 
-#include "ClockMeter.h"
 #include "CPUMeter.h"
 #include "DateTimeMeter.h"
 #include "FileDescriptorMeter.h"

darwin/Platform.c

@@ -27,7 +27,6 @@ in the source distribution for its full text.
 #include <vm/vm_param.h>
 
 #include "CPUMeter.h"
-#include "ClockMeter.h"
 #include "DateTimeMeter.h"
 #include "DiskIOMeter.h"
 #include "FileDescriptorMeter.h"