X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=571b0f88aff04c23859d40a5bd7c650070a74d0b;hp=f15eea5518f4119c896114da3e4936f8caf860e7;hb=dc3eb0c3f241c6b372ee2c15d53bf4cb47d0c9aa;hpb=16b22a0fe150f4923b9902e802bbf28bacce8d0e

diff --git a/src/lttngtop.c b/src/lttngtop.c
index f15eea5..571b0f8 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -40,6 +40,7 @@
 #include <sys/mman.h>
 #include <lttng/lttng.h>
 #include <lttng/lttngtop-helper.h>
+#include <babeltrace/lttngtopmmappacketseek.h>
 
 #include "lttngtoptypes.h"
 #include "cputop.h"
@@ -50,6 +51,9 @@
 #define DEFAULT_FILE_ARRAY_SIZE 1
 
 const char *opt_input_path;
+int opt_textdump;
+
+int quit = 0;
 
 struct lttngtop *copy;
 pthread_t display_thread;
@@ -57,34 +61,47 @@ pthread_t timer_thread;
 
 unsigned long refresh_display = 1 * NSEC_PER_SEC;
 unsigned long last_display_update = 0;
-int quit = 0;
 
-/* LIVE */
 /* 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;
 
 enum {
 	OPT_NONE = 0,
 	OPT_HELP,
-	OPT_LIST,
-	OPT_VERBOSE,
-	OPT_DEBUG,
-	OPT_NAMES,
+	OPT_TEXTDUMP,
 };
 
 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 },
 	{ NULL, 0, 0, NULL, 0, NULL, NULL },
 };
 
 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);
@@ -108,20 +125,44 @@ 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;
+
+	timestamp = bt_ctf_get_timestamp(call_data);
+
+	start = format_timestamp(timestamp);
+	ts_nsec_start = timestamp % NSEC_PER_SEC;
+
+	printf("%02d:%02d:%02d.%09" PRIu64 " %s\n", start.tm_hour,
+			start.tm_min, start.tm_sec, ts_nsec_start,
+			bt_ctf_event_name(call_data));
+
+	return BT_CB_OK;
+}
+
 /*
  * hook on each event to check the timestamp and refresh the display if
  * necessary
@@ -256,7 +297,7 @@ 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;
+	int pid, tid, ppid, vpid, vtid, vppid;
 	char *comm;
 	struct processtop *parent, *child;
 	unsigned long timestamp;
@@ -277,6 +318,18 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 	if (ppid == -1ULL) {
 		goto error;
 	}
+	vpid = get_context_vpid(call_data);
+	if (pid == -1ULL) {
+		vpid = -1;
+	}
+	vtid = get_context_vtid(call_data);
+	if (tid == -1ULL) {
+		vtid = -1;
+	}
+	vppid = get_context_vppid(call_data);
+	if (ppid == -1ULL) {
+		vppid = -1;
+	}
 	comm = get_context_comm(call_data);
 	if (!comm) {
 		goto error;
@@ -286,7 +339,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 	child = find_process_tid(&lttngtop, tid, comm);
 	if (!child)
 		child = add_proc(&lttngtop, tid, comm, timestamp);
-	update_proc(child, pid, tid, ppid, comm);
+	update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm);
 
 	if (pid != tid) {
 		/* find or create the parent */
@@ -326,6 +379,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();
@@ -355,6 +410,9 @@ static int parse_options(int argc, char **argv)
 				usage(stdout);
 				ret = 1;    /* exit cleanly */
 				goto end;
+			case OPT_TEXTDUMP:
+				opt_textdump = 1;
+				goto end;
 			default:
 				ret = -EINVAL;
 				goto end;
@@ -380,52 +438,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) {
+		if (quit || reload_trace)
+			goto end_iter;
 		ret = bt_iter_next(bt_ctf_get_iter(iter));
 		if (ret < 0)
 			goto end_iter;
@@ -644,7 +710,6 @@ ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd,
 
 	if (helper_get_lttng_consumer_stream_output(kconsumerd_fd) == LTTNG_EVENT_SPLICE) {
 		/* Get the next subbuffer */
-		printf("get_next : %d\n", infd);
 		err = helper_kernctl_get_next_subbuf(infd);
 		if (err != 0) {
 			ret = errno;
@@ -659,7 +724,6 @@ ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd,
 			perror("Getting sub-buffer len failed.");
 			goto end;
 		}
-		printf("len : %ld\n", len);
 
 		/* splice the subbuffer to the tracefile */
 		ret = helper_lttng_consumer_on_read_subbuffer_splice(ctx, kconsumerd_fd, len);
@@ -670,8 +734,6 @@ ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd,
 			 */
 			fprintf(stderr,"Error splicing to tracefile\n");
 		}
-		printf("ret : %ld\n", ret);
-		printf("put_next : %d\n", infd);
 		err = helper_kernctl_put_next_subbuf(infd);
 		if (err != 0) {
 			ret = errno;
@@ -679,7 +741,7 @@ ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd,
 					"it is due to concurrency)");
 			goto end;
 		}
-//		sem_post(&metadata_available);
+		sem_post(&metadata_available);
 	}
 
 end:
@@ -697,10 +759,8 @@ int on_update_fd(int key, uint32_t state)
 int on_recv_fd(struct lttng_consumer_stream *kconsumerd_fd)
 {
 	int ret;
-	struct mmap_stream *new_info;
-	size_t tmp_mmap_len;
+	struct mmap_stream *new_mmap_stream;
 
-	printf("Receiving %d\n", helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd));
 	/* 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),
@@ -713,31 +773,13 @@ int on_recv_fd(struct lttng_consumer_stream *kconsumerd_fd)
 	}
 
 	if (helper_get_lttng_consumer_stream_output(kconsumerd_fd) == LTTNG_EVENT_MMAP) {
-		new_info = malloc(sizeof(struct mmap_stream));
-		new_info->fd = helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd);
-		bt_list_add(&new_info->list, &mmap_list.head);
-
-		/* get the len of the mmap region */
-		ret = helper_kernctl_get_mmap_len(helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd),
-				&tmp_mmap_len);
-		if (ret != 0) {
-			ret = errno;
-			perror("helper_kernctl_get_mmap_len");
-			goto end;
-		}
-		helper_set_lttng_consumer_stream_mmap_len(kconsumerd_fd, tmp_mmap_len);
-		printf("mmap len : %ld\n", tmp_mmap_len);
-
-		helper_set_lttng_consumer_stream_mmap_base(kconsumerd_fd,
-				mmap(NULL, helper_get_lttng_consumer_stream_mmap_len(kconsumerd_fd),
-				PROT_READ, MAP_PRIVATE, helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd), 0));
-		if (helper_get_lttng_consumer_stream_mmap_base(kconsumerd_fd) == MAP_FAILED) {
-			perror("Error mmaping");
-			ret = -1;
-			goto end;
-		}
+		new_mmap_stream = malloc(sizeof(struct mmap_stream));
+		new_mmap_stream->fd = helper_get_lttng_consumer_stream_wait_fd(
+				kconsumerd_fd);
+		bt_list_add(&new_mmap_stream->list, &mmap_list.head);
 
 		g_ptr_array_add(lttng_consumer_stream_array, kconsumerd_fd);
+		/* keep mmap FDs internally */
 		ret = 1;
 	} else {
 		consumerd_metadata = helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd);
@@ -745,10 +787,35 @@ int on_recv_fd(struct lttng_consumer_stream *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)
@@ -768,14 +835,14 @@ int setup_consumer(char *command_sock_path, pthread_t *threads,
 	ret = pthread_create(&threads[0], NULL, helper_lttng_consumer_thread_receive_fds,
 			(void *) ctx);
 	if (ret != 0) {
-		perror("pthread_create");
+		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");
+		perror("pthread_create poll fd");
 		goto end;
 	}
 
@@ -788,14 +855,11 @@ int setup_live_tracing()
 	struct lttng_domain dom;
 	struct lttng_channel chan;
 	char *channel_name = "mmapchan";
-	struct lttng_consumer_local_data *ctx = NULL;
 	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;
-	/* list of snapshots currently not consumed */
-	GPtrArray *available_snapshots;
 
 	struct lttng_handle *handle;
 
@@ -805,7 +869,7 @@ int setup_live_tracing()
 
 	if ((ret = setup_consumer(command_sock_path, threads, ctx)) < 0) {
 		fprintf(stderr,"error setting up consumer\n");
-		goto end;
+		goto error;
 	}
 
 	available_snapshots = g_ptr_array_new();
@@ -813,27 +877,38 @@ int setup_live_tracing()
 	/* setup the session */
 	dom.type = LTTNG_DOMAIN_KERNEL;
 
-	ret = system("rm -rf /tmp/livesession");
+	ret = unlink("/tmp/livesession");
 
+	lttng_destroy_session("test");
 	if ((ret = lttng_create_session("test", "/tmp/livesession")) < 0) {
 		fprintf(stderr,"error creating the session : %s\n",
 				helper_lttcomm_get_readable_code(ret));
-		goto end;
+		goto error;
 	}
 
 	if ((handle = lttng_create_handle("test", &dom)) == NULL) {
 		fprintf(stderr,"error creating handle\n");
-		goto end;
+		goto error_session;
+	}
+
+	/*
+	 * FIXME : need to let the
+	 * helper_lttng_consumer_thread_receive_fds create the
+	 * socket.
+	 * Cleaner solution ?
+	 */
+	while (access(command_sock_path, F_OK)) {
+		sleep(0.1);
 	}
 
 	if ((ret = lttng_register_consumer(handle, command_sock_path)) < 0) {
 		fprintf(stderr,"error registering consumer : %s\n",
 				helper_lttcomm_get_readable_code(ret));
-		goto end;
+		goto error_session;
 	}
 
 	strcpy(chan.name, channel_name);
-	chan.attr.overwrite = 1;
+	chan.attr.overwrite = 0;
 //	chan.attr.subbuf_size = 32768;
 	chan.attr.subbuf_size = 1048576; /* 1MB */
 	chan.attr.num_subbuf = 4;
@@ -842,17 +917,25 @@ int setup_live_tracing()
 	chan.attr.output = LTTNG_EVENT_MMAP;
 
 	if ((ret = lttng_enable_channel(handle, &chan)) < 0) {
-		fprintf(stderr,"error creating channel : %s\n", helper_lttcomm_get_readable_code(ret));
-		goto end;
+		fprintf(stderr,"error creating channel : %s\n",
+				helper_lttcomm_get_readable_code(ret));
+		goto error_session;
 	}
 
-	sprintf(ev.name, "sched_switch");
+	memset(&ev, '\0', sizeof(struct lttng_event));
+	//sprintf(ev.name, "sched_switch");
 	ev.type = LTTNG_EVENT_TRACEPOINT;
+	if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
+		fprintf(stderr,"error enabling event : %s\n",
+				helper_lttcomm_get_readable_code(ret));
+		goto error_session;
+	}
 
-	//if ((ret = lttng_enable_event(handle, NULL, channel_name)) < 0) {
+	ev.type = LTTNG_EVENT_SYSCALL;
 	if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
-		fprintf(stderr,"error enabling event : %s\n", helper_lttcomm_get_readable_code(ret));
-		goto end;
+		fprintf(stderr,"error enabling syscalls : %s\n",
+				helper_lttcomm_get_readable_code(ret));
+		goto error_session;
 	}
 
 	kctxpid.ctx = LTTNG_EVENT_CONTEXT_PID;
@@ -863,31 +946,36 @@ int setup_live_tracing()
 	lttng_add_context(handle, &kctxcomm, NULL, NULL);
 	kctxtid.ctx = LTTNG_EVENT_CONTEXT_TID;
 	lttng_add_context(handle, &kctxtid, 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);
 
 	if ((ret = lttng_start_tracing("test")) < 0) {
-		fprintf(stderr,"error starting tracing : %s\n", helper_lttcomm_get_readable_code(ret));
-		goto end;
+		fprintf(stderr,"error starting tracing : %s\n",
+				helper_lttcomm_get_readable_code(ret));
+		goto error_session;
 	}
 
 	helper_kernctl_buffer_flush(consumerd_metadata);
-	sleep(10);
-
-	lttng_stop_tracing("test");
-	lttng_destroy_session("test");
 
 	/* block until metadata is ready */
-	//sem_init(&metadata_available, 0, 0);
+	sem_init(&metadata_available, 0, 0);
 
-	//init_lttngtop();
+	return 0;
 
-end:
-	return ret;
+error_session:
+	lttng_destroy_session("test");
+error:
+	return -1;
 }
 
 int main(int argc, char **argv)
 {
 	int ret;
 	struct bt_context *bt_ctx = NULL;
+	struct mmap_stream *mmap_info;
+	unsigned long mmap_len;
 
 	ret = parse_options(argc, argv);
 	if (ret < 0) {
@@ -899,8 +987,49 @@ int main(int argc, char **argv)
 	}
 
 	if (!opt_input_path) {
-		printf("live tracing enabled\n");
-		setup_live_tracing();
+		ret = setup_live_tracing();
+		if (ret < 0) {
+			goto end;
+		}
+		init_lttngtop();
+		if (!opt_textdump) {
+			pthread_create(&display_thread, NULL, ncurses_display, (void *) NULL);
+			pthread_create(&timer_thread, NULL, refresh_thread, (void *) NULL);
+		}
+		while (!quit) {
+			reload_trace = 0;
+			live_consume(&bt_ctx);
+			iter_trace(bt_ctx);
+			ret = bt_context_remove_trace(bt_ctx, 0);
+			if (ret != 0)
+				fprintf(stderr, "error removing trace\n");
+			if (bt_ctx) {
+				bt_context_put(bt_ctx);
+			}
+
+			/*
+			 * since we receive all FDs every time there is an
+			 * update and the FD number is different every time,
+			 * we don't know which one are valid.
+			 * so we check if all FDs are usable with a simple
+			 * ioctl call.
+			 */
+			bt_list_for_each_entry(mmap_info, &mmap_list.head, list) {
+				ret = helper_kernctl_get_mmap_len(mmap_info->fd, &mmap_len);
+				if (ret != 0) {
+					bt_list_del(&mmap_info->list);
+				}
+			}
+			sem_post(&metadata_available);
+		}
+
+		pthread_join(timer_thread, NULL);
+		quit = 1;
+		pthread_join(display_thread, NULL);
+
+		lttng_stop_tracing("test");
+		lttng_destroy_session("test");
+
 		goto end;
 	} else {
 		init_lttngtop();
@@ -922,8 +1051,8 @@ int main(int argc, char **argv)
 
 		iter_trace(bt_ctx);
 
-		quit = 1;
 		pthread_join(display_thread, NULL);
+		quit = 1;
 		pthread_join(timer_thread, NULL);
 	}