X-Git-Url: http://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=c31b9fd873644f8a3117ce5b001d3b4600a49c23;hp=26da96786455021678a80a6fecd50448a9baa49b;hb=ea5d1dc99544231b4e2085ad706fcc1fa6260faa;hpb=da4353bbbb28c19bd28447018edb94845ae71673

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 26da967..c31b9fd 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -218,16 +218,6 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
 		if (!lookup_filter_tid_list(pid))
 			goto end;
 
-	/*
-	if (!opt_tid && (opt_hostname && !lookup_hostname_list(hostname)))
-		goto end;
-	if (!opt_hostname && (opt_tid && !lookup_tid_list(pid)))
-		goto end;
-	if ((opt_tid && !lookup_tid_list(pid)) &&
-			(opt_hostname && !lookup_hostname_list(hostname)))
-		goto end;
-		*/
-
 	cpu_id = get_cpu_id(call_data);
 	procname = get_context_comm(call_data);
 
@@ -458,7 +448,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 	/* find or create the current process */
 	child = find_process_tid(&lttngtop, tid, comm);
 	if (!child)
-		child = add_proc(&lttngtop, tid, comm, timestamp);
+		child = add_proc(&lttngtop, tid, comm, timestamp, hostname);
 	if (!child)
 		goto end;
 	update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm, hostname);
@@ -467,7 +457,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 		/* find or create the parent */
 		parent = find_process_tid(&lttngtop, pid, comm);
 		if (!parent) {
-			parent = add_proc(&lttngtop, pid, comm, timestamp);
+			parent = add_proc(&lttngtop, pid, comm, timestamp, hostname);
 			if (parent)
 				parent->pid = pid;
 		}
@@ -630,25 +620,25 @@ static int parse_options(int argc, char **argv)
 				break;
 			case OPT_PID:
 				toggle_filter = 1;
-				tid_list = g_hash_table_new(g_str_hash,
+				tid_filter_list = g_hash_table_new(g_str_hash,
 						g_str_equal);
 				tmp_str = strtok(opt_tid, ",");
 				while (tmp_str) {
 					tid = malloc(sizeof(int));
 					*tid = atoi(tmp_str);
-					g_hash_table_insert(tid_list,
+					g_hash_table_insert(tid_filter_list,
 							(gpointer) tid, tid);
 					tmp_str = strtok(NULL, ",");
 				}
 				break;
 			case OPT_HOSTNAME:
 				toggle_filter = 1;
-				hostname_list = g_hash_table_new(g_str_hash,
+				hostname_filter_list = g_hash_table_new(g_str_hash,
 						g_str_equal);
 				tmp_str = strtok(opt_hostname, ",");
 				while (tmp_str) {
 					char *new_str = strdup(tmp_str);
-					g_hash_table_insert(hostname_list,
+					g_hash_table_insert(hostname_filter_list,
 							(gpointer) new_str,
 							(gpointer) new_str);
 					tmp_str = strtok(NULL, ",");
@@ -1214,7 +1204,8 @@ int setup_live_tracing()
 		chan.attr.subbuf_size = 32768;
 		chan.attr.num_subbuf = 8;
 	} else {
-		chan.attr.subbuf_size = 1048576; /* 1MB */
+		//chan.attr.subbuf_size = 1048576; /* 1MB */
+		chan.attr.subbuf_size = 2097152; /* 1MB */
 		chan.attr.num_subbuf = 4;
 	}
 	chan.attr.switch_timer_interval = 0;