debuggers.hg
changeset 4598:a1f760a94785
bitkeeper revision 1.1317 (426426e75ONJGdRHoWdYW1_r-sGgsA)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk
author | iap10@freefall.cl.cam.ac.uk |
---|---|
date | Mon Apr 18 21:30:15 2005 +0000 (2005-04-18) |
parents | 80011c06c033 fde01e3e4b45 |
children | 24775547c56a |
files | BitKeeper/etc/logging_ok xen/common/schedule.c |
line diff
1.1 --- a/BitKeeper/etc/logging_ok Mon Apr 18 21:26:55 2005 +0000 1.2 +++ b/BitKeeper/etc/logging_ok Mon Apr 18 21:30:15 2005 +0000 1.3 @@ -76,6 +76,7 @@ rn@wyvis.camb.intel-research.net 1.4 rn@wyvis.research.intel-research.net 1.5 rneugeba@wyvis.research 1.6 rneugeba@wyvis.research.intel-research.net 1.7 +ryanh@us.ibm.com 1.8 sd386@font.cl.cam.ac.uk 1.9 shand@spidean.research.intel-research.net 1.10 smh22@boulderdash.cl.cam.ac.uk
2.1 --- a/xen/common/schedule.c Mon Apr 18 21:26:55 2005 +0000 2.2 +++ b/xen/common/schedule.c Mon Apr 18 21:30:15 2005 +0000 2.3 @@ -387,7 +387,7 @@ static void __enter_scheduler(void) 2.4 perfc_incrc(sched_ctx); 2.5 2.6 #if defined(WAKE_HISTO) 2.7 - if ( !is_idle_task(next) && next->wokenup ) { 2.8 + if ( !is_idle_task(next->domain) && next->wokenup ) { 2.9 ulong diff = (ulong)(now - next->wokenup); 2.10 diff /= (ulong)MILLISECS(1); 2.11 if (diff <= BUCKETS-2) schedule_data[cpu].hist[diff]++; 2.12 @@ -396,7 +396,7 @@ static void __enter_scheduler(void) 2.13 next->wokenup = (s_time_t)0; 2.14 #elif defined(BLOCKTIME_HISTO) 2.15 prev->lastdeschd = now; 2.16 - if ( !is_idle_task(next) ) 2.17 + if ( !is_idle_task(next->domain) ) 2.18 { 2.19 ulong diff = (ulong)((now - next->lastdeschd) / MILLISECS(10)); 2.20 if (diff <= BUCKETS-2) schedule_data[cpu].hist[diff]++;