Fix printing in perf preference panel

[lttngtop.git] / src / cursesdisplay.c

diff --git a/src/cursesdisplay.c b/src/cursesdisplay.c
index 2fd69763673acf7fb55c51197a962cd7c5479830..acf5753008490925b019c3241838e8c63e2d9d3d 100644 (file)
--- 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);
        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);
        wmove(header, line, 24);
        print_digits(header, first, second);
        wmove(header, line, 40);


@@ -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");
        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);
 }
        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);
        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));
                        -1*(data->nbdeadthreads));

-       print_headers(4, "Files", data->nbfiles, data->nbnewfiles,
+       print_headers(3, "Files", data->nbfiles, data->nbnewfiles,

                        -1*(data->nbclosedfiles));
                        -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);
 }
 
        wrefresh(header);
 }
 


@@ -452,13 +448,20 @@ void update_process_details()
        print_key_title("WRITE B/s", 7);
        wprintw(center, "%d", tmp->filewrite);
 
        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) {
        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++;
                }
        }
                        j++;
                }
        }


@@ -719,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' : ' ',
                        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++;
                wattroff(perf_panel_window, A_BOLD);
                wattroff(perf_panel_window, COLOR_PAIR(5));
                i++;


@@ -940,8 +943,8 @@ void init_ncurses()
        sem_init(&update_display_sem, 0, 1);
        init_screen();
 
        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);
 
        status = create_window(MAX_LOG_LINES + 2, COLS - 1, LINES - 7, 0);
        footer = create_window(1, COLS - 1, LINES - 1, 0);