Cleanup: useless reset of ret to zero

[lttng-tools.git] / src / bin / lttng-sessiond / trace-kernel.c

diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c
index d6ee8e8afb23401b2420e430bdd892dd0acc714d..083add3f30f907eee80dc259b0e961f028e50ab3 100644 (file)
--- a/src/bin/lttng-sessiond/trace-kernel.c
+++ b/src/bin/lttng-sessiond/trace-kernel.c
@@ -181,7 +181,7 @@ struct ltt_kernel_channel *trace_kernel_create_channel(
                struct lttng_channel *chan)
 {
        struct ltt_kernel_channel *lkc;
-       struct lttng_channel_extended *extended;
+       struct lttng_channel_extended *extended = NULL;
 
        assert(chan);
 
@@ -221,6 +221,7 @@ struct ltt_kernel_channel *trace_kernel_create_channel(
        lkc->stream_count = 0;
        lkc->event_count = 0;
        lkc->enabled = 1;
+       lkc->published_to_notification_thread = false;
        /* Init linked list */
        CDS_INIT_LIST_HEAD(&lkc->events_list.head);
        CDS_INIT_LIST_HEAD(&lkc->stream_list.head);
@@ -522,10 +523,13 @@ void trace_kernel_destroy_channel(struct ltt_kernel_channel *channel)
        /* Remove from channel list */
        cds_list_del(&channel->list);
 
-       status = notification_thread_command_remove_channel(
-                       notification_thread_handle,
-                       channel->fd, LTTNG_DOMAIN_KERNEL);
-       assert(status == LTTNG_OK);
+       if (notification_thread_handle
+                       && channel->published_to_notification_thread) {
+               status = notification_thread_command_remove_channel(
+                               notification_thread_handle,
+                               channel->fd, LTTNG_DOMAIN_KERNEL);
+               assert(status == LTTNG_OK);
+       }
        free(channel->channel->attr.extended.ptr);
        free(channel->channel);
        free(channel);