Fix: Conditionally disable test requiring shared libs

[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 25f0e47998eebb85e753d249df947bbb02d1c72f..bdf9b4098be5edef16f3f1d9ad076637079304ec 100644 (file)
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -52,14 +52,14 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
                        channel->channel->name,
                        channel->stream_count);
 
-       health_code_update(&health_thread_kernel);
+       health_code_update();
 
        ret = consumer_send_channel(sock, &lkm);
        if (ret < 0) {
                goto error;
        }
 
-       health_code_update(&health_thread_kernel);
+       health_code_update();
 
 error:
        return ret;
@@ -124,17 +124,17 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
                        session->metadata->fd,
                        session->metadata->conf->attr.subbuf_size,
                        0, /* for kernel */
-                       "metadata",
+                       DEFAULT_METADATA_NAME,
                        1);
 
-       health_code_update(&health_thread_kernel);
+       health_code_update();
 
        ret = consumer_send_channel(sock, &lkm);
        if (ret < 0) {
                goto error;
        }
 
-       health_code_update(&health_thread_kernel);
+       health_code_update();
 
        /* Prep stream message structure */
        consumer_init_stream_comm_msg(&lkm,
@@ -148,11 +148,11 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
                        session->gid,
                        consumer->net_seq_index,
                        1, /* Metadata flag set */
-                       "metadata",
+                       DEFAULT_METADATA_NAME,
                        pathname,
                        session->id);
 
-       health_code_update(&health_thread_kernel);
+       health_code_update();
 
        /* Send stream and file descriptor */
        ret = consumer_send_stream(sock, consumer, &lkm,
@@ -161,7 +161,7 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
                goto error;
        }
 
-       health_code_update(&health_thread_kernel);
+       health_code_update();
 
 error:
        return ret;
@@ -228,7 +228,7 @@ int kernel_consumer_add_stream(struct consumer_socket *sock,
                        pathname,
                        session->id);
 
-       health_code_update(&health_thread_kernel);
+       health_code_update();
 
        /* Send stream and file descriptor */
        ret = consumer_send_stream(sock, consumer, &lkm, &stream->fd, 1);
@@ -236,7 +236,7 @@ int kernel_consumer_add_stream(struct consumer_socket *sock,
                goto error;
        }
 
-       health_code_update(&health_thread_kernel);
+       health_code_update();
 
 error:
        return ret;