summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bin/ps/keyword.c4
-rw-r--r--bin/ps/print.c14
-rw-r--r--lib/libkvm/kvm_proc.c4
-rw-r--r--sys/compat/freebsd32/freebsd32.h2
-rw-r--r--sys/kern/kern_proc.c4
-rw-r--r--sys/sys/user.h9
-rw-r--r--usr.bin/procstat/procstat_kstack.c6
-rw-r--r--usr.bin/procstat/procstat_threads.c6
-rw-r--r--usr.bin/top/machine.c8
9 files changed, 31 insertions, 26 deletions
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index c446756..7dbaa4f 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -82,7 +82,7 @@ static VAR var[] = {
{"class", "CLASS", NULL, LJUST, loginclass, s_loginclass,
MAXLOGNAME-1, 0, CHAR, NULL, 0},
{"comm", "COMMAND", NULL, LJUST, ucomm, s_comm,
- COMMLEN + OCOMMLEN + 1, 0, CHAR, NULL, 0},
+ COMMLEN + TDNAMLEN + 1, 0, CHAR, NULL, 0},
{"command", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16, 0,
CHAR, NULL, 0},
{"cpu", "CPU", NULL, 0, kvar, NULL, 3, KOFF(ki_estcpu), UINT, "d",
@@ -212,7 +212,7 @@ static VAR var[] = {
{"tt", "TT ", NULL, 0, tname, NULL, 4, 0, CHAR, NULL, 0},
{"tty", "TTY", NULL, LJUST, longtname, NULL, 8, 0, CHAR, NULL, 0},
{"ucomm", "UCOMM", NULL, LJUST, ucomm, s_comm,
- COMMLEN + OCOMMLEN + 1, 0, CHAR, NULL, 0},
+ COMMLEN + TDNAMLEN + 1, 0, CHAR, NULL, 0},
{"uid", "UID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_uid), UINT,
UIDFMT, 0},
{"upr", "UPR", NULL, 0, upr, NULL, 3, 0, CHAR, NULL, 0},
diff --git a/bin/ps/print.c b/bin/ps/print.c
index 02c6112..7d1d190 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -136,7 +136,7 @@ command(KINFO *k, VARENT *ve)
(void)printf("%s", k->ki_d.prefix);
(void)printf("%s", k->ki_p->ki_comm);
if (showthreads && k->ki_p->ki_numthreads > 1)
- (void)printf("/%s", k->ki_p->ki_ocomm);
+ (void)printf("/%s", k->ki_p->ki_tdname);
} else
(void)printf("%-*s", v->width, k->ki_p->ki_comm);
return;
@@ -190,7 +190,7 @@ command(KINFO *k, VARENT *ve)
void
ucomm(KINFO *k, VARENT *ve)
{
- char tmpbuff[COMMLEN + OCOMMLEN + 2];
+ char tmpbuff[COMMLEN + TDNAMLEN + 2];
VAR *v;
v = ve->var;
@@ -199,12 +199,12 @@ ucomm(KINFO *k, VARENT *ve)
(void)printf("%s", k->ki_d.prefix);
(void)printf("%s", k->ki_p->ki_comm);
if (showthreads && k->ki_p->ki_numthreads > 1)
- printf("/%s", k->ki_p->ki_ocomm);
+ printf("/%s", k->ki_p->ki_tdname);
} else {
bzero(tmpbuff, sizeof(tmpbuff));
if (showthreads && k->ki_p->ki_numthreads > 1)
sprintf(tmpbuff, "%s/%s", k->ki_p->ki_comm,
- k->ki_p->ki_ocomm);
+ k->ki_p->ki_tdname);
else
sprintf(tmpbuff, "%s", k->ki_p->ki_comm);
(void)printf("%-*s", v->width, tmpbuff);
@@ -218,7 +218,7 @@ tdnam(KINFO *k, VARENT *ve)
v = ve->var;
if (showthreads && k->ki_p->ki_numthreads > 1)
- (void)printf("%-*s", v->width, k->ki_p->ki_ocomm);
+ (void)printf("%-*s", v->width, k->ki_p->ki_tdname);
else
(void)printf("%-*s", v->width, " ");
}
@@ -943,12 +943,12 @@ loginclass(KINFO *k, VARENT *ve)
int
s_comm(KINFO *k)
{
- char tmpbuff[COMMLEN + OCOMMLEN + 2];
+ char tmpbuff[COMMLEN + TDNAMLEN + 2];
bzero(tmpbuff, sizeof(tmpbuff));
if (showthreads && k->ki_p->ki_numthreads > 1)
sprintf(tmpbuff, "%s/%s", k->ki_p->ki_comm,
- k->ki_p->ki_ocomm);
+ k->ki_p->ki_tdname);
else
sprintf(tmpbuff, "%s", k->ki_p->ki_comm);
return (strlen(tmpbuff));
diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index 338d217..876af50 100644
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -426,10 +426,10 @@ nopgrp:
kp->ki_lastcpu = mtd.td_lastcpu;
kp->ki_wchan = mtd.td_wchan;
if (mtd.td_name[0] != 0)
- strlcpy(kp->ki_ocomm, mtd.td_name, MAXCOMLEN);
+ strlcpy(kp->ki_tdname, mtd.td_name, MAXCOMLEN);
kp->ki_oncpu = mtd.td_oncpu;
if (mtd.td_name[0] != '\0')
- strlcpy(kp->ki_ocomm, mtd.td_name, sizeof(kp->ki_ocomm));
+ strlcpy(kp->ki_tdname, mtd.td_name, sizeof(kp->ki_tdname));
kp->ki_pctcpu = 0;
kp->ki_rqindex = 0;
} else {
diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h
index 82bdc53..5d1a269 100644
--- a/sys/compat/freebsd32/freebsd32.h
+++ b/sys/compat/freebsd32/freebsd32.h
@@ -310,7 +310,7 @@ struct kinfo_proc32 {
char ki_rqindex;
u_char ki_oncpu;
u_char ki_lastcpu;
- char ki_ocomm[OCOMMLEN+1];
+ char ki_tdname[TDNAMLEN+1];
char ki_wmesg[WMESGLEN+1];
char ki_login[LOGNAMELEN+1];
char ki_lockname[LOCKNAMELEN+1];
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index aac8b39..91b14a9 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -855,7 +855,7 @@ fill_kinfo_thread(struct thread *td, struct kinfo_proc *kp, int preferthread)
strlcpy(kp->ki_wmesg, td->td_wmesg, sizeof(kp->ki_wmesg));
else
bzero(kp->ki_wmesg, sizeof(kp->ki_wmesg));
- strlcpy(kp->ki_ocomm, td->td_name, sizeof(kp->ki_ocomm));
+ strlcpy(kp->ki_tdname, td->td_name, sizeof(kp->ki_tdname));
if (TD_ON_LOCK(td)) {
kp->ki_kiflag |= KI_LOCKBLOCK;
strlcpy(kp->ki_lockname, td->td_lockname,
@@ -1059,7 +1059,7 @@ freebsd32_kinfo_proc_out(const struct kinfo_proc *ki, struct kinfo_proc32 *ki32)
CP(*ki, *ki32, ki_rqindex);
CP(*ki, *ki32, ki_oncpu);
CP(*ki, *ki32, ki_lastcpu);
- bcopy(ki->ki_ocomm, ki32->ki_ocomm, OCOMMLEN + 1);
+ bcopy(ki->ki_tdname, ki32->ki_tdname, TDNAMLEN + 1);
bcopy(ki->ki_wmesg, ki32->ki_wmesg, WMESGLEN + 1);
bcopy(ki->ki_login, ki32->ki_login, LOGNAMELEN + 1);
bcopy(ki->ki_lockname, ki32->ki_lockname, LOCKNAMELEN + 1);
diff --git a/sys/sys/user.h b/sys/sys/user.h
index 644f911..1863f86 100644
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -95,13 +95,18 @@
#define WMESGLEN 8 /* size of returned wchan message */
#define LOCKNAMELEN 8 /* size of returned lock name */
-#define OCOMMLEN 16 /* size of returned thread name */
+#define TDNAMLEN 16 /* size of returned thread name */
#define COMMLEN 19 /* size of returned ki_comm name */
#define KI_EMULNAMELEN 16 /* size of returned ki_emul */
#define KI_NGROUPS 16 /* number of groups in ki_groups */
#define LOGNAMELEN 17 /* size of returned ki_login */
#define LOGINCLASSLEN 17 /* size of returned ki_loginclass */
+#ifndef BURN_BRIDGES
+#define OCOMMLEN TDNAMLEN
+#define ki_ocomm ki_tdname
+#endif
+
/* Flags for the process credential. */
#define KI_CRF_CAPABILITY_MODE 0x00000001
/*
@@ -167,7 +172,7 @@ struct kinfo_proc {
char ki_rqindex; /* Run queue index */
u_char ki_oncpu; /* Which cpu we are on */
u_char ki_lastcpu; /* Last cpu we were on */
- char ki_ocomm[OCOMMLEN+1]; /* thread name */
+ char ki_tdname[TDNAMLEN+1]; /* thread name */
char ki_wmesg[WMESGLEN+1]; /* wchan message */
char ki_login[LOGNAMELEN+1]; /* setlogin name */
char ki_lockname[LOCKNAMELEN+1]; /* lock name */
diff --git a/usr.bin/procstat/procstat_kstack.c b/usr.bin/procstat/procstat_kstack.c
index fd2b9ab..d887262 100644
--- a/usr.bin/procstat/procstat_kstack.c
+++ b/usr.bin/procstat/procstat_kstack.c
@@ -213,9 +213,9 @@ procstat_kstack(struct kinfo_proc *kipp, int kflag)
printf("%5d ", kipp->ki_pid);
printf("%6d ", kkstp->kkst_tid);
printf("%-16s ", kipp->ki_comm);
- printf("%-16s ", (strlen(kipp->ki_ocomm) &&
- (strcmp(kipp->ki_comm, kipp->ki_ocomm) != 0)) ?
- kipp->ki_ocomm : "-");
+ printf("%-16s ", (strlen(kipp->ki_tdname) &&
+ (strcmp(kipp->ki_comm, kipp->ki_tdname) != 0)) ?
+ kipp->ki_tdname : "-");
switch (kkstp->kkst_state) {
case KKST_STATE_RUNNING:
diff --git a/usr.bin/procstat/procstat_threads.c b/usr.bin/procstat/procstat_threads.c
index 7633608..ffd659c 100644
--- a/usr.bin/procstat/procstat_threads.c
+++ b/usr.bin/procstat/procstat_threads.c
@@ -86,9 +86,9 @@ procstat_threads(struct kinfo_proc *kipp)
printf("%6d ", kipp->ki_tid);
printf("%-16s ", strlen(kipp->ki_comm) ?
kipp->ki_comm : "-");
- printf("%-16s ", (strlen(kipp->ki_ocomm) &&
- (strcmp(kipp->ki_comm, kipp->ki_ocomm) != 0)) ?
- kipp->ki_ocomm : "-");
+ printf("%-16s ", (strlen(kipp->ki_tdname) &&
+ (strcmp(kipp->ki_comm, kipp->ki_tdname) != 0)) ?
+ kipp->ki_tdname : "-");
if (kipp->ki_oncpu != 255)
printf("%3d ", kipp->ki_oncpu);
else if (kipp->ki_lastcpu != 255)
diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c
index 1f8a002..94feb9a 100644
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@@ -833,8 +833,8 @@ format_next_process(caddr_t handle, char *(*get_userid)(int), int flags)
if (!(flags & FMT_SHOWARGS)) {
if (ps.thread && pp->ki_flag & P_HADTHREADS &&
- pp->ki_ocomm[0]) {
- snprintf(cmdbuf, cmdlengthdelta, "{%s}", pp->ki_ocomm);
+ pp->ki_tdname[0]) {
+ snprintf(cmdbuf, cmdlengthdelta, "{%s}", pp->ki_tdname);
} else {
snprintf(cmdbuf, cmdlengthdelta, "%s", pp->ki_comm);
}
@@ -844,9 +844,9 @@ format_next_process(caddr_t handle, char *(*get_userid)(int), int flags)
(args = kvm_getargv(kd, pp, cmdlengthdelta)) == NULL ||
!(*args)) {
if (ps.thread && pp->ki_flag & P_HADTHREADS &&
- pp->ki_ocomm[0]) {
+ pp->ki_tdname[0]) {
snprintf(cmdbuf, cmdlengthdelta,
- "{%s}", pp->ki_ocomm);
+ "{%s}", pp->ki_tdname);
} else {
snprintf(cmdbuf, cmdlengthdelta,
"[%s]", pp->ki_comm);
OpenPOWER on IntegriCloud