From: Julien Desfossez <julien.desfossez@efficios.com>
Date: Wed, 25 Apr 2012 15:38:16 +0000 (-0400)
Subject: fix sort total iostreamtop
X-Git-Tag: v0.2~9
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=41f5890b4f45d14caf1134f0d4397fe2dd3251ea;p=lttngtop.git

fix sort total iostreamtop

Signed-off-by: Julien Desfossez <julien.desfossez@efficios.com>
---

diff --git a/src/cursesdisplay.c b/src/cursesdisplay.c
index c8d7067..01dc543 100644
--- 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;
@@ -826,16 +826,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);