X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fcursesdisplay.c;h=02764dd19976996f13fb1f11a580531aa3285b60;hp=82bb81097f758a80568fb615e68ccf9cd67e92ae;hb=33572a17ebf19098e1f1d3f1088e000e276eec60;hpb=32647247b1922e0aee8ffed0272d356486ee103a diff --git a/src/cursesdisplay.c b/src/cursesdisplay.c index 82bb810..02764dd 100644 --- a/src/cursesdisplay.c +++ b/src/cursesdisplay.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Julien Desfossez + * Copyright (C) 2011-2012 Julien Desfossez * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License Version 2 as @@ -43,6 +43,7 @@ PANEL *pref_panel, *main_panel; int pref_panel_visible = 0; int pref_line_selected = 0; +int pref_current_sort = 0; int last_display_index, currently_displayed_index; @@ -57,7 +58,7 @@ char log_lines[MAX_LINE_LENGTH * MAX_LOG_LINES + MAX_LOG_LINES]; int max_elements = 80; -int toggle_threads = -1; +int toggle_threads = 1; int toggle_pause = -1; int max_center_lines; @@ -73,11 +74,15 @@ void reset_ncurses() { curs_set(1); endwin(); - exit(0); + quit = 1; + sem_post(&pause_sem); + sem_post(&timer); + sem_post(&goodtodisplay); } static void handle_sigterm(int signal) { + pthread_cancel(keyboard_thread); reset_ncurses(); } @@ -118,6 +123,7 @@ void init_screen() define_key("\033[17;2~", KEY_F(18)); } signal(SIGTERM, handle_sigterm); + signal(SIGINT, handle_sigterm); mousemask(BUTTON1_CLICKED, NULL); refresh(); } @@ -237,11 +243,21 @@ int process_selected(struct processtop *process) void update_selected_processes() { + int i; + struct processtop *stored_process; + if (process_selected(selected_process)) { - g_ptr_array_remove(selected_processes, selected_process); - print_log("Process removed"); + for (i = 0; i < selected_processes->len; i++) { + stored_process = g_ptr_array_index(selected_processes, i); + if (!stored_process) + return; + if (stored_process->tid == selected_process->tid) + g_ptr_array_remove(selected_processes, + stored_process); + print_log("Process removed"); + } } else { - g_ptr_array_add(selected_processes, selected_process); + g_ptr_array_add(selected_processes, selected_process); print_log("Process added"); } } @@ -269,8 +285,9 @@ void update_footer() print_key(footer, "F4", "IOTop ", current_view == iostream); print_key(footer, "Enter", "Details ", current_view == process_details); print_key(footer, "Space", "Highlight ", 0); - print_key(footer, "q", "Quit | ", 0); - print_key(footer, "P", "Perf Pref ", 0); + print_key(footer, "q", "Quit ", 0); + print_key(footer, "r", "Pref ", 0); + print_key(footer, "t", "Threads ", toggle_threads); print_key(footer, "p", "Pause ", toggle_pause); wrefresh(footer); @@ -290,23 +307,6 @@ void basic_header() 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) @@ -318,6 +318,7 @@ static void scale_unit(uint64_t bytes, char *ret) else sprintf(ret, "%" PRIu64, bytes); } + uint64_t total_io() { int i; @@ -440,8 +441,8 @@ gint sort_by_process_total_desc(gconstpointer p1, gconstpointer p2) { struct processtop *n1 = *(struct processtop **)p1; struct processtop *n2 = *(struct processtop **)p2; - unsigned long totaln1 = n1->filewrite + n1->fileread; - unsigned long totaln2 = n2->filewrite + n2->fileread; + unsigned long totaln1 = n1->totalfilewrite + n1->totalfileread; + unsigned long totaln2 = n2->totalfilewrite + n2->totalfileread; if (totaln1 < totaln2) return 1; @@ -524,6 +525,7 @@ void update_cputop_display() double maxcputime; int nblinedisplayed = 0; int current_line = 0; + int column; elapsed = data->end - data->start; maxcputime = elapsed * data->cpu_table->len / 100.0; @@ -541,10 +543,16 @@ void update_cputop_display() set_window_title(center, "CPU Top"); wattron(center, A_BOLD); - mvwprintw(center, 1, 1, cputopview[0].title); - mvwprintw(center, 1, 12, cputopview[1].title); - mvwprintw(center, 1, 22, cputopview[2].title); - mvwprintw(center, 1, 32, cputopview[3].title); + column = 1; + for (i = 0; i < 4; i++) { + if (cputopview[i].sort) { + wattron(center, A_UNDERLINE); + pref_current_sort = i; + } + mvwprintw(center, 1, column, cputopview[i].title); + wattroff(center, A_UNDERLINE); + column += 10; + } wattroff(center, A_BOLD); max_center_lines = LINES - 5 - 7 - 1 - header_offset; @@ -553,6 +561,9 @@ void update_cputop_display() for (i = list_offset; i < data->process_table->len && nblinedisplayed < max_center_lines; i++) { tmp = g_ptr_array_index(data->process_table, i); + if (tmp->pid != tmp->tid) + if (toggle_threads == -1) + continue; if (process_selected(tmp)) { wattron(center, COLOR_PAIR(6)); @@ -566,12 +577,12 @@ void update_cputop_display() /* CPU(%) */ mvwprintw(center, current_line + header_offset, 1, "%1.2f", tmp->totalcpunsec / maxcputime); - /* TGID */ - mvwprintw(center, current_line + header_offset, 12, "%d", tmp->pid); /* PID */ - mvwprintw(center, current_line + header_offset, 22, "%d", tmp->tid); + mvwprintw(center, current_line + header_offset, 11, "%d", tmp->pid); + /* TID */ + mvwprintw(center, current_line + header_offset, 21, "%d", tmp->tid); /* NAME */ - mvwprintw(center, current_line + header_offset, 32, "%s", tmp->comm); + mvwprintw(center, current_line + header_offset, 31, "%s", tmp->comm); wattroff(center, COLOR_PAIR(6)); wattroff(center, COLOR_PAIR(5)); nblinedisplayed++; @@ -618,7 +629,8 @@ gint sort_perf(gconstpointer p1, gconstpointer p2, gpointer key) void print_key_title(char *key, int line) { wattron(center, A_BOLD); - mvwprintw(center, line, 1, "%s\t", key); + mvwprintw(center, line, 1, "%s", key); + mvwprintw(center, line, 30, " "); wattroff(center, A_BOLD); } @@ -631,7 +643,12 @@ void update_process_details() int i, j = 0; char unit[4]; char filename_buf[COLS]; + int line = 1; + int column; GPtrArray *newfilearray = g_ptr_array_new(); + GHashTableIter iter; + struct perfcounter *perfn1, *perfn2; + gpointer key; set_window_title(center, "Process details"); @@ -642,35 +659,50 @@ void update_process_details() elapsed = data->end - data->start; maxcputime = elapsed * data->cpu_table->len / 100.0; - print_key_title("Name", 1); + print_key_title("Name", line++); wprintw(center, "%s", selected_process->comm); - print_key_title("TID", 2); + print_key_title("TID", line++); wprintw(center, "%d", selected_process->tid); if (!tmp) { print_key_title("Does not exit at this time", 3); return; } - print_key_title("PID", 3); + print_key_title("PID", line++); wprintw(center, "%d", tmp->pid); - print_key_title("PPID", 4); + print_key_title("PPID", line++); wprintw(center, "%d", tmp->ppid); - print_key_title("CPU", 5); + print_key_title("CPU", line++); wprintw(center, "%1.2f %%", tmp->totalcpunsec/maxcputime); - print_key_title("READ B/s", 6); + print_key_title("READ B/s", line++); scale_unit(tmp->fileread, unit); wprintw(center, "%s", unit); - print_key_title("WRITE B/s", 7); + print_key_title("WRITE B/s", line++); scale_unit(tmp->filewrite, unit); wprintw(center, "%s", unit); + g_hash_table_iter_init(&iter, global_perf_liszt); + while (g_hash_table_iter_next (&iter, &key, (gpointer) &perfn1)) { + print_key_title((char *) key, line++); + perfn2 = g_hash_table_lookup(tmp->perf, (char *) key); + wprintw(center, "%d", perfn2 ? perfn2->count : 0); + } + line++; + wattron(center, A_BOLD); - mvwprintw(center, 8, 1, "FD"); - mvwprintw(center, 8, 10, "READ"); - mvwprintw(center, 8, 17, "WRITE"); - mvwprintw(center, 8, 24, "FILENAME"); + column = 1; + for (i = 0; i < 3; i++) { + if (fileview[i].sort) { + pref_current_sort = i; + wattron(center, A_UNDERLINE); + } + mvwprintw(center, line, column, fileview[i].title); + wattroff(center, A_UNDERLINE); + column += 10; + } + mvwprintw(center, line++, column, "FILENAME"); wattroff(center, A_BOLD); /* @@ -694,17 +726,17 @@ void update_process_details() g_ptr_array_sort(newfilearray, sort_by_file_read_desc); for (i = selected_line; i < newfilearray->len && - i < (selected_line + max_center_lines - 7); i++) { + i < (selected_line + max_center_lines - line + 2); i++) { file_tmp = g_ptr_array_index(newfilearray, i); if (!file_tmp) continue; - mvwprintw(center, 9 + j, 1, "%d", file_tmp->fd); + mvwprintw(center, line + j, 1, "%d", file_tmp->fd); scale_unit(file_tmp->read, unit); - mvwprintw(center, 9 + j, 10, "%s", unit); + mvwprintw(center, line + j, 11, "%s", unit); scale_unit(file_tmp->write, unit); - mvwprintw(center, 9 + j, 17, "%s", unit); + mvwprintw(center, line + j, 21, "%s", unit); snprintf(filename_buf, COLS - 25, "%s", file_tmp->name); - mvwprintw(center, 9 + j, 24, "%s", filename_buf); + mvwprintw(center, line + j, 31, "%s", filename_buf); j++; } g_ptr_array_free(newfilearray, TRUE); @@ -734,16 +766,20 @@ void update_perf() g_hash_table_iter_init(&iter, global_perf_liszt); while (g_hash_table_iter_next (&iter, &key, (gpointer) &perfn1)) { if (perfn1->visible) { + if (perfn1->sort) { + /* pref_current_sort = i; */ + wattron(center, A_UNDERLINE); + } /* + 5 to strip the "perf_" prefix */ mvwprintw(center, 1, perf_row, "%s", (char *) key + 5); + wattroff(center, A_UNDERLINE); perf_row += 20; } if (perfn1->sort) { perf_key = (char *) key; } } - wattroff(center, A_BOLD); g_ptr_array_sort_with_data(data->process_table, sort_perf, perf_key); @@ -751,6 +787,9 @@ void update_perf() for (i = 0; i < data->process_table->len && nblinedisplayed < max_center_lines; i++) { tmp = g_ptr_array_index(data->process_table, i); + if (tmp->pid != tmp->tid) + if (toggle_threads == -1) + continue; if (process_selected(tmp)) { wattron(center, COLOR_PAIR(6)); @@ -798,16 +837,25 @@ void update_iostream() int current_line = 0; int total = 0; char unit[4]; + int column; set_window_title(center, "IO Top"); wattron(center, A_BOLD); mvwprintw(center, 1, 1, "PID"); mvwprintw(center, 1, 11, "TID"); mvwprintw(center, 1, 22, "NAME"); - mvwprintw(center, 1, 40, "R (B/sec)"); - mvwprintw(center, 1, 52, "W (B/sec)"); - mvwprintw(center, 1, 64, "Total"); + column = 40; + for (i = 0; i < 3; i++) { + if (iostreamtopview[i].sort) { + pref_current_sort = i; + wattron(center, A_UNDERLINE); + } + mvwprintw(center, 1, column, iostreamtopview[i].title); + wattroff(center, A_UNDERLINE); + column += 12; + } wattroff(center, A_BOLD); + wattroff(center, A_UNDERLINE); if (iostreamtopview[0].sort == 1) g_ptr_array_sort(data->process_table, sort_by_process_read_desc); @@ -821,6 +869,9 @@ void update_iostream() for (i = list_offset; i < data->process_table->len && nblinedisplayed < max_center_lines; i++) { tmp = g_ptr_array_index(data->process_table, i); + if (tmp->pid != tmp->tid) + if (toggle_threads == -1) + continue; if (process_selected(tmp)) { wattron(center, COLOR_PAIR(6)); @@ -892,6 +943,25 @@ void update_current_view() sem_post(&update_display_sem); } +void update_process_detail_sort(int *line_selected) +{ + int i; + int size; + + size = 3; + + if (*line_selected > (size - 1)) + *line_selected = size - 1; + else if (*line_selected < 0) + *line_selected = 0; + + if (fileview[*line_selected].sort == 1) + fileview[*line_selected].reverse = 1; + for (i = 0; i < size; i++) + fileview[i].sort = 0; + fileview[*line_selected].sort = 1; +} + void update_process_detail_pref(int *line_selected, int toggle_view, int toggle_sort) { int i; @@ -913,17 +983,15 @@ void update_process_detail_pref(int *line_selected, int toggle_view, int toggle_ set_window_title(pref_panel_window, "Process Detail Preferences "); wattron(pref_panel_window, A_BOLD); mvwprintw(pref_panel_window, size + 1, 1, - " 's' to sort"); + " 's' : sort, space : toggle"); wattroff(pref_panel_window, A_BOLD); if (*line_selected > (size - 1)) *line_selected = size - 1; + else if (*line_selected < 0) + *line_selected = 0; if (toggle_sort == 1) { - if (fileview[*line_selected].sort == 1) - fileview[*line_selected].reverse = 1; - for (i = 0; i < size; i++) - fileview[i].sort = 0; - fileview[*line_selected].sort = 1; + update_process_detail_sort(line_selected); update_current_view(); } @@ -934,7 +1002,7 @@ void update_process_detail_pref(int *line_selected, int toggle_view, int toggle_ } if (fileview[i].sort == 1) wattron(pref_panel_window, A_BOLD); - mvwprintw(pref_panel_window, i + 1, 1, "[x] %s", + mvwprintw(pref_panel_window, i + 1, 1, "[-] %s", fileview[i].title); wattroff(pref_panel_window, A_BOLD); wattroff(pref_panel_window, COLOR_PAIR(5)); @@ -944,6 +1012,24 @@ void update_process_detail_pref(int *line_selected, int toggle_view, int toggle_ doupdate(); } +void update_iostream_sort(int *line_selected) +{ + int i; + int size; + + size = 3; + if (*line_selected > (size - 1)) + *line_selected = size - 1; + else if (*line_selected < 0) + *line_selected = 0; + if (iostreamtopview[*line_selected].sort == 1) + iostreamtopview[*line_selected].reverse = 1; + for (i = 0; i < size; i++) + iostreamtopview[i].sort = 0; + iostreamtopview[*line_selected].sort = 1; + +} + void update_iostream_pref(int *line_selected, int toggle_view, int toggle_sort) { int i; @@ -965,17 +1051,15 @@ void update_iostream_pref(int *line_selected, int toggle_view, int toggle_sort) set_window_title(pref_panel_window, "IOTop Preferences "); wattron(pref_panel_window, A_BOLD); mvwprintw(pref_panel_window, size + 1, 1, - " 's' to sort"); + " 's' : sort, space : toggle"); wattroff(pref_panel_window, A_BOLD); if (*line_selected > (size - 1)) *line_selected = size - 1; + else if (*line_selected < 0) + *line_selected = 0; if (toggle_sort == 1) { - if (iostreamtopview[*line_selected].sort == 1) - iostreamtopview[*line_selected].reverse = 1; - for (i = 0; i < size; i++) - iostreamtopview[i].sort = 0; - iostreamtopview[*line_selected].sort = 1; + update_iostream_sort(line_selected); update_current_view(); } @@ -986,7 +1070,7 @@ void update_iostream_pref(int *line_selected, int toggle_view, int toggle_sort) } if (iostreamtopview[i].sort == 1) wattron(pref_panel_window, A_BOLD); - mvwprintw(pref_panel_window, i + 1, 1, "[x] %s", + mvwprintw(pref_panel_window, i + 1, 1, "[-] %s", iostreamtopview[i].title); wattroff(pref_panel_window, A_BOLD); wattroff(pref_panel_window, COLOR_PAIR(5)); @@ -996,6 +1080,26 @@ void update_iostream_pref(int *line_selected, int toggle_view, int toggle_sort) doupdate(); } +void update_cpu_sort(int *line_selected) +{ + int i; + int size = 3; + + if (*line_selected > (size - 1)) + *line_selected = size - 1; + else if (*line_selected < 0) + *line_selected = 0; + + /* special case, we don't support sorting by procname for now */ + if (*line_selected != 3) { + if (cputopview[*line_selected].sort == 1) + cputopview[*line_selected].reverse = 1; + for (i = 0; i < size; i++) + cputopview[i].sort = 0; + cputopview[*line_selected].sort = 1; + } +} + void update_cpu_pref(int *line_selected, int toggle_view, int toggle_sort) { int i; @@ -1017,21 +1121,16 @@ void update_cpu_pref(int *line_selected, int toggle_view, int toggle_sort) set_window_title(pref_panel_window, "CPUTop Preferences "); wattron(pref_panel_window, A_BOLD); mvwprintw(pref_panel_window, size + 1, 1, - " 's' to sort"); + " 's' : sort, space : toggle"); wattroff(pref_panel_window, A_BOLD); if (*line_selected > (size - 1)) *line_selected = size - 1; + else if (*line_selected < 0) + *line_selected = 0; if (toggle_sort == 1) { - /* special case, we don't support sorting by procname for now */ - if (*line_selected != 3) { - if (cputopview[*line_selected].sort == 1) - cputopview[*line_selected].reverse = 1; - for (i = 0; i < size; i++) - cputopview[i].sort = 0; - cputopview[*line_selected].sort = 1; - update_current_view(); - } + update_cpu_sort(line_selected); + update_current_view(); } for (i = 0; i < size; i++) { @@ -1041,7 +1140,7 @@ void update_cpu_pref(int *line_selected, int toggle_view, int toggle_sort) } if (cputopview[i].sort == 1) wattron(pref_panel_window, A_BOLD); - mvwprintw(pref_panel_window, i + 1, 1, "[x] %s", + mvwprintw(pref_panel_window, i + 1, 1, "[-] %s", cputopview[i].title); wattroff(pref_panel_window, A_BOLD); wattroff(pref_panel_window, COLOR_PAIR(5)); @@ -1051,6 +1150,32 @@ void update_cpu_pref(int *line_selected, int toggle_view, int toggle_sort) doupdate(); } +void update_perf_sort(int *line_selected) +{ + int i; + struct perfcounter *perf; + GList *perflist; + int size; + + size = g_hash_table_size(global_perf_liszt); + if (*line_selected > (size - 1)) + *line_selected = size - 1; + else if (*line_selected < 0) + *line_selected = 0; + + i = 0; + perflist = g_list_first(g_hash_table_get_keys(global_perf_liszt)); + while (perflist) { + perf = g_hash_table_lookup(global_perf_liszt, perflist->data); + if (i != *line_selected) + perf->sort = 0; + else + perf->sort = 1; + i++; + perflist = g_list_next(perflist); + } +} + void update_perf_pref(int *line_selected, int toggle_view, int toggle_sort) { int i; @@ -1074,21 +1199,16 @@ void update_perf_pref(int *line_selected, int toggle_view, int toggle_sort) set_window_title(pref_panel_window, "Perf Preferences "); wattron(pref_panel_window, A_BOLD); mvwprintw(pref_panel_window, g_hash_table_size(global_perf_liszt) + 1, 1, - " 's' to sort"); + " 's' : sort, space : toggle"); wattroff(pref_panel_window, A_BOLD); + if (*line_selected > (size - 1)) + *line_selected = size - 1; + else if (*line_selected < 0) + *line_selected = 0; + if (toggle_sort == 1) { - i = 0; - perflist = g_list_first(g_hash_table_get_keys(global_perf_liszt)); - while (perflist) { - perf = g_hash_table_lookup(global_perf_liszt, perflist->data); - if (i != *line_selected) - perf->sort = 0; - else - perf->sort = 1; - i++; - perflist = g_list_next(perflist); - } + update_perf_sort(line_selected); update_current_view(); } @@ -1143,6 +1263,32 @@ int update_preference_panel(int *line_selected, int toggle_view, int toggle_sort return ret; } +int update_sort(int *line_selected) +{ + int ret = 0; + + switch(current_view) { + case perf: + update_perf_sort(line_selected); + break; + case cpu: + update_cpu_sort(line_selected); + break; + case iostream: + update_iostream_sort(line_selected); + break; + case process_details: + update_process_detail_sort(line_selected); + break; + default: + ret = -1; + break; + } + + return ret; +} + + void toggle_pref_panel(void) { int ret; @@ -1195,6 +1341,7 @@ void *handle_keyboard(void *p) while((ch = getch())) { switch(ch) { /* Move the cursor and scroll */ + case 'j': case KEY_DOWN: if (pref_panel_visible) { pref_line_selected++; @@ -1214,6 +1361,7 @@ void *handle_keyboard(void *p) break; case KEY_NPAGE: break; + case 'k': case KEY_UP: if (pref_panel_visible) { if (pref_line_selected > 0) @@ -1262,9 +1410,11 @@ void *handle_keyboard(void *p) } else { print_log("Manually moving forward"); sem_post(&timer); - /* we force to resume the refresh when moving forward */ - if (toggle_pause > 0) - resume_display(); + if (toggle_pause > 0) { + sem_post(&pause_sem); + update_current_view(); + sem_wait(&pause_sem); + } } break; @@ -1280,8 +1430,30 @@ void *handle_keyboard(void *p) if (pref_panel_visible) update_preference_panel(&pref_line_selected, 0, 1); break; + case '>': + /* 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 '<': + /* 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 ?? */ + if (pref_panel_visible) + break; if (current_view != process_details) { previous_view = current_view; current_view = process_details; @@ -1289,6 +1461,7 @@ void *handle_keyboard(void *p) current_view = previous_view; previous_view = process_details; } + selected_line = 0; update_current_view(); break; @@ -1323,6 +1496,8 @@ void *handle_keyboard(void *p) case KEY_F(10): case 'q': reset_ncurses(); + /* exit keyboard thread */ + pthread_exit(0); break; case 't': toggle_threads *= -1; @@ -1335,9 +1510,19 @@ void *handle_keyboard(void *p) resume_display(); } break; - case 'P': + case 'r': toggle_pref_panel(); break; + /* ESCAPE, but slow to process, don't know why */ + case 27: + if (pref_panel_visible) + toggle_pref_panel(); + else if (current_view == process_details) { + current_view = previous_view; + previous_view = process_details; + } + update_current_view(); + break; default: if (data) update_current_view(); @@ -1352,8 +1537,8 @@ void init_view_headers() { cputopview[0].title = strdup("CPU(%)"); cputopview[0].sort = 1; - cputopview[1].title = strdup("TGID"); - cputopview[2].title = strdup("PID"); + cputopview[1].title = strdup("PID"); + cputopview[2].title = strdup("TID"); cputopview[3].title = strdup("NAME"); iostreamtopview[0].title = strdup("R (B/sec)");