underline for sorted column in process detail view

[lttngtop.git] / src / cursesdisplay.c

diff --git a/src/cursesdisplay.c b/src/cursesdisplay.c
index c8d7067805c6b37440edcc2bf2827a5ab8e8b923..77686ca8959472cef9e29ccd013126b225bfdba9 100644 (file)
--- a/src/cursesdisplay.c
+++ b/src/cursesdisplay.c
@@ -450,8 +450,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;
@@ -648,6 +648,7 @@ void update_process_details()
        char unit[4];
        char filename_buf[COLS];
        int line = 1;
+       int column;
        GPtrArray *newfilearray = g_ptr_array_new();
        GHashTableIter iter;
        struct perfcounter *perfn1, *perfn2;
@@ -695,10 +696,15 @@ void update_process_details()
        line++;
 
        wattron(center, A_BOLD);
-       mvwprintw(center, line, 1, "FD");
-       mvwprintw(center, line, 10, "READ");
-       mvwprintw(center, line, 17, "WRITE");
-       mvwprintw(center, line++, 24, "FILENAME");
+       column = 1;
+       for (i = 0; i < 3; i++) {
+               if (fileview[i].sort)
+                       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);
 
        /*
@@ -728,11 +734,11 @@ void update_process_details()
                        continue;
                mvwprintw(center, line + j, 1, "%d", file_tmp->fd);
                scale_unit(file_tmp->read, unit);
-               mvwprintw(center, line + j, 10, "%s", unit);
+               mvwprintw(center, line + j, 11, "%s", unit);
                scale_unit(file_tmp->write, unit);
-               mvwprintw(center, line + j, 17, "%s", unit);
+               mvwprintw(center, line + j, 21, "%s", unit);
                snprintf(filename_buf, COLS - 25, "%s", file_tmp->name);
-               mvwprintw(center, line + j, 24, "%s", filename_buf);
+               mvwprintw(center, line + j, 31, "%s", filename_buf);
                j++;
        }
        g_ptr_array_free(newfilearray, TRUE);
@@ -826,16 +832,23 @@ 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)
+                       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);