From: Julien Desfossez <jdesfossez@efficios.com>
Date: Tue, 28 Aug 2012 20:35:15 +0000 (-0400)
Subject: fix segfault if no kprobe defined
X-Git-Tag: v0.3~85
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=957eed4676f9276f3a6305f12c9ad62dd2b435af;p=lttngtop.git

fix segfault if no kprobe defined

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
---

diff --git a/src/lttngtop.c b/src/lttngtop.c
index d1b36a3..a92b9e3 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -1230,9 +1230,11 @@ int setup_live_tracing()
 		goto error_session;
 	}
 
-	ret = enable_kprobes(handle, channel_name);
-	if (ret < 0) {
-		goto error_session;
+	if (lttngtop.kprobes_table) {
+		ret = enable_kprobes(handle, channel_name);
+		if (ret < 0) {
+			goto error_session;
+		}
 	}
 
 	kctxpid.ctx = LTTNG_EVENT_CONTEXT_PID;
@@ -1276,6 +1278,7 @@ int main(int argc, char **argv)
 	struct mmap_stream *mmap_info;
 	unsigned long mmap_len;
 
+	init_lttngtop();
 	ret = parse_options(argc, argv);
 	if (ret < 0) {
 		fprintf(stdout, "Error parsing options.\n\n");
@@ -1290,7 +1293,6 @@ int main(int argc, char **argv)
 			signal(SIGTERM, handle_textdump_sigterm);
 			signal(SIGINT, handle_textdump_sigterm);
 		}
-		init_lttngtop();
 		ret = setup_live_tracing();
 		if (ret < 0) {
 			goto end;
@@ -1335,7 +1337,7 @@ int main(int argc, char **argv)
 
 		goto end;
 	} else {
-		init_lttngtop();
+		//init_lttngtop();
 
 		bt_ctx = bt_context_create();
 		ret = bt_context_add_traces_recursive(bt_ctx, opt_input_path, "ctf", NULL);