aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/xentrace/formats28
-rw-r--r--tools/xentrace/xentrace.c2
2 files changed, 15 insertions, 15 deletions
diff --git a/tools/xentrace/formats b/tools/xentrace/formats
index 9a5b157f47..0452385484 100644
--- a/tools/xentrace/formats
+++ b/tools/xentrace/formats
@@ -1,17 +1,17 @@
-#0x00010000 CPU%(cpu)d %(tsc).6f sched_add_domain(0x%(3)08x) [ dom id = 0x%(1)x%(2)08x ]
-#0x00010001 CPU%(cpu)d %(tsc).6f sched_rem_domain(0x%08(3)x) [ dom id = 0x%(1)x%(2)08x ]
-#0x00010002 CPU%(cpu)d %(tsc).6f __wake_up(0x%(3)08x) [ dom id = 0x%(1)x%(2)08x ]
-#0x00010003 CPU%(cpu)d %(tsc).6f do_block() [ current = 0x%(2)08x ]
-#0x00010004 CPU%(cpu)d %(tsc).6f do_yield() [ current = %(2)08x ]
-#0x00010005 CPU%(cpu)d %(tsc).6f do_set_timer_op(0x%(4)08x, 0x%(5)08x) [ current = 0x%(3)08x ]
-#0x00010006 CPU%(cpu)d %(tsc).6f sched_ctl(0x%(1)08x)
-#0x00010007 CPU%(cpu)d %(tsc).6f sched_adjdom(params) [ dom id = 0x%(1)x%(2)08x ]
-#0x00010008 CPU%(cpu)d %(tsc).6f __reschedule(0x%(3)08x) [ dom id = 0x%(1)x%(2)08x ]
-#0x00010009 CPU%(cpu)d %(tsc).6f switching to task_struct 0x%(1)08x [ dom id = 0x%(1)x ]
-#0x0001000A CPU%(cpu)d %(tsc).6f s_timer_fn(unused)
-#0x0001000B CPU%(cpu)d %(tsc).6f t_timer_fn(unused)
-#0x0001000C CPU%(cpu)d %(tsc).6f dom_timer_fn(data)
-#0x0001000D CPU%(cpu)d %(tsc).6f fallback_timer_fn(unused)
+0x00010000 CPU%(cpu)d %(tsc).6f sched_add_domain(0x%(3)08x) [ dom id = 0x%(2)08x ]
+0x00010001 CPU%(cpu)d %(tsc).6f sched_rem_domain(0x%08(3)x) [ dom id = 0x%(2)08x ]
+0x00010002 CPU%(cpu)d %(tsc).6f __wake_up(0x%(3)08x) [ dom id = 0x%(2)08x ]
+0x00010003 CPU%(cpu)d %(tsc).6f do_block() [ current = 0x%(2)08x ]
+0x00010004 CPU%(cpu)d %(tsc).6f do_yield() [ current = %(2)08x ]
+0x00010005 CPU%(cpu)d %(tsc).6f do_set_timer_op(0x%(4)08x, 0x%(5)08x) [ current = 0x%(3)08x ]
+0x00010006 CPU%(cpu)d %(tsc).6f sched_ctl(0x%(1)08x)
+0x00010007 CPU%(cpu)d %(tsc).6f sched_adjdom(params) [ dom id = 0x%(2)08x ]
+0x00010008 CPU%(cpu)d %(tsc).6f __reschedule(0x%(3)08x) [ dom id = 0x(2)08x ]
+0x00010009 CPU%(cpu)d %(tsc).6f switching to task_struct 0x%(1)08x [ dom id = 0x%(1)x ]
+0x0001000A CPU%(cpu)d %(tsc).6f s_timer_fn(unused)
+0x0001000B CPU%(cpu)d %(tsc).6f t_timer_fn(unused)
+0x0001000C CPU%(cpu)d %(tsc).6f dom_timer_fn(data)
+0x0001000D CPU%(cpu)d %(tsc).6f fallback_timer_fn(unused)
0x00020008 CPU%(cpu)d %(tsc).6f enter: dom0_create_dom ( )
diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c
index dae9b67d80..3560745a42 100644
--- a/tools/xentrace/xentrace.c
+++ b/tools/xentrace/xentrace.c
@@ -311,7 +311,7 @@ int monitor_tbufs(FILE *logfile)
/* printf("XX%d: cons=%ld head=%ld %p\n", i,
cons[i], meta[i]->head, data[i] + (cons[i] % size_in_recs) );
*/
- while( cons[i] < meta[i]->head )
+ while( cons[i] != meta[i]->head )
{
/*
if( (cons[i] % 6 ) == 0 )