cleanup, live textdump working
[lttngtop.git] / src / cursesdisplay.c
index b8694ee258e88f33256873af9160b7f674411f18..25fe1f94e075836daf83d85861407e1bd1817103 100644 (file)
@@ -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;
@@ -67,6 +68,7 @@ pthread_t keyboard_thread;
 
 struct header_view cputopview[4];
 struct header_view iostreamtopview[3];
+struct header_view fileview[3];
 
 void reset_ncurses()
 {
@@ -226,6 +228,8 @@ int process_selected(struct processtop *process)
 
        for (i = 0; i < selected_processes->len; i++) {
                stored_process = g_ptr_array_index(selected_processes, i);
+               if (!stored_process)
+                       return 0;
                if (stored_process->tid == process->tid)
                        return 1;
        }
@@ -234,11 +238,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");
        }
 }
@@ -266,8 +280,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);
@@ -287,23 +302,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)
@@ -315,6 +313,7 @@ static void scale_unit(uint64_t bytes, char *ret)
        else
                sprintf(ret, "%" PRIu64, bytes);
 }
+
 uint64_t total_io()
 {
        int i;
@@ -437,8 +436,59 @@ 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;
+       if (totaln1 == totaln2)
+               return 0;
+       return -1;
+}
+
+gint sort_by_file_read_desc(gconstpointer p1, gconstpointer p2)
+{
+       struct files *n1 = *(struct files **)p1;
+       struct files *n2 = *(struct files **)p2;
+       unsigned long totaln1;
+       unsigned long totaln2;
+
+       totaln1 = n1->read;
+       totaln2 = n2->read;
+
+       if (totaln1 < totaln2)
+               return 1;
+       if (totaln1 == totaln2)
+               return 0;
+       return -1;
+}
+
+gint sort_by_file_write_desc(gconstpointer p1, gconstpointer p2)
+{
+       struct files *n1 = *(struct files **)p1;
+       struct files *n2 = *(struct files **)p2;
+       unsigned long totaln1;
+       unsigned long totaln2;
+
+       totaln1 = n1->write;
+       totaln2 = n2->write;
+
+       if (totaln1 < totaln2)
+               return 1;
+       if (totaln1 == totaln2)
+               return 0;
+       return -1;
+}
+
+gint sort_by_file_fd_desc(gconstpointer p1, gconstpointer p2)
+{
+       struct files *n1 = *(struct files **)p1;
+       struct files *n2 = *(struct files **)p2;
+       unsigned long totaln1;
+       unsigned long totaln2;
+
+       totaln1 = n1->fd;
+       totaln2 = n2->fd;
 
        if (totaln1 < totaln2)
                return 1;
@@ -470,6 +520,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;
@@ -487,10 +538,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;
@@ -499,8 +556,10 @@ 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;
 
-               /* FIXME : random segfault here */
                if (process_selected(tmp)) {
                        wattron(center, COLOR_PAIR(6));
                        mvwhline(center, current_line + header_offset, 1, ' ', COLS-3);
@@ -513,12 +572,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++;
@@ -565,7 +624,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);
 }
 
@@ -578,6 +638,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");
 
@@ -588,51 +654,87 @@ 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);
 
-       for (i = selected_line; i < tmp->process_files_table->len &&
-                       i < (selected_line + max_center_lines - 7); i++) {
-               file_tmp = get_file(tmp, i);
-               if (file_tmp != NULL) {
-                       mvwprintw(center, 9 + j, 1, "%d", i);
-                       scale_unit(file_tmp->read, unit);
-                       mvwprintw(center, 9 + j, 10, "%s", unit);
-                       scale_unit(file_tmp->write, unit);
-                       mvwprintw(center, 9 + j, 17, "%s", unit);
-                       snprintf(filename_buf, COLS - 25, "%s", file_tmp->name);
-                       mvwprintw(center, 9 + j, 24, "%s", filename_buf);
-                       j++;
-               }
+       /*
+        * since the process_files_table array could contain NULL file structures,
+        * and that the positions inside the array is important (it is the FD), we
+        * need to create a temporary array that we can sort.
+        */
+       for (i = 0; i < tmp->process_files_table->len; i++) {
+               file_tmp = g_ptr_array_index(tmp->process_files_table, i);
+               if (file_tmp)
+                       g_ptr_array_add(newfilearray, file_tmp);
        }
+
+       if (fileview[0].sort == 1)
+               g_ptr_array_sort(newfilearray, sort_by_file_fd_desc);
+       else if (fileview[1].sort == 1)
+               g_ptr_array_sort(newfilearray, sort_by_file_read_desc);
+       else if (fileview[2].sort == 1)
+               g_ptr_array_sort(newfilearray, sort_by_file_write_desc);
+       else
+               g_ptr_array_sort(newfilearray, sort_by_file_read_desc);
+
+       for (i = selected_line; i < newfilearray->len &&
+                       i < (selected_line + max_center_lines - line + 2); i++) {
+               file_tmp = g_ptr_array_index(newfilearray, i);
+               if (!file_tmp)
+                       continue;
+               mvwprintw(center, line + j, 1, "%d", file_tmp->fd);
+               scale_unit(file_tmp->read, unit);
+               mvwprintw(center, line + j, 11, "%s", unit);
+               scale_unit(file_tmp->write, unit);
+               mvwprintw(center, line + j, 21, "%s", unit);
+               snprintf(filename_buf, COLS - 25, "%s", file_tmp->name);
+               mvwprintw(center, line + j, 31, "%s", filename_buf);
+               j++;
+       }
+       g_ptr_array_free(newfilearray, TRUE);
 }
 
 void update_perf()
@@ -659,16 +761,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);
@@ -676,6 +782,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));
@@ -723,16 +832,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);
@@ -746,6 +864,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));
@@ -817,6 +938,93 @@ 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;
+       int size;
+
+       if (!data)
+               return;
+       if (pref_panel_window) {
+               del_panel(pref_panel);
+               delwin(pref_panel_window);
+       }
+       size = 3;
+
+       pref_panel_window = create_window(size + 2, 30, 10, 10);
+       pref_panel = new_panel(pref_panel_window);
+
+       werase(pref_panel_window);
+       box(pref_panel_window, 0 , 0);
+       set_window_title(pref_panel_window, "Process Detail Preferences ");
+       wattron(pref_panel_window, A_BOLD);
+       mvwprintw(pref_panel_window, size + 1, 1,
+                       " '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) {
+               update_process_detail_sort(line_selected);
+               update_current_view();
+       }
+
+       for (i = 0; i < size; i++) {
+               if (i == *line_selected) {
+                       wattron(pref_panel_window, COLOR_PAIR(5));
+                       mvwhline(pref_panel_window, i + 1, 1, ' ', 30 - 2);
+               }
+               if (fileview[i].sort == 1)
+                       wattron(pref_panel_window, A_BOLD);
+               mvwprintw(pref_panel_window, i + 1, 1, "[-] %s",
+                               fileview[i].title);
+               wattroff(pref_panel_window, A_BOLD);
+               wattroff(pref_panel_window, COLOR_PAIR(5));
+
+       }
+       update_panels();
+       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;
@@ -838,17 +1046,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();
        }
 
@@ -859,7 +1065,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));
@@ -869,6 +1075,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;
@@ -890,21 +1116,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++) {
@@ -914,7 +1135,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));
@@ -924,6 +1145,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;
@@ -947,21 +1194,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();
        }
 
@@ -1005,6 +1247,9 @@ int update_preference_panel(int *line_selected, int toggle_view, int toggle_sort
                case iostream:
                        update_iostream_pref(line_selected, toggle_view, toggle_sort);
                        break;
+               case process_details:
+                       update_process_detail_pref(line_selected, toggle_view, toggle_sort);
+                       break;
                default:
                        ret = -1;
                        break;
@@ -1013,6 +1258,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;
@@ -1065,6 +1336,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++;
@@ -1084,6 +1356,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)
@@ -1132,9 +1405,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;
@@ -1150,8 +1425,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;
@@ -1159,6 +1456,7 @@ void *handle_keyboard(void *p)
                                current_view = previous_view;
                                previous_view = process_details;
                        }
+                       selected_line = 0;
                        update_current_view();
                        break;
 
@@ -1205,9 +1503,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();
@@ -1222,14 +1530,19 @@ 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)");
        iostreamtopview[1].title = strdup("W (B/sec)");
        iostreamtopview[2].title = strdup("Total (B)");
        iostreamtopview[2].sort = 1;
+
+       fileview[0].title = strdup("FD");
+       fileview[1].title = strdup("READ");
+       fileview[1].sort = 1;
+       fileview[2].title = strdup("WRITE");
 }
 
 void init_ncurses()
This page took 0.03164 seconds and 4 git commands to generate.