On 2020/11/29 15:00, Ashton Fagg wrote:
> Stuart Henderson writes:
>
> > On 2020/11/07 23:24, Ashton Fagg wrote (on bugs@):
> >>
> >> I'm running a Ryzen 4750U (8 cores, 16 with SMT). Obviously SMT
> >>being disabled means only 8 of them show up in htop and the
> >>like. However, I've noticed that 4 of my cores are always
> >>idle. They never, ever leave 0% usage no matter what I do -
> >>running stress tests, running make with -j8, doesn't matter,
> >>only 4 cores ever have usage >0.
> >
> > Does this help?
>
> Hi Stuart,
>
> Apologies for the belated reply.
>
> I just tested this on my Ryzen machine and can confirm that it does fix
> the issue with only half of the active cores being shown - screenshots
> attached. Tested with `stress -c 8` as in my original report.
Thanks. I've just committed that.
Here's a diff on top to update to 3.0.2. Shouldn't be much in the way
of visible change but it gets rid of the Python build dependency.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/htop/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile29 Nov 2020 20:15:05 - 1.24
+++ Makefile29 Nov 2020 20:19:53 -
@@ -4,8 +4,7 @@ COMMENT = interactive process viewer
GH_ACCOUNT = htop-dev
GH_PROJECT = htop
-GH_TAGNAME = 3.0.1
-REVISION = 0
+GH_TAGNAME = 3.0.2
CATEGORIES = sysutils
@@ -18,7 +17,6 @@ PERMIT_PACKAGE = Yes
WANTLIB = c curses kvm m
-MODULES = lang/python
RUN_DEPENDS = devel/desktop-file-utils
NO_TEST = Yes
@@ -29,9 +27,6 @@ AUTOMAKE_VERSION =1.16
AUTORECONF = ./autogen.sh
CONFIGURE_ARGS += --disable-unicode \
--disable-taskstats
-
-MODPY_RUNDEP = No
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
# htop has some bugs which take hours or days to reach.
# Keep the symbols to give a chance to the user to get an useful coredump.
Index: distinfo
===
RCS file: /cvs/ports/sysutils/htop/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo12 Sep 2020 17:25:21 - 1.5
+++ distinfo29 Nov 2020 20:19:53 -
@@ -1,2 +1,2 @@
-SHA256 (htop-3.0.1.tar.gz) = hGUWS8CF9fGBPh0/bEubVr9MlcwSImpTZ+ZXlJSbAco=
-SIZE (htop-3.0.1.tar.gz) = 179925
+SHA256 (htop-3.0.2.tar.gz) = tHRKO+onnyo3Je2OXjX/2csQ1mZzvwfI/iH+s8RmEwU=
+SIZE (htop-3.0.2.tar.gz) = 176132
Index: patches/patch-CPUMeter_c
===
RCS file: /cvs/ports/sysutils/htop/patches/patch-CPUMeter_c,v
retrieving revision 1.7
diff -u -p -r1.7 patch-CPUMeter_c
--- patches/patch-CPUMeter_c21 Nov 2020 15:50:40 - 1.7
+++ patches/patch-CPUMeter_c29 Nov 2020 20:19:53 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-CPUMeter_c,v 1.7 2020/11
Index: CPUMeter.c
--- CPUMeter.c.orig
+++ CPUMeter.c
-@@ -233,6 +233,10 @@ static void SingleColCPUsMeter_draw(Meter* this, int x
+@@ -202,6 +202,10 @@ static void SingleColCPUsMeter_draw(Meter* this, int x
int start, count;
AllCPUsMeter_getRange(this, , );
for (int i = 0; i < count; i++) {
Index: patches/patch-FunctionBar_c
===
RCS file: /cvs/ports/sysutils/htop/patches/patch-FunctionBar_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-FunctionBar_c
--- patches/patch-FunctionBar_c 26 Jul 2018 12:49:04 - 1.3
+++ patches/patch-FunctionBar_c 29 Nov 2020 20:19:53 -
@@ -6,7 +6,7 @@ so we leak for now.
Index: FunctionBar.c
--- FunctionBar.c.orig
+++ FunctionBar.c
-@@ -72,14 +72,8 @@ FunctionBar* FunctionBar_new(const char* const* functi
+@@ -59,14 +59,8 @@ FunctionBar* FunctionBar_new(const char* const* functi
}
void FunctionBar_delete(FunctionBar* this) {
Index: patches/patch-Header_c
===
RCS file: /cvs/ports/sysutils/htop/patches/patch-Header_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Header_c
--- patches/patch-Header_c 21 Nov 2020 15:50:40 - 1.2
+++ patches/patch-Header_c 29 Nov 2020 20:19:53 -
@@ -1,17 +1,15 @@
-$OpenBSD: patch-Header_c,v 1.2 2020/11/21 15:50:40 sthen Exp $
+$OpenBSD: patch-Header_c,v 1.2 2020/11/21 15:50:40 sthen Exp $
Index: Header.c
--- Header.c.orig
+++ Header.c
-@@ -192,8 +192,9 @@ void Header_draw(const Header* this) {
+@@ -168,7 +168,8 @@ void Header_draw(const Header* this) {
Header_forEachColumn(this, col) {
Vector* meters = this->columns[col];
for (int y = (pad / 2), i = 0; i < Vector_size(meters); i++) {
- Meter* meter = (Meter*) Vector_get(meters, i);
-- meter->draw(meter, x, y, width);
+ Meter* meter = (Meter*) Vector_get(meters, i);
+ if (meter == 0x1 || meter->draw == 0x1) continue;
-+ meter->draw(meter, x, y,