X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=c29c5a5443efc9a7d5e3c8f49d2a6ba4f67cb67b;hp=bfae663182c0cb89a9dd0d59da74a5627d66f09a;hb=09e7f98e84338afb3f6959a19df84ec4b4c1c012;hpb=bab469fc468832ae02c61e24bf3afaba24228c09

diff --git a/src/lttngtop.c b/src/lttngtop.c
index bfae663..c29c5a5 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -38,6 +38,7 @@
 #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>
@@ -52,16 +53,21 @@
 #include "common.h"
 #include "network-live.h"
 
-#include "lttng-index.h"
+#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;
-static int opt_textdump;
-static int opt_child;
-static int opt_begin;
+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;
@@ -70,6 +76,7 @@ pthread_t timer_thread;
 unsigned long refresh_display = 1 * NSEC_PER_SEC;
 unsigned long last_display_update = 0;
 unsigned long last_event_ts = 0;
+struct syscall *last_syscall;
 
 /* list of FDs available for being read with snapshots */
 struct bt_mmap_stream_list mmap_list;
@@ -81,7 +88,7 @@ GPtrArray *available_snapshots;
 sem_t metadata_available;
 int reload_trace = 0;
 
-int last_textdump_print_newline = 1;
+uint64_t prev_ts = 0;
 
 enum {
 	OPT_NONE = 0,
@@ -93,6 +100,9 @@ enum {
 	OPT_RELAY_HOSTNAME,
 	OPT_KPROBES,
 	OPT_BEGIN,
+	OPT_ALL,
+	OPT_OUTPUT_FILE,
+	OPT_VERBOSE,
 };
 
 static struct poptOption long_options[] = {
@@ -106,6 +116,9 @@ static struct poptOption long_options[] = {
 	{ "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 },
 	{ NULL, 0, 0, NULL, 0, NULL, NULL },
 };
 
@@ -172,7 +185,8 @@ void *ncurses_display(void *p)
 	}
 }
 
-void print_fields(struct bt_ctf_event *event)
+void print_fields(struct bt_ctf_event *event, const char *procname,
+		int pid)
 {
 	unsigned int cnt, i;
 	const struct bt_definition *const * list;
@@ -180,27 +194,46 @@ void print_fields(struct bt_ctf_event *event)
 	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)
-			printf(", ");
-		printf("%s = ", bt_ctf_field_name(list[i]));
+			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)
-				printf("%" PRIu64 "", bt_ctf_get_uint64(list[i]));
-			else
-				printf("%" PRId64 "", bt_ctf_get_int64(list[i]));
+			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) {
-			printf("%s", bt_ctf_get_string(list[i]));
+			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)
-				printf("%s", 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);
 		}
 	}
 }
@@ -209,15 +242,17 @@ void print_fields(struct bt_ctf_event *event)
  * 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;
-	int pid, cpu_id;
-	int64_t syscall_ret;
+	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;
 
 	timestamp = bt_ctf_get_timestamp(call_data);
 
@@ -234,42 +269,125 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
 	if (pid == -1ULL && opt_tid) {
 		goto error;
 	}
+
+	tid = get_context_tid(call_data);
 	
 	hostname = get_context_hostname(call_data);
-	if (opt_tid || opt_hostname)
-		if (!lookup_filter_tid_list(pid))
-			goto end;
+	if (opt_child)
+		lookup = pid;
+	else
+		lookup = tid;
+	if (opt_tid || opt_hostname || 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 (last_syscall && (strncmp(bt_ctf_event_name(call_data),
+				 "exit_syscall", 12)) != 0) {
+		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) {
+		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 ((strncmp(bt_ctf_event_name(call_data), "exit_syscall", 12)) == 0) {
+		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");
+			}
+		}
 
-	if ((strcmp(bt_ctf_event_name(call_data), "exit_syscall") == 0) &&
-			!last_textdump_print_newline) {
-		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 " (%s) (cpu %d) [%s (%d)] %s (",
-				start.tm_hour, start.tm_min, start.tm_sec,
-				ts_nsec_start, hostname, cpu_id, procname, pid,
-				bt_ctf_event_name(call_data));
-		print_fields(call_data);
-		printf(") ");
-		if (strncmp(bt_ctf_event_name(call_data), "sys_", 4) != 0) {
-			printf("\n");
-			last_textdump_print_newline = 1;
-		} else {
-			last_textdump_print_newline = 0;
+		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_hostname || opt_exec_name))
+		fprintf(output, "%c[0m", 27);
+
 end:
 	return BT_CB_OK;
 error:
@@ -457,7 +575,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 	}
 	ppid = get_context_ppid(call_data);
 	if (ppid == -1ULL) {
-		goto error;
+		goto end;
 	}
 	vpid = get_context_vpid(call_data);
 	if (pid == -1ULL) {
@@ -515,6 +633,8 @@ void init_lttngtop()
 	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);
+	tid_filter_list = g_hash_table_new(g_str_hash,
+			g_str_equal);
 
 	sem_init(&goodtodisplay, 0, 0);
 	sem_init(&goodtoupdate, 0, 1);
@@ -540,16 +660,18 @@ void init_lttngtop()
 void usage(FILE *fp)
 {
 	fprintf(fp, "LTTngTop %s\n\n", VERSION);
-	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, "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, --hostname           Comma-separated list of hostnames to display (require hostname 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");
 }
 
 /*
@@ -637,6 +759,7 @@ static int parse_options(int argc, char **argv)
 	int opt, ret = 0;
 	char *tmp_str;
 	int *tid;
+	int i;
 
 	remote_live = 0;
 
@@ -652,14 +775,14 @@ static int parse_options(int argc, char **argv)
 			case OPT_TEXTDUMP:
 				opt_textdump = 1;
 				break;
+			case OPT_ALL:
+				opt_all = 1;
+				break;
 			case OPT_CHILD:
-				opt_textdump = 1;
 				opt_child = 1;
 				break;
 			case OPT_PID:
 				toggle_filter = 1;
-				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));
@@ -702,13 +825,38 @@ static int parse_options(int argc, char **argv)
 					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) {
@@ -733,9 +881,37 @@ void iter_trace(struct bt_context *bt_ctx)
 	bt_ctf_iter_add_callback(iter, 0, NULL, 0,
 			fix_process_table,
 			NULL, NULL, NULL);
+	/* to handle the follow child option */
+	bt_ctf_iter_add_callback(iter,
+			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"),
+			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);
+	bt_ctf_iter_add_callback(iter,
+			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("sys_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);
 	if (opt_textdump) {
 		bt_ctf_iter_add_callback(iter, 0, NULL, 0,
-				print_timestamp,
+				textdump,
 				NULL, NULL, NULL);
 	} else {
 		/* at each event check if we need to refresh */
@@ -746,38 +922,13 @@ void iter_trace(struct bt_context *bt_ctx)
 		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);
 
 		/* for kprobes */
 		if (lttngtop.kprobes_table) {
@@ -792,6 +943,24 @@ void iter_trace(struct bt_context *bt_ctx)
 		}
 	}
 
+	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;
@@ -831,6 +1000,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.
@@ -1002,12 +1184,22 @@ int check_requirements(struct bt_context *ctx)
 		ret = -1;
 		fprintf(stderr, "[error] missing procname context information\n");
 	}
+	if (ret == 0) {
+		valid_trace = 1;
+	}
 
 end:
 	return ret;
 }
 
-int main(int argc, char **argv)
+static void handle_sigchild(int signal)
+{
+	int status;
+
+	waitpid(opt_exec_pid, &status, 0);
+}
+
+int main(int argc, char **argv, char **envp)
 {
 	int ret;
 	struct bt_context *bt_ctx = NULL;
@@ -1022,7 +1214,12 @@ int main(int argc, char **argv)
 		exit(EXIT_SUCCESS);
 	}
 
-	if (!opt_input_path && !remote_live) {
+	if (opt_exec_name) {
+		opt_exec_env = envp;
+		signal(SIGCHLD, handle_sigchild);
+	}
+
+	if (!opt_input_path && !remote_live && !opt_exec_name) {
 		/* mmap live */
 #ifdef LTTNGTOP_MMAP_LIVE
 		if (opt_textdump) {
@@ -1039,18 +1236,19 @@ int main(int argc, char **argv)
 
 		goto end;
 #else
-		fprintf(stderr, "Mmap live support not compiled\n");
+		fprintf(stderr, "[ERROR] Mmap live support not compiled, specify a "
+				"trace directory or -r <relayd hostname/IP>\n");
+		usage(stdout);
+		ret = -1;
 		goto end;
 #endif /* LTTNGTOP_MMAP_LIVE */
 	} else if (!opt_input_path && remote_live) {
 		/* network live */
-		ret = setup_network_live(opt_relay_hostname, opt_begin);
-		if (ret < 0) {
-			goto end;
-		}
-
-		ret = open_trace(&bt_ctx);
+		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 {
@@ -1062,27 +1260,34 @@ int main(int argc, char **argv)
 			fprintf(stderr, "[error] Opening the trace\n");
 			goto end;
 		}
-	}
 
-	ret = check_requirements(bt_ctx);
-	if (ret < 0) {
-		fprintf(stderr, "[error] some mandatory contexts were missing, exiting.\n");
-		goto end;
-	}
-	if (!opt_textdump) {
-		pthread_create(&display_thread, NULL, ncurses_display, (void *) NULL);
-		pthread_create(&timer_thread, NULL, refresh_thread, (void *) NULL);
+		ret = check_requirements(bt_ctx);
+		if (ret < 0 && !valid_trace) {
+			fprintf(stderr, "[error] some mandatory contexts "
+					"were missing, exiting.\n");
+			//goto end;
+		}
+
+		if (!opt_textdump) {
+			pthread_create(&display_thread, NULL, ncurses_display,
+					(void *) NULL);
+			pthread_create(&timer_thread, NULL, refresh_thread,
+					(void *) NULL);
+		}
+
+		iter_trace(bt_ctx);
 	}
 
-	iter_trace(bt_ctx);
 
 	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;
+	return ret;
 }