From 0bdade1b6cb40c5bd374a93ac0489058a7421bb5 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Tue, 2 May 2023 09:02:22 +1000 Subject: Introduce Machine class for host-specific info (split from ProcessList) First stage in sanitizing the process list structure so that htop can support other types of lists too (cgroups, filesystems, ...), in the not-too-distant future. This introduces struct Machine for system-wide information while keeping process-list information in ProcessList (now much less). Next step is to propogate this separation into each platform, to match these core changes. --- Meter.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Meter.h') diff --git a/Meter.h b/Meter.h index 8e8618d6..db93e4c0 100644 --- a/Meter.h +++ b/Meter.h @@ -15,8 +15,8 @@ in the source distribution for its full text. #include #include "ListItem.h" +#include "Machine.h" #include "Object.h" -#include "ProcessList.h" #define METER_TXTBUFFER_LEN 256 @@ -105,6 +105,7 @@ typedef struct GraphData_ { struct Meter_ { Object super; Meter_Draw draw; + const Machine* host; char* caption; int mode; @@ -112,7 +113,6 @@ struct Meter_ { GraphData* drawData; int h; int columnWidthCount; /**< only used internally by the Header */ - const ProcessList* pl; uint8_t curItems; const int* curAttributes; char txtBuffer[METER_TXTBUFFER_LEN]; @@ -145,7 +145,7 @@ typedef enum { extern const MeterClass Meter_class; -Meter* Meter_new(const ProcessList* pl, unsigned int param, const MeterClass* type); +Meter* Meter_new(const Machine* host, unsigned int param, const MeterClass* type); int Meter_humanUnit(char* buffer, unsigned long int value, size_t size); -- cgit v1.2.3