summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2010-05-21 17:17:56 +0000
committerjhb <jhb@FreeBSD.org>2010-05-21 17:17:56 +0000
commitcf780ce2673bbe22eebc547b9fcc51ba023bf5b7 (patch)
tree169c777469774e08c88e16f2820d11d6f8e15a22
parentce208e1f416b3cd9a575871ae3bf80ee8d52d960 (diff)
downloadFreeBSD-src-cf780ce2673bbe22eebc547b9fcc51ba023bf5b7.zip
FreeBSD-src-cf780ce2673bbe22eebc547b9fcc51ba023bf5b7.tar.gz
- Adjust the whitespace for the lines that output fields in 'show pcpu' in
DDB so that all the fields line up. - Print out the tid of the per-CPU idlethread instead of the pid since the idle process is now shared across all idle threads. MFC after: 1 month
-rw-r--r--sys/amd64/amd64/db_interface.c14
-rw-r--r--sys/ia64/ia64/db_machdep.c10
-rw-r--r--sys/kern/subr_pcpu.c7
-rw-r--r--sys/mips/mips/db_trace.c4
4 files changed, 17 insertions, 18 deletions
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c
index 287c236..f44cac4 100644
--- a/sys/amd64/amd64/db_interface.c
+++ b/sys/amd64/amd64/db_interface.c
@@ -139,11 +139,11 @@ void
db_show_mdpcpu(struct pcpu *pc)
{
- db_printf("curpmap = %p\n", pc->pc_curpmap);
- db_printf("tssp = %p\n", pc->pc_tssp);
- db_printf("commontssp = %p\n", pc->pc_commontssp);
- db_printf("rsp0 = 0x%lx\n", pc->pc_rsp0);
- db_printf("gs32p = %p\n", pc->pc_gs32p);
- db_printf("ldt = %p\n", pc->pc_ldt);
- db_printf("tss = %p\n", pc->pc_tss);
+ db_printf("curpmap = %p\n", pc->pc_curpmap);
+ db_printf("tssp = %p\n", pc->pc_tssp);
+ db_printf("commontssp = %p\n", pc->pc_commontssp);
+ db_printf("rsp0 = 0x%lx\n", pc->pc_rsp0);
+ db_printf("gs32p = %p\n", pc->pc_gs32p);
+ db_printf("ldt = %p\n", pc->pc_ldt);
+ db_printf("tss = %p\n", pc->pc_tss);
}
diff --git a/sys/ia64/ia64/db_machdep.c b/sys/ia64/ia64/db_machdep.c
index 2684bfe..75f698c 100644
--- a/sys/ia64/ia64/db_machdep.c
+++ b/sys/ia64/ia64/db_machdep.c
@@ -579,11 +579,11 @@ db_show_mdpcpu(struct pcpu *pc)
{
struct pcpu_md *md = &pc->pc_md;
- db_printf("MD: vhpt = %#lx\n", md->vhpt);
- db_printf("MD: lid = %#lx\n", md->lid);
- db_printf("MD: clock = %#lx/%#lx\n", md->clock, md->clockadj);
- db_printf("MD: stats = %p\n", &md->stats);
- db_printf("MD: pmap = %p\n", md->current_pmap);
+ db_printf("MD: vhpt = %#lx\n", md->vhpt);
+ db_printf("MD: lid = %#lx\n", md->lid);
+ db_printf("MD: clock = %#lx/%#lx\n", md->clock, md->clockadj);
+ db_printf("MD: stats = %p\n", &md->stats);
+ db_printf("MD: pmap = %p\n", md->current_pmap);
}
void
diff --git a/sys/kern/subr_pcpu.c b/sys/kern/subr_pcpu.c
index c63a971..ef69ff6 100644
--- a/sys/kern/subr_pcpu.c
+++ b/sys/kern/subr_pcpu.c
@@ -332,7 +332,7 @@ show_pcpu(struct pcpu *pc)
struct thread *td;
db_printf("cpuid = %d\n", pc->pc_cpuid);
- db_printf("dynamic pcpu = %p\n", (void *)pc->pc_dynamic);
+ db_printf("dynamic pcpu = %p\n", (void *)pc->pc_dynamic);
db_printf("curthread = ");
td = pc->pc_curthread;
if (td != NULL)
@@ -351,12 +351,11 @@ show_pcpu(struct pcpu *pc)
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_name);
+ db_printf("%p: tid %d \"%s\"\n", td, td->td_tid, td->td_name);
else
db_printf("none\n");
db_show_mdpcpu(pc);
-
+
#ifdef VIMAGE
db_printf("curvnet = %p\n", pc->pc_curthread->td_vnet);
#endif
diff --git a/sys/mips/mips/db_trace.c b/sys/mips/mips/db_trace.c
index 116470c..6a9c22b 100644
--- a/sys/mips/mips/db_trace.c
+++ b/sys/mips/mips/db_trace.c
@@ -432,8 +432,8 @@ void
db_show_mdpcpu(struct pcpu *pc)
{
- db_printf("ipis = 0x%x\n", pc->pc_pending_ipis);
+ db_printf("ipis = 0x%x\n", pc->pc_pending_ipis);
db_printf("next ASID = %d\n", pc->pc_next_asid);
- db_printf("GENID = %d\n", pc->pc_asid_generation);
+ db_printf("GENID = %d\n", pc->pc_asid_generation);
return;
}
OpenPOWER on IntegriCloud