int toggle_threads = -1;
int toggle_pause = -1;
-int toggle_tree = -1;
int max_center_lines;
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);
}
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 &&
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);
if (current_line == selected_line) {
selected_process = tmp;
+ selected_tid = tmp->tid;
+ selected_comm = tmp->comm;
wattron(center, COLOR_PAIR(5));
mvwhline(center, current_line + header_offset, 1, ' ', COLS-3);
}
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;
case KEY_F(1):
- toggle_tree *= -1;
current_view = cpu;
+ selected_line = 0;
update_current_view();
break;
case KEY_F(2):
current_view = cpu;
+ selected_line = 0;
update_current_view();
break;
case KEY_F(3):
current_view = perf;
- toggle_tree = -1;
+ selected_line = 0;
update_current_view();
break;
case KEY_F(4):
current_view = iostream;
- toggle_tree = -1;
+ selected_line = 0;
update_current_view();
break;
case KEY_F(10):
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);