int max_elements = 80;
int toggle_threads = 1;
+int toggle_virt = -1;
int toggle_pause = -1;
int max_center_lines;
pthread_t keyboard_thread;
-struct header_view cputopview[4];
+struct header_view cputopview[6];
struct header_view iostreamtopview[3];
struct header_view fileview[3];
{
curs_set(1);
endwin();
- exit(0);
+ quit = 1;
+ sem_post(&pause_sem);
+ sem_post(&timer);
+ sem_post(&goodtodisplay);
+ sem_post(&end_trace_sem);
+ sem_post(&goodtoupdate);
}
static void handle_sigterm(int signal)
{
+ pthread_cancel(keyboard_thread);
reset_ncurses();
}
define_key("\033[17;2~", KEY_F(18));
}
signal(SIGTERM, handle_sigterm);
+ signal(SIGINT, handle_sigterm);
mousemask(BUTTON1_CLICKED, NULL);
refresh();
}
print_key(footer, "q", "Quit ", 0);
print_key(footer, "r", "Pref ", 0);
print_key(footer, "t", "Threads ", toggle_threads);
+ print_key(footer, "v", "Virt ", toggle_virt);
print_key(footer, "p", "Pause ", toggle_pause);
wrefresh(footer);
wrefresh(header);
}
-struct tm format_timestamp(uint64_t timestamp)
-{
- struct tm tm;
- uint64_t ts_sec = 0, ts_nsec;
- time_t time_s;
-
- ts_nsec = timestamp;
- ts_sec += ts_nsec / NSEC_PER_SEC;
- ts_nsec = ts_nsec % NSEC_PER_SEC;
-
- time_s = (time_t) ts_sec;
-
- localtime_r(&time_s, &tm);
-
- return tm;
-}
-
static void scale_unit(uint64_t bytes, char *ret)
{
if (bytes >= 1000000000)
double maxcputime;
int nblinedisplayed = 0;
int current_line = 0;
+ int current_row_offset;
int column;
elapsed = data->end - data->start;
set_window_title(center, "CPU Top");
wattron(center, A_BOLD);
column = 1;
- for (i = 0; i < 4; i++) {
+ for (i = 0; i < 6; i++) {
+ if (toggle_virt < 0 && (i == 3 || i == 4)) {
+ continue;
+ }
if (cputopview[i].sort) {
wattron(center, A_UNDERLINE);
pref_current_sort = i;
for (i = list_offset; i < data->process_table->len &&
nblinedisplayed < max_center_lines; i++) {
tmp = g_ptr_array_index(data->process_table, i);
+ current_row_offset = 1;
if (tmp->pid != tmp->tid)
if (toggle_threads == -1)
continue;
mvwhline(center, current_line + header_offset, 1, ' ', COLS-3);
}
/* CPU(%) */
- mvwprintw(center, current_line + header_offset, 1, "%1.2f",
+ mvwprintw(center, current_line + header_offset,
+ current_row_offset, "%1.2f",
tmp->totalcpunsec / maxcputime);
+ current_row_offset += 10;
/* PID */
- mvwprintw(center, current_line + header_offset, 11, "%d", tmp->pid);
+ mvwprintw(center, current_line + header_offset,
+ current_row_offset, "%d", tmp->pid);
+ current_row_offset += 10;
/* TID */
- mvwprintw(center, current_line + header_offset, 21, "%d", tmp->tid);
+ mvwprintw(center, current_line + header_offset,
+ current_row_offset, "%d", tmp->tid);
+ current_row_offset += 10;
+ if (toggle_virt > 0) {
+ /* VPID */
+ mvwprintw(center, current_line + header_offset,
+ current_row_offset, "%d", tmp->vpid);
+ current_row_offset += 10;
+ /* VTID */
+ mvwprintw(center, current_line + header_offset,
+ current_row_offset, "%d", tmp->vtid);
+ current_row_offset += 10;
+ }
/* NAME */
- mvwprintw(center, current_line + header_offset, 31, "%s", tmp->comm);
+ mvwprintw(center, current_line + header_offset,
+ current_row_offset, "%s", tmp->comm);
wattroff(center, COLOR_PAIR(6));
wattroff(center, COLOR_PAIR(5));
nblinedisplayed++;
wprintw(center, "%d", tmp->pid);
print_key_title("PPID", line++);
wprintw(center, "%d", tmp->ppid);
+ print_key_title("VPID", line++);
+ wprintw(center, "%d", tmp->vpid);
+ print_key_title("VTID", line++);
+ wprintw(center, "%d", tmp->vtid);
+ print_key_title("VPPID", line++);
+ wprintw(center, "%d", tmp->vppid);
print_key_title("CPU", line++);
wprintw(center, "%1.2f %%", tmp->totalcpunsec/maxcputime);
while (g_hash_table_iter_next (&iter, &key, (gpointer) &perfn1)) {
if (perfn1->visible) {
if (perfn1->sort) {
+ /* pref_current_sort = i; */
wattron(center, A_UNDERLINE);
- /* FIXME : sort in the opposite direction */
}
/* + 5 to strip the "perf_" prefix */
mvwprintw(center, 1, perf_row, "%s",
update_preference_panel(&pref_line_selected, 0, 1);
break;
case '>':
- if (!pref_panel_visible) {
+ /* perf uses a hashtable, it is ordered backward */
+ if (current_view == perf) {
+ pref_current_sort--;
+ } else if (!pref_panel_visible) {
pref_current_sort++;
- update_sort(&pref_current_sort);
- update_current_view();
}
+ update_sort(&pref_current_sort);
+ update_current_view();
break;
case '<':
- if (!pref_panel_visible) {
- if (pref_current_sort > 0)
- pref_current_sort--;
- update_sort(&pref_current_sort);
- update_current_view();
+ /* perf uses a hashtable, it is ordered backward */
+ if (current_view == perf) {
+ pref_current_sort++;
+ } else if (!pref_panel_visible) {
+ pref_current_sort--;
}
+ update_sort(&pref_current_sort);
+ update_current_view();
break;
case 13: /* FIXME : KEY_ENTER ?? */
current_view = previous_view;
previous_view = process_details;
}
+ selected_line = 0;
update_current_view();
break;
case KEY_F(10):
case 'q':
reset_ncurses();
+ /* exit keyboard thread */
+ pthread_exit(0);
break;
case 't':
toggle_threads *= -1;
case 'r':
toggle_pref_panel();
break;
+ case 'v':
+ toggle_virt *= -1;
+ update_current_view();
+ break;
/* ESCAPE, but slow to process, don't know why */
case 27:
if (pref_panel_visible)
cputopview[0].sort = 1;
cputopview[1].title = strdup("PID");
cputopview[2].title = strdup("TID");
- cputopview[3].title = strdup("NAME");
+ cputopview[3].title = strdup("VPID");
+ cputopview[4].title = strdup("VTID");
+ cputopview[5].title = strdup("NAME");
iostreamtopview[0].title = strdup("R (B/sec)");
iostreamtopview[1].title = strdup("W (B/sec)");