oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

top: add memory order, order cycling key

Browse Source
This commit is contained in:
Ben Gras 2012-09-11 02:17:25 +02:00
parent 373cb6526c
commit 17e41d3081
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
usr.bin/top/top.c
View File

@ -41,6 +41,11 @@
#define TIMECYCLEKEY 't' #define TIMECYCLEKEY 't'
#define ORDER_CPU 0
#define ORDER_MEMORY 1
#define ORDER_HIGHEST ORDER_MEMORY
int order = ORDER_CPU;
u32_t system_hz; u32_t system_hz;
/* name of cpu cycle types, in the order they appear in /psinfo. */ /* name of cpu cycle types, in the order they appear in /psinfo. */
@ -281,12 +286,18 @@ struct tp {
u64_t ticks; u64_t ticks;
}; };
int cmp_ticks(const void *v1, const void *v2) int cmp_procs(const void *v1, const void *v2)
{ {
int c; int c;
struct tp *p1 = (struct tp *) v1, *p2 = (struct tp *) v2; struct tp *p1 = (struct tp *) v1, *p2 = (struct tp *) v2;
int p1blocked, p2blocked; int p1blocked, p2blocked;
if(order == ORDER_MEMORY) {
if(p1->p->p_memory < p2->p->p_memory) return 1;
if(p1->p->p_memory > p2->p->p_memory) return -1;
return 0;
}
p1blocked = !!(p1->p->p_flags & BLOCKED); p1blocked = !!(p1->p->p_flags & BLOCKED);
p2blocked = !!(p2->p->p_flags & BLOCKED); p2blocked = !!(p2->p->p_flags & BLOCKED);
@ -464,7 +475,7 @@ void print_procs(int maxlines,
if (!cmp64u(total_ticks, 0)) if (!cmp64u(total_ticks, 0))
return; return;
qsort(tick_procs, nprocs, sizeof(tick_procs[0]), cmp_ticks); qsort(tick_procs, nprocs, sizeof(tick_procs[0]), cmp_procs);
tcyc = div64u(total_ticks, SCALE); tcyc = div64u(total_ticks, SCALE);
@ -692,6 +703,11 @@ int main(int argc, char *argv[])
putchar('\r'); putchar('\r');
return 0; return 0;
break; break;
case 'o':
order++;
if(order > ORDER_HIGHEST)
order = 0;
break;
case TIMECYCLEKEY: case TIMECYCLEKEY:
cputimemode++; cputimemode++;
if(cputimemode >= (1L << CPUTIMENAMES)) if(cputimemode >= (1L << CPUTIMENAMES))