From owner-svn-src-all@freebsd.org Sat Jun 27 19:21:11 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EAD4835A81D; Sat, 27 Jun 2020 19:21:11 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49vNs34hDrz4LlY; Sat, 27 Jun 2020 19:21:11 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id 05RJL2sr082429 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 27 Jun 2020 22:21:05 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 05RJL2sr082429 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id 05RJL22O082428; Sat, 27 Jun 2020 22:21:02 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 27 Jun 2020 22:21:02 +0300 From: Konstantin Belousov To: Piotr Pawel Stefaniak Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r362705 - head/bin/ps Message-ID: <20200627192102.GD32126@kib.kiev.ua> References: <202006271909.05RJ9Xae048991@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <202006271909.05RJ9Xae048991@repo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on tom.home X-Rspamd-Queue-Id: 49vNs34hDrz4LlY X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2020 19:21:12 -0000 On Sat, Jun 27, 2020 at 07:09:33PM +0000, Piotr Pawel Stefaniak wrote: > Author: pstef > Date: Sat Jun 27 19:09:33 2020 > New Revision: 362705 > URL: https://svnweb.freebsd.org/changeset/base/362705 > > Log: > ps(1): reuse keyword "cpu" to show CPU number > > This flag will now show the processor number on which a process is running. > > This change was inspired by PR129965. Initially I didn't think that the > patch attached to it was correct -- it sacrificed ki_estcpu use in "cpu" > for ki_lastcpu and I thought that the old functionality should be kept and > the new (cpu#) one added to it. But I've since discovered that ki_estcpu is > sched_4bsd-specific. What's worse, it represents the same thing as > ki_pctcpu, except ki_pctcpu is universal -- so "%cpu" has been using it > successfully. Therefore, I've decided to replace information based on > ki_estcpu with information based on ki_oncpu/ki_lastcpu. > > Key parts of the code and manual changes were borrowed from top(1). > > PR: 129965 > Reported by: Nikola Knežević > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D25377 > > Modified: > head/bin/ps/extern.h > head/bin/ps/keyword.c > head/bin/ps/print.c > head/bin/ps/ps.1 > head/bin/ps/ps.c > > Modified: head/bin/ps/extern.h > ============================================================================== > --- head/bin/ps/extern.h Sat Jun 27 18:35:00 2020 (r362704) > +++ head/bin/ps/extern.h Sat Jun 27 19:09:33 2020 (r362705) > @@ -41,13 +41,14 @@ extern fixpt_t ccpu; > extern int cflag, eval, fscale, nlistread, rawcpu; > extern unsigned long mempages; > extern time_t now; > -extern int showthreads, sumrusage, termwidth; > +extern int showthreads, sumrusage, termwidth, smp; > extern STAILQ_HEAD(velisthead, varent) varlist; > > __BEGIN_DECLS > char *arguments(KINFO *, VARENT *); > char *command(KINFO *, VARENT *); > char *cputime(KINFO *, VARENT *); > +char *cpunum(KINFO *, VARENT *); > int donlist(void); > char *elapsed(KINFO *, VARENT *); > char *elapseds(KINFO *, VARENT *); > > Modified: head/bin/ps/keyword.c > ============================================================================== > --- head/bin/ps/keyword.c Sat Jun 27 18:35:00 2020 (r362704) > +++ head/bin/ps/keyword.c Sat Jun 27 19:09:33 2020 (r362705) > @@ -83,8 +83,7 @@ static VAR var[] = { > CHAR, NULL, 0}, > {"cow", "COW", NULL, "copy-on-write-faults", 0, kvar, KOFF(ki_cow), > UINT, "u", 0}, > - {"cpu", "CPU", NULL, "cpu-usage", 0, kvar, KOFF(ki_estcpu), UINT, "d", > - 0}, > + {"cpu", "C", NULL, "on-cpu", 0, cpunum, 0, CHAR, NULL, 0}, > {"cputime", "", "time", NULL, 0, NULL, 0, CHAR, NULL, 0}, > {"dsiz", "DSIZ", NULL, "data-size", 0, kvar, KOFF(ki_dsize), PGTOK, > "ld", 0}, > > Modified: head/bin/ps/print.c > ============================================================================== > --- head/bin/ps/print.c Sat Jun 27 18:35:00 2020 (r362704) > +++ head/bin/ps/print.c Sat Jun 27 19:09:33 2020 (r362705) > @@ -551,6 +551,22 @@ cputime(KINFO *k, VARENT *ve) > } > > char * > +cpunum(KINFO *k, VARENT *ve __unused) > +{ > + char *cpu; > + > + if (!smp) > + return (NULL); > + > + if (k->ki_p->ki_stat == SRUN && k->ki_p->ki_oncpu != NOCPU) { > + asprintf(&cpu, "%d", k->ki_p->ki_oncpu); > + } else { > + asprintf(&cpu, "%d", k->ki_p->ki_lastcpu); > + } > + return (cpu); > +} > + > +char * > systime(KINFO *k, VARENT *ve) > { > long secs, psecs; > > Modified: head/bin/ps/ps.1 > ============================================================================== > --- head/bin/ps/ps.1 Sat Jun 27 18:35:00 2020 (r362704) > +++ head/bin/ps/ps.1 Sat Jun 27 19:09:33 2020 (r362705) > @@ -29,7 +29,7 @@ > .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 > .\" $FreeBSD$ > .\" > -.Dd October 31, 2018 > +.Dd June 27, 2020 > .Dt PS 1 > .Os > .Sh NAME > @@ -545,7 +545,8 @@ command and arguments > .It Cm cow > number of copy-on-write faults > .It Cm cpu > -short-term CPU usage factor (for scheduling) > +The processor number on which the process is executing (visible only on SMP > +systems). > .It Cm dsiz > data size (in Kbytes) > .It Cm emul > > Modified: head/bin/ps/ps.c > ============================================================================== > --- head/bin/ps/ps.c Sat Jun 27 18:35:00 2020 (r362704) > +++ head/bin/ps/ps.c Sat Jun 27 19:09:33 2020 (r362705) > @@ -105,6 +105,7 @@ int rawcpu; /* -C */ > int sumrusage; /* -S */ > int termwidth; /* Width of the screen (0 == infinity). */ > int showthreads; /* will threads be shown? */ > +int smp; /* multi-processor support */ > > struct velisthead varlist = STAILQ_HEAD_INITIALIZER(varlist); > > @@ -157,6 +158,7 @@ static void saveuser(KINFO *); > static void scanvars(void); > static void sizevars(void); > static void pidmax_init(void); > +static void smp_init(void); > static void usage(void); > > static char dfmt[] = "pid,tt,state,time,command"; > @@ -226,6 +228,7 @@ main(int argc, char *argv[]) > argv[1] = kludge_oldps_options(PS_ARGS, argv[1], argv[2]); > > pidmax_init(); > + smp_init(); > > all = descendancy = _fmt = nselectors = optfatal = 0; > prtheader = showthreads = wflag = xkeep_implied = 0; > @@ -1454,6 +1457,18 @@ pidmax_init(void) > xo_warn("unable to read kern.pid_max"); > pid_max = 99999; > } > +} > + > +static void > +smp_init(void) > +{ > + size_t size; > + > + size = sizeof(smp); > + if ((sysctlbyname("machdep.smp_active", &smp, &size, NULL, 0) != 0 && There is no such sysctl machdep.smp_active, and it does not make sense to call it (even if it existed in some ancient FreeBSD version, I am not sure). > + sysctlbyname("kern.smp.active", &smp, &size, NULL, 0) != 0) || > + size != sizeof(smp)) The indent on this and previous lines is wrong. > + smp = 0; > } That said, I do not see why do you need to check this kind of configuration at all, on UP we return CPU 0 for all threads. > > static void __dead2