From owner-cvs-src@FreeBSD.ORG Mon May 16 03:27:46 2005 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4EB2316A4CE; Mon, 16 May 2005 03:27:46 +0000 (GMT) Received: from dragon.NUXI.org (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id D87FD43D66; Mon, 16 May 2005 03:27:45 +0000 (GMT) (envelope-from obrien@NUXI.com) Received: from dragon.NUXI.org (obrien@localhost [127.0.0.1]) by dragon.NUXI.org (8.13.3/8.13.3) with ESMTP id j4G3Rhf7090106; Sun, 15 May 2005 20:27:43 -0700 (PDT) (envelope-from obrien@dragon.NUXI.org) Received: (from obrien@localhost) by dragon.NUXI.org (8.13.3/8.13.1/Submit) id j4G3RhUk090105; Sun, 15 May 2005 20:27:43 -0700 (PDT) (envelope-from obrien) Date: Sun, 15 May 2005 20:27:43 -0700 From: "David O'Brien" To: Giorgos Keramidas Message-ID: <20050516032743.GA89903@dragon.NUXI.org> References: <200504161543.j3GFhclO075103@repoman.freebsd.org> <20050516001837.GA65506@dragon.NUXI.org> <20050516004059.GA15002@gothmog.gr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20050516004059.GA15002@gothmog.gr> X-Operating-System: FreeBSD 6.0-CURRENT Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 User-Agent: Mutt/1.5.9i cc: cvs-src@freebsd.org cc: src-committers@freebsd.org cc: cvs-all@freebsd.org Subject: Re: cvs commit: src/usr.bin/top machine.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: obrien@freebsd.org List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 May 2005 03:27:46 -0000 On Mon, May 16, 2005 at 03:40:59AM +0300, Giorgos Keramidas wrote: > On 2005-05-15 17:18, David O'Brien wrote: > >On Sat, Apr 16, 2005 at 03:43:38PM +0000, Giorgos Keramidas wrote: > >> Reduce the width of the THR column to 4 characters, to avoid wrap-around > >> of lines in SMP machines (which are wider), until we have a better way > >> of handling window sizes & columns in top. > >> > >> Caught by: ache, Andre Guibert de Bruet > >> Point hat: keramida > >> > >> Revision Changes Path > >> 1.71 +5 -5 src/usr.bin/top/machine.c > > > > Please back machine.c back to revsion 1.69, ASAP. > > The current top is redicious: ..snip.. > Your USERNAME column is too wide (12 columns). Do you happen to have > very long names? The dovecot port adds a the 'dovecot-auth' user. The top(1) code supports 13 character usernames on SMP systems and 15 on UP systems. Your rev 1.70-1.71 changes failed to take that into account. > If that is true, would it be ok to wait 1-2 days until I have a > machine.c version that prints USERNAME using only 8 columns instead of > using arbitrarily long columns, like now? I don't know why to wait 1-2 days. I made the change in 1 minute. Or is there debate if that change will be acceptable? If there isn't a debate about it, let me know and I'll commit this diff. Index: machine.c =================================================================== RCS file: /home/ncvs/src/usr.bin/top/machine.c,v retrieving revision 1.71 diff -u -r1.71 machine.c --- machine.c 16 Apr 2005 15:43:38 -0000 1.71 +++ machine.c 16 May 2005 03:25:20 -0000 @@ -60,7 +60,7 @@ int swapmode(int *retavail, int *retfree); static int smpmode; enum displaymodes displaymode; -static int namelength; +static int namelength = 8; static int cmdlengthdelta; /* Prototypes for top internals */ @@ -233,17 +233,6 @@ modelen != sizeof(smpmode)) smpmode = 0; - while ((pw = getpwent()) != NULL) { - if (strlen(pw->pw_name) > namelength) - namelength = strlen(pw->pw_name); - } - if (namelength < 8) - namelength = 8; - if (smpmode && namelength > 13) - namelength = 13; - else if (namelength > 15) - namelength = 15; - kd = kvm_open(NULL, _PATH_DEVNULL, NULL, O_RDONLY, "kvm_open"); if (kd == NULL) return (-1); -- -- David (obrien@FreeBSD.org)