emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

top: much faster cursor key navigation by avoiding process rescan

Browse Source 
function                                             old     new   delta
handle_input                                         549     560     +11
top_main                                             889     891      +2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-03-07 04:47:52 +01:00
parent 75e56a3db9
commit a2cae937d0
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
procps/top.c
View File

@ -896,7 +896,8 @@ enum {
| PSSCAN_PID | PSSCAN_PID
| PSSCAN_SMAPS | PSSCAN_SMAPS
| PSSCAN_COMM, | PSSCAN_COMM,
EXIT_MASK = (unsigned)-1, EXIT_MASK = 0,
NO_RESCAN_MASK = (unsigned)-1,
}; };
#if ENABLE_FEATURE_TOP_INTERACTIVE #if ENABLE_FEATURE_TOP_INTERACTIVE
@ -934,7 +935,7 @@ static unsigned handle_input(unsigned scan_mask, unsigned interval)
} }
if (c == KEYCODE_HOME) { if (c == KEYCODE_HOME) {
G_scroll_ofs = 0; G_scroll_ofs = 0;
break; goto normalize_ofs;
} }
if (c == KEYCODE_END) { if (c == KEYCODE_END) {
G_scroll_ofs = ntop - G.lines / 2; G_scroll_ofs = ntop - G.lines / 2;
@ -951,7 +952,7 @@ static unsigned handle_input(unsigned scan_mask, unsigned interval)
G_scroll_ofs = ntop - 1; G_scroll_ofs = ntop - 1;
if (G_scroll_ofs < 0) if (G_scroll_ofs < 0)
G_scroll_ofs = 0; G_scroll_ofs = 0;
break; return NO_RESCAN_MASK;
} }
c |= 0x20; /* lowercase */ c |= 0x20; /* lowercase */
@ -1156,6 +1157,7 @@ int top_main(int argc UNUSED_PARAM, char **argv)
#endif #endif
while (scan_mask != EXIT_MASK) { while (scan_mask != EXIT_MASK) {
unsigned new_mask;
procps_status_t *p = NULL; procps_status_t *p = NULL;
if (OPT_BATCH_MODE) { if (OPT_BATCH_MODE) {
@ -1233,21 +1235,32 @@ int top_main(int argc UNUSED_PARAM, char **argv)
#else #else
qsort(top, ntop, sizeof(top_status_t), (void*)(sort_function[0])); qsort(top, ntop, sizeof(top_status_t), (void*)(sort_function[0]));
#endif #endif
display_process_list(G.lines, col);
} }
#if ENABLE_FEATURE_TOPMEM #if ENABLE_FEATURE_TOPMEM
else { /* TOPMEM */ else { /* TOPMEM */
qsort(topmem, ntop, sizeof(topmem_status_t), (void*)topmem_sort); qsort(topmem, ntop, sizeof(topmem_status_t), (void*)topmem_sort);
}
#endif
IF_FEATURE_TOP_INTERACTIVE(display:)
IF_FEATURE_TOPMEM(if (scan_mask != TOPMEM_MASK)) {
display_process_list(G.lines, col);
}
#if ENABLE_FEATURE_TOPMEM
else { /* TOPMEM */
display_topmem_process_list(G.lines, col); display_topmem_process_list(G.lines, col);
} }
#endif #endif
clearmems();
if (iterations >= 0 && !--iterations) if (iterations >= 0 && !--iterations)
break; break;
#if !ENABLE_FEATURE_TOP_INTERACTIVE #if !ENABLE_FEATURE_TOP_INTERACTIVE
clearmems();
sleep(interval); sleep(interval);
#else #else
scan_mask = handle_input(scan_mask, interval); new_mask = handle_input(scan_mask, interval);
if (new_mask == NO_RESCAN_MASK)
goto display;
scan_mask = new_mask;
clearmems();
#endif #endif
} /* end of "while (not Q)" */ } /* end of "while (not Q)" */