Pass the consumerd stream's trace archive id to the relayd

[lttng-tools.git] / src / common / relayd / relayd.c

diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
index 45f965c7941e9c3be6d13880a3933f9e40a86106..b88a536b95a7b6d5edd95d6096959b4806f821cc 100644 (file)
--- a/src/common/relayd/relayd.c
+++ b/src/common/relayd/relayd.c
@@ -284,6 +284,119 @@ error:
        return ret;
 }
 
+static int relayd_add_stream_2_1(struct lttcomm_relayd_sock *rsock,
+               const char *channel_name, const char *pathname)
+{
+       int ret;
+       struct lttcomm_relayd_add_stream msg;
+
+       memset(&msg, 0, sizeof(msg));
+       if (lttng_strncpy(msg.channel_name, channel_name,
+                               sizeof(msg.channel_name))) {
+               ret = -1;
+               goto error;
+       }
+
+       if (lttng_strncpy(msg.pathname, pathname,
+                               sizeof(msg.pathname))) {
+               ret = -1;
+               goto error;
+       }
+
+       /* Send command */
+       ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) &msg, sizeof(msg), 0);
+       if (ret < 0) {
+               ret = -1;
+               goto error;
+       }
+       ret = 0;
+error:
+       return ret;
+}
+
+static int relayd_add_stream_2_2(struct lttcomm_relayd_sock *rsock,
+               const char *channel_name, const char *pathname,
+               uint64_t tracefile_size, uint64_t tracefile_count)
+{
+       int ret;
+       struct lttcomm_relayd_add_stream_2_2 msg;
+
+       memset(&msg, 0, sizeof(msg));
+       /* Compat with relayd 2.2 to 2.10 */
+       if (lttng_strncpy(msg.channel_name, channel_name,
+                               sizeof(msg.channel_name))) {
+               ret = -1;
+               goto error;
+       }
+       if (lttng_strncpy(msg.pathname, pathname,
+                               sizeof(msg.pathname))) {
+               ret = -1;
+               goto error;
+       }
+       msg.tracefile_size = htobe64(tracefile_size);
+       msg.tracefile_count = htobe64(tracefile_count);
+
+       /* Send command */
+       ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) &msg, sizeof(msg), 0);
+       if (ret < 0) {
+               goto error;
+       }
+       ret = 0;
+error:
+       return ret;
+}
+
+static int relayd_add_stream_2_11(struct lttcomm_relayd_sock *rsock,
+               const char *channel_name, const char *pathname,
+               uint64_t tracefile_size, uint64_t tracefile_count)
+{
+       int ret;
+       struct lttcomm_relayd_add_stream_2_11 *msg = NULL;
+       size_t channel_name_len;
+       size_t pathname_len;
+       size_t msg_length;
+
+       /* The two names are sent with a '\0' delimiter between them. */
+       channel_name_len = strlen(channel_name) + 1;
+       pathname_len = strlen(pathname) + 1;
+
+       msg_length = sizeof(*msg) + channel_name_len + pathname_len;
+       msg = zmalloc(msg_length);
+       if (!msg) {
+               PERROR("zmalloc add_stream_2_11 command message");
+               ret = -1;
+               goto error;
+       }
+
+       assert(channel_name_len <= UINT32_MAX);
+       msg->channel_name_len = htobe32(channel_name_len);
+
+       assert(pathname_len <= UINT32_MAX);
+       msg->pathname_len = htobe32(pathname_len);
+
+       if (lttng_strncpy(msg->names, channel_name, channel_name_len)) {
+               ret = -1;
+               goto error;
+       }
+       if (lttng_strncpy(msg->names + channel_name_len, pathname, pathname_len)) {
+               ret = -1;
+               goto error;
+       }
+
+       msg->tracefile_size = htobe64(tracefile_size);
+       msg->tracefile_count = htobe64(tracefile_count);
+
+       /* Send command */
+       ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) msg, msg_length, 0);
+       if (ret < 0) {
+               goto error;
+       }
+       ret = 0;
+error:
+       free(msg);
+       return ret;
+}
+
 /*
  * Add stream on the relayd and assign stream handle to the stream_id argument.
  *
@@ -291,11 +404,10 @@ error:
  */
 int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_name,
                const char *pathname, uint64_t *stream_id,
-               uint64_t tracefile_size, uint64_t tracefile_count)
+               uint64_t tracefile_size, uint64_t tracefile_count,
+               uint64_t trace_archive_id)
 {
        int ret;
-       struct lttcomm_relayd_add_stream msg;
-       struct lttcomm_relayd_add_stream_2_2 msg_2_2;
        struct lttcomm_relayd_status_stream reply;
 
        /* Code flow error. Safety net. */
@@ -307,44 +419,22 @@ int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam
 
        /* Compat with relayd 2.1 */
        if (rsock->minor == 1) {
-               memset(&msg, 0, sizeof(msg));
-               if (lttng_strncpy(msg.channel_name, channel_name,
-                               sizeof(msg.channel_name))) {
-                       ret = -1;
-                       goto error;
-               }
-               if (lttng_strncpy(msg.pathname, pathname,
-                               sizeof(msg.pathname))) {
-                       ret = -1;
-                       goto error;
-               }
-
-               /* Send command */
-               ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) &msg, sizeof(msg), 0);
-               if (ret < 0) {
-                       goto error;
-               }
+               /* For 2.1 */
+               ret = relayd_add_stream_2_1(rsock, channel_name, pathname);
+       
+       } else if (rsock->minor > 1 && rsock->minor < 11) {
+               /* From 2.2 to 2.10 */
+               ret = relayd_add_stream_2_2(rsock, channel_name, pathname,
+                               tracefile_size, tracefile_count);
        } else {
-               memset(&msg_2_2, 0, sizeof(msg_2_2));
-               /* Compat with relayd 2.2+ */
-               if (lttng_strncpy(msg_2_2.channel_name, channel_name,
-                               sizeof(msg_2_2.channel_name))) {
-                       ret = -1;
-                       goto error;
-               }
-               if (lttng_strncpy(msg_2_2.pathname, pathname,
-                               sizeof(msg_2_2.pathname))) {
-                       ret = -1;
-                       goto error;
-               }
-               msg_2_2.tracefile_size = htobe64(tracefile_size);
-               msg_2_2.tracefile_count = htobe64(tracefile_count);
+               /* From 2.11 to ...*/
+               ret = relayd_add_stream_2_11(rsock, channel_name, pathname,
+                               tracefile_size, tracefile_count);
+       }
 
-               /* Send command */
-               ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) &msg_2_2, sizeof(msg_2_2), 0);
-               if (ret < 0) {
-                       goto error;
-               }
+       if (ret) {
+               ret = -1;
+               goto error;
        }
 
        /* Waiting for reply */
@@ -368,7 +458,7 @@ int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam
        }
 
        DBG("Relayd stream added successfully with handle %" PRIu64,
-               reply.handle);
+                       reply.handle);
 
 error:
        return ret;