diff options
| author | emaste <emaste@FreeBSD.org> | 2010-10-08 00:44:53 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2010-10-08 00:44:53 +0000 |
| commit | a3f660853385a7931dbd3ec6d30de7fcdc90ab8a (patch) | |
| tree | 6f6c32190d7d431cca57f1e2d1390390be4fd83a | |
| parent | aa3acd013b51f0e16ff13d9bbb843bcf0e3b1032 (diff) | |
| download | FreeBSD-src-a3f660853385a7931dbd3ec6d30de7fcdc90ab8a.zip FreeBSD-src-a3f660853385a7931dbd3ec6d30de7fcdc90ab8a.tar.gz | |
Make a thread's address available via the kern proc sysctl, just like the
process address.
Add "tdaddr" keyword to ps(1) to display this thread address.
Distilled from Sandvine's patch set by Mark Johnston.
| -rw-r--r-- | bin/ps/keyword.c | 2 | ||||
| -rw-r--r-- | bin/ps/ps.1 | 2 | ||||
| -rw-r--r-- | sys/kern/kern_proc.c | 1 | ||||
| -rw-r--r-- | sys/sys/user.h | 3 |
4 files changed, 7 insertions, 1 deletions
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index 74165ce..561b087 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -187,6 +187,8 @@ static VAR var[] = { UINT, UIDFMT, 0}, {"svuid", "SVUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_svuid), UINT, UIDFMT, 0}, + {"tdaddr", "TDADDR", NULL, 0, kvar, NULL, sizeof(void *) * 2, + KOFF(ki_tdaddr), KPTR, "lx", 0}, {"tdev", "TDEV", NULL, 0, tdev, NULL, 5, 0, CHAR, NULL, 0}, {"tdnam", "TDNAM", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, NULL, 0}, {"time", "TIME", NULL, USER, cputime, NULL, 9, 0, CHAR, NULL, 0}, diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index ba1cb18..2f52584 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -591,6 +591,8 @@ symbolic process state (alias saved gid from a setgid executable .It Cm svuid saved UID from a setuid executable +.It Cm tdaddr +thread address .It Cm tdev control terminal device number .It Cm time diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 4899946..286ba2e 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -842,6 +842,7 @@ fill_kinfo_thread(struct thread *td, struct kinfo_proc *kp, int preferthread) struct proc *p; p = td->td_proc; + kp->ki_tdaddr = td; PROC_LOCK_ASSERT(p, MA_OWNED); thread_lock(td); diff --git a/sys/sys/user.h b/sys/sys/user.h index 50fc96d..b32ca04 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -85,7 +85,7 @@ */ #define KI_NSPARE_INT 9 #define KI_NSPARE_LONG 12 -#define KI_NSPARE_PTR 7 +#define KI_NSPARE_PTR 6 #ifndef _KERNEL #ifndef KINFO_PROC_SIZE @@ -188,6 +188,7 @@ struct kinfo_proc { struct pcb *ki_pcb; /* kernel virtual addr of pcb */ void *ki_kstack; /* kernel virtual addr of stack */ void *ki_udata; /* User convenience pointer */ + struct thread *ki_tdaddr; /* address of thread */ /* * When adding new variables, take space for pointers from the * front of ki_spareptrs, and longs from the end of ki_sparelongs. |
