Date: Thu, 14 Jun 2018 11:27:20 +0200 From: =?UTF-8?B?VMSzbA==?= Coosemans <tijl@FreeBSD.org> To: Eitan Adler <eadler@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r334869 - head/usr.bin/top Message-ID: <20180614112720.7bd13a9e@kalimero.tijl.coosemans.org> In-Reply-To: <201806090247.w592l2b2071661@repo.freebsd.org> References: <201806090247.w592l2b2071661@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, 9 Jun 2018 02:47:02 +0000 (UTC) Eitan Adler <eadler@FreeBSD.org> wrote: > Author: eadler > Date: Sat Jun 9 02:47:02 2018 > New Revision: 334869 > URL: https://svnweb.freebsd.org/changeset/base/334869 > > Log: > top(1): correct header, align it. > > THR is always 6 digits or longer. Now that the PID/THR change is > separated, use correct headers. > > PR: 228823 > Reported by: Trond.Endrestol@ximalas.info > > Modified: > head/usr.bin/top/machine.c > > Modified: head/usr.bin/top/machine.c > ============================================================================== > --- head/usr.bin/top/machine.c Sat Jun 9 02:41:51 2018 (r334868) > +++ head/usr.bin/top/machine.c Sat Jun 9 02:47:02 2018 (r334869) > @@ -94,17 +94,20 @@ static const char io_header[] = > static const char io_Proc_format[] = > "%5d%*s %-*.*s %6ld %6ld %6ld %6ld %6ld %6ld %6.2f%% %.*s"; > > +/* XXX: build up header instead of statically defining them. > + * This will also allow for a "format string" to be supplied > + * as an argument to top(1) instead of having predefined options */ > static const char smp_header_thr_and_pid[] = > - " PID%*s %-*.*s THR PRI NICE SIZE RES%*s STATE C TIME %7s COMMAND"; > -static const char smp_header_tid_only[] = > - " THR%*s %-*.*s " "PRI NICE SIZE RES%*s STATE C TIME %7s COMMAND"; > + " %s%*s %-*.*s THR PRI NICE SIZE RES%*s STATE C TIME %7s COMMAND"; > +static const char smp_header_id_only[] = > + " %s%*s %-*.*s PRI NICE SIZE RES%*s STATE C TIME %7s COMMAND"; > static const char smp_Proc_format[] = > "%5d%*s %-*.*s %s%3d %4s%7s %6s%*.*s %-6.6s %2d%7s %6.2f%% %.*s"; > > static char up_header_thr_and_pid[] = > " PID%*s %-*.*s THR PRI NICE SIZE RES%*s STATE TIME %7s COMMAND"; You need to replace PID with %s here as well. > -static char up_header_tid_only[] = > - " THR%*s %-*.*s " "PRI NICE SIZE RES%*s STATE TIME %7s COMMAND"; > +static char up_header_id_only[] = > + " %s%*s %-*.*s PRI NICE SIZE RES%*s STATE TIME %7s COMMAND"; > static char up_Proc_format[] = > "%5d%*s %-*.*s %s%3d %4s%7s %6s%*.*s %-6.6s%.0d%7s %6.2f%% %.*s";
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180614112720.7bd13a9e>