X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcursesdisplay.c;h=49ec23ce6f8d72169abdc18af7ac33dd60902e61;hb=84c36c18637e2b02dd9a91646065f90e02eca660;hp=edcf4e59a7fc1340df45915e75c37a33286cd9a9;hpb=f9ff6939d608d012d34dc77dfebdff2e025e23c0;p=lttngtop.git

diff --git a/src/cursesdisplay.c b/src/cursesdisplay.c
index edcf4e5..49ec23c 100644
--- a/src/cursesdisplay.c
+++ b/src/cursesdisplay.c
@@ -237,11 +237,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");
 	}
 }
@@ -524,6 +534,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;
@@ -541,10 +552,14 @@ 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);
+		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;
@@ -567,11 +582,11 @@ void update_cputop_display()
 		mvwprintw(center, current_line + header_offset, 1, "%1.2f",
 				tmp->totalcpunsec / maxcputime);
 		/* TGID */
-		mvwprintw(center, current_line + header_offset, 12, "%d", tmp->pid);
+		mvwprintw(center, current_line + header_offset, 11, "%d", tmp->pid);
 		/* PID */
-		mvwprintw(center, current_line + header_offset, 22, "%d", tmp->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++;