X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fcursesdisplay.c;h=acf5753008490925b019c3241838e8c63e2d9d3d;hp=d6befea5be042fe34f7d9647ed7b61c9eca94085;hb=b8a1df45a129ecca6e761af956b8b2aab6f98045;hpb=ceb3a2216fed5f405aa77c358328f71f44ed3303 diff --git a/src/cursesdisplay.c b/src/cursesdisplay.c index d6befea..acf5753 100644 --- a/src/cursesdisplay.c +++ b/src/cursesdisplay.c @@ -165,7 +165,7 @@ void print_headers(int line, char *desc, int value, int first, int second) wattron(header, A_BOLD); mvwprintw(header, line, 4, "%s", desc); wattroff(header, A_BOLD); - mvwprintw(header, line, 16, "N/A", value); + mvwprintw(header, line, 16, "%d", value); wmove(header, line, 24); print_digits(header, first, second); wmove(header, line, 40); @@ -237,7 +237,7 @@ void update_footer() wmove(footer, 1, 1); print_key(footer, "F2", "CPUtop ", current_view == cpu); print_key(footer, "F3", "PerfTop ", current_view == perf); - print_key(footer, "F6", "IOTop ", current_view == iostream); + print_key(footer, "F4", "IOTop ", current_view == iostream); print_key(footer, "Enter", "Details ", current_view == process_details); print_key(footer, "q", "Quit | ", 0); print_key(footer, "P", "Perf Pref ", 0); @@ -254,11 +254,9 @@ void basic_header() set_window_title(header, "Statistics for interval [gathering data...["); wattron(header, A_BOLD); mvwprintw(header, 1, 4, "CPUs"); - mvwprintw(header, 2, 4, "Processes"); - mvwprintw(header, 3, 4, "Threads"); - mvwprintw(header, 4, 4, "Files"); - mvwprintw(header, 5, 4, "Network"); - mvwprintw(header, 6, 4, "IO"); + mvwprintw(header, 2, 4, "Threads"); + mvwprintw(header, 3, 4, "Files"); + mvwprintw(header, 4, 4, "Network"); wattroff(header, A_BOLD); wrefresh(header); } @@ -281,15 +279,13 @@ void update_header() wattroff(header, A_BOLD); wprintw(header, "\t%d\t(max/cpu : %0.2f%)", data->cpu_table->len, 100.0/data->cpu_table->len); - print_headers(2, "Processes", data->nbproc, data->nbnewproc, - -1*(data->nbdeadproc)); - print_headers(3, "Threads", data->nbthreads, data->nbnewthreads, + print_headers(2, "Threads", data->nbthreads, data->nbnewthreads, -1*(data->nbdeadthreads)); - print_headers(4, "Files", data->nbfiles, data->nbnewfiles, + print_headers(3, "Files", data->nbfiles, data->nbnewfiles, -1*(data->nbclosedfiles)); - mvwprintw(header, 4, 43, "N/A kbytes/sec"); - print_headers(5, "Network", 114, 0, 0); - mvwprintw(header, 5, 43, "N/A Mbytes/sec"); + mvwprintw(header, 3, 43, "N/A kbytes/sec"); + print_headers(4, "Network", 0, 0, 0); + mvwprintw(header, 4, 43, "N/A Mbytes/sec"); wrefresh(header); } @@ -422,7 +418,6 @@ void update_process_details() double maxcputime; struct processtop *tmp = find_process_tid(data, selected_tid, selected_comm); struct files *file_tmp; - struct file_history *history = tmp->files_history; int i, j = 0; set_window_title(center, "Process details"); @@ -453,25 +448,23 @@ void update_process_details() print_key_title("WRITE B/s", 7); wprintw(center, "%d", tmp->filewrite); + wattron(center, A_BOLD); + mvwprintw(center, 8, 1, "FD"); + mvwprintw(center, 8, 12, "READ"); + mvwprintw(center, 8, 22, "WRITE"); + mvwprintw(center, 8, 32, "FILENAME"); + wattroff(center, A_BOLD); + for (i = 0; i < tmp->process_files_table->len; i++) { file_tmp = get_file(tmp, i); if (file_tmp != NULL) { - print_key_title("file", 8+j); - wprintw(center, "%s fd = %d", file_tmp->name, i); - wprintw(center, " read = %d", file_tmp->read); - wprintw(center, " write = %d", file_tmp->write); + mvwprintw(center, 9 + j, 1, "%d", i); + mvwprintw(center, 9 + j, 12, "%d", file_tmp->read); + mvwprintw(center, 9 + j, 22, "%d", file_tmp->write); + mvwprintw(center, 9 + j, 32, "%s", file_tmp->name); j++; } } -/* - print_key_title("----------- Files History -----------",8+j); - j = 0; - while (history != NULL) { - file_tmp = history->file; - wprintw(center, "fd = %d\n", file_tmp->fd);//, file_tmp->fd); - history = history->next; - } -*/ } void update_perf() @@ -548,47 +541,6 @@ void update_perf() } } -void update_fileio() -{ - int i; - int offset; - - set_window_title(center, "IO Top"); - wattron(center, A_BOLD); - mvwprintw(center, 1, 10, "READ"); - mvwprintw(center, 2, 1, "bytes"); - mvwprintw(center, 2, 15, "bytes/sec"); - - mvwprintw(center, 1, 39, "WRITE"); - mvwprintw(center, 2, 33, "bytes"); - mvwprintw(center, 2, 45, "bytes/sec"); - - if (toggle_threads > 0) { - mvwprintw(center, 1, 60, "TGID"); - mvwprintw(center, 1, 70, "PID"); - offset = 8; - } else { - mvwprintw(center, 1, 60, "PID(TGID)"); - offset = 0; - } - mvwprintw(center, 1, 72 + offset, "NAME"); - wattroff(center, A_BOLD); - - for (i = 3; i < LINES - 3 - 8 - 1; i++) { - mvwprintw(center, i, 1, "%d", i*1000); - mvwprintw(center, i, 15, "%dk", i); - mvwprintw(center, i, 28, "| %d", i*2000); - mvwprintw(center, i, 45, "%dk", i*2); - if (toggle_threads > 0) { - mvwprintw(center, i, 57, "| %d", i); - mvwprintw(center, i, 70, "%d", i); - } else { - mvwprintw(center, i, 57, "| %d", i); - } - mvwprintw(center, i, 72 + offset, "process_%d", i); - } -} - gint sort_by_ret_desc(gconstpointer p1, gconstpointer p2) { struct processtop *n1 = *(struct processtop **)p1; @@ -692,9 +644,6 @@ void update_current_view() case process_details: update_process_details(); break; - case fileio: - update_fileio(); - break; case iostream: update_iostream(); break; @@ -773,7 +722,7 @@ void update_perf_panel(int line_selected, int toggle_view, int toggle_sort) wattron(perf_panel_window, A_BOLD); mvwprintw(perf_panel_window, i + 1, 1, "[%c] %s", perf->visible == 1 ? 'x' : ' ', - (char *) perflist->data + 6); + (char *) perflist->data + 5); wattroff(perf_panel_window, A_BOLD); wattroff(perf_panel_window, COLOR_PAIR(5)); i++; @@ -957,16 +906,6 @@ void *handle_keyboard(void *p) update_current_view(); break; case KEY_F(4): - current_view = fileio; - toggle_tree = -1; - update_current_view(); - break; - case KEY_F(5): - current_view = netio; - toggle_tree = -1; - update_current_view(); - break; - case KEY_F(6): current_view = iostream; toggle_tree = -1; update_current_view(); @@ -1004,8 +943,8 @@ void init_ncurses() sem_init(&update_display_sem, 0, 1); init_screen(); - header = create_window(7, COLS - 1, 0, 0); - center = create_window(LINES - 7 - 7, COLS - 1, 7, 0); + header = create_window(6, COLS - 1, 0, 0); + center = create_window(LINES - 7 - 7, COLS - 1, 6, 0); status = create_window(MAX_LOG_LINES + 2, COLS - 1, LINES - 7, 0); footer = create_window(1, COLS - 1, LINES - 1, 0);