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

diff --git a/src/lttngtop.c b/src/lttngtop.c
index f659b52..5cb418f 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Julien Desfossez
+ * Copyright (C) 2011-2012 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
@@ -37,6 +37,10 @@
 #include <sys/types.h>
 #include <fts.h>
 #include <assert.h>
+#include <sys/mman.h>
+#include <lttng/lttng.h>
+#include <lttng/lttngtop-helper.h>
+#include <babeltrace/lttngtopmmappacketseek.h>
 
 #include "lttngtoptypes.h"
 #include "cputop.h"
@@ -47,6 +51,10 @@
 #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;
@@ -54,28 +62,61 @@ pthread_t timer_thread;
 
 unsigned long refresh_display = 1 * NSEC_PER_SEC;
 unsigned long last_display_update = 0;
-int quit = 0;
+
+/* list of FDs available for being read with snapshots */
+struct 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;
+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);
@@ -88,6 +129,10 @@ void *ncurses_display(void *p)
 	unsigned int current_display_index = 0;
 
 	sem_wait(&bootstrap);
+	/*
+	 * Prevent the 1 second delay when we hit ESC
+	 */
+	ESCDELAY = 0;
 	init_ncurses();
 
 	while (1) {
@@ -95,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;
 }
 
 /*
@@ -146,7 +250,7 @@ error:
 struct perfcounter *get_perf_counter(const char *name, struct processtop *proc,
 		struct cputime *cpu)
 {
-	struct perfcounter *ret, *global;
+	struct perfcounter *ret;
 	GHashTable *table;
 
 	if (proc)
@@ -165,16 +269,6 @@ struct perfcounter *get_perf_counter(const char *name, struct processtop *proc,
 	ret->visible = 1;
 	g_hash_table_insert(table, (gpointer) strdup(name), ret);
 
-	global = g_hash_table_lookup(lttngtop.perf_list, (gpointer) name);
-	if (!global) {
-		global = g_new0(struct perfcounter, 1);
-		memcpy(global, ret, sizeof(struct perfcounter));
-		/* by default, sort on the first perf context */
-		if (g_hash_table_size(lttngtop.perf_list) == 0)
-			global->sort = 1;
-		g_hash_table_insert(lttngtop.perf_list, (gpointer) strdup(name), global);
-	}
-
 end:
 	return ret;
 
@@ -196,13 +290,17 @@ void update_perf_value(struct processtop *proc, struct cputime *cpu,
 }
 
 void extract_perf_counter_scope(const struct bt_ctf_event *event,
-		const struct definition *scope,
+		const struct bt_definition *scope,
 		struct processtop *proc,
 		struct cputime *cpu)
 {
-	struct definition const * const *list = NULL;
+	struct bt_definition const * const *list = NULL;
+	const struct bt_definition *field;
 	unsigned int count;
-	int i, ret;
+	struct perfcounter *perfcounter;
+	GHashTableIter iter;
+	gpointer key;
+	int ret;
 
 	if (!scope)
 		goto end;
@@ -211,13 +309,17 @@ void extract_perf_counter_scope(const struct bt_ctf_event *event,
 	if (ret < 0)
 		goto end;
 
-	for (i = 0; i < count; i++) {
-		const char *name = bt_ctf_field_name(list[i]);
-		if (strncmp(name, "perf_", 5) == 0) {
-			int value = bt_ctf_get_uint64(list[i]);
+	if (count == 0)
+		goto end;
+
+	g_hash_table_iter_init(&iter, global_perf_liszt);
+	while (g_hash_table_iter_next (&iter, &key, (gpointer) &perfcounter)) {
+		field = bt_ctf_get_field(event, scope, (char *) key);
+		if (field) {
+			int value = bt_ctf_get_uint64(field);
 			if (bt_ctf_field_get_error())
 				continue;
-			update_perf_value(proc, cpu, name, value);
+			update_perf_value(proc, cpu, (char *) key, value);
 		}
 	}
 
@@ -228,7 +330,7 @@ end:
 void update_perf_counter(struct processtop *proc, const struct bt_ctf_event *event)
 {
 	struct cputime *cpu;
-	const struct definition *scope;
+	const struct bt_definition *scope;
 
 	cpu = get_cpu(get_cpu_id(event));
 
@@ -245,50 +347,62 @@ 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;
 
-	/* FIXME : display nice error when missing context pid, tid, ppid and comm */
-
 	timestamp = bt_ctf_get_timestamp(call_data);
 	if (timestamp == -1ULL)
 		goto error;
 
 	pid = get_context_pid(call_data);
 	if (pid == -1ULL) {
-//		fprintf(stderr, "Missing pid context info\n");
 		goto error;
 	}
+
 	tid = get_context_tid(call_data);
 	if (tid == -1ULL) {
-//		fprintf(stderr, "Missing tid context info\n");
 		goto error;
 	}
 	ppid = get_context_ppid(call_data);
 	if (ppid == -1ULL) {
-//		fprintf(stderr, "Missing ppid context info\n");
 		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) {
-//		fprintf(stderr, "Missing procname context info\n");
 		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 */
@@ -298,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:
@@ -307,7 +422,7 @@ error:
 void init_lttngtop()
 {
 	copies = g_ptr_array_new();
-	lttngtop.perf_list = g_hash_table_new(g_str_hash, g_str_equal);
+	global_perf_liszt = g_hash_table_new(g_str_hash, g_str_equal);
 
 	sem_init(&goodtodisplay, 0, 0);
 	sem_init(&goodtoupdate, 0, 1);
@@ -321,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();
@@ -329,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");
 }
 
 /*
@@ -340,11 +463,8 @@ static int parse_options(int argc, char **argv)
 {
 	poptContext pc;
 	int opt, ret = 0;
-
-	if (argc == 1) {
-		usage(stdout);
-		return 1;   /* exit cleanly */
-	}
+	char *tmp_str;
+	int *tid;
 
 	pc = poptGetContext(NULL, argc, (const char **) argv, long_options, 0);
 	poptReadDefaultConfig(pc, 0);
@@ -355,18 +475,36 @@ static int parse_options(int argc, char **argv)
 				usage(stdout);
 				ret = 1;    /* exit cleanly */
 				goto end;
-			case OPT_LIST:
-			//	list_formats(stdout);
-				ret = 1;
-				goto end;
-			case OPT_VERBOSE:
-//				babeltrace_verbose = 1;
+			case OPT_TEXTDUMP:
+				opt_textdump = 1;
 				break;
-			case OPT_DEBUG:
-//				babeltrace_debug = 1;
+			case OPT_CHILD:
+				opt_textdump = 1;
+				opt_child = 1;
 				break;
-			case OPT_NAMES:
-//				opt_field_names = 1;
+			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;
@@ -375,10 +513,7 @@ static int parse_options(int argc, char **argv)
 	}
 
 	opt_input_path = poptGetArg(pc);
-	if (!opt_input_path) {
-		ret = -EINVAL;
-		goto end;
-	}
+
 end:
 	if (pc) {
 		poptFreeContext(pc);
@@ -396,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;
@@ -468,7 +611,7 @@ end_iter:
  */
 int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 		const char *format_str,
-		void (*packet_seek)(struct stream_pos *pos,
+		void (*packet_seek)(struct bt_stream_pos *pos,
 			size_t offset, int whence))
 {
 	FTS *tree;
@@ -476,7 +619,7 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 	GArray *trace_ids;
 	char lpath[PATH_MAX];
 	char * const paths[2] = { lpath, NULL };
-	int ret;
+	int ret = -1;
 
 	/*
 	 * Need to copy path, because fts_open can change it.
@@ -509,11 +652,9 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 		}
 		metafd = openat(dirfd, "metadata", O_RDONLY);
 		if (metafd < 0) {
-			ret = close(dirfd);
-			if (ret < 0) {
-				perror("close");
-				goto error;
-			}
+			close(dirfd);
+			ret = -1;
+			continue;
 		} else {
 			int trace_id;
 
@@ -532,48 +673,61 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 				node->fts_accpath, format_str,
 				packet_seek, NULL, NULL);
 			if (trace_id < 0) {
-				fprintf(stderr, "[error] [Context] opening trace \"%s\" from %s "
+				fprintf(stderr, "[warning] [Context] opening trace \"%s\" from %s "
 					"for reading.\n", node->fts_accpath, path);
-				ret = trace_id;
-				goto error;
+				/* Allow to skip erroneous traces. */
+				continue;
 			}
 			g_array_append_val(trace_ids, trace_id);
 		}
 	}
 
 	g_array_free(trace_ids, TRUE);
-	return 0;
+	return ret;
 
 error:
 	return ret;
 }
 
-int check_field_requirements(const struct bt_ctf_field_decl *const * field_list,
+static int check_field_requirements(const struct bt_ctf_field_decl *const * field_list,
 		int field_cnt, int *tid_check, int *pid_check,
 		int *procname_check, int *ppid_check)
 {
 	int j;
+	struct perfcounter *global;
+	const char *name;
 
 	for (j = 0; j < field_cnt; j++) {
+		name = bt_ctf_get_decl_field_name(field_list[j]);
 		if (*tid_check == 0) {
-			if (strncmp(bt_ctf_get_decl_field_name(field_list[j]), "tid", 3) == 0) {
+			if (strncmp(name, "tid", 3) == 0)
 				(*tid_check)++;
-			}
 		}
 		if (*pid_check == 0) {
-			if (strncmp(bt_ctf_get_decl_field_name(field_list[j]), "pid", 3) == 0)
+			if (strncmp(name, "pid", 3) == 0)
 				(*pid_check)++;
 		}
 		if (*ppid_check == 0) {
-			if (strncmp(bt_ctf_get_decl_field_name(field_list[j]), "ppid", 4) == 0)
+			if (strncmp(name, "ppid", 4) == 0)
 				(*ppid_check)++;
 		}
 		if (*procname_check == 0) {
-			if (strncmp(bt_ctf_get_decl_field_name(field_list[j]), "procname", 8) == 0)
+			if (strncmp(name, "procname", 8) == 0)
 				(*procname_check)++;
 		}
+		if (strncmp(name, "perf_", 5) == 0) {
+			global = g_hash_table_lookup(global_perf_liszt, (gpointer) name);
+			if (!global) {
+				global = g_new0(struct perfcounter, 1);
+				/* by default, sort on the first perf context */
+				if (g_hash_table_size(global_perf_liszt) == 0)
+					global->sort = 1;
+				global->visible = 1;
+				g_hash_table_insert(global_perf_liszt, (gpointer) strdup(name), global);
+			}
+		}
 	}
-	/* if all checks are OK, no need to continue the checks */
+
 	if (*tid_check == 1 && *pid_check == 1 && *ppid_check == 1 &&
 			*procname_check == 1)
 		return 0;
@@ -586,8 +740,6 @@ int check_field_requirements(const struct bt_ctf_field_decl *const * field_list,
  *
  * If each mandatory context information is available for at least in one
  * event, return 0 otherwise return -1.
- * Also, we make here a list for all the perf counters available during the
- * trace.
  */
 int check_requirements(struct bt_context *ctx)
 {
@@ -607,24 +759,18 @@ int check_requirements(struct bt_context *ctx)
 		ret = check_field_requirements(field_list, field_cnt,
 				&tid_check, &pid_check, &procname_check,
 				&ppid_check);
-		if (ret == 0)
-			goto end;
 
 		bt_ctf_get_decl_fields(evt_list[i], BT_EVENT_CONTEXT,
 				&field_list, &field_cnt);
 		ret = check_field_requirements(field_list, field_cnt,
 				&tid_check, &pid_check, &procname_check,
 				&ppid_check);
-		if (ret == 0)
-			goto end;
 
 		bt_ctf_get_decl_fields(evt_list[i], BT_STREAM_PACKET_CONTEXT,
 				&field_list, &field_cnt);
 		ret = check_field_requirements(field_list, field_cnt,
 				&tid_check, &pid_check, &procname_check,
 				&ppid_check);
-		if (ret == 0)
-			goto end;
 	}
 
 	if (tid_check == 0) {
@@ -644,14 +790,291 @@ int check_requirements(struct bt_context *ctx)
 		fprintf(stderr, "[error] missing procname context information\n");
 	}
 
+	return ret;
+}
+
+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 */
+		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;
+		}
+
+		/* 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");
+		}
+		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_mmap_stream;
+
+	/* 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_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);
+		/* 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(struct bt_context **bt_ctx)
+{
+	int ret;
+	FILE *metadata_fp;
+
+	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");
+
+	*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,
+		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;
+	}
+
+end:
+	return ret;
+}
+
+int setup_live_tracing()
+{
+	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 error;
+	}
+
+	available_snapshots = g_ptr_array_new();
+
+	/* setup the session */
+	dom.type = LTTNG_DOMAIN_KERNEL;
+
+	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 error;
+	}
+
+	if ((handle = lttng_create_handle("test", &dom)) == NULL) {
+		fprintf(stderr,"error creating handle\n");
+		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 error_session;
+	}
+
+	strcpy(chan.name, channel_name);
+	chan.attr.overwrite = 0;
+	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 error_session;
+	}
+
+	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;
+	}
+
+	ev.type = LTTNG_EVENT_SYSCALL;
+	if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
+		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);
+	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 error_session;
+	}
+
+	helper_kernctl_buffer_flush(consumerd_metadata);
+
+	/* block until metadata is ready */
+	sem_init(&metadata_available, 0, 0);
+
+	return 0;
+
+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) {
@@ -662,31 +1085,83 @@ int main(int argc, char **argv)
 		exit(EXIT_SUCCESS);
 	}
 
-	init_lttngtop();
+	if (!opt_input_path) {
+		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);
+			}
 
-	bt_ctx = bt_context_create();
-	ret = bt_context_add_traces_recursive(bt_ctx, opt_input_path, "ctf", NULL);
-	if (ret < 0) {
-		fprintf(stderr, "[error] Opening the trace\n");
-		goto end;
-	}
+			/*
+			 * 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");
+		lttng_destroy_session("test");
 
-	ret = check_requirements(bt_ctx);
-	if (ret < 0) {
-		fprintf(stderr, "[error] missing mandatory context informations\n");
 		goto end;
-	}
+	} else {
+		init_lttngtop();
 
-	pthread_create(&display_thread, NULL, ncurses_display, (void *) NULL);
-	pthread_create(&timer_thread, NULL, refresh_thread, (void *) NULL);
+		bt_ctx = bt_context_create();
+		ret = bt_context_add_traces_recursive(bt_ctx, opt_input_path, "ctf", NULL);
+		if (ret < 0) {
+			fprintf(stderr, "[error] Opening the trace\n");
+			goto end;
+		}
 
-	iter_trace(bt_ctx);
+		ret = check_requirements(bt_ctx);
+		if (ret < 0) {
+			fprintf(stderr, "[error] some mandatory contexts were missing, exiting.\n");
+			goto end;
+		}
+		pthread_create(&display_thread, NULL, ncurses_display, (void *) NULL);
+		pthread_create(&timer_thread, NULL, refresh_thread, (void *) NULL);
 
-	quit = 1;
-	pthread_join(display_thread, NULL);
-	pthread_join(timer_thread, NULL);
+		iter_trace(bt_ctx);
+
+		pthread_join(display_thread, NULL);
+		quit = 1;
+		pthread_join(timer_thread, NULL);
+	}
 
 end:
-	bt_context_put(bt_ctx);
+	if (bt_ctx)
+		bt_context_put(bt_ctx);
+
 	return 0;
 }