Attachment #217986 for bug #249355

View | Details | Raw Unified | Return to bug 249355
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	htop
DISTVERSION=	3.0.2
PORTREVISION=	1
CATEGORIES=	sysutils

MAINTAINER=	gaod@hychen.org

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--enable-unicode
USE_GITHUB=	yes
GH_ACCOUNT=	htop-dev
SHEBANG_FILES=	scripts/MakeHeader.py

PLIST_FILES=	bin/htop \
		man/man1/htop.1.gz \

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1524217137	1	TIMESTAMP = 1600219337
2	SHA256 (hishamhm-htop-2.2.0_GH0.tar.gz) = fb23275090ee5fb19266384c39c69519c8b3844b8f6444730094949c621197c0	2	SHA256 (htop-dev-htop-3.0.2_GH0.tar.gz) = b4744a3bea279f2a3725ed8e5e35ffd9cb10d66673bf07c8fe21feb3c4661305
3	SIZE (hishamhm-htop-2.2.0_GH0.tar.gz) = 172913	3	SIZE (htop-dev-htop-3.0.2_GH0.tar.gz) = 176132




--- CRT.h.orig	2018-04-10 13:42:59 UTC
+++ CRT.h
@@ -140,7 +140,7 @@ extern const char **CRT_treeStr;
 
 extern int CRT_delay;
 
-int* CRT_colors;
+extern int* CRT_colors;
 
 extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT];
 
@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount;
 
 extern int CRT_scrollWheelVAmount;
 
-char* CRT_termType;
+extern char* CRT_termType;
 
 // TODO move color scheme to Settings, perhaps?
 
 extern int CRT_colorScheme;
 
-void *backtraceArray[128];
+extern void *backtraceArray[128];
 
 #if HAVE_SETUID_ENABLED
 




Fix memory display in the header on FreeBSD/powerpc

https://github.com/hishamhm/htop/pull/871

--- freebsd/FreeBSDProcessList.c.orig	2018-04-10 13:42:59 UTC
+++ freebsd/FreeBSDProcessList.c
@@ -28,8 +28,9 @@ in the source distribution for its full text.
 #include <sys/resource.h>
 
 #define JAIL_ERRMSGLEN	1024
+*/
 char jail_errmsg[JAIL_ERRMSGLEN];
-
+/*
 typedef struct CPUData_ {
 
    double userPercent;
@@ -296,31 +297,46 @@ static inline void FreeBSDProcessList_scanMemoryInfo(P
    //
    // htop_used   = active + (wired - arc)
    // htop_cache  = buffers + cache + arc
-   size_t len = sizeof(pl->totalMem);
+   u_long totalMem;
+   u_int memActive, memWire, cachedMem;
+   long buffersMem;
+   uint64_t memZfsArc;
+   size_t len;
 
    //disabled for now, as it is always smaller than phycal amount of memory...
    //...to avoid "where is my memory?" questions
    //sysctl(MIB_vm_stats_vm_v_page_count, 4, &(pl->totalMem), &len, NULL, 0);
    //pl->totalMem *= pageSizeKb;
-   sysctl(MIB_hw_physmem, 2, &(pl->totalMem), &len, NULL, 0);
-   pl->totalMem /= 1024;
+   len = sizeof(totalMem);
+   sysctl(MIB_hw_physmem, 2, &(totalMem), &len, NULL, 0);
+   totalMem /= 1024;
+   pl->totalMem = totalMem;
 
-   sysctl(MIB_vm_stats_vm_v_active_count, 4, &(fpl->memActive), &len, NULL, 0);
-   fpl->memActive *= pageSizeKb;
+   len = sizeof(memActive);
+   sysctl(MIB_vm_stats_vm_v_active_count, 4, &(memActive), &len, NULL, 0);
+   memActive *= pageSizeKb;
+   fpl->memActive = memActive;
 
-   sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(fpl->memWire), &len, NULL, 0);
-   fpl->memWire *= pageSizeKb;
+   len = sizeof(memWire);
+   sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(memWire), &len, NULL, 0);
+   memWire *= pageSizeKb;
+   fpl->memWire = memWire;
 
-   sysctl(MIB_vfs_bufspace, 2, &(pl->buffersMem), &len, NULL, 0);
-   pl->buffersMem /= 1024;
+   len = sizeof(buffersMem);
+   sysctl(MIB_vfs_bufspace, 2, &(buffersMem), &len, NULL, 0);
+   buffersMem /= 1024;
+   pl->buffersMem = buffersMem;
 
-   sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(pl->cachedMem), &len, NULL, 0);
-   pl->cachedMem *= pageSizeKb;
+   len = sizeof(cachedMem);
+   sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(cachedMem), &len, NULL, 0);
+   cachedMem *= pageSizeKb;
+   pl->cachedMem = cachedMem;
 
    if (fpl->zfsArcEnabled) {
-      len = sizeof(fpl->memZfsArc);
-      sysctl(MIB_kstat_zfs_misc_arcstats_size, 5, &(fpl->memZfsArc), &len , NULL, 0);
-      fpl->memZfsArc /= 1024;
+      len = sizeof(memZfsArc);
+      sysctl(MIB_kstat_zfs_misc_arcstats_size, 5, &(memZfsArc), &len , NULL, 0);
+      memZfsArc /= 1024;
+      fpl->memZfsArc = memZfsArc;
       fpl->memWire -= fpl->memZfsArc;
       pl->cachedMem += fpl->memZfsArc;
       // maybe when we learn how to make custom memory meter

Lines 1-11 Link Here

(-)files/patch-freebsd_FreeBSDProcessList.h (-11 lines)
1	--- freebsd/FreeBSDProcessList.h.orig 2018-04-10 13:42:59 UTC
2	+++ freebsd/FreeBSDProcessList.h
3	@@ -17,7 +17,7 @@ in the source distribution for its full text.
4	#include <sys/resource.h>
5
6	#define JAIL_ERRMSGLEN 1024
7	-char jail_errmsg[JAIL_ERRMSGLEN];
8	+extern char jail_errmsg[JAIL_ERRMSGLEN];
9
10	typedef struct CPUData_ {
11

Lines 17-20 Link Here

(-)pkg-descr (-1 / +1 lines)
17	* In 'htop' you can kill multiple processes at once.	17	* In 'htop' you can kill multiple processes at once.
18	* 'top' is older, hence, more tested.	18	* 'top' is older, hence, more tested.
19		19
20	WWW: https://hisham.hm/htop/	20	WWW: https://htop.dev/

Return to bug 249355

Lines 2-9 Link Here

(-)Makefile (-4 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= htop	4	PORTNAME= htop
5	DISTVERSION= 2.2.0	5	DISTVERSION= 3.0.2
6	PORTREVISION= 1
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8		7
9	MAINTAINER= gaod@hychen.org	8	MAINTAINER= gaod@hychen.org
Lines 16-23 Link Here
16	GNU_CONFIGURE= yes	15	GNU_CONFIGURE= yes
17	CONFIGURE_ARGS= --enable-unicode	16	CONFIGURE_ARGS= --enable-unicode
18	USE_GITHUB= yes	17	USE_GITHUB= yes
19	GH_ACCOUNT= hishamhm	18	GH_ACCOUNT= htop-dev
20	SHEBANG_FILES= scripts/MakeHeader.py
21		19
22	PLIST_FILES= bin/htop \	20	PLIST_FILES= bin/htop \
23	man/man1/htop.1.gz \	21	man/man1/htop.1.gz \

Lines 1-27 Link Here

(-)files/patch-CRT.h (-27 lines)
1	--- CRT.h.orig 2018-04-10 13:42:59 UTC
2	+++ CRT.h
3	@@ -140,7 +140,7 @@ extern const char **CRT_treeStr;
4
5	extern int CRT_delay;
6
7	-int* CRT_colors;
8	+extern int* CRT_colors;
9
10	extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT];
11
12	@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount;
13
14	extern int CRT_scrollWheelVAmount;
15
16	-char* CRT_termType;
17	+extern char* CRT_termType;
18
19	// TODO move color scheme to Settings, perhaps?
20
21	extern int CRT_colorScheme;
22
23	-void *backtraceArray[128];
24	+extern void *backtraceArray[128];
25
26	#if HAVE_SETUID_ENABLED
27

Lines 1-78 Link Here

(-)files/patch-freebsd_FreeBSDProcessList.c (-78 lines)
1	Fix memory display in the header on FreeBSD/powerpc
2
3	https://github.com/hishamhm/htop/pull/871
4
5	--- freebsd/FreeBSDProcessList.c.orig 2018-04-10 13:42:59 UTC
6	+++ freebsd/FreeBSDProcessList.c
7	@@ -28,8 +28,9 @@ in the source distribution for its full text.
8	#include <sys/resource.h>
9
10	#define JAIL_ERRMSGLEN 1024
11	+*/
12	char jail_errmsg[JAIL_ERRMSGLEN];
13	-
14	+/*
15	typedef struct CPUData_ {
16
17	double userPercent;
18	@@ -296,31 +297,46 @@ static inline void FreeBSDProcessList_scanMemoryInfo(P
19	//
20	// htop_used = active + (wired - arc)
21	// htop_cache = buffers + cache + arc
22	- size_t len = sizeof(pl->totalMem);
23	+ u_long totalMem;
24	+ u_int memActive, memWire, cachedMem;
25	+ long buffersMem;
26	+ uint64_t memZfsArc;
27	+ size_t len;
28
29	//disabled for now, as it is always smaller than phycal amount of memory...
30	//...to avoid "where is my memory?" questions
31	//sysctl(MIB_vm_stats_vm_v_page_count, 4, &(pl->totalMem), &len, NULL, 0);
32	//pl->totalMem *= pageSizeKb;
33	- sysctl(MIB_hw_physmem, 2, &(pl->totalMem), &len, NULL, 0);
34	- pl->totalMem /= 1024;
35	+ len = sizeof(totalMem);
36	+ sysctl(MIB_hw_physmem, 2, &(totalMem), &len, NULL, 0);
37	+ totalMem /= 1024;
38	+ pl->totalMem = totalMem;
39
40	- sysctl(MIB_vm_stats_vm_v_active_count, 4, &(fpl->memActive), &len, NULL, 0);
41	- fpl->memActive *= pageSizeKb;
42	+ len = sizeof(memActive);
43	+ sysctl(MIB_vm_stats_vm_v_active_count, 4, &(memActive), &len, NULL, 0);
44	+ memActive *= pageSizeKb;
45	+ fpl->memActive = memActive;
46
47	- sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(fpl->memWire), &len, NULL, 0);
48	- fpl->memWire *= pageSizeKb;
49	+ len = sizeof(memWire);
50	+ sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(memWire), &len, NULL, 0);
51	+ memWire *= pageSizeKb;
52	+ fpl->memWire = memWire;
53
54	- sysctl(MIB_vfs_bufspace, 2, &(pl->buffersMem), &len, NULL, 0);
55	- pl->buffersMem /= 1024;
56	+ len = sizeof(buffersMem);
57	+ sysctl(MIB_vfs_bufspace, 2, &(buffersMem), &len, NULL, 0);
58	+ buffersMem /= 1024;
59	+ pl->buffersMem = buffersMem;
60
61	- sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(pl->cachedMem), &len, NULL, 0);
62	- pl->cachedMem *= pageSizeKb;
63	+ len = sizeof(cachedMem);
64	+ sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(cachedMem), &len, NULL, 0);
65	+ cachedMem *= pageSizeKb;
66	+ pl->cachedMem = cachedMem;
67
68	if (fpl->zfsArcEnabled) {
69	- len = sizeof(fpl->memZfsArc);
70	- sysctl(MIB_kstat_zfs_misc_arcstats_size, 5, &(fpl->memZfsArc), &len , NULL, 0);
71	- fpl->memZfsArc /= 1024;
72	+ len = sizeof(memZfsArc);
73	+ sysctl(MIB_kstat_zfs_misc_arcstats_size, 5, &(memZfsArc), &len , NULL, 0);
74	+ memZfsArc /= 1024;
75	+ fpl->memZfsArc = memZfsArc;
76	fpl->memWire -= fpl->memZfsArc;
77	pl->cachedMem += fpl->memZfsArc;
78	// maybe when we learn how to make custom memory meter