diff --git a/src/bin/top.c b/src/bin/top.c index ad92f0553a..6ee6a1022d 100644 --- a/src/bin/top.c +++ b/src/bin/top.c @@ -151,8 +151,6 @@ static void compare( thread_time_list_t *old, thread_time_list_t *new, - bigtime_t old_busy, - bigtime_t new_busy, bigtime_t uinterval, int refresh ) @@ -238,7 +236,7 @@ compare( printf("%6s %7s %7s %7s %4s %16s %16s\n", "thid", "total", "user", "kernel", "%cpu", "team name", "thread name"); linecount = 1; - idletime = new_busy - old_busy; + idletime = 0; gtotal = 0; ktotal = 0; utotal = 0; @@ -338,7 +336,6 @@ setup_term(bool onlyRows) static thread_time_list_t gather( thread_time_list_t *old, - bigtime_t *busy_wait_time, int refresh ) { @@ -347,7 +344,6 @@ gather( thread_info t; team_info tm; thread_time_list_t times; - bigtime_t old_busy; int i; system_info info; bigtime_t oldLastMeasure; @@ -358,10 +354,6 @@ gather( oldLastMeasure = lastMeasure; lastMeasure = system_time(); - get_system_info(&info); - old_busy = *busy_wait_time; - *busy_wait_time = info._busy_wait_time; - while (get_next_team_info(&tmcookie, &tm) == B_NO_ERROR) { thcookie = 0; while (get_next_thread_info(tm.team, &thcookie, &t) == B_NO_ERROR) { @@ -377,8 +369,7 @@ gather( setup_term(true); screen_size_changed = 0; } - compare(old, ×, old_busy, *busy_wait_time, - system_time() - oldLastMeasure, refresh); + compare(old, ×, system_time() - oldLastMeasure, refresh); free_times(old); } return (times); @@ -414,7 +405,6 @@ main(int argc, char **argv) bigtime_t then; bigtime_t uinterval; bigtime_t elapsed; - bigtime_t busy; char *myname; get_system_info (&sysinfo); @@ -460,22 +450,22 @@ main(int argc, char **argv) if (iters < 0) { // You will only have to wait half a second for the first iteration. uinterval = 1 * 1000000 / 2; - baseline = gather(NULL, &busy, refresh); + baseline = gather(NULL, refresh); elapsed = system_time() - lastMeasure; if (elapsed < uinterval) snooze(uinterval - elapsed); then = system_time(); - baseline = gather(&baseline, &busy, refresh); + baseline = gather(&baseline, refresh); } else - baseline = gather(NULL, &busy, refresh); + baseline = gather(NULL, refresh); uinterval = interval * 1000000; for (i = 0; iters < 0 || i < iters; i++) { elapsed = system_time() - lastMeasure; if (elapsed < uinterval) snooze(uinterval - elapsed); - baseline = gather(&baseline, &busy, refresh); + baseline = gather(&baseline, refresh); } exit(0); }