Mon Feb 26 09:31:52 2024 UTC (90d)
htop: import illumos fixes from OmniOS CE
(nia)
diff -r1.24 -r1.25 pkgsrc/sysutils/htop/distinfo
diff -r0 -r1.3 pkgsrc/sysutils/htop/patches/patch-solaris_Platform.c
diff -r1.1 -r0 pkgsrc/sysutils/htop/patches/patch-solaris_Platform.h
diff -r0 -r1.1 pkgsrc/sysutils/htop/patches/patch-solaris_SolarisMachine.c
diff -r0 -r1.1 pkgsrc/sysutils/htop/patches/patch-solaris_SolarisMachine.h
diff -r0 -r1.1 pkgsrc/sysutils/htop/patches/patch-solaris_SolarisProcess.c
diff -r0 -r1.1 pkgsrc/sysutils/htop/patches/patch-solaris_SolarisProcess.h
diff -r0 -r1.1 pkgsrc/sysutils/htop/patches/patch-solaris_SolarisProcessTable.c
Mon Feb 26 18:31:52 2024
Mon Jun 26 19:40:28 2023
pkgsrc/sysutils/htop/patches/patch-solaris_Platform.h,v
anoncvs not yet been updated
--- pkgsrc/sysutils/htop/distinfo 2024/02/18 01:51:01 1.24
+++ pkgsrc/sysutils/htop/distinfo 2024/02/26 09:31:51 1.25
| @@ -1,6 +1,11 @@ | | | @@ -1,6 +1,11 @@ |
1 | $NetBSD: distinfo,v 1.24 2024/02/18 01:51:01 fox Exp $ | | 1 | $NetBSD: distinfo,v 1.25 2024/02/26 09:31:51 nia Exp $ |
2 | | | 2 | |
3 | BLAKE2s (htop-3.3.0.tar.gz) = 49b573cab35804cb6e0c437af78e9311e00d719e66724222252980cf4b869f99 | | 3 | BLAKE2s (htop-3.3.0.tar.gz) = 49b573cab35804cb6e0c437af78e9311e00d719e66724222252980cf4b869f99 |
4 | SHA512 (htop-3.3.0.tar.gz) = 4c03bd183d97ec84010472ea52ff6e210e6d211c813d0ab52bacef16d7e4eef9483e65279fb0a846dcdb532ad19eb1c1c39bad9dd8b103d36aeb51cb5d28e23a | | 4 | SHA512 (htop-3.3.0.tar.gz) = 4c03bd183d97ec84010472ea52ff6e210e6d211c813d0ab52bacef16d7e4eef9483e65279fb0a846dcdb532ad19eb1c1c39bad9dd8b103d36aeb51cb5d28e23a |
5 | Size (htop-3.3.0.tar.gz) = 406012 bytes | | 5 | Size (htop-3.3.0.tar.gz) = 406012 bytes |
6 | SHA1 (patch-solaris_Platform.h) = c23c6cf20607dd69e626be716337471fffd70d86 | | 6 | SHA1 (patch-solaris_Platform.c) = 0388d962692ce071e587a9a6a9f809051e817ef8 |
| | | 7 | SHA1 (patch-solaris_SolarisMachine.c) = 8a25f831b674a2bb2342d70052c78edf3602c81f |
| | | 8 | SHA1 (patch-solaris_SolarisMachine.h) = 76d744d0189a7849b2d655e2343569e33609f367 |
| | | 9 | SHA1 (patch-solaris_SolarisProcess.c) = 5d9725eccbd3a5cf857575f309ec86519adb433e |
| | | 10 | SHA1 (patch-solaris_SolarisProcess.h) = a1cc8f29f008e9a21cc79a524f78d9cd91bcd36c |
| | | 11 | SHA1 (patch-solaris_SolarisProcessTable.c) = 951b595cce2e6c460a16e46e8a26a6c2329607e0 |
$NetBSD: patch-solaris_Platform.c,v 1.3 2024/02/26 09:31:52 nia Exp $
PR created upstream:
https://github.com/htop-dev/htop/pull/1371
From 4b87af0663f83ed90f044f975e519409c92b8bd9 Mon Sep 17 00:00:00 2001
From: Dominik Hassler <hadfl@omnios.org>
Date: Thu, 11 Jan 2024 17:44:34 +0000
Subject: [PATCH] fixes for illumos/Solaris platforms
--- solaris/Platform.c.orig 2024-01-10 09:54:15.000000000 +0000
+++ solaris/Platform.c
@@ -220,7 +220,7 @@ double Platform_setCPUValues(Meter* this
v[CPU_METER_NICE] = cpuData->nicePercent;
v[CPU_METER_NORMAL] = cpuData->userPercent;
- if (super->settings->detailedCPUTime) {
+ if (host->settings->detailedCPUTime) {
v[CPU_METER_KERNEL] = cpuData->systemPercent;
v[CPU_METER_IRQ] = cpuData->irqPercent;
this->curItems = 4;
@@ -258,13 +258,13 @@ void Platform_setSwapValues(Meter* this)
}
void Platform_setZfsArcValues(Meter* this) {
- const SolarisMachine* shost = (SolarisMachine*) this->host;
+ const SolarisMachine* shost = (const SolarisMachine*) this->host;
ZfsArcMeter_readStats(this, &shost->zfs);
}
void Platform_setZfsCompressedArcValues(Meter* this) {
- const SolarisMachine* shost = (SolarisMachine*) this->host;
+ const SolarisMachine* shost = (const SolarisMachine*) this->host;
ZfsCompressedArcMeter_readStats(this, &shost->zfs);
}
$NetBSD: patch-solaris_SolarisMachine.c,v 1.1 2024/02/26 09:31:52 nia Exp $
PR created upstream:
https://github.com/htop-dev/htop/pull/1371
From 4b87af0663f83ed90f044f975e519409c92b8bd9 Mon Sep 17 00:00:00 2001
From: Dominik Hassler <hadfl@omnios.org>
Date: Thu, 11 Jan 2024 17:44:34 +0000
Subject: [PATCH] fixes for illumos/Solaris platforms
--- solaris/SolarisMachine.c.orig 2024-01-10 09:54:15.000000000 +0000
+++ solaris/SolarisMachine.c
@@ -57,7 +57,7 @@ static void SolarisMachine_updateCPUcoun
if (s != super->activeCPUs) {
change = true;
- hsuper->activeCPUs = s;
+ super->activeCPUs = s;
}
if (change) {
@@ -310,6 +310,10 @@ Machine* Machine_new(UsersTable* usersTa
CRT_fatalError("Cannot get pagesize by sysconf(_SC_PAGESIZE)");
this->pageSizeKB = this->pageSize / 1024;
+ this->kd = kstat_open();
+ if (!this->kd)
+ CRT_fatalError("Cannot open kstat handle");
+
SolarisMachine_updateCPUcount(this);
return super;
$NetBSD: patch-solaris_SolarisMachine.h,v 1.1 2024/02/26 09:31:52 nia Exp $
PR created upstream:
https://github.com/htop-dev/htop/pull/1371
From 4b87af0663f83ed90f044f975e519409c92b8bd9 Mon Sep 17 00:00:00 2001
From: Dominik Hassler <hadfl@omnios.org>
Date: Thu, 11 Jan 2024 17:44:34 +0000
Subject: [PATCH] fixes for illumos/Solaris platforms
--- solaris/SolarisMachine.h.orig 2024-01-10 09:54:15.000000000 +0000
+++ solaris/SolarisMachine.h
@@ -19,6 +19,7 @@ in the source distribution for its full
#include <sys/uio.h>
#include "Hashtable.h"
+#include "Machine.h"
#include "UsersTable.h"
#include "zfs/ZfsArcStats.h"
$NetBSD: patch-solaris_SolarisProcess.c,v 1.1 2024/02/26 09:31:52 nia Exp $
PR created upstream:
https://github.com/htop-dev/htop/pull/1371
From 4b87af0663f83ed90f044f975e519409c92b8bd9 Mon Sep 17 00:00:00 2001
From: Dominik Hassler <hadfl@omnios.org>
Date: Thu, 11 Jan 2024 17:44:34 +0000
Subject: [PATCH] fixes for illumos/Solaris platforms
--- solaris/SolarisProcess.c.orig 2024-01-10 09:54:15.000000000 +0000
+++ solaris/SolarisProcess.c
@@ -15,7 +15,6 @@ in the source distribution for its full
#include <unistd.h>
#include <sys/syscall.h>
-#include "Process.h"
#include "ProcessTable.h"
#include "CRT.h"
$NetBSD: patch-solaris_SolarisProcess.h,v 1.1 2024/02/26 09:31:52 nia Exp $
PR created upstream:
https://github.com/htop-dev/htop/pull/1371
From 4b87af0663f83ed90f044f975e519409c92b8bd9 Mon Sep 17 00:00:00 2001
From: Dominik Hassler <hadfl@omnios.org>
Date: Thu, 11 Jan 2024 17:44:34 +0000
Subject: [PATCH] fixes for illumos/Solaris platforms
--- solaris/SolarisProcess.h.orig 2024-01-10 09:54:15.000000000 +0000
+++ solaris/SolarisProcess.h
@@ -20,6 +20,7 @@ in the source distribution for its full
#define ERR (-1)
#include "Machine.h"
+#include "Process.h"
typedef struct SolarisProcess_ {
$NetBSD: patch-solaris_SolarisProcessTable.c,v 1.1 2024/02/26 09:31:52 nia Exp $
PR created upstream:
https://github.com/htop-dev/htop/pull/1371
From 4b87af0663f83ed90f044f975e519409c92b8bd9 Mon Sep 17 00:00:00 2001
From: Dominik Hassler <hadfl@omnios.org>
Date: Thu, 11 Jan 2024 17:44:34 +0000
Subject: [PATCH] fixes for illumos/Solaris platforms
--- solaris/SolarisProcessTable.c.orig 2024-01-10 09:54:15.000000000 +0000
+++ solaris/SolarisProcessTable.c
@@ -24,6 +24,7 @@ in the source distribution for its full
#include "CRT.h"
#include "solaris/Platform.h"
+#include "solaris/SolarisMachine.h"
#include "solaris/SolarisProcess.h"
@@ -112,8 +113,8 @@ static int SolarisProcessTable_walkproc(
// Setup process list
ProcessTable* pt = (ProcessTable*) listptr;
- SolarisProcessTable* spt = (SolarisProcessTable*) listptr;
- Machine* host = pt->host;
+ const Machine* host = pt->super.host;
+ const SolarisMachine* shost = (const SolarisMachine*) host;
id_t lwpid_real = _lwpsinfo->pr_lwpid;
if (lwpid_real > 1023) {
@@ -133,7 +134,7 @@ static int SolarisProcessTable_walkproc(
const Settings* settings = host->settings;
// Common code pass 1
- proc->show = false;
+ proc->super.show = false;
sproc->taskid = _psinfo->pr_taskid;
sproc->projid = _psinfo->pr_projid;
sproc->poolid = _psinfo->pr_poolid;
@@ -171,7 +172,7 @@ static int SolarisProcessTable_walkproc(
sproc->realpid = _psinfo->pr_pid;
sproc->lwpid = lwpid_real;
sproc->zoneid = _psinfo->pr_zoneid;
- sproc->zname = SolarisProcessTable_readZoneName(spt->kd, sproc);
+ sproc->zname = SolarisProcessTable_readZoneName(shost->kd, sproc);
SolarisProcessTable_updateExe(_psinfo->pr_pid, proc);
Process_updateComm(proc, _psinfo->pr_fname);
@@ -218,7 +219,7 @@ static int SolarisProcessTable_walkproc(
pt->totalTasks += proc->nlwp + 1;
}
}
- proc->show = !(settings->hideKernelThreads && proc->isKernelThread);
+ proc->super.show = !(settings->hideKernelThreads && proc->isKernelThread);
} else { // We are not in the master LWP, so jump to the LWP handling code
proc->percent_cpu = ((uint16_t)_lwpsinfo->pr_pctcpu / (double)32768) * (double)100.0;
Process_updateCPUFieldWidths(proc->percent_cpu);