X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=5cb418fae0fd069e25d2cd94de6b59b4597211f2;hp=fd23e74da416c746cf437586ecb275d3c0628a2d;hb=c8d75a13bc5c025053b0c2c14fa1a7dfdaa1b448;hpb=c78f2cdca5c8f39eddd468a7c4ec6c373ed5495e

diff --git a/src/lttngtop.c b/src/lttngtop.c
index fd23e74..5cb418f 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -51,18 +51,18 @@
 #define DEFAULT_FILE_ARRAY_SIZE 1
 
 const char *opt_input_path;
+static int opt_textdump;
+static int opt_child;
+
+int quit = 0;
 
 struct lttngtop *copy;
 pthread_t display_thread;
 pthread_t timer_thread;
-pthread_t live_trace_thread;
 
 unsigned long refresh_display = 1 * NSEC_PER_SEC;
 unsigned long last_display_update = 0;
-int quit = 0;
 
-/* LIVE */
-pthread_t thread_live_consume;
 /* list of FDs available for being read with snapshots */
 struct mmap_stream_list mmap_list;
 GPtrArray *lttng_consumer_stream_array;
@@ -71,30 +71,52 @@ struct lttng_consumer_local_data *ctx = NULL;
 /* list of snapshots currently not consumed */
 GPtrArray *available_snapshots;
 sem_t metadata_available;
-FILE *metadata_fp;
-int trace_opened = 0;
-int metadata_ready = 0;
+int reload_trace = 0;
+
+int last_textdump_print_newline = 1;
 
 enum {
 	OPT_NONE = 0,
 	OPT_HELP,
-	OPT_LIST,
-	OPT_VERBOSE,
-	OPT_DEBUG,
-	OPT_NAMES,
+	OPT_TEXTDUMP,
+	OPT_PID,
+	OPT_CHILD,
+	OPT_HOSTNAME,
 };
 
 static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
 	{ "help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL },
+	{ "textdump", 't', POPT_ARG_NONE, NULL, OPT_TEXTDUMP, NULL, NULL },
+	{ "child", 'f', POPT_ARG_NONE, NULL, OPT_CHILD, NULL, NULL },
+	{ "pid", 'p', POPT_ARG_STRING, &opt_tid, OPT_PID, NULL, NULL },
+	{ "hostname", 'n', POPT_ARG_STRING, &opt_hostname, OPT_HOSTNAME, NULL, NULL },
 	{ NULL, 0, 0, NULL, 0, NULL, NULL },
 };
 
+static void handle_textdump_sigterm(int signal)
+{
+	quit = 1;
+	lttng_destroy_session("test");
+}
+
 void *refresh_thread(void *p)
 {
+	struct mmap_stream *mmap_info;
+
 	while (1) {
-		if (quit)
-			return NULL;
+		if (quit) {
+			sem_post(&pause_sem);
+			sem_post(&timer);
+			sem_post(&end_trace_sem);
+			sem_post(&goodtodisplay);
+			sem_post(&goodtoupdate);
+			pthread_exit(0);
+		}
+		if (!opt_input_path) {
+			bt_list_for_each_entry(mmap_info, &mmap_list.head, list)
+				helper_kernctl_buffer_flush(mmap_info->fd);
+		}
 		sem_wait(&pause_sem);
 		sem_post(&pause_sem);
 		sem_post(&timer);
@@ -118,18 +140,77 @@ void *ncurses_display(void *p)
 		sem_wait(&goodtodisplay);
 		sem_wait(&pause_sem);
 
+		if (quit) {
+			sem_post(&pause_sem);
+			sem_post(&timer);
+			reset_ncurses();
+			pthread_exit(0);
+		}
+
 		copy = g_ptr_array_index(copies, current_display_index);
 		assert(copy);
 		display(current_display_index++);
 
 		sem_post(&goodtoupdate);
 		sem_post(&pause_sem);
+	}
+}
 
-		if (quit) {
-			reset_ncurses();
-			pthread_exit(0);
-		}
+/*
+ * hook on each event to check the timestamp and refresh the display if
+ * necessary
+ */
+enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_data)
+{
+	unsigned long timestamp;
+	struct tm start;
+	uint64_t ts_nsec_start;
+	int pid;
+	int64_t syscall_ret;
+	const struct definition *scope;
+	const char *hostname;
+
+	timestamp = bt_ctf_get_timestamp(call_data);
+
+	start = format_timestamp(timestamp);
+	ts_nsec_start = timestamp % NSEC_PER_SEC;
+
+	pid = get_context_pid(call_data);
+	if (pid == -1ULL && opt_tid) {
+		goto error;
+	}
+	
+	hostname = get_context_hostname(call_data);
+	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;
+
+	if (strcmp(bt_ctf_event_name(call_data), "exit_syscall") == 0) {
+		scope = bt_ctf_get_top_level_scope(call_data,
+				BT_EVENT_FIELDS);
+		syscall_ret = bt_ctf_get_int64(bt_ctf_get_field(call_data,
+					scope, "_ret"));
+		printf("= %ld\n", syscall_ret);
+		last_textdump_print_newline = 1;
+	} else {
+		/* we might have lost the exit_syscall event, so need to
+		 * print the newline in this case */
+		if (last_textdump_print_newline == 0)
+			printf("\n");
+		printf("%02d:%02d:%02d.%09" PRIu64 " %d : %s ", start.tm_hour,
+				start.tm_min, start.tm_sec, ts_nsec_start,
+				pid, bt_ctf_event_name(call_data));
+		last_textdump_print_newline = 0;
 	}
+
+end:
+	return BT_CB_OK;
+error:
+	return BT_CB_ERROR_STOP;
 }
 
 /*
@@ -266,8 +347,8 @@ void update_perf_counter(struct processtop *proc, const struct bt_ctf_event *eve
 enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 		void *private_data)
 {
-	int pid, tid, ppid;
-	char *comm;
+	int pid, tid, ppid, vpid, vtid, vppid;
+	char *comm, *hostname;
 	struct processtop *parent, *child;
 	unsigned long timestamp;
 
@@ -279,6 +360,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 	if (pid == -1ULL) {
 		goto error;
 	}
+
 	tid = get_context_tid(call_data);
 	if (tid == -1ULL) {
 		goto error;
@@ -287,23 +369,40 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 	if (ppid == -1ULL) {
 		goto error;
 	}
+	vpid = get_context_vpid(call_data);
+	if (pid == -1ULL) {
+		vpid = -1;
+	}
+	vtid = get_context_vtid(call_data);
+	if (tid == -1ULL) {
+		vtid = -1;
+	}
+	vppid = get_context_vppid(call_data);
+	if (ppid == -1ULL) {
+		vppid = -1;
+	}
 	comm = get_context_comm(call_data);
 	if (!comm) {
 		goto error;
 	}
+	/* optional */
+	hostname = get_context_hostname(call_data);
 
 	/* find or create the current process */
 	child = find_process_tid(&lttngtop, tid, comm);
 	if (!child)
 		child = add_proc(&lttngtop, tid, comm, timestamp);
-	update_proc(child, pid, tid, ppid, comm);
+	if (!child)
+		goto end;
+	update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm, hostname);
 
 	if (pid != tid) {
 		/* find or create the parent */
 		parent = find_process_tid(&lttngtop, pid, comm);
 		if (!parent) {
 			parent = add_proc(&lttngtop, pid, comm, timestamp);
-			parent->pid = pid;
+			if (parent)
+				parent->pid = pid;
 		}
 
 		/* attach the parent to the current process */
@@ -313,6 +412,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 
 	update_perf_counter(child, call_data);
 
+end:
 	return BT_CB_OK;
 
 error:
@@ -336,6 +436,8 @@ void init_lttngtop()
 	lttngtop.nbthreads = 0;
 	lttngtop.nbfiles = 0;
 
+	lttngtop.process_hash_table = g_hash_table_new(g_direct_hash,
+			g_direct_equal);
 	lttngtop.process_table = g_ptr_array_new();
 	lttngtop.files_table = g_ptr_array_new();
 	lttngtop.cpu_table = g_ptr_array_new();
@@ -344,7 +446,13 @@ void init_lttngtop()
 void usage(FILE *fp)
 {
 	fprintf(fp, "LTTngTop %s\n\n", VERSION);
-	fprintf(fp, "Usage : lttngtop /path/to/trace\n");
+	fprintf(fp, "Usage : lttngtop [OPTIONS] [TRACE]\n");
+	fprintf(fp, "  TRACE			Path to the trace to analyse (no trace path for live tracing)\n");
+	fprintf(fp, "  -h, --help               This help message\n");
+	fprintf(fp, "  -t, --textdump           Display live events in text-only\n");
+	fprintf(fp, "  -p, --pid                Comma-separated list of PIDs to display\n");
+	fprintf(fp, "  -f, --child              Follow threads associated with selected PIDs\n");
+	fprintf(fp, "  -n, --hostname           Comma-separated list of hostnames to display (require hostname context in trace)\n");
 }
 
 /*
@@ -355,6 +463,8 @@ static int parse_options(int argc, char **argv)
 {
 	poptContext pc;
 	int opt, ret = 0;
+	char *tmp_str;
+	int *tid;
 
 	pc = poptGetContext(NULL, argc, (const char **) argv, long_options, 0);
 	poptReadDefaultConfig(pc, 0);
@@ -365,6 +475,37 @@ static int parse_options(int argc, char **argv)
 				usage(stdout);
 				ret = 1;    /* exit cleanly */
 				goto end;
+			case OPT_TEXTDUMP:
+				opt_textdump = 1;
+				break;
+			case OPT_CHILD:
+				opt_textdump = 1;
+				opt_child = 1;
+				break;
+			case OPT_PID:
+				tid_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,
+							(gpointer) tid, tid);
+					tmp_str = strtok(NULL, ",");
+				}
+				break;
+			case OPT_HOSTNAME:
+				hostname_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,
+							(gpointer) new_str,
+							(gpointer) new_str);
+					tmp_str = strtok(NULL, ",");
+				}
+				break;
 			default:
 				ret = -EINVAL;
 				goto end;
@@ -390,52 +531,60 @@ void iter_trace(struct bt_context *bt_ctx)
 	begin_pos.type = BT_SEEK_BEGIN;
 	iter = bt_ctf_iter_create(bt_ctx, &begin_pos, NULL);
 
-	/* at each event check if we need to refresh */
-	bt_ctf_iter_add_callback(iter, 0, NULL, 0,
-			check_timestamp,
-			NULL, NULL, NULL);
-	/* at each event, verify the status of the process table */
-	bt_ctf_iter_add_callback(iter, 0, NULL, 0,
-			fix_process_table,
-			NULL, NULL, NULL);
-	/* to handle the scheduling events */
-	bt_ctf_iter_add_callback(iter,
-			g_quark_from_static_string("sched_switch"),
-			NULL, 0, handle_sched_switch, NULL, NULL, NULL);
-	/* to clean up the process table */
-	bt_ctf_iter_add_callback(iter,
-			g_quark_from_static_string("sched_process_free"),
-			NULL, 0, handle_sched_process_free, NULL, NULL, NULL);
-	/* to get all the process from the statedumps */
-	bt_ctf_iter_add_callback(iter,
-			g_quark_from_static_string(
-				"lttng_statedump_process_state"),
-			NULL, 0, handle_statedump_process_state,
-			NULL, NULL, NULL);
-
-	/* for IO top */
-	bt_ctf_iter_add_callback(iter,
-			g_quark_from_static_string("exit_syscall"),
-			NULL, 0, handle_exit_syscall, NULL, NULL, NULL);
-	bt_ctf_iter_add_callback(iter,
-			g_quark_from_static_string("sys_write"),
-			NULL, 0, handle_sys_write, NULL, NULL, NULL);
-	bt_ctf_iter_add_callback(iter,
-			g_quark_from_static_string("sys_read"),
-			NULL, 0, handle_sys_read, NULL, NULL, NULL);
-	bt_ctf_iter_add_callback(iter,
-			g_quark_from_static_string("sys_open"),
-			NULL, 0, handle_sys_open, NULL, NULL, NULL);
-	bt_ctf_iter_add_callback(iter,
-			g_quark_from_static_string("sys_close"),
-			NULL, 0, handle_sys_close, NULL, NULL, NULL);
-	bt_ctf_iter_add_callback(iter,
-			g_quark_from_static_string(
+	if (opt_textdump) {
+		bt_ctf_iter_add_callback(iter, 0, NULL, 0,
+				print_timestamp,
+				NULL, NULL, NULL);
+	} else {
+		/* at each event check if we need to refresh */
+		bt_ctf_iter_add_callback(iter, 0, NULL, 0,
+				check_timestamp,
+				NULL, NULL, NULL);
+		/* at each event, verify the status of the process table */
+		bt_ctf_iter_add_callback(iter, 0, NULL, 0,
+				fix_process_table,
+				NULL, NULL, NULL);
+		/* to handle the scheduling events */
+		bt_ctf_iter_add_callback(iter,
+				g_quark_from_static_string("sched_switch"),
+				NULL, 0, handle_sched_switch, NULL, NULL, NULL);
+		/* to clean up the process table */
+		bt_ctf_iter_add_callback(iter,
+				g_quark_from_static_string("sched_process_free"),
+				NULL, 0, handle_sched_process_free, NULL, NULL, NULL);
+		/* to get all the process from the statedumps */
+		bt_ctf_iter_add_callback(iter,
+				g_quark_from_static_string(
+					"lttng_statedump_process_state"),
+				NULL, 0, handle_statedump_process_state,
+				NULL, NULL, NULL);
+
+		/* for IO top */
+		bt_ctf_iter_add_callback(iter,
+				g_quark_from_static_string("exit_syscall"),
+				NULL, 0, handle_exit_syscall, NULL, NULL, NULL);
+		bt_ctf_iter_add_callback(iter,
+				g_quark_from_static_string("sys_write"),
+				NULL, 0, handle_sys_write, NULL, NULL, NULL);
+		bt_ctf_iter_add_callback(iter,
+				g_quark_from_static_string("sys_read"),
+				NULL, 0, handle_sys_read, NULL, NULL, NULL);
+		bt_ctf_iter_add_callback(iter,
+				g_quark_from_static_string("sys_open"),
+				NULL, 0, handle_sys_open, NULL, NULL, NULL);
+		bt_ctf_iter_add_callback(iter,
+				g_quark_from_static_string("sys_close"),
+				NULL, 0, handle_sys_close, NULL, NULL, NULL);
+		bt_ctf_iter_add_callback(iter,
+				g_quark_from_static_string(
 					"lttng_statedump_file_descriptor"),
-			NULL, 0, handle_statedump_file_descriptor,
-			NULL, NULL, NULL);
+				NULL, 0, handle_statedump_file_descriptor,
+				NULL, NULL, NULL);
+	}
 
-	while ((event = bt_ctf_iter_read_event(iter)) != NULL) {
+	while ((event = bt_ctf_iter_read_event(iter, NULL)) != NULL) {
+		if (quit || reload_trace)
+			goto end_iter;
 		ret = bt_iter_next(bt_ctf_get_iter(iter));
 		if (ret < 0)
 			goto end_iter;
@@ -644,84 +793,6 @@ int check_requirements(struct bt_context *ctx)
 	return ret;
 }
 
-void dump_snapshot()
-{
-#if 0
-	struct lttng_consumer_stream *iter;
-	unsigned long spos;
-	struct mmap_stream *new_snapshot;
-
-	int ret = 0;
-	int i;
-	/*
-	 * try lock mutex ressource courante (overrun)
-	 * if fail : overrun
-	 * stop trace (flush implicite avant stop)
-	 * lttng_consumer_take_snapshot
-	 * read timestamp packet end (use time as end pos)
-	 * 	- stream_packet_context
-	 * 	- reculer de 1 subbuf : pos - max_subbuff_size
-	 *
-	 * 	- position de fin (take_snapshot)
-	 * 	- mov_pos_slow ( fin - max_subbuff_size) lire timestamp packet end
-	 * 	- prend min(end) (activité sur tous les streams)
-	 *
-	 * start trace
-	 * unlock mutex
-	 */
-
-	helper_kernctl_buffer_flush(consumerd_metadata);
-	for (i = 0; i < lttng_consumer_stream_array->len; i++) {
-		iter = g_ptr_array_index(lttng_consumer_stream_array, i);
-		helper_kernctl_buffer_flush(helper_get_lttng_consumer_stream_wait_fd(iter));
-		printf("Taking snapshot of fd : %d\n", helper_get_lttng_consumer_stream_wait_fd(iter));
-		ret = helper_lttng_consumer_take_snapshot(ctx, iter);
-		if (ret != 0) {
-			ret = errno;
-			perror("lttng_consumer_take_snapshots");
-			goto end;
-		}
-	}
-	for (i = 0; i < lttng_consumer_stream_array->len; i++) {
-		iter = g_ptr_array_index(lttng_consumer_stream_array, i);
-		ret = helper_lttng_consumer_get_produced_snapshot(ctx, iter, &spos);
-		if (ret != 0) {
-			ret = errno;
-			perror("helper_lttng_consumer_get_produced_snapshot");
-			goto end;
-		}
-		while (helper_get_lttng_consumer_stream_wait_last_pos(iter) < spos) {
-			new_snapshot = g_new0(struct mmap_stream, 1);
-			new_snapshot->fd = helper_get_lttng_consumer_stream_wait_fd(iter);
-			new_snapshot->last_pos = helper_get_lttng_consumer_stream_wait_last_pos(iter);
-			fprintf(stderr,"ADDING AVAILABLE SNAPSHOT ON FD %d AT POSITION %lu\n",
-					new_snapshot->fd,
-					new_snapshot->last_pos);
-			g_ptr_array_add(available_snapshots, new_snapshot);
-			helper_set_lttng_consumer_stream_wait_last_pos(iter, 
-				helper_get_lttng_consumer_stream_wait_last_pos(iter) +
-				helper_get_lttng_consumer_stream_chan_max_sb_size(iter));
-		}
-	}
-
-	if (!metadata_ready) {
-		fprintf(stderr, "BLOCKING BEFORE METADATA\n");
-		sem_wait(&metadata_available);
-		fprintf(stderr,"OPENING TRACE\n");
-		if (access("/tmp/livesession/kernel/metadata", F_OK) != 0) {
-			fprintf(stderr,"NO METADATA FILE, SKIPPING\n");
-			return;
-		}
-		metadata_ready = 1;
-		metadata_fp = fopen("/tmp/livesession/kernel/metadata", "r");
-	}
-
-
-end:
-	return;
-#endif
-}
-
 ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd,
 		struct lttng_consumer_local_data *ctx)
 {
@@ -732,7 +803,6 @@ ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd,
 
 	if (helper_get_lttng_consumer_stream_output(kconsumerd_fd) == LTTNG_EVENT_SPLICE) {
 		/* Get the next subbuffer */
-		printf("get_next : %d\n", infd);
 		err = helper_kernctl_get_next_subbuf(infd);
 		if (err != 0) {
 			ret = errno;
@@ -747,7 +817,6 @@ ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd,
 			perror("Getting sub-buffer len failed.");
 			goto end;
 		}
-		printf("len : %ld\n", len);
 
 		/* splice the subbuffer to the tracefile */
 		ret = helper_lttng_consumer_on_read_subbuffer_splice(ctx, kconsumerd_fd, len);
@@ -758,8 +827,6 @@ ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd,
 			 */
 			fprintf(stderr,"Error splicing to tracefile\n");
 		}
-		printf("ret : %ld\n", ret);
-		printf("put_next : %d\n", infd);
 		err = helper_kernctl_put_next_subbuf(infd);
 		if (err != 0) {
 			ret = errno;
@@ -785,8 +852,7 @@ int on_update_fd(int key, uint32_t state)
 int on_recv_fd(struct lttng_consumer_stream *kconsumerd_fd)
 {
 	int ret;
-	struct mmap_stream *new_info;
-	size_t tmp_mmap_len;
+	struct mmap_stream *new_mmap_stream;
 
 	/* Opening the tracefile in write mode */
 	if (helper_get_lttng_consumer_stream_path_name(kconsumerd_fd) != NULL) {
@@ -800,70 +866,48 @@ int on_recv_fd(struct lttng_consumer_stream *kconsumerd_fd)
 	}
 
 	if (helper_get_lttng_consumer_stream_output(kconsumerd_fd) == LTTNG_EVENT_MMAP) {
-		new_info = malloc(sizeof(struct mmap_stream));
-		new_info->fd = helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd);
-		bt_list_add(&new_info->list, &mmap_list.head);
-
-		/* get the len of the mmap region */
-		ret = helper_kernctl_get_mmap_len(helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd),
-				&tmp_mmap_len);
-		if (ret != 0) {
-			ret = errno;
-			perror("helper_kernctl_get_mmap_len");
-			goto end;
-		}
-		helper_set_lttng_consumer_stream_mmap_len(kconsumerd_fd, tmp_mmap_len);
-
-		helper_set_lttng_consumer_stream_mmap_base(kconsumerd_fd,
-				mmap(NULL, helper_get_lttng_consumer_stream_mmap_len(kconsumerd_fd),
-				PROT_READ, MAP_PRIVATE, helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd), 0));
-		if (helper_get_lttng_consumer_stream_mmap_base(kconsumerd_fd) == MAP_FAILED) {
-			perror("Error mmaping");
-			ret = -1;
-			goto end;
-		}
+		new_mmap_stream = malloc(sizeof(struct mmap_stream));
+		new_mmap_stream->fd = helper_get_lttng_consumer_stream_wait_fd(
+				kconsumerd_fd);
+		bt_list_add(&new_mmap_stream->list, &mmap_list.head);
 
 		g_ptr_array_add(lttng_consumer_stream_array, kconsumerd_fd);
-		ret = 0;
+		/* keep mmap FDs internally */
+		ret = 1;
 	} else {
 		consumerd_metadata = helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd);
 		sessiond_metadata = helper_get_lttng_consumer_stream_key(kconsumerd_fd);
 		ret = 0;
 	}
 
+	reload_trace = 1;
+
 end:
 	return ret;
 }
 
-void *live_consume()
+void live_consume(struct bt_context **bt_ctx)
 {
-	struct bt_context *bt_ctx = NULL;
 	int ret;
+	FILE *metadata_fp;
 
-	while (1) {
-//		dump_snapshot();
-
-		if (!metadata_ready) {
-			fprintf(stderr, "BLOCKING BEFORE METADATA\n");
-			sem_wait(&metadata_available);
-			fprintf(stderr,"OPENING TRACE\n");
-			if (access("/tmp/livesession/kernel/metadata", F_OK) != 0) {
-				fprintf(stderr,"NO METADATA FILE, SKIPPING\n");
-				return;
-			}
-			metadata_ready = 1;
-			metadata_fp = fopen("/tmp/livesession/kernel/metadata", "r");
-		}
+	sem_wait(&metadata_available);
+	if (access("/tmp/livesession/kernel/metadata", F_OK) != 0) {
+		fprintf(stderr,"no metadata\n");
+		goto end;
+	}
+	metadata_fp = fopen("/tmp/livesession/kernel/metadata", "r");
 
-		if (!trace_opened) {
-			bt_ctx = bt_context_create();
-			ret = bt_context_add_trace(bt_ctx, NULL, "ctf",
-					lttngtop_ctf_packet_seek, &mmap_list, metadata_fp);
-			trace_opened = 1;
-		}
-		iter_trace(bt_ctx);
-		sleep(1);
+	*bt_ctx = bt_context_create();
+	ret = bt_context_add_trace(*bt_ctx, NULL, "ctf",
+			lttngtop_ctf_packet_seek, &mmap_list, metadata_fp);
+	if (ret < 0) {
+		printf("Error adding trace\n");
+		goto end;
 	}
+
+end:
+	return;
 }
 
 int setup_consumer(char *command_sock_path, pthread_t *threads,
@@ -899,7 +943,7 @@ end:
 	return ret;
 }
 
-void *setup_live_tracing()
+int setup_live_tracing()
 {
 	struct lttng_domain dom;
 	struct lttng_channel chan;
@@ -918,7 +962,7 @@ void *setup_live_tracing()
 
 	if ((ret = setup_consumer(command_sock_path, threads, ctx)) < 0) {
 		fprintf(stderr,"error setting up consumer\n");
-		goto end;
+		goto error;
 	}
 
 	available_snapshots = g_ptr_array_new();
@@ -926,86 +970,111 @@ void *setup_live_tracing()
 	/* setup the session */
 	dom.type = LTTNG_DOMAIN_KERNEL;
 
-	ret = system("rm -rf /tmp/livesession");
+	ret = unlink("/tmp/livesession");
 
+	lttng_destroy_session("test");
 	if ((ret = lttng_create_session("test", "/tmp/livesession")) < 0) {
 		fprintf(stderr,"error creating the session : %s\n",
 				helper_lttcomm_get_readable_code(ret));
-		goto end;
+		goto error;
 	}
 
 	if ((handle = lttng_create_handle("test", &dom)) == NULL) {
 		fprintf(stderr,"error creating handle\n");
-		goto end;
+		goto error_session;
+	}
+
+	/*
+	 * FIXME : need to let the
+	 * helper_lttng_consumer_thread_receive_fds create the
+	 * socket.
+	 * Cleaner solution ?
+	 */
+	while (access(command_sock_path, F_OK)) {
+		sleep(0.1);
 	}
 
 	if ((ret = lttng_register_consumer(handle, command_sock_path)) < 0) {
 		fprintf(stderr,"error registering consumer : %s\n",
 				helper_lttcomm_get_readable_code(ret));
-		goto end;
+		goto error_session;
 	}
 
 	strcpy(chan.name, channel_name);
 	chan.attr.overwrite = 0;
-	chan.attr.subbuf_size = 32768;
-//	chan.attr.subbuf_size = 1048576; /* 1MB */
-	chan.attr.num_subbuf = 4;
+	if (opt_tid && opt_textdump) {
+		chan.attr.subbuf_size = 32768;
+		chan.attr.num_subbuf = 8;
+	} else {
+		chan.attr.subbuf_size = 1048576; /* 1MB */
+		chan.attr.num_subbuf = 4;
+	}
 	chan.attr.switch_timer_interval = 0;
 	chan.attr.read_timer_interval = 200;
 	chan.attr.output = LTTNG_EVENT_MMAP;
 
 	if ((ret = lttng_enable_channel(handle, &chan)) < 0) {
-		fprintf(stderr,"error creating channel : %s\n", helper_lttcomm_get_readable_code(ret));
-		goto end;
+		fprintf(stderr,"error creating channel : %s\n",
+				helper_lttcomm_get_readable_code(ret));
+		goto error_session;
 	}
 
-	sprintf(ev.name, "sched_switch");
+	memset(&ev, '\0', sizeof(struct lttng_event));
+	//sprintf(ev.name, "sched_switch");
 	ev.type = LTTNG_EVENT_TRACEPOINT;
+	if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
+		fprintf(stderr,"error enabling event : %s\n",
+				helper_lttcomm_get_readable_code(ret));
+		goto error_session;
+	}
 
-	//if ((ret = lttng_enable_event(handle, NULL, channel_name)) < 0) {
+	ev.type = LTTNG_EVENT_SYSCALL;
 	if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
-		fprintf(stderr,"error enabling event : %s\n", helper_lttcomm_get_readable_code(ret));
-		goto end;
+		fprintf(stderr,"error enabling syscalls : %s\n",
+				helper_lttcomm_get_readable_code(ret));
+		goto error_session;
 	}
 
 	kctxpid.ctx = LTTNG_EVENT_CONTEXT_PID;
 	lttng_add_context(handle, &kctxpid, NULL, NULL);
+	kctxtid.ctx = LTTNG_EVENT_CONTEXT_TID;
+	lttng_add_context(handle, &kctxtid, NULL, NULL);
 	kctxppid.ctx = LTTNG_EVENT_CONTEXT_PPID;
 	lttng_add_context(handle, &kctxppid, NULL, NULL);
 	kctxcomm.ctx = LTTNG_EVENT_CONTEXT_PROCNAME;
 	lttng_add_context(handle, &kctxcomm, NULL, NULL);
-	kctxtid.ctx = LTTNG_EVENT_CONTEXT_TID;
+	kctxpid.ctx = LTTNG_EVENT_CONTEXT_VPID;
+	lttng_add_context(handle, &kctxpid, NULL, NULL);
+	kctxtid.ctx = LTTNG_EVENT_CONTEXT_VTID;
+	lttng_add_context(handle, &kctxtid, NULL, NULL);
+	kctxtid.ctx = LTTNG_EVENT_CONTEXT_HOSTNAME;
 	lttng_add_context(handle, &kctxtid, NULL, NULL);
 
 	if ((ret = lttng_start_tracing("test")) < 0) {
-		fprintf(stderr,"error starting tracing : %s\n", helper_lttcomm_get_readable_code(ret));
-		goto end;
+		fprintf(stderr,"error starting tracing : %s\n",
+				helper_lttcomm_get_readable_code(ret));
+		goto error_session;
 	}
 
 	helper_kernctl_buffer_flush(consumerd_metadata);
 
-	/* Create thread to manage the polling/writing of traces */
-	ret = pthread_create(&thread_live_consume, NULL, live_consume, NULL);
-	if (ret != 0) {
-		perror("pthread_create");
-		goto end;
-	}
-
-//	pthread_cancel(live_trace_thread);
-
 	/* block until metadata is ready */
 	sem_init(&metadata_available, 0, 0);
 
-	//init_lttngtop();
+	return 0;
 
-end:
-	return ret;
+error_session:
+	lttng_destroy_session("test");
+error:
+	return -1;
 }
 
 int main(int argc, char **argv)
 {
 	int ret;
 	struct bt_context *bt_ctx = NULL;
+	struct mmap_stream *mmap_info;
+	unsigned long mmap_len;
 
 	ret = parse_options(argc, argv);
 	if (ret < 0) {
@@ -1017,16 +1086,53 @@ int main(int argc, char **argv)
 	}
 
 	if (!opt_input_path) {
-		printf("live tracing enabled\n");
-		pthread_create(&live_trace_thread, NULL, setup_live_tracing, (void *) NULL);
-		sleep(20);
-		printf("STOPPING\n");
+		if (opt_textdump) {
+			signal(SIGTERM, handle_textdump_sigterm);
+			signal(SIGINT, handle_textdump_sigterm);
+		}
+		ret = setup_live_tracing();
+		if (ret < 0) {
+			goto end;
+		}
+		init_lttngtop();
+		if (!opt_textdump) {
+			pthread_create(&display_thread, NULL, ncurses_display, (void *) NULL);
+			pthread_create(&timer_thread, NULL, refresh_thread, (void *) NULL);
+		}
+		while (!quit) {
+			reload_trace = 0;
+			live_consume(&bt_ctx);
+			iter_trace(bt_ctx);
+			ret = bt_context_remove_trace(bt_ctx, 0);
+			if (ret != 0)
+				fprintf(stderr, "error removing trace\n");
+			if (bt_ctx) {
+				bt_context_put(bt_ctx);
+			}
+
+			/*
+			 * since we receive all FDs every time there is an
+			 * update and the FD number is different every time,
+			 * we don't know which one are valid.
+			 * so we check if all FDs are usable with a simple
+			 * ioctl call.
+			 */
+			bt_list_for_each_entry(mmap_info, &mmap_list.head, list) {
+				ret = helper_kernctl_get_mmap_len(mmap_info->fd, &mmap_len);
+				if (ret != 0) {
+					bt_list_del(&mmap_info->list);
+				}
+			}
+			sem_post(&metadata_available);
+		}
+
+		pthread_join(timer_thread, NULL);
+		quit = 1;
+		pthread_join(display_thread, NULL);
+
 		lttng_stop_tracing("test");
-		printf("DESTROYING\n");
 		lttng_destroy_session("test");
 
-		printf("CANCELLING\n");
-		pthread_cancel(live_trace_thread);
 		goto end;
 	} else {
 		init_lttngtop();
@@ -1048,8 +1154,8 @@ int main(int argc, char **argv)
 
 		iter_trace(bt_ctx);
 
-		quit = 1;
 		pthread_join(display_thread, NULL);
+		quit = 1;
 		pthread_join(timer_thread, NULL);
 	}