fix segfault if no kprobe defined
authorJulien Desfossez <jdesfossez@efficios.com>
Tue, 28 Aug 2012 20:35:15 +0000 (16:35 -0400)
committerJulien Desfossez <jdesfossez@efficios.com>
Sat, 19 Oct 2013 16:02:38 +0000 (12:02 -0400)
Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
src/lttngtop.c

index d1b36a3e31e17ac20d7493c7e7c0e1849912747b..a92b9e32e8f57fb12499374f0d8cb02fffcd341f 100644 (file)
@@ -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);
This page took 0.031698 seconds and 4 git commands to generate.