X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcursesdisplay.c;h=e6482f4a8b94418d6590790488a7c7de578135c5;hb=aa15ac1c699ea5f76f6c26fb14ab22f725ecc293;hp=77686ca8959472cef9e29ccd013126b225bfdba9;hpb=cc30e58de025f10913fe2e1cbe6e9709b2df573a;p=lttngtop.git

diff --git a/src/cursesdisplay.c b/src/cursesdisplay.c
index 77686ca..e6482f4 100644
--- a/src/cursesdisplay.c
+++ b/src/cursesdisplay.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Julien Desfossez
+ * Copyright (C) 2011-2012 Julien Desfossez
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License Version 2 as
@@ -57,7 +57,7 @@ char log_lines[MAX_LINE_LENGTH * MAX_LOG_LINES + MAX_LOG_LINES];
 
 int max_elements = 80;
 
-int toggle_threads = -1;
+int toggle_threads = 1;
 int toggle_pause = -1;
 
 int max_center_lines;
@@ -281,6 +281,7 @@ void update_footer()
 	print_key(footer, "Space", "Highlight  ", 0);
 	print_key(footer, "q", "Quit ", 0);
 	print_key(footer, "r", "Pref  ", 0);
+	print_key(footer, "t", "Threads  ", toggle_threads);
 	print_key(footer, "p", "Pause  ", toggle_pause);
 
 	wrefresh(footer);
@@ -568,6 +569,9 @@ void update_cputop_display()
 	for (i = list_offset; i < data->process_table->len &&
 			nblinedisplayed < max_center_lines; i++) {
 		tmp = g_ptr_array_index(data->process_table, i);
+		if (tmp->pid != tmp->tid)
+			if (toggle_threads == -1)
+				continue;
 
 		if (process_selected(tmp)) {
 			wattron(center, COLOR_PAIR(6));
@@ -581,9 +585,9 @@ void update_cputop_display()
 		/* CPU(%) */
 		mvwprintw(center, current_line + header_offset, 1, "%1.2f",
 				tmp->totalcpunsec / maxcputime);
-		/* TGID */
-		mvwprintw(center, current_line + header_offset, 11, "%d", tmp->pid);
 		/* PID */
+		mvwprintw(center, current_line + header_offset, 11, "%d", tmp->pid);
+		/* TID */
 		mvwprintw(center, current_line + header_offset, 21, "%d", tmp->tid);
 		/* NAME */
 		mvwprintw(center, current_line + header_offset, 31, "%s", tmp->comm);
@@ -785,6 +789,9 @@ void update_perf()
 	for (i = 0; i < data->process_table->len &&
 			nblinedisplayed < max_center_lines; i++) {
 		tmp = g_ptr_array_index(data->process_table, i);
+		if (tmp->pid != tmp->tid)
+			if (toggle_threads == -1)
+				continue;
 
 		if (process_selected(tmp)) {
 			wattron(center, COLOR_PAIR(6));
@@ -862,6 +869,9 @@ void update_iostream()
 	for (i = list_offset; i < data->process_table->len &&
 			nblinedisplayed < max_center_lines; i++) {
 		tmp = g_ptr_array_index(data->process_table, i);
+		if (tmp->pid != tmp->tid)
+			if (toggle_threads == -1)
+				continue;
 
 		if (process_selected(tmp)) {
 			wattron(center, COLOR_PAIR(6));
@@ -1409,8 +1419,8 @@ void init_view_headers()
 {
 	cputopview[0].title = strdup("CPU(%)");
 	cputopview[0].sort = 1;
-	cputopview[1].title = strdup("TGID");
-	cputopview[2].title = strdup("PID");
+	cputopview[1].title = strdup("PID");
+	cputopview[2].title = strdup("TID");
 	cputopview[3].title = strdup("NAME");
 
 	iostreamtopview[0].title = strdup("R (B/sec)");