Re: UPDATE: sysutils/htop 2.2.0 => 3.0.0
On Sat, Sep 05, 2020 at 08:08:36AM +0200, Rafael Sadowski wrote: > On Tue Sep 01, 2020 at 02:44:43PM +1000, Stephen Gregoratto wrote: > > A fork[1] of htop has appeared, with blessings[2] from the original > > developer. Downsides are that it uses GitHub archives, so GH_* stuff is > > addded. I took the time to modify the patches to work on this release, > > but since there were some substantial rewrites[3] I wonder if we should > > drop them altogether. > > > > [1] https://github.com/htop-dev/htop > > [2] https://github.com/hishamhm/htop/issues/992#issuecomment-683286672 > > [3] The shortlog: > > > > b92f62f Remove trailing whitespaces > > dd33444 Clean up existing whitespace > > 909bb86 Show N/A on unsupported platforms instead of 0KHz > > 27fe307 Remove a few unnecessary #includes > > 9197adf Fix CPU usage on OpenBSD > > c34be41 Widen ST_UID (UID) column to 5 chars to allow UIDs > > > without breaking alignment Issue Github #841, Debian bug > > #910492 > > ca1cce4 OpenBSD: make the STARTTIME column display correctly (#815) > > c1fb585 OpenBSD: add environment reading support (#819) > > 060aa2b remove wrongfix > > 3d79c72 Update OpenBSD maximum PID > > c005ffc Fix zero-index array bounds issue > > 48b807b Fix CPU meters > > -- > > Stephen Gregoratto > > OK with a small trailing whitespace zap after "-g". Any maintainer > feedback? > > Rafael Sadowski > whoops, missed this. everything looks good. i was wondering why my patches from 2 years ago were suddenly getting merged upstream. good to see someone has taken over the project. thanks for the bump there's 3.0.1 now Index: ports/sysutils/htop//Makefile === RCS file: /cvs/ports/sysutils/htop/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- ports/sysutils/htop//Makefile 11 Sep 2020 12:34:28 - 1.22 +++ ports/sysutils/htop//Makefile 12 Sep 2020 16:55:34 - @@ -4,7 +4,7 @@ COMMENT = interactive process viewer GH_ACCOUNT = htop-dev GH_PROJECT = htop -GH_TAGNAME = 3.0.0 +GH_TAGNAME = 3.0.1 CATEGORIES = sysutils @@ -35,6 +35,6 @@ MODPY_VERSION = ${MODPY_DEFAULT_VERSION # 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. MAKE_FLAGS = AM_CPPFLAGS="-DDEBUG" -DEBUG =-g +DEBUG =-g .include Index: ports/sysutils/htop//distinfo === RCS file: /cvs/ports/sysutils/htop/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- ports/sysutils/htop//distinfo 11 Sep 2020 12:34:28 - 1.4 +++ ports/sysutils/htop//distinfo 12 Sep 2020 16:55:34 - @@ -1,2 +1,2 @@ -SHA256 (htop-3.0.0.tar.gz) = HAZh8K5fTih02iULYM1RXkrEwEFYMiGt/pXxDhjRpOY= -SIZE (htop-3.0.0.tar.gz) = 179371 +SHA256 (htop-3.0.1.tar.gz) = hGUWS8CF9fGBPh0/bEubVr9MlcwSImpTZ+ZXlJSbAco= +SIZE (htop-3.0.1.tar.gz) = 179925 ok ?
htop crashes fixed
hello, most startup crashes on htop have been fixed, but to confirm, i would like some folks to test it, leave it running, and send any coredumps to this address. note -- crashes occurring shortly after exiting (hitting q) i am aware of & do not need coredumps for many thanks, ians
Re: htop local patch: off by one CPU meter
I agree, I am not sure what I was thinking. I reviewed the code and it is indeed an error. The zero index bug I was trying to fix with that patch lives elsewhere. Thanks! Ian On Wed, Sep 12, 2018 at 3:21 PM, Daniel Jakots wrote: > Hi, > > patches/patch-CPUMeter_c seems wrong to me. On a 4-core machine, htop > will show only 3 cpu meter. I don't really know what happen on other > machines with a different number of cores because all the machine I own > happen to have 4 cores. > > Does anyone reproduce that? I commented the 2 lines in the patch and > rebuild htop and then have the correct number of cpu meter. > > Cheers, > Daniel
htop fixed
After being broken for far too long, htop works again (hooray). htop no longer crashes shortly after startup. I am trying to improve htop's working state so that people start using it again and can depend on it. Towards this end I need people to run htop, test htop, crash htop, and send coredumps to me. For some reason, systems with hw.ncpu=8 (eight "core" systems) tend to crash htop more frequently; coredumps from such machines are especially helpful. I have htop building with debugging symbols left unstripped. If you send me a coredump, please make sure it is from a binary built from the latest REVISION (6 as of writing). Some technical details: htop on OpenBSD is a special case -- we don't run the normal portable code that every other OS runs as it relies on procfs data. We have our own special code seperate from htop proper that understandably isn't afforded the same level of attention. This is why htop runs so weirdly on OpenBSD. Instead of procfs, htop uses sysctl(3) to gather processor metrics. Interestingly enough (I did not realize this prior to working with htop) the command line sysctl(8) utility only exposes a small subset of what is actually possible through the sysctl(3) system call. In htop's case, we pull temporal per-processor statistics using KERN_CPTIME2, which gives us CPUSTATES (six) values, of which only CP_IDLE is relevant. htop was broken for a few months -- after the addition of a new CPUSTATE (https://marc.info/?l=openbsd-cvs&m=152630109526317&w=2) re-indexed the CPUSTATES in sched.h, htop's hard-coded values now sampled the wrong metric, resulting in perpetually zero activity on the meters. THe memory management for the OpenBSD-specific code is a bit wonky, we have commented out a lot of free()'s because they are run too early & crash htop -- tradeoff is memory leaks. Best, Ian Sutton
Re: NEW: games/soyuz
On Sat, Sep 30, 2017 at 04:32:27PM +0100, Stuart Henderson wrote: > Diff on top to tidy it up a bit. > > I don't read Russian (totally killing my chances of being an astronaut > ;) but is there something on the screen you get by pressing T that would > pass for a version number? Is there copyright information anywhere > that would let us fill in the markers better? I had a russian pal translate the 't' screen: The first line of text says Version Number The second line of text says Information System Version Number So that gives us 4.29 D and 4.04 respectively. Nothing about copyrights. > (btw, it's easier to review if you send a tar with just portname/* rather > than usr/ports/category/portname/* .. or category/portname/* if there are > multiple ports in different categories within one submission). I'll remember for the next one. Diff looks good, I'll go ahead and add in the version numbers.
NEW: games/soyuz
Hello, I've ported some software. http://ce.gl/soyuz-port.tgz games/soyuz is a spaceflight simulator used to train Soviet cosmonauts to fly fourth generation Soyuz rockets in the mid-to-late 1980s, it was designed and written by members of the Soviet space program. It specifically simulates the instrumentation and control interface for the descent module re-entering the atmosphere, and provides a virtual interface that functionally matches hardware found in real-life Soyuz modules. Here are some screenshots: https://ce.gl/soyuz/ It passes portcheck: 0 $ pwd /usr/ports/games/soyuz 0 $ /usr/ports/infrastructure/bin/portcheck games/soyuz However I'm not very experienced with writing ports and would appreciate feedback. PS - I'd be interested in hearing from anyone who manages to land, because this is beyond difficult :) Ian
Re: new: sysutils/htop
On Tue, Nov 15, 2016 at 04:29:46PM -0500, Ian Sutton wrote: > I am happy to take over maintainership. I will investigate these issues > and incorporate your patches in a mail to follow. I'll try to get some > coredumps & fix extant issues too. And here is the mail with tarball. On Sat, Nov 05, 2016 at 10:24:23AM +0100, Landry Breuil wrote: > given that it runs for example on macppc.. ok to import with that line > zapped. zapped On Sat, Nov 05, 2016 at 12:03:32PM +0100, Juan Francisco Cantero Hurtado wrote: > Random crashes and double frees. Run the program with MALLOC_OPTIONS=F. I'll fix any that I find > If you take the maintainership, I will import the port. Happy to do this, although I do not have a CVS account > A few comments: > > - Remove the extra space at the end of DESCR. > - Change "This is htop, an interactive" to "htop is an interactive" in > DESCR. > - Remove the second phrase in DESCR. Users don't need to know what are > the dependencies of the packages. Fixed these three > - Look the Makefile in my old port and copy the ALL_TARGET and > INSTALL_STRIP lines to your Makefile, with the comment included. Added Ian htop-2.0.2.tgz Description: application/tar-gz
Re: new: sysutils/htop
On Sat, Nov 05, 2016 at 12:03:32PM +0100, Juan Francisco Cantero Hurtado wrote: > On Sat, Nov 05, 2016 at 06:09:43AM -0400, Ian Sutton wrote: > > On Sat, Nov 05, 2016 at 10:24:23AM +0100, Landry Breuil wrote: > > > given that it runs for example on macppc.. ok to import with that line > > > zapped. > > > > zapped > > > > On Sat, Nov 05, 2016 at 10:24:27AM +0100, Daniel Jakots wrote: > > > You probably want to look at what juanfra@ already did: > > > https://github.com/jasperla/openbsd-wip/tree/master/sysutils/htop > > > > hmm -- what's causing the commit hesitation? > > Random crashes and double frees. Run the program with MALLOC_OPTIONS=F. > > If you take the maintainership, I will import the port. > > A few comments: > > - Remove the extra space at the end of DESCR. > - Change "This is htop, an interactive" to "htop is an interactive" in > DESCR. > - Remove the second phrase in DESCR. Users don't need to know what are > the dependencies of the packages. > - Look the Makefile in my old port and copy the ALL_TARGET and > INSTALL_STRIP lines to your Makefile, with the comment included. Hi, I am happy to take over maintainership. I will investigate these issues and incorporate your patches in a mail to follow. I'll try to get some coredumps & fix extant issues too. Ian
Re: new: sysutils/htop
On Sat, Nov 05, 2016 at 10:24:23AM +0100, Landry Breuil wrote: > given that it runs for example on macppc.. ok to import with that line > zapped. zapped On Sat, Nov 05, 2016 at 10:24:27AM +0100, Daniel Jakots wrote: > You probably want to look at what juanfra@ already did: > https://github.com/jasperla/openbsd-wip/tree/master/sysutils/htop hmm -- what's causing the commit hesitation? ian htop-2.0.2.tgz Description: application/tar-gz
new: sysutils/htop
htop is an enhanced version of the venerable top(1). could a porter please add this? i am more than happy to maintain. ian htop-2.0.2.tgz Description: application/tar-gz
Re: [UPDATE] plan9/drawterm: new repository and update maintainer e-mail
On Wed, Sep 14, 2016 at 09:19:01PM -0400, Ian Sutton wrote: > This patch works for me as far as I can tell. Below is your patch with ...nd here's the patch: Index: plan9/drawterm/Makefile === RCS file: /cvs/ports/plan9/drawterm/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- plan9/drawterm/Makefile 11 Mar 2013 11:37:53 - 1.3 +++ plan9/drawterm/Makefile 15 Sep 2016 01:16:03 - @@ -4,28 +4,28 @@ ONLY_FOR_ARCHS= i386 amd64 powerpc sparc COMMENT= Plan9 terminal emulator -DISTNAME= drawterm-20110221 +COMMIT_ID= d9813b086ec6 +DISTNAME= drawterm-20160914 CATEGORIES=plan9 -HOMEPAGE= http://swtch.com/drawterm/ +HOMEPAGE= http://drawterm.9front.org/ -MASTER_SITES= ${HOMEPAGE} \ - http://openbsd.stanleylieber.com/drawterm/ -EXTRACT_SUFX= .tgz +DISTFILES= ${DISTNAME}{${COMMIT_ID}}${EXTRACT_SUFX} +MASTER_SITES= https://code.9front.org/hg/drawterm/archive/ -MAINTAINER=Stanley Lieber +MAINTAINER=Stanley Lieber # Lucent Public License Version 1.02 PERMIT_PACKAGE_CDROM= Yes -WANTLIB = X11 c pthread +WANTLIB= X11 c pthread sndio NO_TEST= Yes -MAKE_FLAGS=CONF=unix AUDIO=none +MAKE_FLAGS=CONF=openbsd -WRKDIST= ${WRKDIR}/drawterm/ +WRKDIST= ${WRKDIR}/drawterm-${COMMIT_ID}/ do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/drawterm/drawterm ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKDIST}/drawterm ${PREFIX}/bin .include Index: plan9/drawterm/distinfo === RCS file: /cvs/ports/plan9/drawterm/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- plan9/drawterm/distinfo 18 Jan 2015 03:14:56 - 1.2 +++ plan9/drawterm/distinfo 15 Sep 2016 01:16:03 - @@ -1,2 +1,2 @@ -SHA256 (drawterm-20110221.tgz) = 8yHq1y7YlvoMSYbcyfmE4T2XVwvb09H05vjYQT74Fqg= -SIZE (drawterm-20110221.tgz) = 1191194 +SHA256 (drawterm-20160914.tar.gz) = nSYimgN+OwRWWOSdqPB7h7rSpkv7SM1A2SrxFa20qNc= +SIZE (drawterm-20160914.tar.gz) = 492816 Index: plan9/drawterm/patches/patch-Make_unix === RCS file: plan9/drawterm/patches/patch-Make_unix diff -N plan9/drawterm/patches/patch-Make_unix --- plan9/drawterm/patches/patch-Make_unix 12 Oct 2011 20:13:33 - 1.4 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,21 +0,0 @@ -$OpenBSD: patch-Make_unix,v 1.4 2011/10/12 20:13:33 mpi Exp $ Make.unix.orig Wed Aug 26 07:44:41 2009 -+++ Make.unix Sat Oct 8 12:49:18 2011 -@@ -5,8 +5,8 @@ - AS=as - RANLIB=ranlib - X11=/usr/X11R6 --CC=gcc --CFLAGS=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD) -O2 -+CC?=gcc -+CFLAGS+=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD) - O=o - OS=posix - GUI=x11 -@@ -19,5 +19,5 @@ - all: default - - libmachdep.a: -- arch=`uname -m|sed 's/i.86/386/;s/Power Macintosh/power/; s/x86_64/amd64/'`; \ -+ arch=`arch -s|sed 's/i386/386/; s/powerpc/power/; s/sparc64/sun4u/; s/mips64el/mips/; s/mips64/mips/'`; \ - (cd posix-$$arch && make) Index: plan9/drawterm/patches/patch-posix-mips_getcallerpc_c === RCS file: plan9/drawterm/patches/patch-posix-mips_getcallerpc_c diff -N plan9/drawterm/patches/patch-posix-mips_getcallerpc_c --- plan9/drawterm/patches/patch-posix-mips_getcallerpc_c 18 Aug 2011 08:04:03 - 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,12 +0,0 @@ -$OpenBSD: patch-posix-mips_getcallerpc_c,v 1.1.1.1 2011/08/18 08:04:03 jasper Exp $ posix-mips/getcallerpc.c.orig Tue Mar 10 11:45:20 2009 -+++ posix-mips/getcallerpc.c Tue Mar 10 11:45:24 2009 -@@ -1,7 +1,7 @@ - #include "u.h" - #include "libc.h" - --ulong -+uintptr - getcallerpc(void *a) - { - return ((ulong*)a)[-1]; Index: plan9/drawterm/patches/patch-posix-sun4u_getcallerpc_c === RCS file: plan9/drawterm/patches/patch-posix-sun4u_getcallerpc_c diff -N plan9/drawterm/patches/patch-posix-sun4u_getcallerpc_c --- plan9/drawterm/patches/patch-posix-sun4u_getcallerpc_c 18 Aug 2011 08:04:03 - 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,12 +0,0 @@ -$OpenBSD: patch-posix-sun4u_getcallerpc_c,v 1.1.1.1 2011/08/18 08:04:03 jasper Exp $ posix-sun4u/getcallerpc.c.orig Tue Mar 10 11:45:20 2009 -+++ posix-sun4u/getcallerpc.c Tue Mar 10 11:45:24 2009 -@@ -1,7 +1,7 @@ - #include "u.h" - #include "libc.h" - --ulong -+uintptr - getcallerpc(void *a) - { - return ((ulong*)a)[-1];
Re: [UPDATE] plan9/drawterm: new repository and update maintainer e-mail
On Thu, Sep 15, 2016 at 01:23:18AM +0200, Dmitrij D. Czarkoff wrote: > Several issues with this update: > > * WANTLIB should be updated as now drawterm depends on sndio. > * Patch expands tabs; this is inconsistent with the rest of ports tree. > * "d9813b086ec6.tar.gz" is a poor name for distfile. Good luck finding a > port >that added this gem to ports/distfiles. > > An updated diff follows. Comments? OKs? This patch works for me as far as I can tell. Below is your patch with patches/patch-Make_unix patches/patch-posix-mips_getcallerpc_c patches/patch-posix-sun4u_getcallerpc_c all properly removed from the tree, as was/is intended. Ian
Re: [UPDATE] plan9/drawterm: new repository and update maintainer e-mail
On Wed, Sep 14, 2016 at 04:38:35PM -0400, stanley lieber wrote: > Updated again. The original drawterm is effectively abandoned by its authors. I've tested this and can confirm it works. I'd really like to see this committed as a frequent user of drawterm. The patch below fixes the files CVS complained about in the previous patch, someone forgot to `cvs rm` them after deleting them. Ian Index: Makefile === RCS file: /cvs/ports/plan9/drawterm/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile11 Mar 2013 11:37:53 - 1.3 +++ Makefile14 Sep 2016 20:55:02 - @@ -1,31 +1,29 @@ # $OpenBSD: Makefile,v 1.3 2013/03/11 11:37:53 espie Exp $ -ONLY_FOR_ARCHS=i386 amd64 powerpc sparc64 mips64 mips64el +ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 mips64 mips64el -COMMENT= Plan9 terminal emulator +COMMENT=Plan9 terminal emulator -DISTNAME= drawterm-20110221 -CATEGORIES=plan9 +DISTNAME= d9813b086ec6 +PKGNAME=drawterm-20160914 +CATEGORIES= plan9 -HOMEPAGE= http://swtch.com/drawterm/ +HOMEPAGE= http://drawterm.9front.org/ +MASTER_SITES= https://code.9front.org/hg/drawterm/archive/ -MASTER_SITES= ${HOMEPAGE} \ - http://openbsd.stanleylieber.com/drawterm/ -EXTRACT_SUFX= .tgz - -MAINTAINER=Stanley Lieber +MAINTAINER= Stanley Lieber # Lucent Public License Version 1.02 -PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_CDROM= Yes -WANTLIB = X11 c pthread +WANTLIB=X11 c pthread -NO_TEST= Yes -MAKE_FLAGS=CONF=unix AUDIO=none +NO_TEST=Yes +MAKE_FLAGS= CONF=openbsd -WRKDIST= ${WRKDIR}/drawterm/ +WRKDIST=${WRKDIR}/drawterm-${DISTNAME}/ do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/drawterm/drawterm ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKDIST}/drawterm ${PREFIX}/bin .include Index: distinfo === RCS file: /cvs/ports/plan9/drawterm/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo18 Jan 2015 03:14:56 - 1.2 +++ distinfo14 Sep 2016 20:55:02 - @@ -1,2 +1,2 @@ -SHA256 (drawterm-20110221.tgz) = 8yHq1y7YlvoMSYbcyfmE4T2XVwvb09H05vjYQT74Fqg= -SIZE (drawterm-20110221.tgz) = 1191194 +SHA256 (d9813b086ec6.tar.gz) = nSYimgN+OwRWWOSdqPB7h7rSpkv7SM1A2SrxFa20qNc= +SIZE (d9813b086ec6.tar.gz) = 492816 Index: patches/patch-Make_unix === RCS file: patches/patch-Make_unix diff -N patches/patch-Make_unix --- patches/patch-Make_unix 12 Oct 2011 20:13:33 - 1.4 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,21 +0,0 @@ -$OpenBSD: patch-Make_unix,v 1.4 2011/10/12 20:13:33 mpi Exp $ Make.unix.orig Wed Aug 26 07:44:41 2009 -+++ Make.unix Sat Oct 8 12:49:18 2011 -@@ -5,8 +5,8 @@ - AS=as - RANLIB=ranlib - X11=/usr/X11R6 --CC=gcc --CFLAGS=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD) -O2 -+CC?=gcc -+CFLAGS+=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD) - O=o - OS=posix - GUI=x11 -@@ -19,5 +19,5 @@ - all: default - - libmachdep.a: -- arch=`uname -m|sed 's/i.86/386/;s/Power Macintosh/power/; s/x86_64/amd64/'`; \ -+ arch=`arch -s|sed 's/i386/386/; s/powerpc/power/; s/sparc64/sun4u/; s/mips64el/mips/; s/mips64/mips/'`; \ - (cd posix-$$arch && make) Index: patches/patch-posix-mips_getcallerpc_c === RCS file: patches/patch-posix-mips_getcallerpc_c diff -N patches/patch-posix-mips_getcallerpc_c --- patches/patch-posix-mips_getcallerpc_c 18 Aug 2011 08:04:03 - 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,12 +0,0 @@ -$OpenBSD: patch-posix-mips_getcallerpc_c,v 1.1.1.1 2011/08/18 08:04:03 jasper Exp $ posix-mips/getcallerpc.c.orig Tue Mar 10 11:45:20 2009 -+++ posix-mips/getcallerpc.c Tue Mar 10 11:45:24 2009 -@@ -1,7 +1,7 @@ - #include "u.h" - #include "libc.h" - --ulong -+uintptr - getcallerpc(void *a) - { - return ((ulong*)a)[-1]; Index: patches/patch-posix-sun4u_getcallerpc_c === RCS file: patches/patch-posix-sun4u_getcallerpc_c diff -N patches/patch-posix-sun4u_getcallerpc_c --- patches/patch-posix-sun4u_getcallerpc_c 18 Aug 2011 08:04:03 - 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,12 +0,0 @@ -$OpenBSD: patch-posix-sun4u_getcallerpc_c,v 1.1.1.1 2011/08/18 08:04:03 jasper Exp $ posix-sun4u/getcallerpc.c.orig Tue Mar 10 11:45:20 2009 -+++ posix-sun4u/getcallerpc.c Tue Mar 10 11:45:24 2009 -@@ -1,7 +1,7 @@ - #include "u.h" - #include "libc.h" - --ulong -+uintptr - getcallerpc(void *a) - { - return ((ulong*)a)[-1];