diff options
-rw-r--r-- | BatteryMeter.c | 4 | ||||
-rw-r--r-- | CPUMeter.c | 4 | ||||
-rw-r--r-- | ClockMeter.c | 4 | ||||
-rw-r--r-- | HostnameMeter.c | 4 | ||||
-rw-r--r-- | LoadAverageMeter.c | 8 | ||||
-rw-r--r-- | MemoryMeter.c | 4 | ||||
-rw-r--r-- | Meter.c | 19 | ||||
-rw-r--r-- | Meter.h | 7 | ||||
-rw-r--r-- | Process.c | 2 | ||||
-rw-r--r-- | SwapMeter.c | 4 | ||||
-rw-r--r-- | TasksMeter.c | 4 | ||||
-rw-r--r-- | UptimeMeter.c | 4 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | darwin/Platform.c | 8 | ||||
-rw-r--r-- | htop.desktop | 1 | ||||
-rw-r--r-- | openbsd/Platform.c | 3 |
16 files changed, 41 insertions, 42 deletions
diff --git a/BatteryMeter.c b/BatteryMeter.c index 622b7798..0031050f 100644 --- a/BatteryMeter.c +++ b/BatteryMeter.c @@ -32,7 +32,7 @@ int BatteryMeter_attributes[] = { BATTERY }; -static void BatteryMeter_setValues(Meter * this, char *buffer, int len) { +static void BatteryMeter_updateValues(Meter * this, char *buffer, int len) { ACPresence isOnAC; double percent; @@ -73,7 +73,7 @@ MeterClass BatteryMeter_class = { .extends = Class(Meter), .delete = Meter_delete }, - .setValues = BatteryMeter_setValues, + .updateValues = BatteryMeter_updateValues, .defaultMode = TEXT_METERMODE, .maxItems = 1, .total = 100.0, @@ -55,7 +55,7 @@ static void CPUMeter_init(Meter* this) { Meter_setCaption(this, "Avg"); } -static void CPUMeter_setValues(Meter* this, char* buffer, int size) { +static void CPUMeter_updateValues(Meter* this, char* buffer, int size) { int cpu = this->param; if (cpu > this->pl->cpuCount) { snprintf(buffer, size, "absent"); @@ -215,7 +215,7 @@ MeterClass CPUMeter_class = { .delete = Meter_delete, .display = CPUMeter_display }, - .setValues = CPUMeter_setValues, + .updateValues = CPUMeter_updateValues, .defaultMode = BAR_METERMODE, .maxItems = CPU_METER_ITEMCOUNT, .total = 100.0, diff --git a/ClockMeter.c b/ClockMeter.c index a248b9bb..0af88626 100644 --- a/ClockMeter.c +++ b/ClockMeter.c @@ -19,7 +19,7 @@ int ClockMeter_attributes[] = { CLOCK }; -static void ClockMeter_setValues(Meter* this, char* buffer, int size) { +static void ClockMeter_updateValues(Meter* this, char* buffer, int size) { time_t t = time(NULL); struct tm result; struct tm *lt = localtime_r(&t, &result); @@ -32,7 +32,7 @@ MeterClass ClockMeter_class = { .extends = Class(Meter), .delete = Meter_delete }, - .setValues = ClockMeter_setValues, + .updateValues = ClockMeter_updateValues, .defaultMode = TEXT_METERMODE, .maxItems = 1, .total = 1440, /* 24*60 */ diff --git a/HostnameMeter.c b/HostnameMeter.c index ccfaaca9..4c3b051e 100644 --- a/HostnameMeter.c +++ b/HostnameMeter.c @@ -19,7 +19,7 @@ int HostnameMeter_attributes[] = { HOSTNAME }; -static void HostnameMeter_setValues(Meter* this, char* buffer, int size) { +static void HostnameMeter_updateValues(Meter* this, char* buffer, int size) { (void) this; gethostname(buffer, size-1); } @@ -29,7 +29,7 @@ MeterClass HostnameMeter_class = { .extends = Class(Meter), .delete = Meter_delete }, - .setValues = HostnameMeter_setValues, + .updateValues = HostnameMeter_updateValues, .defaultMode = TEXT_METERMODE, .maxItems = 0, .total = 100.0, diff --git a/LoadAverageMeter.c b/LoadAverageMeter.c index a5a04d32..54e517a8 100644 --- a/LoadAverageMeter.c +++ b/LoadAverageMeter.c @@ -20,7 +20,7 @@ int LoadAverageMeter_attributes[] = { int LoadMeter_attributes[] = { LOAD }; -static void LoadAverageMeter_setValues(Meter* this, char* buffer, int size) { +static void LoadAverageMeter_updateValues(Meter* this, char* buffer, int size) { Platform_getLoadAverage(&this->values[0], &this->values[1], &this->values[2]); snprintf(buffer, size, "%.2f/%.2f/%.2f", this->values[0], this->values[1], this->values[2]); } @@ -36,7 +36,7 @@ static void LoadAverageMeter_display(Object* cast, RichString* out) { RichString_append(out, CRT_colors[LOAD_AVERAGE_FIFTEEN], buffer); } -static void LoadMeter_setValues(Meter* this, char* buffer, int size) { +static void LoadMeter_updateValues(Meter* this, char* buffer, int size) { double five, fifteen; Platform_getLoadAverage(&this->values[0], &five, &fifteen); if (this->values[0] > this->total) { @@ -58,7 +58,7 @@ MeterClass LoadAverageMeter_class = { .delete = Meter_delete, .display = LoadAverageMeter_display, }, - .setValues = LoadAverageMeter_setValues, + .updateValues = LoadAverageMeter_updateValues, .defaultMode = TEXT_METERMODE, .maxItems = 3, .total = 100.0, @@ -75,7 +75,7 @@ MeterClass LoadMeter_class = { .delete = Meter_delete, .display = LoadMeter_display, }, - .setValues = LoadMeter_setValues, + .updateValues = LoadMeter_updateValues, .defaultMode = TEXT_METERMODE, .maxItems = 1, .total = 100.0, diff --git a/MemoryMeter.c b/MemoryMeter.c index dae56b5e..fbf5330c 100644 --- a/MemoryMeter.c +++ b/MemoryMeter.c @@ -24,7 +24,7 @@ int MemoryMeter_attributes[] = { MEMORY_USED, MEMORY_BUFFERS, MEMORY_CACHE }; -static void MemoryMeter_setValues(Meter* this, char* buffer, int size) { +static void MemoryMeter_updateValues(Meter* this, char* buffer, int size) { int written; Platform_setMemoryValues(this); @@ -60,7 +60,7 @@ MeterClass MemoryMeter_class = { .delete = Meter_delete, .display = MemoryMeter_display, }, - .setValues = MemoryMeter_setValues, + .updateValues = MemoryMeter_updateValues, .defaultMode = BAR_METERMODE, .maxItems = 3, .total = 100.0, @@ -37,7 +37,7 @@ typedef struct Meter_ Meter; typedef void(*Meter_Init)(Meter*); typedef void(*Meter_Done)(Meter*); typedef void(*Meter_UpdateMode)(Meter*, int); -typedef void(*Meter_SetValues)(Meter*, char*, int); +typedef void(*Meter_UpdateValues)(Meter*, char*, int); typedef void(*Meter_Draw)(Meter*, int, int, int); typedef struct MeterClass_ { @@ -46,7 +46,7 @@ typedef struct MeterClass_ { const Meter_Done done; const Meter_UpdateMode updateMode; const Meter_Draw draw; - const Meter_SetValues setValues; + const Meter_UpdateValues updateValues; const int defaultMode; const double total; const int* attributes; @@ -66,7 +66,8 @@ typedef struct MeterClass_ { #define Meter_updateMode(this_, m_) As_Meter(this_)->updateMode((Meter*)(this_), m_) #define Meter_drawFn(this_) As_Meter(this_)->draw #define Meter_doneFn(this_) As_Meter(this_)->done -#define Meter_setValues(this_, c_, i_) As_Meter(this_)->setValues((Meter*)(this_), c_, i_) +#define Meter_updateValues(this_, buf_, sz_) \ + As_Meter(this_)->updateValues((Meter*)(this_), buf_, sz_) #define Meter_defaultMode(this_) As_Meter(this_)->defaultMode #define Meter_getItems(this_) As_Meter(this_)->curItems #define Meter_setItems(this_, n_) As_Meter(this_)->curItems = (n_) @@ -245,7 +246,7 @@ ListItem* Meter_toListItem(Meter* this, bool moving) { static void TextMeterMode_draw(Meter* this, int x, int y, int w) { char buffer[METER_BUFFER_LEN]; - Meter_setValues(this, buffer, METER_BUFFER_LEN - 1); + Meter_updateValues(this, buffer, METER_BUFFER_LEN - 1); (void) w; attrset(CRT_colors[METER_TEXT]); @@ -265,7 +266,7 @@ static char BarMeterMode_characters[] = "|#*@$%&."; static void BarMeterMode_draw(Meter* this, int x, int y, int w) { char buffer[METER_BUFFER_LEN]; - Meter_setValues(this, buffer, METER_BUFFER_LEN - 1); + Meter_updateValues(this, buffer, METER_BUFFER_LEN - 1); w -= 2; attrset(CRT_colors[METER_TEXT]); @@ -390,7 +391,7 @@ static void GraphMeterMode_draw(Meter* this, int x, int y, int w) { data->values[i] = data->values[i+1]; char buffer[nValues]; - Meter_setValues(this, buffer, nValues - 1); + Meter_updateValues(this, buffer, nValues - 1); double value = 0.0; int items = Meter_getItems(this); @@ -459,7 +460,7 @@ static void LEDMeterMode_draw(Meter* this, int x, int y, int w) { LEDMeterMode_digits = LEDMeterMode_digitsAscii; char buffer[METER_BUFFER_LEN]; - Meter_setValues(this, buffer, METER_BUFFER_LEN - 1); + Meter_updateValues(this, buffer, METER_BUFFER_LEN - 1); RichString_begin(out); Meter_displayBuffer(this, buffer, &out); @@ -522,7 +523,7 @@ MeterMode* Meter_modes[] = { /* Blank meter */ -static void BlankMeter_setValues(Meter* this, char* buffer, int size) { +static void BlankMeter_updateValues(Meter* this, char* buffer, int size) { (void) this; (void) buffer; (void) size; } @@ -541,7 +542,7 @@ MeterClass BlankMeter_class = { .delete = Meter_delete, .display = BlankMeter_display, }, - .setValues = BlankMeter_setValues, + .updateValues = BlankMeter_updateValues, .defaultMode = TEXT_METERMODE, .maxItems = 0, .total = 100.0, @@ -24,7 +24,7 @@ typedef struct Meter_ Meter; typedef void(*Meter_Init)(Meter*); typedef void(*Meter_Done)(Meter*); typedef void(*Meter_UpdateMode)(Meter*, int); -typedef void(*Meter_SetValues)(Meter*, char*, int); +typedef void(*Meter_UpdateValues)(Meter*, char*, int); typedef void(*Meter_Draw)(Meter*, int, int, int); typedef struct MeterClass_ { @@ -33,7 +33,7 @@ typedef struct MeterClass_ { const Meter_Done done; const Meter_UpdateMode updateMode; const Meter_Draw draw; - const Meter_SetValues setValues; + const Meter_UpdateValues updateValues; const int defaultMode; const double total; const int* attributes; @@ -53,7 +53,8 @@ typedef struct MeterClass_ { #define Meter_updateMode(this_, m_) As_Meter(this_)->updateMode((Meter*)(this_), m_) #define Meter_drawFn(this_) As_Meter(this_)->draw #define Meter_doneFn(this_) As_Meter(this_)->done -#define Meter_setValues(this_, c_, i_) As_Meter(this_)->setValues((Meter*)(this_), c_, i_) +#define Meter_updateValues(this_, buf_, sz_) \ + As_Meter(this_)->updateValues((Meter*)(this_), buf_, sz_) #define Meter_defaultMode(this_) As_Meter(this_)->defaultMode #define Meter_getItems(this_) As_Meter(this_)->curItems #define Meter_setItems(this_, n_) As_Meter(this_)->curItems = (n_) @@ -394,7 +394,7 @@ void Process_writeField(Process* this, RichString* str, ProcessField field) { int indent = (this->indent < 0 ? -this->indent : this->indent); for (int i = 0; i < 32; i++) - if (indent & (1 << i)) + if (indent & (1U << i)) maxIndent = i+1; for (int i = 0; i < maxIndent - 1; i++) { int written; diff --git a/SwapMeter.c b/SwapMeter.c index 476c4240..1406d6fb 100644 --- a/SwapMeter.c +++ b/SwapMeter.c @@ -24,7 +24,7 @@ int SwapMeter_attributes[] = { SWAP }; -static void SwapMeter_setValues(Meter* this, char* buffer, int size) { +static void SwapMeter_updateValues(Meter* this, char* buffer, int size) { int written; Platform_setSwapValues(this); @@ -54,7 +54,7 @@ MeterClass SwapMeter_class = { .delete = Meter_delete, .display = SwapMeter_display, }, - .setValues = SwapMeter_setValues, + .updateValues = SwapMeter_updateValues, .defaultMode = BAR_METERMODE, .maxItems = 1, .total = 100.0, diff --git a/TasksMeter.c b/TasksMeter.c index dc057188..78a14683 100644 --- a/TasksMeter.c +++ b/TasksMeter.c @@ -18,7 +18,7 @@ int TasksMeter_attributes[] = { CPU_KERNEL, PROCESS_THREAD, PROCESS, TASKS_RUNNING }; -static void TasksMeter_setValues(Meter* this, char* buffer, int len) { +static void TasksMeter_updateValues(Meter* this, char* buffer, int len) { ProcessList* pl = this->pl; this->values[0] = pl->kernelThreads; this->values[1] = pl->userlandThreads; @@ -72,7 +72,7 @@ MeterClass TasksMeter_class = { .delete = Meter_delete, .display = TasksMeter_display, }, - .setValues = TasksMeter_setValues, + .updateValues = TasksMeter_updateValues, .defaultMode = TEXT_METERMODE, .maxItems = 4, .total = 100.0, diff --git a/UptimeMeter.c b/UptimeMeter.c index 5e0a9e9a..d20c4797 100644 --- a/UptimeMeter.c +++ b/UptimeMeter.c @@ -17,7 +17,7 @@ int UptimeMeter_attributes[] = { UPTIME }; -static void UptimeMeter_setValues(Meter* this, char* buffer, int len) { +static void UptimeMeter_updateValues(Meter* this, char* buffer, int len) { int totalseconds = Platform_getUptime(); if (totalseconds == -1) { snprintf(buffer, len, "(unknown)"); @@ -49,7 +49,7 @@ MeterClass UptimeMeter_class = { .extends = Class(Meter), .delete = Meter_delete }, - .setValues = UptimeMeter_setValues, + .updateValues = UptimeMeter_updateValues, .defaultMode = TEXT_METERMODE, .maxItems = 1, .total = 100.0, diff --git a/configure.ac b/configure.ac index fa323598..9b3c17bd 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,8 @@ AC_PREREQ(2.65) AC_INIT([htop],[2.0.1],[hisham@gobolinux.org]) -year=$(date +%Y) +SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(date +%s)}" +year=$(date -u -d "@$SOURCE_DATE_EPOCH" "+%Y" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" "+%Y" 2>/dev/null || date -u "+%Y") # The following two lines are required by hwloc scripts AC_USE_SYSTEM_EXTENSIONS diff --git a/darwin/Platform.c b/darwin/Platform.c index 303b6c15..9274d0d8 100644 --- a/darwin/Platform.c +++ b/darwin/Platform.c @@ -280,11 +280,9 @@ char* Platform_getProcessEnv(pid_t pid) { size_t size = endp - p; env = xMalloc(size+2); - if (env) { - memcpy(env, p, size); - env[size] = 0; - env[size+1] = 0; - } + memcpy(env, p, size); + env[size] = 0; + env[size+1] = 0; } } free(buf); diff --git a/htop.desktop b/htop.desktop index 2f7a7ee6..b88d530a 100644 --- a/htop.desktop +++ b/htop.desktop @@ -60,3 +60,4 @@ GenericName[sv]=Processvisning GenericName[tr]=Süreç Görüntüleyici GenericName[uk]=Перегляд процесів GenericName[zh_TW]=行程檢視器 +Keywords=system;process;task diff --git a/openbsd/Platform.c b/openbsd/Platform.c index 251a7136..9273abc0 100644 --- a/openbsd/Platform.c +++ b/openbsd/Platform.c @@ -265,9 +265,6 @@ void Platform_setSwapValues(Meter* this) { } swdev = xCalloc(nswap, sizeof(*swdev)); - if (swdev == NULL) { - return; - } rnswap = swapctl(SWAP_STATS, swdev, nswap); if (rnswap == -1) { |