X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=c3596aa23f697a5c487ddf0004b03e578b279f96;hp=bae4fad217b95bc8dc0c474e81a00c394d47fd86;hb=494bc09aafd8a4a956db683bbecd85ec2241b30e;hpb=6112d0d4436698a4e5625b89309d7ac8864ebef1

diff --git a/src/lttngtop.c b/src/lttngtop.c
index bae4fad..c3596aa 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Julien Desfossez
+ * Copyright (C) 2013 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
@@ -38,63 +38,125 @@
 #include <fts.h>
 #include <assert.h>
 #include <sys/mman.h>
+#include <sys/wait.h>
 #include <lttng/lttng.h>
+
+#ifdef LTTNGTOP_MMAP_LIVE
 #include <lttng/lttngtop-helper.h>
 #include <babeltrace/lttngtopmmappacketseek.h>
+#include "mmap-live.h"
+#endif /* LTTNGTOP_MMAP_LIVE */
 
 #include "lttngtoptypes.h"
 #include "cputop.h"
 #include "iostreamtop.h"
-#include "cursesdisplay.h"
 #include "common.h"
+#include "network-live.h"
+#include "lttng-session.h"
+
+#ifdef HAVE_LIBNCURSES
+#include "cursesdisplay.h"
+#endif
+
+#define NET_URL_PREFIX	"net://"
+#define NET4_URL_PREFIX	"net4://"
+#define NET6_URL_PREFIX	"net6://"
 
 #define DEFAULT_FILE_ARRAY_SIZE 1
 
 const char *opt_input_path;
+int opt_textdump;
+int opt_child;
+int opt_begin;
+int opt_all;
+
+int quit = 0;
+/* We need at least one valid trace to start processing. */
+int valid_trace = 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;
+unsigned long last_event_ts = 0;
+struct syscall *last_syscall;
 
-/* LIVE */
-pthread_t thread_live_consume;
 /* list of FDs available for being read with snapshots */
-struct mmap_stream_list mmap_list;
+struct bt_mmap_stream_list mmap_list;
 GPtrArray *lttng_consumer_stream_array;
 int sessiond_metadata, consumerd_metadata;
 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;
+
+uint64_t prev_ts = 0;
 
 enum {
 	OPT_NONE = 0,
 	OPT_HELP,
-	OPT_LIST,
+	OPT_TEXTDUMP,
+	OPT_PID,
+	OPT_CHILD,
+	OPT_PROCNAME,
+	OPT_RELAY_HOSTNAME,
+	OPT_KPROBES,
+	OPT_BEGIN,
+	OPT_ALL,
+	OPT_OUTPUT_FILE,
 	OPT_VERBOSE,
-	OPT_DEBUG,
-	OPT_NAMES,
+	OPT_GUI_TEST,
+	OPT_CREATE_LOCAL_SESSION,
+	OPT_CREATE_LIVE_SESSION,
 };
 
 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 },
+	{ "begin", 'b', POPT_ARG_NONE, NULL, OPT_BEGIN, NULL, NULL },
+	{ "pid", 'p', POPT_ARG_STRING, &opt_tid, OPT_PID, NULL, NULL },
+	{ "procname", 'n', POPT_ARG_STRING, &opt_procname, OPT_PROCNAME, NULL, NULL },
+	{ "relay-hostname", 'r', POPT_ARG_STRING, &opt_relay_hostname,
+		OPT_RELAY_HOSTNAME, NULL, NULL },
+	{ "kprobes", 'k', POPT_ARG_STRING, &opt_kprobes, OPT_KPROBES, NULL, NULL },
+	{ "all", 'a', POPT_ARG_NONE, NULL, OPT_ALL, NULL, NULL },
+	{ "output", 'o', POPT_ARG_STRING, &opt_output, OPT_OUTPUT_FILE, NULL, NULL },
+	{ "verbose", 'v', POPT_ARG_NONE, NULL, OPT_VERBOSE, NULL, NULL },
+	{ "gui-test", 'g', POPT_ARG_NONE, NULL, OPT_GUI_TEST, NULL, NULL },
+	{ "create-local-session", 0, POPT_ARG_NONE, NULL, OPT_CREATE_LOCAL_SESSION, NULL, NULL },
+	{ "create-live-session", 0, POPT_ARG_NONE, NULL, OPT_CREATE_LIVE_SESSION, NULL, NULL },
 	{ NULL, 0, 0, NULL, 0, NULL, NULL },
 };
 
+#ifdef LTTNGTOP_MMAP_LIVE
+static void handle_textdump_sigterm(int signal)
+{
+	quit = 1;
+	lttng_destroy_session("test");
+}
+#endif
+
 void *refresh_thread(void *p)
 {
 	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) {
+#ifdef LTTNGTOP_MMAP_LIVE 
+			mmap_live_flush(mmap_list);
+#endif
+		}
 		sem_wait(&pause_sem);
 		sem_post(&pause_sem);
 		sem_post(&timer);
@@ -102,6 +164,7 @@ void *refresh_thread(void *p)
 	}
 }
 
+#ifdef HAVE_LIBNCURSES
 void *ncurses_display(void *p)
 {
 	unsigned int current_display_index = 0;
@@ -118,55 +181,254 @@ 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);
-		}
 	}
 }
+#endif /* HAVE_LIBNCURSES */
 
-/* FIXME : TMP */
-struct tm ts_format_timestamp(uint64_t timestamp)
+void print_fields(struct bt_ctf_event *event, const char *procname,
+		int pid)
 {
-	struct tm tm;
-	uint64_t ts_sec = 0, ts_nsec;
-	time_t time_s;
-
-	ts_nsec = timestamp;
-	ts_sec += ts_nsec / NSEC_PER_SEC;
-	ts_nsec = ts_nsec % NSEC_PER_SEC;
-
-	time_s = (time_t) ts_sec;
-
-	localtime_r(&time_s, &tm);
-
-	return tm;
+	unsigned int cnt, i;
+	const struct bt_definition *const * list;
+	const struct bt_declaration *l;
+	const struct bt_definition *scope;
+	enum ctf_type_id type;
+	const char *str;
+	struct processtop *current_proc;
+	struct files *current_file;
+	int fd, fd_value = -1;
+
+	scope = bt_ctf_get_top_level_scope(event, BT_EVENT_FIELDS);
+
+	bt_ctf_get_field_list(event, scope, &list, &cnt);
+	for (i = 0; i < cnt; i++) {
+		if (i != 0)
+			fprintf(output, ", ");
+		fprintf(output, "%s = ", bt_ctf_field_name(list[i]));
+		l = bt_ctf_get_decl_from_def(list[i]);
+		if (strncmp(bt_ctf_field_name(list[i]), "fd", 2) == 0)
+			fd = 1;
+		else
+			fd = 0;
+		type = bt_ctf_field_type(l);
+		if (type == CTF_TYPE_INTEGER) {
+			if (bt_ctf_get_int_signedness(l) == 0) {
+				fd_value = bt_ctf_get_uint64(list[i]);
+				fprintf(output, "%" PRIu64, bt_ctf_get_uint64(list[i]));
+			} else {
+				fd_value = bt_ctf_get_int64(list[i]);
+				fprintf(output, "%" PRId64, bt_ctf_get_int64(list[i]));
+			}
+		} else if (type == CTF_TYPE_STRING) {
+			fprintf(output, "%s", bt_ctf_get_string(list[i]));
+		} else if (type == CTF_TYPE_ARRAY) {
+			str = bt_ctf_get_char_array(list[i]);
+			if (!bt_ctf_field_get_error() && str)
+				fprintf(output, "%s", str);
+		}
+		if (fd) {
+			current_proc = find_process_tid(&lttngtop, pid, procname);
+			if (!current_proc)
+				continue;
+			current_file = get_file(current_proc, fd_value);
+			if (!current_file || !current_file->name)
+				continue;
+			fprintf(output, "<%s>", current_file->name);
+		}
+	}
 }
 
 /*
  * 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)
+enum bt_cb_ret textdump(struct bt_ctf_event *call_data, void *private_data)
 {
 	unsigned long timestamp;
+	uint64_t delta;
 	struct tm start;
-	uint64_t ts_nsec_start, ts_nsec_end;
-
+	uint64_t ts_nsec_start;
+	int pid, cpu_id, tid, ret, lookup, current_syscall = 0;
+	const struct bt_definition *scope;
+	const char *hostname, *procname;
+	struct cputime *cpu;
+	char *from_syscall = NULL;
+	int syscall_exit = 0;
 
 	timestamp = bt_ctf_get_timestamp(call_data);
 
-	start = ts_format_timestamp(timestamp);
+	/* can happen in network live when tracing is idle */
+	if (timestamp < last_event_ts)
+		goto end_stop;
+
+	last_event_ts = timestamp;
+
+	start = format_timestamp(timestamp);
 	ts_nsec_start = timestamp % NSEC_PER_SEC;
 
-//	printf("%02d:%02d:%02d.%09" PRIu64 "\n", start.tm_hour, start.tm_min, start.tm_sec, ts_nsec_start);
+	pid = get_context_pid(call_data);
+	if (pid == -1ULL && opt_tid) {
+		goto error;
+	}
+
+	tid = get_context_tid(call_data);
+	
+	hostname = get_context_hostname(call_data);
+	if (opt_child)
+		lookup = pid;
+	else
+		lookup = tid;
+	if (opt_tid || opt_procname || opt_exec_name) {
+		if (!lookup_filter_tid_list(lookup)) {
+			/* To display when a process of ours in getting scheduled in */
+			if (strcmp(bt_ctf_event_name(call_data), "sched_switch") == 0) {
+				int next_tid;
+
+				scope = bt_ctf_get_top_level_scope(call_data,
+						BT_EVENT_FIELDS);
+				next_tid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
+							scope, "_next_tid"));
+				if (bt_ctf_field_get_error()) {
+					fprintf(stderr, "Missing next_tid field\n");
+					goto error;
+				}
+				if (!lookup_filter_tid_list(next_tid)) {
+					if (!opt_all)
+						goto end;
+				} else {
+					if (opt_all)
+						fprintf(output, "%c[1m", 27);
+				}
+			} else if (!opt_all) {
+				goto end;
+			}
+		} else {
+			if (opt_all)
+				fprintf(output, "%c[1m", 27);
+		}
+	}
+
+	if (((strncmp(bt_ctf_event_name(call_data),
+						"exit_syscall", 12)) == 0) ||
+			((strncmp(bt_ctf_event_name(call_data),
+				 "syscall_exit", 12)) == 0)) {
+		syscall_exit = 1;
+	}
+
+	if (last_syscall && !syscall_exit) {
+		last_syscall = NULL;
+		fprintf(output, " ...interrupted...\n");
+	}
+
+	cpu_id = get_cpu_id(call_data);
+	procname = get_context_comm(call_data);
+	if ((strncmp(bt_ctf_event_name(call_data), "sys_", 4) == 0) ||
+			(strncmp(bt_ctf_event_name(call_data), "syscall_entry", 13) == 0)){
+		cpu = get_cpu(cpu_id);
+		cpu->current_syscall = g_new0(struct syscall, 1);
+		cpu->current_syscall->name = strdup(bt_ctf_event_name(call_data));
+		cpu->current_syscall->ts_start = timestamp;
+		cpu->current_syscall->cpu_id = cpu_id;
+		last_syscall = cpu->current_syscall;
+		current_syscall = 1;
+	} else if (syscall_exit) {
+		struct tm start_ts;
+
+		/* Return code of a syscall if it was the last displayed event. */
+		if (last_syscall && last_syscall->ts_start == prev_ts) {
+			if (last_syscall->cpu_id == cpu_id) {
+				int64_t syscall_ret;
+
+				delta = timestamp - last_syscall->ts_start;
+				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"));
+
+				fprintf(output, "= %" PRId64 " (%" PRIu64 ".%09" PRIu64 "s)\n",
+						syscall_ret, delta / NSEC_PER_SEC,
+						delta % NSEC_PER_SEC);
+				last_syscall = NULL;
+				goto end;
+			} else {
+				last_syscall = NULL;
+				fprintf(output, " ...interrupted...\n");
+			}
+		}
+
+		cpu = get_cpu(cpu_id);
+		if (cpu->current_syscall) {
+			delta = timestamp - cpu->current_syscall->ts_start;
+			start_ts = format_timestamp(cpu->current_syscall->ts_start);
+			ret = asprintf(&from_syscall, " [from %02d:%02d:%02d.%09" PRIu64
+					" (+%" PRIu64 ".%09" PRIu64 ") (cpu %d) %s]",
+					start_ts.tm_hour, start_ts.tm_min, start_ts.tm_sec,
+					cpu->current_syscall->ts_start % NSEC_PER_SEC,
+					delta / NSEC_PER_SEC, delta % NSEC_PER_SEC,
+					cpu_id, cpu->current_syscall->name);
+			if (ret < 0) {
+				goto error;
+			}
+			free(cpu->current_syscall->name);
+			g_free(cpu->current_syscall);
+			cpu->current_syscall = NULL;
+			last_syscall = NULL;
+		}
+	}
+
+	if (prev_ts == 0)
+		prev_ts = timestamp;
+	delta = timestamp - prev_ts;
+	prev_ts = timestamp;
+
+	fprintf(output, "%02d:%02d:%02d.%09" PRIu64 " (+%" PRIu64 ".%09" PRIu64 ") %s%s"
+			"(cpu %d) [%s (%d/%d)] %s (",
+			start.tm_hour, start.tm_min, start.tm_sec,
+			ts_nsec_start, delta / NSEC_PER_SEC,
+			delta % NSEC_PER_SEC, (hostname) ? hostname : "",
+			(hostname) ? " ": "", cpu_id, procname, pid, tid,
+			bt_ctf_event_name(call_data));
+	print_fields(call_data, procname, pid);
+	fprintf(output, ")%s%c", (from_syscall) ? from_syscall : "",
+			(!current_syscall) ? '\n' : ' ');
+
+	free(from_syscall);
+	if (opt_all && (opt_tid || opt_procname || opt_exec_name))
+		fprintf(output, "%c[0m", 27);
+
+end:
+	return BT_CB_OK;
+error:
+	return BT_CB_ERROR_STOP;
+end_stop:
+	return BT_CB_OK_STOP;
+}
+
+enum bt_cb_ret handle_kprobes(struct bt_ctf_event *call_data, void *private_data)
+{
+	int i;
+	struct kprobes *kprobe;
+
+	/* for kprobes */
+	for (i = 0; i < lttngtop.kprobes_table->len; i++) {
+		kprobe = g_ptr_array_index(lttngtop.kprobes_table, i);
+		if (strcmp(bt_ctf_event_name(call_data), kprobe->probe_name) == 0) {
+			kprobe->count++;
+		}
+	}
 
 	return BT_CB_OK;
 }
@@ -183,6 +445,12 @@ enum bt_cb_ret check_timestamp(struct bt_ctf_event *call_data, void *private_dat
 	if (timestamp == -1ULL)
 		goto error;
 
+	/* can happen in network live when tracing is idle */
+	if (timestamp < last_event_ts)
+		goto end_stop;
+
+	last_event_ts = timestamp;
+
 	if (last_display_update == 0)
 		last_display_update = timestamp;
 
@@ -199,6 +467,9 @@ enum bt_cb_ret check_timestamp(struct bt_ctf_event *call_data, void *private_dat
 error:
 	fprintf(stderr, "check_timestamp callback error\n");
 	return BT_CB_ERROR_STOP;
+
+end_stop:
+	return BT_CB_OK_STOP;
 }
 
 /*
@@ -305,8 +576,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;
 
@@ -318,31 +589,60 @@ 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;
 	}
 	ppid = get_context_ppid(call_data);
 	if (ppid == -1ULL) {
-		goto error;
+		goto end;
+	}
+	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);
+		child = add_proc(&lttngtop, tid, comm, timestamp, hostname);
+	if (!child)
+		goto end;
+	update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm, hostname);
+
+	if (opt_procname && lookup_procname(comm) &&
+			!lookup_filter_tid_list(tid)) {
+		int *tmp_tid;
+
+		tmp_tid = malloc(sizeof(int));
+		*tmp_tid = tid;
+		printf("ADDING %s %d\n", comm, tid);
+		g_hash_table_insert(global_filter_list,
+				(gpointer) tmp_tid, tmp_tid);
+	}
 
 	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;
+			parent = add_proc(&lttngtop, pid, comm, timestamp, hostname);
+			if (parent)
+				parent->pid = pid;
 		}
 
 		/* attach the parent to the current process */
@@ -352,6 +652,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:
@@ -362,6 +663,11 @@ void init_lttngtop()
 {
 	copies = g_ptr_array_new();
 	global_perf_liszt = g_hash_table_new(g_str_hash, g_str_equal);
+	global_filter_list = g_hash_table_new(g_str_hash, g_str_equal);
+	global_host_list = g_hash_table_new(g_str_hash, g_str_equal);
+	global_procname_list = g_hash_table_new(g_str_hash, g_str_equal);
+	tid_filter_list = g_hash_table_new(g_str_hash,
+			g_str_equal);
 
 	sem_init(&goodtodisplay, 0, 0);
 	sem_init(&goodtoupdate, 0, 1);
@@ -375,15 +681,108 @@ 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();
+
+	toggle_filter = -1;
 }
 
 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 (-r for network live tracing, nothing for mmap live streaming)\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, --procname           Comma-separated list of procnames to display (require procname context in trace)\n");
+	fprintf(fp, "  -a, --all                In textdump mode, display all events but write in bold the processes we are interested in (-f, -p and -n)\n");
+	fprintf(fp, "  -k, --kprobes            Comma-separated list of kprobes to insert (same format as lttng enable-event)\n");
+	fprintf(fp, "  -r, --relay-hostname     Network live streaming : hostname of the lttng-relayd (default port)\n");
+	fprintf(fp, "  -b, --begin              Network live streaming : read the trace for the beginning of the recording\n");
+	fprintf(fp, "  -o, --output <filename>  In textdump, output the log in <filename>\n");
+	fprintf(fp, "  -g, --gui-test           Test if the ncurses support is compiled in (return 0 if it is)\n");
+	fprintf(fp, "  --create-local-session   Setup a LTTng local session with all the right parameters\n");
+	fprintf(fp, "  --create-live-session    Setup a LTTng live session on localhost with all the right parameters\n");
+}
+
+/*
+ * Parse probe options.
+ * Shamelessly stolen from lttng-tools :
+ * src/bin/lttng/commands/enable_events.c
+ */
+static struct kprobes *parse_probe_opts(char *opt)
+{
+	char s_hex[19];
+	char name[LTTNG_SYMBOL_NAME_LEN];
+	struct kprobes *kprobe;
+	int ret;
+
+	/*
+	kprobe->probe_addr = 0;
+	kprobe->probe_offset = 0;
+	asprintf(&kprobe->probe_name, "probe_sys_open");
+	asprintf(&kprobe->symbol_name, "sys_open");
+	*/
+
+	if (opt == NULL) {
+		kprobe = NULL;
+		goto end;
+	}
+
+	kprobe = g_new0(struct kprobes, 1);
+
+	/* Check for symbol+offset */
+	ret = sscanf(opt, "%[^'+']+%s", name, s_hex);
+	if (ret == 2) {
+		ret = asprintf(&kprobe->probe_name, "probe_%s", name);
+		ret = asprintf(&kprobe->symbol_name, "%s", name);
+
+		if (strlen(s_hex) == 0) {
+			fprintf(stderr, "Invalid probe offset %s", s_hex);
+			ret = -1;
+			goto end;
+		}
+		kprobe->probe_offset = strtoul(s_hex, NULL, 0);
+		kprobe->probe_addr = 0;
+		goto end;
+	}
+
+	/* Check for symbol */
+	if (isalpha(name[0])) {
+		ret = sscanf(opt, "%s", name);
+		if (ret == 1) {
+			ret = asprintf(&kprobe->probe_name, "probe_%s", name);
+			ret = asprintf(&kprobe->symbol_name, "%s", name);
+			kprobe->probe_offset = 0;
+			kprobe->probe_addr = 0;
+			goto end;
+		}
+	}
+
+	/* Check for address */
+	ret = sscanf(opt, "%s", s_hex);
+	if (ret > 0) {
+		if (strlen(s_hex) == 0) {
+			fprintf(stderr, "Invalid probe address %s", s_hex);
+			ret = -1;
+			goto end;
+		}
+		ret = asprintf(&kprobe->probe_name, "probe_%s", s_hex);
+		kprobe->probe_offset = 0;
+		kprobe->probe_addr = strtoul(s_hex, NULL, 0);
+		goto end;
+	}
+
+	/* No match */
+	kprobe = NULL;
+
+end:
+	return kprobe;
 }
 
 /*
@@ -394,6 +793,11 @@ static int parse_options(int argc, char **argv)
 {
 	poptContext pc;
 	int opt, ret = 0;
+	char *tmp_str;
+	int *tid;
+	int i;
+
+	remote_live = 0;
 
 	pc = poptGetContext(NULL, argc, (const char **) argv, long_options, 0);
 	poptReadDefaultConfig(pc, 0);
@@ -404,13 +808,104 @@ static int parse_options(int argc, char **argv)
 				usage(stdout);
 				ret = 1;    /* exit cleanly */
 				goto end;
+			case OPT_GUI_TEST:
+#ifdef HAVE_LIBNCURSES
+				exit(EXIT_SUCCESS);
+#else
+				exit(EXIT_FAILURE);
+#endif
+				goto end;
+			case OPT_CREATE_LOCAL_SESSION:
+				ret = create_local_session();
+				exit(ret);
+			case OPT_CREATE_LIVE_SESSION:
+				ret = create_live_local_session(NULL, NULL, 1);
+				exit(ret);
+			case OPT_TEXTDUMP:
+				opt_textdump = 1;
+				break;
+			case OPT_ALL:
+				opt_all = 1;
+				break;
+			case OPT_CHILD:
+				opt_child = 1;
+				break;
+			case OPT_PID:
+				toggle_filter = 1;
+				tmp_str = strtok(opt_tid, ",");
+				while (tmp_str) {
+					tid = malloc(sizeof(int));
+					*tid = atoi(tmp_str);
+					g_hash_table_insert(tid_filter_list,
+							(gpointer) tid, tid);
+					tmp_str = strtok(NULL, ",");
+				}
+				break;
+			case OPT_BEGIN:
+				/* start reading the live trace from the beginning */
+				opt_begin = 1;
+				break;
+			case OPT_PROCNAME:
+				toggle_filter = 1;
+				tmp_str = strtok(opt_procname, ",");
+				while (tmp_str) {
+					add_procname_list(tmp_str, 1);
+					tmp_str = strtok(NULL, ",");
+				}
+				break;
+			case OPT_RELAY_HOSTNAME:
+				remote_live = 1;
+				break;
+			case OPT_KPROBES:
+				lttngtop.kprobes_table = g_ptr_array_new();
+				tmp_str = strtok(opt_kprobes, ",");
+				while (tmp_str) {
+					struct kprobes *kprobe;
+
+					kprobe = parse_probe_opts(tmp_str);
+					if (kprobe) {
+						g_ptr_array_add(
+							lttngtop.kprobes_table,
+							kprobe);
+					} else {
+						ret = -EINVAL;
+						goto end;
+					}
+					tmp_str = strtok(NULL, ",");
+				}
+				break;
+			case OPT_OUTPUT_FILE:
+				break;
+			case OPT_VERBOSE:
+				babeltrace_verbose = 1;
+				break;
 			default:
 				ret = -EINVAL;
 				goto end;
 		}
 	}
 
-	opt_input_path = poptGetArg(pc);
+	opt_exec_name = NULL;
+	opt_exec_argv = NULL;
+	for (i = 0; i < argc; i++) {
+		if (argv[i][0] == '-' && argv[i][1] == '-') {
+			opt_exec_name = argv[i + 1];
+			opt_exec_argv = &argv[i + 1];
+			break;
+		}
+	}
+	if (!opt_exec_name) {
+		opt_input_path = poptGetArg(pc);
+	}
+	if (!opt_output) {
+		opt_output = strdup("/dev/stdout");
+	}
+	output = fopen(opt_output, "w");
+	if (!output) {
+		perror("Error opening output file");
+		ret = -1;
+		goto end;
+	}
 
 end:
 	if (pc) {
@@ -423,29 +918,22 @@ void iter_trace(struct bt_context *bt_ctx)
 {
 	struct bt_ctf_iter *iter;
 	struct bt_iter_pos begin_pos;
+	struct kprobes *kprobe;
 	const struct bt_ctf_event *event;
+	int i;
 	int ret = 0;
 
 	begin_pos.type = BT_SEEK_BEGIN;
 	iter = bt_ctf_iter_create(bt_ctx, &begin_pos, NULL);
 
-	bt_ctf_iter_add_callback(iter, 0, NULL, 0,
-			print_timestamp,
-			NULL, NULL, NULL);
-
-#if 0
-	/* 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 */
+	/* to handle the follow child option */
 	bt_ctf_iter_add_callback(iter,
-			g_quark_from_static_string("sched_switch"),
-			NULL, 0, handle_sched_switch, NULL, NULL, NULL);
+			g_quark_from_static_string("sched_process_fork"),
+			NULL, 0, handle_sched_process_fork, NULL, NULL, NULL);
 	/* to clean up the process table */
 	bt_ctf_iter_add_callback(iter,
 			g_quark_from_static_string("sched_process_free"),
@@ -456,30 +944,112 @@ void iter_trace(struct bt_context *bt_ctx)
 				"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);
+			g_quark_from_static_string(
+				"lttng_statedump_file_descriptor"),
+			NULL, 0, handle_statedump_file_descriptor,
+			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("syscall_entry_open"),
+			NULL, 0, handle_sys_open, NULL, NULL, NULL);
+
+	bt_ctf_iter_add_callback(iter,
+			g_quark_from_static_string("sys_socket"),
+			NULL, 0, handle_sys_socket, NULL, NULL, NULL);
+	bt_ctf_iter_add_callback(iter,
+			g_quark_from_static_string("syscall_entry_socket"),
+			NULL, 0, handle_sys_socket, 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);
-#endif
+			g_quark_from_static_string("syscall_entry_close"),
+			NULL, 0, handle_sys_close, NULL, NULL, NULL);
+
+	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("syscall_exit_open"),
+			NULL, 0, handle_exit_syscall, NULL, NULL, NULL);
+	bt_ctf_iter_add_callback(iter,
+			g_quark_from_static_string("syscall_exit_socket"),
+			NULL, 0, handle_exit_syscall, NULL, NULL, NULL);
+	bt_ctf_iter_add_callback(iter,
+			g_quark_from_static_string("syscall_exit_close"),
+			NULL, 0, handle_exit_syscall, NULL, NULL, NULL);
+	if (opt_textdump) {
+		bt_ctf_iter_add_callback(iter, 0, NULL, 0,
+				textdump,
+				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);
+		/* 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);
+		/* for IO top */
+		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("syscall_entry_write"),
+				NULL, 0, handle_sys_write, NULL, NULL, NULL);
+		bt_ctf_iter_add_callback(iter,
+				g_quark_from_static_string("syscall_exit_write"),
+				NULL, 0, handle_exit_syscall, 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("syscall_entry_read"),
+				NULL, 0, handle_sys_read, NULL, NULL, NULL);
+		bt_ctf_iter_add_callback(iter,
+				g_quark_from_static_string("syscall_exit_read"),
+				NULL, 0, handle_exit_syscall, NULL, NULL, NULL);
+
+		/* for kprobes */
+		if (lttngtop.kprobes_table) {
+			for (i = 0; i < lttngtop.kprobes_table->len; i++) {
+				kprobe = g_ptr_array_index(lttngtop.kprobes_table, i);
+				bt_ctf_iter_add_callback(iter,
+						g_quark_from_static_string(
+							kprobe->probe_name),
+						NULL, 0, handle_kprobes,
+						NULL, NULL, NULL);
+			}
+		}
+	}
+
+	if (opt_exec_name) {
+		pid_t pid;
+
+		pid = fork();
+		if (pid == 0) {
+			execvpe(opt_exec_name, opt_exec_argv, opt_exec_env);
+			exit(EXIT_SUCCESS);
+		} else if (pid > 0) {
+			opt_exec_pid = pid;
+			g_hash_table_insert(tid_filter_list,
+					(gpointer) &pid,
+					&pid);
+		} else {
+			perror("fork");
+			exit(EXIT_FAILURE);
+		}
+	}
+
 	while ((event = bt_ctf_iter_read_event(iter)) != NULL) {
+		if (quit || reload_trace)
+			goto end_iter;
 		ret = bt_iter_next(bt_ctf_get_iter(iter));
 		if (ret < 0)
 			goto end_iter;
@@ -516,6 +1086,19 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 	char * const paths[2] = { lpath, NULL };
 	int ret = -1;
 
+	if ((strncmp(path, NET4_URL_PREFIX, sizeof(NET4_URL_PREFIX) - 1)) == 0 ||
+			(strncmp(path, NET6_URL_PREFIX, sizeof(NET6_URL_PREFIX) - 1)) == 0 ||
+			(strncmp(path, NET_URL_PREFIX, sizeof(NET_URL_PREFIX) - 1)) == 0) {
+		ret = bt_context_add_trace(ctx,
+				path, format_str, packet_seek, NULL, NULL);
+		if (ret < 0) {
+			fprintf(stderr, "[warning] [Context] cannot open trace \"%s\" "
+					"for reading.\n", path);
+			/* Allow to skip erroneous traces. */
+			ret = 1;	/* partial error */
+		}
+		return ret;
+	}
 	/*
 	 * Need to copy path, because fts_open can change it.
 	 * It is the pointer array, not the strings, that are constant.
@@ -548,7 +1131,6 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 		metafd = openat(dirfd, "metadata", O_RDONLY);
 		if (metafd < 0) {
 			close(dirfd);
-			ret = -1;
 			continue;
 		} else {
 			int trace_id;
@@ -647,7 +1229,11 @@ int check_requirements(struct bt_context *ctx)
 	int ppid_check = 0;
 	int ret = 0;
 
-	bt_ctf_get_event_decl_list(0, ctx, &evt_list, &evt_cnt);
+	ret = bt_ctf_get_event_decl_list(0, ctx, &evt_list, &evt_cnt);
+	if (ret < 0) {
+		goto end;
+	}
+
 	for (i = 0; i < evt_cnt; i++) {
 		bt_ctf_get_decl_fields(evt_list[i], BT_STREAM_EVENT_CONTEXT,
 				&field_list, &field_cnt);
@@ -684,378 +1270,28 @@ int check_requirements(struct bt_context *ctx)
 		ret = -1;
 		fprintf(stderr, "[error] missing procname context information\n");
 	}
-
-	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)
-{
-	unsigned long len;
-	int err;
-	long ret = 0;
-	int infd = helper_get_lttng_consumer_stream_wait_fd(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;
-			perror("Reserving sub buffer failed (everything is normal, "
-					"it is due to concurrency)");
-			goto end;
-		}
-		/* read the whole subbuffer */
-		err = helper_kernctl_get_padded_subbuf_size(infd, &len);
-		if (err != 0) {
-			ret = errno;
-			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);
-		if (ret < 0) {
-			/*
-			 * display the error but continue processing to try
-			 * to release the subbuffer
-			 */
-			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;
-			perror("Reserving sub buffer failed (everything is normal, "
-					"it is due to concurrency)");
-			goto end;
-		}
-		sem_post(&metadata_available);
-	}
-
-end:
-	return 0;
-}
-
-int on_update_fd(int key, uint32_t state)
-{
-	/* let the lib handle the metadata FD */
-	if (key == sessiond_metadata)
-		return 0;
-	return 1;
-}
-
-int on_recv_fd(struct lttng_consumer_stream *kconsumerd_fd)
-{
-	int ret;
-	struct mmap_stream *new_info;
-	size_t tmp_mmap_len;
-
-	/* Opening the tracefile in write mode */
-	if (helper_get_lttng_consumer_stream_path_name(kconsumerd_fd) != NULL) {
-		ret = open(helper_get_lttng_consumer_stream_path_name(kconsumerd_fd),
-				O_WRONLY|O_CREAT|O_TRUNC, S_IRWXU|S_IRWXG|S_IRWXO);
-		if (ret < 0) {
-			perror("open");
-			goto end;
-		}
-		helper_set_lttng_consumer_stream_out_fd(kconsumerd_fd, ret);
-	}
-
-	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;
-		}
-
-		g_ptr_array_add(lttng_consumer_stream_array, kconsumerd_fd);
-		/* 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;
-	}
-
-end:
-	return ret;
-}
-
-void *live_consume()
-{
-	struct bt_context *bt_ctx = NULL;
-	int ret;
-
-	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 NULL;
-			}
-			metadata_ready = 1;
-			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);
-			if (ret < 0) {
-				printf("Error adding trace\n");
-				return NULL;
-			}
-			trace_opened = 1;
-		}
-		iter_trace(bt_ctx);
-		sleep(1);
-	}
-}
-
-int setup_consumer(char *command_sock_path, pthread_t *threads,
-		struct lttng_consumer_local_data *ctx)
-{
-	int ret = 0;
-
-	ctx = helper_lttng_consumer_create(HELPER_LTTNG_CONSUMER_KERNEL,
-		read_subbuffer, NULL, on_recv_fd, on_update_fd);
-	if (!ctx)
-		goto end;
-
-	unlink(command_sock_path);
-	helper_lttng_consumer_set_command_sock_path(ctx, command_sock_path);
-	helper_lttng_consumer_init();
-
-	/* Create the thread to manage the receive of fd */
-	ret = pthread_create(&threads[0], NULL, helper_lttng_consumer_thread_receive_fds,
-			(void *) ctx);
-	if (ret != 0) {
-		perror("pthread_create receive fd");
-		goto end;
-	}
-	/* Create thread to manage the polling/writing of traces */
-	ret = pthread_create(&threads[1], NULL, helper_lttng_consumer_thread_poll_fds,
-			(void *) ctx);
-	if (ret != 0) {
-		perror("pthread_create poll fd");
-		goto end;
+	if (ret == 0) {
+		valid_trace = 1;
 	}
 
 end:
 	return ret;
 }
 
-void *setup_live_tracing()
+static void handle_sigchild(int signal)
 {
-	struct lttng_domain dom;
-	struct lttng_channel chan;
-	char *channel_name = "mmapchan";
-	struct lttng_event ev;
-	int ret = 0;
-	char *command_sock_path = "/tmp/consumerd_sock";
-	static pthread_t threads[2]; /* recv_fd, poll */
-	struct lttng_event_context kctxpid, kctxcomm, kctxppid, kctxtid;
-
-	struct lttng_handle *handle;
-
-	BT_INIT_LIST_HEAD(&mmap_list.head);
-
-	lttng_consumer_stream_array = g_ptr_array_new();
-
-	if ((ret = setup_consumer(command_sock_path, threads, ctx)) < 0) {
-		fprintf(stderr,"error setting up consumer\n");
-		goto end;
-	}
-
-	available_snapshots = g_ptr_array_new();
-
-	/* setup the session */
-	dom.type = LTTNG_DOMAIN_KERNEL;
-
-	ret = system("rm -rf /tmp/livesession");
-
-	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;
-	}
-
-	if ((handle = lttng_create_handle("test", &dom)) == NULL) {
-		fprintf(stderr,"error creating handle\n");
-		goto end;
-	}
-
-	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;
-	}
+	int status;
 
-	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;
-	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;
-	}
-
-	sprintf(ev.name, "sched_switch");
-	ev.type = LTTNG_EVENT_TRACEPOINT;
-
-	//if ((ret = lttng_enable_event(handle, NULL, channel_name)) < 0) {
-	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;
-	}
-
-	kctxpid.ctx = LTTNG_EVENT_CONTEXT_PID;
-	lttng_add_context(handle, &kctxpid, 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;
-	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;
-	}
-
-	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();
-
-end:
-	return NULL;
+	waitpid(opt_exec_pid, &status, 0);
 }
 
-int main(int argc, char **argv)
+int main(int argc, char **argv, char **envp)
 {
 	int ret;
 	struct bt_context *bt_ctx = NULL;
+	char *live_session_name = NULL;
 
+	init_lttngtop();
 	ret = parse_options(argc, argv);
 	if (ret < 0) {
 		fprintf(stdout, "Error parsing options.\n\n");
@@ -1065,21 +1301,29 @@ int main(int argc, char **argv)
 		exit(EXIT_SUCCESS);
 	}
 
-	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");
-		lttng_stop_tracing("test");
-		printf("DESTROYING\n");
-		lttng_destroy_session("test");
-
-		printf("CANCELLING\n");
-		pthread_cancel(live_trace_thread);
-		goto end;
-	} else {
-		init_lttngtop();
+	if (opt_exec_name) {
+		opt_exec_env = envp;
+		signal(SIGCHLD, handle_sigchild);
+	}
 
+	if (!opt_input_path && !remote_live && !opt_exec_name) {
+		/* mmap live */
+		ret = create_live_local_session(&opt_relay_hostname,
+				&live_session_name, 0);
+		if (ret < 0)
+			goto end;
+		remote_live = 1;
+	}
+	if (!opt_input_path && remote_live) {
+		/* network live */
+		bt_ctx = bt_context_create();
+		ret = bt_context_add_traces_recursive(bt_ctx, opt_relay_hostname,
+				"lttng-live", NULL);
+		if (ret < 0) {
+			fprintf(stderr, "[error] Opening the trace\n");
+			goto end;
+		}
+	} else {
 		bt_ctx = bt_context_create();
 		ret = bt_context_add_traces_recursive(bt_ctx, opt_input_path, "ctf", NULL);
 		if (ret < 0) {
@@ -1088,23 +1332,45 @@ int main(int argc, char **argv)
 		}
 
 		ret = check_requirements(bt_ctx);
-		if (ret < 0) {
-			fprintf(stderr, "[error] some mandatory contexts were missing, exiting.\n");
+		if (ret < 0 && !valid_trace) {
+			fprintf(stderr, "[error] some mandatory contexts "
+					"were missing, exiting.\n");
+			//goto end;
+		}
+
+		if (!opt_textdump) {
+#ifdef HAVE_LIBNCURSES
+			pthread_create(&display_thread, NULL, ncurses_display,
+					(void *) NULL);
+			pthread_create(&timer_thread, NULL, refresh_thread,
+					(void *) NULL);
+#else
+			printf("Ncurses support not compiled, please install "
+					"the missing dependencies and recompile\n");
 			goto end;
+#endif
 		}
-		pthread_create(&display_thread, NULL, ncurses_display, (void *) NULL);
-		pthread_create(&timer_thread, NULL, refresh_thread, (void *) NULL);
 
 		iter_trace(bt_ctx);
-
-		quit = 1;
-		pthread_join(display_thread, NULL);
-		pthread_join(timer_thread, NULL);
 	}
 
+
+	pthread_join(display_thread, NULL);
+	quit = 1;
+	pthread_join(timer_thread, NULL);
+
+	ret = 0;
+
 end:
 	if (bt_ctx)
 		bt_context_put(bt_ctx);
 
-	return 0;
+	if (live_session_name) {
+		ret = destroy_live_local_session(live_session_name);
+		if (ret < 0) {
+			fprintf(stderr, "Error destroying %s\n", live_session_name);
+		}
+	}
+
+	return ret;
 }