hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-14 22:32:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

ps(1): don't try to handle non-SMP systems

Browse Source 
As reported by kib, sysctl machdep.smp_active doesn't exist and on UP we
return CPU 0 for all threads anyway.

Reported by:	kib
This commit is contained in:
Piotr Pawel Stefaniak 2020-06-27 20:01:56 +00:00
parent 557905569d
commit ac4b8a1ce4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=362707
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/ps/extern.h
View File

@ -41,7 +41,7 @@ extern fixpt_t ccpu;
extern int cflag, eval, fscale, nlistread, rawcpu;
extern unsigned long mempages;
extern time_t now;
extern int showthreads, sumrusage, termwidth, smp;
extern int showthreads, sumrusage, termwidth;
extern STAILQ_HEAD(velisthead, varent) varlist;
__BEGIN_DECLS

3
bin/ps/print.c
View File

@ -555,9 +555,6 @@ 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 {

15
bin/ps/ps.c
View File

@ -105,7 +105,6 @@ 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);
@ -158,7 +157,6 @@ 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";
@ -228,7 +226,6 @@ 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;
@ -1459,18 +1456,6 @@ pidmax_init(void)
}
}
static void
smp_init(void)
{
size_t size;
size = sizeof(smp);
if ((sysctlbyname("machdep.smp_active", &smp, &size, NULL, 0) != 0 &&
sysctlbyname("kern.smp.active", &smp, &size, NULL, 0) != 0) ||
size != sizeof(smp))
smp = 0;
}
static void __dead2
usage(void)
{