X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fcursesdisplay.c;h=e4565ede33708d4410842062d86c6f0a7fe87d78;hp=eb859af1e33d5a618bff1804132b869ab8e91176;hb=91be6bb5a6b9a1485b2daceb7152f545d3566e0c;hpb=71bd7ce14826a0d7067c45657f33080e546cd5dc

diff --git a/src/cursesdisplay.c b/src/cursesdisplay.c
index eb859af..e4565ed 100644
--- 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);
-	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);
@@ -237,7 +237,7 @@ void update_footer()
 	wmove(footer, 1, 1);
 	print_key(footer, "F2", "CPUtop  ", current_view == cpu);
 	print_key(footer, "F3", "PerfTop  ", current_view == perf);
-	print_key(footer, "F6", "IOTop  ", current_view == iostream);
+	print_key(footer, "F4", "IOTop  ", current_view == iostream);
 	print_key(footer, "Enter", "Details  ", current_view == process_details);
 	print_key(footer, "q", "Quit | ", 0);
 	print_key(footer, "P", "Perf Pref  ", 0);
@@ -254,42 +254,60 @@ void basic_header()
 	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);
 }
 
+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, "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));
-	print_headers(4, "Files", data->nbfiles, data->nbnewfiles,
+	print_headers(3, "Files", data->nbfiles, data->nbnewfiles,
 			-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);
 }
 
@@ -452,13 +470,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++;
 		}
 	}
@@ -488,9 +513,9 @@ void update_perf()
 	g_hash_table_iter_init(&iter, data->perf_list);
 	while (g_hash_table_iter_next (&iter, &key, (gpointer) &perfn1)) {
 		if (perfn1->visible) {
-			/* + 6 to strip the "_perf_" prefix */
+			/* + 5 to strip the "perf_" prefix */
 			mvwprintw(center, 1, perf_row, "%s",
-					(char *) key + 6);
+					(char *) key + 5);
 			perf_row += 20;
 		}
 		if (perfn1->sort) {
@@ -502,7 +527,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);
 
@@ -538,47 +563,6 @@ void update_perf()
 	}
 }
 
-void update_fileio()
-{
-	int i;
-	int offset;
-
-	set_window_title(center, "IO Top");
-	wattron(center, A_BOLD);
-	mvwprintw(center, 1, 10, "READ");
-	mvwprintw(center, 2, 1, "bytes");
-	mvwprintw(center, 2, 15, "bytes/sec");
-
-	mvwprintw(center, 1, 39, "WRITE");
-	mvwprintw(center, 2, 33, "bytes");
-	mvwprintw(center, 2, 45, "bytes/sec");
-
-	if (toggle_threads > 0) {
-		mvwprintw(center, 1, 60, "TGID");
-		mvwprintw(center, 1, 70, "PID");
-		offset = 8;
-	} else {
-		mvwprintw(center, 1, 60, "PID(TGID)");
-		offset = 0;
-	}
-	mvwprintw(center, 1, 72 + offset, "NAME");
-	wattroff(center, A_BOLD);
-
-	for (i = 3; i < LINES - 3 - 8 - 1; i++) {
-		mvwprintw(center, i, 1, "%d", i*1000);
-		mvwprintw(center, i, 15, "%dk", i);
-		mvwprintw(center, i, 28, "|    %d", i*2000);
-		mvwprintw(center, i, 45, "%dk", i*2);
-		if (toggle_threads > 0) {
-			mvwprintw(center, i, 57, "|  %d", i);
-			mvwprintw(center, i, 70, "%d", i);
-		} else {
-			mvwprintw(center, i, 57, "|  %d", i);
-		}
-		mvwprintw(center, i, 72 + offset, "process_%d", i);
-	}
-}
-
 gint sort_by_ret_desc(gconstpointer p1, gconstpointer p2)
 {
 	struct processtop *n1 = *(struct processtop **)p1;
@@ -682,9 +666,6 @@ void update_current_view()
 	case process_details:
 		update_process_details();
 		break;
-	case fileio:
-		update_fileio();
-		break;
 	case iostream:
 		update_iostream();
 		break;
@@ -763,7 +744,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++;
@@ -947,16 +928,6 @@ void *handle_keyboard(void *p)
 			update_current_view();
 			break;
 		case KEY_F(4):
-			current_view = fileio;
-			toggle_tree = -1;
-			update_current_view();
-			break;
-		case KEY_F(5):
-			current_view = netio;
-			toggle_tree = -1;
-			update_current_view();
-			break;
-		case KEY_F(6):
 			current_view = iostream;
 			toggle_tree = -1;
 			update_current_view();
@@ -994,8 +965,8 @@ void init_ncurses()
 	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);