Truncate exclusion names to have a terminal '\0'

[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 4c069588a36cf36ce8755433f2f03c480df06ba4..7582d80f0dea7eaf17d6d805eb680a4dbb657f15 100644 (file)
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -15,15 +15,15 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <common/common.h>
 #include <common/defaults.h>
+#include <common/compat/string.h>
 
 #include "consumer.h"
 #include "health-sessiond.h"
@@ -47,12 +47,16 @@ static char *create_channel_path(struct consumer_output *consumer,
                        PERROR("snprintf kernel channel path");
                        goto error;
                }
-               pathname = strndup(tmp_path, sizeof(tmp_path));
+               pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
+               if (!pathname) {
+                       PERROR("lttng_strndup");
+                       goto error;
+               }
 
                /* Create directory */
                ret = run_as_mkdir_recursive(pathname, S_IRWXU | S_IRWXG, uid, gid);
                if (ret < 0) {
-                       if (ret != -EEXIST) {
+                       if (errno != EEXIST) {
                                ERR("Trace directory creation error");
                                goto error;
                        }
@@ -64,7 +68,11 @@ static char *create_channel_path(struct consumer_output *consumer,
                        PERROR("snprintf kernel metadata path");
                        goto error;
                }
-               pathname = strndup(tmp_path, sizeof(tmp_path));
+               pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
+               if (!pathname) {
+                       PERROR("lttng_strndup");
+                       goto error;
+               }
                DBG3("Kernel network consumer subdir path: %s", pathname);
        }
 
@@ -99,13 +107,13 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
 
        if (monitor) {
                pathname = create_channel_path(consumer, session->uid, session->gid);
-               if (!pathname) {
-                       ret = -1;
-                       goto error;
-               }
        } else {
                /* Empty path. */
-               pathname = "";
+               pathname = strdup("");
+       }
+       if (!pathname) {
+               ret = -1;
+               goto error;
        }
 
        /* Prep channel message structure */
@@ -136,6 +144,7 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
        health_code_update();
 
 error:
+       free(pathname);
        return ret;
 }
 
@@ -162,13 +171,13 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 
        if (monitor) {
                pathname = create_channel_path(consumer, session->uid, session->gid);
-               if (!pathname) {
-                       ret = -1;
-                       goto error;
-               }
        } else {
                /* Empty path. */
-               pathname = "";
+               pathname = strdup("");
+       }
+       if (!pathname) {
+               ret = -1;
+               goto error;
        }
 
        /* Prep channel message structure */
@@ -215,6 +224,7 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
        health_code_update();
 
 error:
+       free(pathname);
        return ret;
 }
 
@@ -305,7 +315,6 @@ int kernel_consumer_send_channel_stream(struct consumer_socket *sock,
 {
        int ret;
        struct ltt_kernel_stream *stream;
-       uint64_t channel_key = -1ULL;
 
        /* Safety net */
        assert(channel);
@@ -339,22 +348,8 @@ int kernel_consumer_send_channel_stream(struct consumer_socket *sock,
                if (ret < 0) {
                        goto error;
                }
-               if (channel_key == -1ULL) {
-                       channel_key = channel->fd;
-               }
-       }
-
-       if (!monitor || channel_key == -1ULL) {
-               goto end;
-       }
-
-       /* Add stream on the kernel consumer side. */
-       ret = kernel_consumer_streams_sent(sock, session, channel_key);
-       if (ret < 0) {
-               goto error;
        }
 
-end:
 error:
        return ret;
 }
@@ -386,14 +381,11 @@ int kernel_consumer_send_session(struct consumer_socket *sock,
 
        DBG("Sending session stream to kernel consumer");
 
-       if (session->metadata_stream_fd >= 0) {
+       if (session->metadata_stream_fd >= 0 && session->metadata) {
                ret = kernel_consumer_add_metadata(sock, session, monitor);
                if (ret < 0) {
                        goto error;
                }
-
-               /* Flag that at least the metadata has been sent to the consumer. */
-               session->consumer_fds_sent = 1;
        }
 
        /* Send channel and streams of it */
@@ -403,10 +395,21 @@ int kernel_consumer_send_session(struct consumer_socket *sock,
                if (ret < 0) {
                        goto error;
                }
+               if (monitor) {
+                       /*
+                        * Inform the relay that all the streams for the
+                        * channel were sent.
+                        */
+                       ret = kernel_consumer_streams_sent(sock, session, chan->fd);
+                       if (ret < 0) {
+                               goto error;
+                       }
+               }
        }
 
        DBG("Kernel consumer FDs of metadata and channel streams sent");
 
+       session->consumer_fds_sent = 1;
        return 0;
 
 error:
@@ -424,6 +427,7 @@ int kernel_consumer_destroy_channel(struct consumer_socket *socket,
 
        DBG("Sending kernel consumer destroy channel key %d", channel->fd);
 
+       memset(&msg, 0, sizeof(msg));
        msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
        msg.u.destroy_channel.key = channel->fd;
 
@@ -452,6 +456,7 @@ int kernel_consumer_destroy_metadata(struct consumer_socket *socket,
 
        DBG("Sending kernel consumer destroy channel key %d", metadata->fd);
 
+       memset(&msg, 0, sizeof(msg));
        msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
        msg.u.destroy_channel.key = metadata->fd;