d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

generally we are interested in what thread did something as

Browse Source 
opposed to what process. Since threads by default have teh name of the
process unless over-written with more useful information, just print the
thread name instead.
This commit is contained in:
Julian Elischer 2007-11-14 06:21:24 +00:00
parent ca081fdbc5
commit 431f890614
22 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/amd64/trap.c
View File

@ -806,7 +806,7 @@ syscall(struct trapframe *frame)
#endif
CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td,
td->td_proc->p_pid, td->td_proc->p_comm, code);
td->td_proc->p_pid, td->td_name, code);
td->td_syscalls++;
@ -888,7 +888,7 @@ syscall(struct trapframe *frame)
userret(td, frame);
CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td,
td->td_proc->p_pid, td->td_proc->p_comm, code);
td->td_proc->p_pid, td->td_name, code);
#ifdef KTRACE
if (KTRPOINT(td, KTR_SYSRET))

8
sys/arm/arm/trap.c
View File

@ -455,7 +455,7 @@ data_abort_handler(trapframe_t *tf)
if (error == ENOMEM) {
printf("VM: pid %d (%s), uid %d killed: "
"out of swap\n", td->td_proc->p_pid, td->td_proc->p_comm,
"out of swap\n", td->td_proc->p_pid, td->td_name,
(td->td_proc->p_ucred) ?
td->td_proc->p_ucred->cr_uid : -1);
ksig.signb = SIGKILL;
@ -805,7 +805,7 @@ prefetch_abort_handler(trapframe_t *tf)
if (error == ENOMEM) {
printf("VM: pid %d (%s), uid %d killed: "
"out of swap\n", td->td_proc->p_pid, td->td_proc->p_comm,
"out of swap\n", td->td_proc->p_pid, td->td_name,
(td->td_proc->p_ucred) ?
td->td_proc->p_ucred->cr_uid : -1);
ksig.signb = SIGKILL;
@ -927,7 +927,7 @@ syscall(struct thread *td, trapframe_t *frame, u_int32_t insn)
#endif
CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td,
td->td_proc->p_pid, td->td_proc->p_comm, code);
td->td_proc->p_pid, td->td_name, code);
if (error == 0) {
td->td_retval[0] = 0;
td->td_retval[1] = 0;
@ -989,7 +989,7 @@ bad:
userret(td, frame);
CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td,
td->td_proc->p_pid, td->td_proc->p_comm, code);
td->td_proc->p_pid, td->td_name, code);
STOPEVENT(p, S_SCX, code);
PTRACESTOP_SC(p, td, S_PT_SCX);

4
sys/i386/i386/trap.c
View File

@ -992,7 +992,7 @@ syscall(struct trapframe *frame)
#endif
CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td,
td->td_proc->p_pid, td->td_proc->p_comm, code);
td->td_proc->p_pid, td->td_name, code);
td->td_syscalls++;
@ -1070,7 +1070,7 @@ syscall(struct trapframe *frame)
userret(td, frame);
CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td,
td->td_proc->p_pid, td->td_proc->p_comm, code);
td->td_proc->p_pid, td->td_name, code);
#ifdef KTRACE
if (KTRPOINT(td, KTR_SYSRET))

6
sys/ia64/ia64/trap.c
View File

@ -279,7 +279,7 @@ printtrap(int vector, struct trapframe *tf, int isfatal, int user)
printf(" curthread = %p\n", curthread);
if (curthread != NULL)
printf(" pid = %d, comm = %s\n",
curthread->td_proc->p_pid, curthread->td_proc->p_comm);
curthread->td_proc->p_pid, curthread->td_name);
printf("\n");
}
@ -1022,7 +1022,7 @@ syscall(struct trapframe *tf)
ktrsyscall(code, callp->sy_narg, args);
#endif
CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td,
td->td_proc->p_pid, td->td_proc->p_comm, code);
td->td_proc->p_pid, td->td_name, code);
td->td_retval[0] = 0;
td->td_retval[1] = 0;
@ -1077,7 +1077,7 @@ syscall(struct trapframe *tf)
userret(td, tf);
CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td,
td->td_proc->p_pid, td->td_proc->p_comm, code);
td->td_proc->p_pid, td->td_name, code);
#ifdef KTRACE
if (KTRPOINT(td, KTR_SYSRET))
ktrsysret(code, error, td->td_retval[0]);

2
sys/kern/kern_clock.c
View File

@ -465,7 +465,7 @@ statclock(int usermode)
if (ru->ru_maxrss < rss)
ru->ru_maxrss = rss;
CTR4(KTR_SCHED, "statclock: %p(%s) prio %d stathz %d",
td, td->td_proc->p_comm, td->td_priority, (stathz)?stathz:hz);
td, td->td_name, td->td_priority, (stathz)?stathz:hz);
sched_clock(td);
thread_unlock(td);
}

4
sys/kern/kern_kse.c
View File

@ -1036,7 +1036,7 @@ thread_schedule_upcall(struct thread *td, struct kse_upcall *ku)
return (NULL);
}
CTR3(KTR_PROC, "thread_schedule_upcall: thread %p (pid %d, %s)",
td2, td->td_proc->p_pid, td->td_proc->p_comm);
td2, td->td_proc->p_pid, td->td_name);
/*
* Bzero already done in thread_alloc_spare() because we can't
* do the crhold here because we are in schedlock already.
@ -1339,7 +1339,7 @@ thread_userret(struct thread *td, struct trapframe *frame)
* Do the last parts of the setup needed for the upcall.
*/
CTR3(KTR_PROC, "userret: upcall thread %p (pid %d, %s)",
td, td->td_proc->p_pid, td->td_proc->p_comm);
td, td->td_proc->p_pid, td->td_name);
td->td_pflags &= ~TDP_UPCALLING;
if (ku->ku_flags & KUF_DOUPCALL) {

2
sys/kern/kern_lock.c
View File

@ -708,7 +708,7 @@ db_show_lockmgr(struct lock_object *lock)
td = lkp->lk_lockholder;
db_printf("EXCL (count %d) %p ", lkp->lk_exclusivecount, td);
db_printf("(tid %d, pid %d, \"%s\")\n", td->td_tid,
td->td_proc->p_pid, td->td_proc->p_comm);
td->td_proc->p_pid, td->td_name);
} else
db_printf("UNLOCKED\n");
if (lkp->lk_waitcount > 0)

2
sys/kern/kern_mutex.c
View File

@ -819,7 +819,7 @@ db_show_mtx(struct lock_object *lock)
if (!mtx_unowned(m) && !mtx_destroyed(m)) {
td = mtx_owner(m);
db_printf(" owner: %p (tid %d, pid %d, \"%s\")\n", td,
td->td_tid, td->td_proc->p_pid, td->td_proc->p_comm);
td->td_tid, td->td_proc->p_pid, td->td_name);
if (mtx_recursed(m))
db_printf(" recursed: %d\n", m->mtx_recurse);
}

2
sys/kern/kern_rwlock.c
View File

@ -967,7 +967,7 @@ db_show_rwlock(struct lock_object *lock)
else {
td = rw_wowner(rw);
db_printf("WLOCK: %p (tid %d, pid %d, \"%s\")\n", td,
td->td_tid, td->td_proc->p_pid, td->td_proc->p_comm);
td->td_tid, td->td_proc->p_pid, td->td_name);
if (rw_recursed(rw))
db_printf(" recursed: %u\n", rw->rw_recurse);
}

6
sys/kern/kern_switch.c
View File

@ -163,7 +163,7 @@ critical_enter(void)
td = curthread;
td->td_critnest++;
CTR4(KTR_CRITICAL, "critical_enter by thread %p (%ld, %s) to %d", td,
(long)td->td_proc->p_pid, td->td_proc->p_comm, td->td_critnest);
(long)td->td_proc->p_pid, td->td_name, td->td_critnest);
}
void
@ -189,7 +189,7 @@ critical_exit(void)
td->td_critnest--;
CTR4(KTR_CRITICAL, "critical_exit by thread %p (%ld, %s) to %d", td,
(long)td->td_proc->p_pid, td->td_proc->p_comm, td->td_critnest);
(long)td->td_proc->p_pid, td->td_name, td->td_critnest);
}
/*
@ -260,7 +260,7 @@ maybe_preempt(struct thread *td)
MPASS(TD_ON_RUNQ(td));
TD_SET_RUNNING(td);
CTR3(KTR_PROC, "preempting to thread %p (pid %d, %s)\n", td,
td->td_proc->p_pid, td->td_proc->p_comm);
td->td_proc->p_pid, td->td_name);
SCHED_STAT_INC(switch_preempt);
mi_switch(SW_INVOL|SW_PREEMPT, td);
/*

2
sys/kern/kern_sx.c
View File

@ -986,7 +986,7 @@ db_show_sx(struct lock_object *lock)
else {
td = sx_xholder(sx);
db_printf("XLOCK: %p (tid %d, pid %d, \"%s\")\n", td,
td->td_tid, td->td_proc->p_pid, td->td_proc->p_comm);
td->td_tid, td->td_proc->p_pid, td->td_name);
if (sx_recursed(sx))
db_printf(" recursed: %d\n", sx->sx_recurse);
}

10
sys/kern/kern_synch.c
View File

@ -419,16 +419,16 @@ mi_switch(int flags, struct thread *newtd)
#if (KTR_COMPILE & KTR_SCHED) != 0
if (TD_IS_IDLETHREAD(td))
CTR3(KTR_SCHED, "mi_switch: %p(%s) prio %d idle",
td, td->td_proc->p_comm, td->td_priority);
td, td->td_name, td->td_priority);
else if (newtd != NULL)
CTR5(KTR_SCHED,
"mi_switch: %p(%s) prio %d preempted by %p(%s)",
td, td->td_proc->p_comm, td->td_priority, newtd,
newtd->td_proc->p_comm);
td, td->td_name, td->td_priority, newtd,
newtd->td_name);
else
CTR6(KTR_SCHED,
"mi_switch: %p(%s) prio %d inhibit %d wmesg %s lock %s",
td, td->td_proc->p_comm, td->td_priority,
td, td->td_name, td->td_priority,
td->td_inhibitors, td->td_wmesg, td->td_lockname);
#endif
/*
@ -441,7 +441,7 @@ mi_switch(int flags, struct thread *newtd)
#endif
sched_switch(td, newtd, flags);
CTR3(KTR_SCHED, "mi_switch: running %p(%s) prio %d",
td, td->td_proc->p_comm, td->td_priority);
td, td->td_name, td->td_priority);
CTR4(KTR_PROC, "mi_switch: new thread %ld (kse %p, pid %ld, %s)",
td->td_tid, td->td_sched, p->p_pid, p->p_comm);

2
sys/kern/p1003_1b.c
View File

@ -63,7 +63,7 @@ int
syscall_not_present(struct thread *td, const char *s, struct nosys_args *uap)
{
log(LOG_ERR, "cmd %s pid %d tried to use non-present %s\n",
td->td_proc->p_comm, td->td_proc->p_pid, s);
td->td_name, td->td_proc->p_pid, s);
/* a " return nosys(p, uap); " here causes a core dump.
*/

20
sys/kern/sched_4bsd.c
View File

@ -615,7 +615,7 @@ sched_exit(struct proc *p, struct thread *td)
{
CTR3(KTR_SCHED, "sched_exit: %p(%s) prio %d",
td, td->td_proc->p_comm, td->td_priority);
td, td->td_name, td->td_priority);
PROC_SLOCK_ASSERT(p, MA_OWNED);
sched_exit_thread(FIRST_THREAD_IN_PROC(p), td);
}
@ -625,7 +625,7 @@ sched_exit_thread(struct thread *td, struct thread *child)
{
CTR3(KTR_SCHED, "sched_exit_thread: %p(%s) prio %d",
child, child->td_proc->p_comm, child->td_priority);
child, child->td_name, child->td_priority);
thread_lock(td);
td->td_estcpu = ESTCPULIM(td->td_estcpu + child->td_estcpu);
thread_unlock(td);
@ -679,8 +679,8 @@ static void
sched_priority(struct thread *td, u_char prio)
{
CTR6(KTR_SCHED, "sched_prio: %p(%s) prio %d newprio %d by %p(%s)",
td, td->td_proc->p_comm, td->td_priority, prio, curthread,
curthread->td_proc->p_comm);
td, td->td_name, td->td_priority, prio, curthread,
curthread->td_name);
THREAD_LOCK_ASSERT(td, MA_OWNED);
if (td->td_priority == prio)
@ -1071,8 +1071,8 @@ sched_add(struct thread *td, int flags)
KASSERT(td->td_flags & TDF_INMEM,
("sched_add: thread swapped out"));
CTR5(KTR_SCHED, "sched_add: %p(%s) prio %d by %p(%s)",
td, td->td_proc->p_comm, td->td_priority, curthread,
curthread->td_proc->p_comm);
td, td->td_name, td->td_priority, curthread,
curthread->td_name);
/*
* Now that the thread is moving to the run-queue, set the lock
* to the scheduler's lock.
@ -1140,8 +1140,8 @@ sched_add(struct thread *td, int flags)
KASSERT(td->td_flags & TDF_INMEM,
("sched_add: thread swapped out"));
CTR5(KTR_SCHED, "sched_add: %p(%s) prio %d by %p(%s)",
td, td->td_proc->p_comm, td->td_priority, curthread,
curthread->td_proc->p_comm);
td, td->td_name, td->td_priority, curthread,
curthread->td_name);
/*
* Now that the thread is moving to the run-queue, set the lock
* to the scheduler's lock.
@ -1188,8 +1188,8 @@ sched_rem(struct thread *td)
("sched_rem: thread not on run queue"));
mtx_assert(&sched_lock, MA_OWNED);
CTR5(KTR_SCHED, "sched_rem: %p(%s) prio %d by %p(%s)",
td, td->td_proc->p_comm, td->td_priority, curthread,
curthread->td_proc->p_comm);
td, td->td_name, td->td_priority, curthread,
curthread->td_name);
if ((td->td_proc->p_flag & P_NOLOAD) == 0)
sched_load_rem();

18
sys/kern/sched_ule.c
View File

@ -339,7 +339,7 @@ runq_print(struct runq *rq)
rqh = &rq->rq_queues[pri];
TAILQ_FOREACH(ts, rqh, ts_procq) {
printf("\t\t\ttd %p(%s) priority %d rqindex %d pri %d\n",
ts->ts_thread, ts->ts_thread->td_proc->p_comm, ts->ts_thread->td_priority, ts->ts_rqindex, pri);
ts->ts_thread, ts->ts_thread->td_name, ts->ts_thread->td_priority, ts->ts_rqindex, pri);
}
}
}
@ -1600,8 +1600,8 @@ sched_thread_priority(struct thread *td, u_char prio)
struct td_sched *ts;
CTR6(KTR_SCHED, "sched_prio: %p(%s) prio %d newprio %d by %p(%s)",
td, td->td_proc->p_comm, td->td_priority, prio, curthread,
curthread->td_proc->p_comm);
td, td->td_name, td->td_priority, prio, curthread,
curthread->td_name);
ts = td->td_sched;
THREAD_LOCK_ASSERT(td, MA_OWNED);
if (td->td_priority == prio)
@ -2087,7 +2087,7 @@ sched_exit(struct proc *p, struct thread *child)
struct thread *td;
CTR3(KTR_SCHED, "sched_exit: %p(%s) prio %d",
child, child->td_proc->p_comm, child->td_priority);
child, child->td_name, child->td_priority);
PROC_SLOCK_ASSERT(p, MA_OWNED);
td = FIRST_THREAD_IN_PROC(p);
@ -2105,7 +2105,7 @@ sched_exit_thread(struct thread *td, struct thread *child)
{
CTR3(KTR_SCHED, "sched_exit_thread: %p(%s) prio %d",
child, child->td_proc->p_comm, child->td_priority);
child, child->td_name, child->td_priority);
#ifdef KSE
/*
@ -2396,8 +2396,8 @@ sched_add(struct thread *td, int flags)
int cpu;
#endif
CTR5(KTR_SCHED, "sched_add: %p(%s) prio %d by %p(%s)",
td, td->td_proc->p_comm, td->td_priority, curthread,
curthread->td_proc->p_comm);
td, td->td_name, td->td_priority, curthread,
curthread->td_name);
THREAD_LOCK_ASSERT(td, MA_OWNED);
ts = td->td_sched;
/*
@ -2450,8 +2450,8 @@ sched_rem(struct thread *td)
struct td_sched *ts;
CTR5(KTR_SCHED, "sched_rem: %p(%s) prio %d by %p(%s)",
td, td->td_proc->p_comm, td->td_priority, curthread,
curthread->td_proc->p_comm);
td, td->td_name, td->td_priority, curthread,
curthread->td_name);
ts = td->td_sched;
tdq = TDQ_CPU(ts->ts_cpu);
TDQ_LOCK_ASSERT(tdq, MA_OWNED);

6
sys/kern/subr_pcpu.c
View File

@ -112,7 +112,7 @@ show_pcpu(struct pcpu *pc)
td = pc->pc_curthread;
if (td != NULL)
db_printf("%p: pid %d \"%s\"\n", td, td->td_proc->p_pid,
td->td_proc->p_comm);
td->td_name);
else
db_printf("none\n");
db_printf("curpcb = %p\n", pc->pc_curpcb);
@ -120,14 +120,14 @@ show_pcpu(struct pcpu *pc)
td = pc->pc_fpcurthread;
if (td != NULL)
db_printf("%p: pid %d \"%s\"\n", td, td->td_proc->p_pid,
td->td_proc->p_comm);
td->td_name);
else
db_printf("none\n");
db_printf("idlethread = ");
td = pc->pc_idlethread;
if (td != NULL)
db_printf("%p: pid %d \"%s\"\n", td, td->td_proc->p_pid,
td->td_proc->p_comm);
td->td_name);
else
db_printf("none\n");
db_show_mdpcpu(pc);

10
sys/kern/subr_sleepqueue.c
View File

@ -459,7 +459,7 @@ sleepq_switch(void *wchan)
mi_switch(SW_VOL, NULL);
KASSERT(TD_IS_RUNNING(td), ("running but not TDS_RUNNING"));
CTR3(KTR_PROC, "sleepq resume: thread %p (pid %ld, %s)",
(void *)td, (long)td->td_proc->p_pid, (void *)td->td_proc->p_comm);
(void *)td, (long)td->td_proc->p_pid, (void *)td->td_name);
}
/*
@ -650,7 +650,7 @@ sleepq_resume_thread(struct sleepqueue *sq, struct thread *td, int pri)
* do it. However, we can't assert that it is set.
*/
CTR3(KTR_PROC, "sleepq_wakeup: thread %p (pid %ld, %s)",
(void *)td, (long)td->td_proc->p_pid, td->td_proc->p_comm);
(void *)td, (long)td->td_proc->p_pid, td->td_name);
TD_CLR_SLEEPING(td);
/* Adjust priority if requested. */
@ -772,7 +772,7 @@ sleepq_timeout(void *arg)
td = arg;
CTR3(KTR_PROC, "sleepq_timeout: thread %p (pid %ld, %s)",
(void *)td, (long)td->td_proc->p_pid, (void *)td->td_proc->p_comm);
(void *)td, (long)td->td_proc->p_pid, (void *)td->td_name);
/*
* First, see if the thread is asleep and get the wait channel if
@ -880,7 +880,7 @@ sleepq_abort(struct thread *td, int intrval)
return;
CTR3(KTR_PROC, "sleepq_abort: thread %p (pid %ld, %s)",
(void *)td, (long)td->td_proc->p_pid, (void *)td->td_proc->p_comm);
(void *)td, (long)td->td_proc->p_pid, (void *)td->td_name);
td->td_intrval = intrval;
td->td_flags |= TDF_SLEEPABORT;
/*
@ -957,7 +957,7 @@ found:
db_printf("\t%p (tid %d, pid %d, \"%s\")\n", td,
td->td_tid, td->td_proc->p_pid,
td->td_name[i] != '\0' ? td->td_name :
td->td_proc->p_comm);
td->td_name);
}
}
}

8
sys/kern/subr_turnstile.c
View File

@ -259,7 +259,7 @@ propagate_priority(struct thread *td)
*/
KASSERT(TD_ON_LOCK(td), (
"thread %d(%s):%d holds %s but isn't blocked on a lock\n",
td->td_tid, td->td_proc->p_comm, td->td_state,
td->td_tid, td->td_name, td->td_state,
ts->ts_lockobj->lo_name));
/*
@ -1024,7 +1024,7 @@ print_thread(struct thread *td, const char *prefix)
db_printf("%s%p (tid %d, pid %d, \"%s\")\n", prefix, td, td->td_tid,
td->td_proc->p_pid, td->td_name[0] != '\0' ? td->td_name :
td->td_proc->p_comm);
td->td_name);
}
static void
@ -1107,7 +1107,7 @@ print_lockchain(struct thread *td, const char *prefix)
while (!db_pager_quit) {
db_printf("%sthread %d (pid %d, %s) ", prefix, td->td_tid,
td->td_proc->p_pid, td->td_name[0] != '\0' ? td->td_name :
td->td_proc->p_comm);
td->td_name);
switch (td->td_state) {
case TDS_INACTIVE:
db_printf("is inactive\n");
@ -1190,7 +1190,7 @@ print_sleepchain(struct thread *td, const char *prefix)
while (!db_pager_quit) {
db_printf("%sthread %d (pid %d, %s) ", prefix, td->td_tid,
td->td_proc->p_pid, td->td_name[0] != '\0' ? td->td_name :
td->td_proc->p_comm);
td->td_name);
switch (td->td_state) {
case TDS_INACTIVE:
db_printf("is inactive\n");

2
sys/kern/sys_generic.c
View File

@ -521,7 +521,7 @@ ioctl(struct thread *td, struct ioctl_args *uap)
if (uap->com > 0xffffffff) {
printf(
"WARNING pid %d (%s): ioctl sign-extension ioctl %lx\n",
td->td_proc->p_pid, td->td_proc->p_comm, uap->com);
td->td_proc->p_pid, td->td_name, uap->com);
uap->com &= 0xffffffff;
}
com = uap->com;

2
sys/powerpc/aim/trap.c
View File

@ -303,7 +303,7 @@ printtrap(u_int vector, struct trapframe *frame, int isfatal, int user)
printf(" curthread = %p\n", curthread);
if (curthread != NULL)
printf(" pid = %d, comm = %s\n",
curthread->td_proc->p_pid, curthread->td_proc->p_comm);
curthread->td_proc->p_pid, curthread->td_name);
printf("\n");
}

2
sys/powerpc/powerpc/trap.c
View File

@ -303,7 +303,7 @@ printtrap(u_int vector, struct trapframe *frame, int isfatal, int user)
printf(" curthread = %p\n", curthread);
if (curthread != NULL)
printf(" pid = %d, comm = %s\n",
curthread->td_proc->p_pid, curthread->td_proc->p_comm);
curthread->td_proc->p_pid, curthread->td_name);
printf("\n");
}

2
sys/sun4v/sun4v/trap.c
View File

@ -370,7 +370,7 @@ trap(struct trapframe *tf, int64_t type, uint64_t data)
#ifdef VERBOSE
if (sig == 4 || sig == 10 || sig == 11)
printf("trap: %ld:%s: 0x%lx at 0x%lx on cpu=%d sig=%d proc=%s\n",
trapno, trap_msg[trapno], data, tf->tf_tpc, curcpu, sig, curthread->td_proc->p_comm);
trapno, trap_msg[trapno], data, tf->tf_tpc, curcpu, sig, curthread->td_name);
#endif
/* XXX I've renumbered the traps to largely reflect what the hardware uses
* so this will need to be re-visited