Live timer set up

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

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 1405554d97cc04e2a466c74a8930d2deb27de0de..de8fddb97d0cc698c80248d752b3b2d923f9e686 100644 (file)
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -123,7 +123,8 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
                        CONSUMER_CHANNEL_TYPE_DATA,
                        channel->channel->attr.tracefile_size,
                        channel->channel->attr.tracefile_count,
-                       monitor);
+                       monitor,
+                       channel->channel->attr.live_timer_interval);
 
        health_code_update();
 
@@ -184,7 +185,7 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
                        DEFAULT_KERNEL_CHANNEL_OUTPUT,
                        CONSUMER_CHANNEL_TYPE_METADATA,
                        0, 0,
-                       monitor);
+                       monitor, 0);
 
        health_code_update();
 
@@ -371,7 +372,6 @@ int kernel_consumer_destroy_channel(struct consumer_socket *socket,
 
        assert(channel);
        assert(socket);
-       assert(socket->fd);
 
        DBG("Sending kernel consumer destroy channel key %d", channel->fd);
 
@@ -400,7 +400,6 @@ int kernel_consumer_destroy_metadata(struct consumer_socket *socket,
 
        assert(metadata);
        assert(socket);
-       assert(socket->fd);
 
        DBG("Sending kernel consumer destroy channel key %d", metadata->fd);