allow return to previous view with enter

[lttngtop.git] / src / cursesdisplay.c

diff --git a/src/cursesdisplay.c b/src/cursesdisplay.c
index 042d45a6feb6bfbfa7a0962f935fd0b1509d8a50..7dfe7ad0937ac2164d530f8aed373573c0c6bfa9 100644 (file)
--- a/src/cursesdisplay.c
+++ b/src/cursesdisplay.c
@@ -255,37 +255,56 @@ void basic_header()
        wattron(header, A_BOLD);
        mvwprintw(header, 1, 4, "CPUs");
        mvwprintw(header, 2, 4, "Threads");
-       mvwprintw(header, 3, 4, "Files");
-       mvwprintw(header, 4, 4, "Network");
+       mvwprintw(header, 3, 4, "FDs");
        wattroff(header, A_BOLD);
        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;
+}
+
 void update_header()
 {
+       struct tm start, end;
+       uint64_t ts_nsec_start, ts_nsec_end;
+
+       ts_nsec_start = data->start % NSEC_PER_SEC;
+       start = format_timestamp(data->start);
+
+       ts_nsec_end = data->end % NSEC_PER_SEC;
+       end = format_timestamp(data->end);
+
        werase(header);
        box(header, 0 , 0);
        set_window_title(header, "Statistics for interval ");
        wattron(header, A_BOLD);
-       /*
-       wprintw(header, "[%lu.%lu, %lu.%lu[",
-                       data->start.tv_sec, data->start.tv_nsec,
-                       data->end.tv_sec, data->end.tv_nsec);
-                       */
-       wprintw(header, "[%lu, %lu[",
-            data->start,
-            data->end);
+
+       wprintw(header, "[%02d:%02d:%02d.%09" PRIu64 ", %02d:%02d:%02d.%09" PRIu64 "[",
+               start.tm_hour, start.tm_min, start.tm_sec, ts_nsec_start,
+               end.tm_hour, end.tm_min, end.tm_sec, ts_nsec_end);
        mvwprintw(header, 1, 4, "CPUs");
        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, "Threads", data->nbthreads, data->nbnewthreads,
                        -1*(data->nbdeadthreads));
-       print_headers(3, "Files", data->nbfiles, data->nbnewfiles,
+       print_headers(3, "FDs", data->nbfiles, data->nbnewfiles,
                        -1*(data->nbclosedfiles));
        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);
 }
 
@@ -340,7 +359,7 @@ void update_cputop_display()
        mvwprintw(center, 1, 32, "NAME");
        wattroff(center, A_BOLD);
 
-       max_center_lines = LINES - 7 - 7 - 1 - header_offset;
+       max_center_lines = LINES - 5 - 7 - 1 - header_offset;
 
        /* iterate the process (thread) list */
        for (i = list_offset; i < data->process_table->len &&
@@ -448,13 +467,20 @@ 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++;
                }
        }
@@ -498,7 +524,7 @@ void update_perf()
 
        g_ptr_array_sort_with_data(data->process_table, sort_perf, perf_key);
 
-       for (i = 0; i < data->process_table->len && 
+       for (i = 0; i < data->process_table->len &&
                        nblinedisplayed < max_center_lines; i++) {
                tmp = g_ptr_array_index(data->process_table, i);
 
@@ -715,7 +741,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++;
@@ -878,8 +904,12 @@ void *handle_keyboard(void *p)
                        break;
 
                case 13: /* FIXME : KEY_ENTER ?? */
-                       if (current_view == cpu) {
+                       if (current_view != process_details) {
+                               previous_view = current_view;
                                current_view = process_details;
+                       } else {
+                               current_view = previous_view;
+                               previous_view = process_details;
                        }
                        update_current_view();
                        break;
@@ -936,8 +966,8 @@ void init_ncurses()
        sem_init(&update_display_sem, 0, 1);
        init_screen();
 
-       header = create_window(6, COLS - 1, 0, 0);
-       center = create_window(LINES - 7 - 7, COLS - 1, 6, 0);
+       header = create_window(5, COLS - 1, 0, 0);
+       center = create_window(LINES - 5 - 7, COLS - 1, 5, 0);
        status = create_window(MAX_LOG_LINES + 2, COLS - 1, LINES - 7, 0);
        footer = create_window(1, COLS - 1, LINES - 1, 0);