X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fcursesdisplay.c;h=d6befea5be042fe34f7d9647ed7b61c9eca94085;hp=7a9f99da3e666aea4ca83c307b0a297ea243e961;hb=ceb3a2216fed5f405aa77c358328f71f44ed3303;hpb=bb053abbd39b0b8b90e44c673daf61faff234d09

diff --git a/src/cursesdisplay.c b/src/cursesdisplay.c
index 7a9f99d..d6befea 100644
--- a/src/cursesdisplay.c
+++ b/src/cursesdisplay.c
@@ -10,10 +10,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <stdio.h>
@@ -27,6 +26,7 @@
 
 #include "cursesdisplay.h"
 #include "lttngtoptypes.h"
+#include "iostreamtop.h"
 #include "common.h"
 
 #define DEFAULT_DELAY 15
@@ -210,7 +210,8 @@ void print_log(char *str)
 			wmove(status, ++current_line, 1);
 			current_char = 1;
 		} else {
-			mvwprintw(status, current_line, current_char++, "%c", log_lines[i]);
+			mvwprintw(status, current_line, current_char++, "%c",
+					log_lines[i]);
 		}
 	}
 	wrefresh(status);
@@ -420,6 +421,9 @@ void update_process_details()
 	unsigned long elapsed;
 	double maxcputime;
 	struct processtop *tmp = find_process_tid(data, selected_tid, selected_comm);
+	struct files *file_tmp;
+	struct file_history *history = tmp->files_history;
+	int i, j = 0;
 
 	set_window_title(center, "Process details");
 
@@ -442,6 +446,32 @@ void update_process_details()
 	wprintw(center, "%d", tmp->ppid);
 	print_key_title("CPU", 5);
 	wprintw(center, "%1.2f %%", tmp->totalcpunsec/maxcputime);
+
+	print_key_title("READ B/s", 6);
+	wprintw(center, "%d", tmp->fileread);
+
+	print_key_title("WRITE B/s", 7);
+	wprintw(center, "%d", tmp->filewrite);
+
+	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);
+			j++;
+		}
+	}
+/*
+	print_key_title("----------- Files History -----------",8+j);
+	j = 0;
+	while (history != NULL) {
+		file_tmp = history->file;
+		wprintw(center, "fd = %d\n", file_tmp->fd);//, file_tmp->fd);
+		history = history->next;
+	}
+*/
 }
 
 void update_perf()
@@ -468,9 +498,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) {
@@ -506,7 +536,8 @@ void update_perf()
 					value = perfn2->count;
 				else
 					value = 0;
-				mvwprintw(center, current_line + header_offset, perf_row, "%d", value);
+				mvwprintw(center, current_line + header_offset,
+						perf_row, "%d", value);
 				perf_row += 20;
 			}
 		}
@@ -562,8 +593,9 @@ gint sort_by_ret_desc(gconstpointer p1, gconstpointer p2)
 {
 	struct processtop *n1 = *(struct processtop **)p1;
 	struct processtop *n2 = *(struct processtop **)p2;
-	unsigned long totaln1 = n1->iostream->ret_total;
-	unsigned long totaln2 = n2->iostream->ret_total;
+
+	unsigned long totaln1 = n1->totalfileread + n1->totalfilewrite;
+	unsigned long totaln2 = n2->totalfileread + n2->totalfilewrite;
 
 	if (totaln1 < totaln2)
 		return 1;
@@ -579,6 +611,7 @@ void update_iostream()
 	struct processtop *tmp;
 	int nblinedisplayed = 0;
 	int current_line = 0;
+	int total = 0;
 
 	set_window_title(center, "IO Top");
 	wattron(center, A_BOLD);
@@ -606,24 +639,28 @@ void update_iostream()
 			wattron(center, COLOR_PAIR(5));
 			mvwhline(center, current_line + header_offset, 1, ' ', COLS-3);
 		}
+
 		/* READ (bytes/sec) */
 		mvwprintw(center, current_line + header_offset, 1, "%lu",
-				tmp->iostream->ret_read);
+			tmp->fileread);
 
 		/* WRITE (bytes/sec) */
 		mvwprintw(center, current_line + header_offset, 20, "%lu",
-				tmp->iostream->ret_write);
+			tmp->filewrite);
 
 		/* TOTAL STREAM */
-		if(tmp->iostream->ret_total >= 1000000)
+		total = tmp->totalfileread + tmp->totalfilewrite;
+
+		if (total >= 1000000)
 			mvwprintw(center, current_line + header_offset, 40, "%lu MB",
-					tmp->iostream->ret_total/1000000);
-		else if(tmp->iostream->ret_total >=1000)
+					total/1000000);
+		else if (total >= 1000)
 			mvwprintw(center, current_line + header_offset, 40, "%lu KB",
-					tmp->iostream->ret_total/1000);
+					total/1000);
 		else
 			mvwprintw(center, current_line + header_offset, 40, "%lu B",
-					tmp->iostream->ret_total);
+					total);
+
 		/* TGID */
 		mvwprintw(center, current_line + header_offset, 60, "%d", tmp->pid);
 		/* PID */
@@ -701,7 +738,8 @@ void update_perf_panel(int line_selected, int toggle_view, int toggle_sort)
 	box(perf_panel_window, 0 , 0);
 	set_window_title(perf_panel_window, "Perf Preferences ");
 	wattron(perf_panel_window, A_BOLD);
-	mvwprintw(perf_panel_window, g_hash_table_size(data->perf_list) + 1, 1, " 's' to sort");
+	mvwprintw(perf_panel_window, g_hash_table_size(data->perf_list) + 1, 1,
+			" 's' to sort");
 	wattroff(perf_panel_window, A_BOLD);
 
 	if (toggle_sort == 1) {
@@ -952,12 +990,8 @@ void *handle_keyboard(void *p)
 			toggle_perf_panel();
 			break;
 		default:
-			/*
-			 * commented because it makes the list refresh in different order
-			 * if we sort and there are equal values
-			 if (data)
-			 update_current_view();
-			 */
+			if (data)
+				update_current_view();
 			break;
 		}
 		update_footer();