Create stream files relative to a stream's current trace chunk

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

diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
index 78ed85558c8cf24cc1048924ce4db794e0dfeef9..fb459699d32a68ddbf93d001df1829d93798181f 100644 (file)
--- a/src/common/relayd/relayd.c
+++ b/src/common/relayd/relayd.c
@@ -29,6 +29,7 @@
 #include <common/compat/string.h>
 #include <common/sessiond-comm/relayd.h>
 #include <common/index/ctf-index.h>
+#include <common/trace-chunk.h>
 
 #include "relayd.h"
 
@@ -126,8 +127,9 @@ error:
  * payload size is introduced.
  */
 static int relayd_create_session_2_11(struct lttcomm_relayd_sock *rsock,
-               char *session_name, char *hostname,
-               int session_live_timer, unsigned int snapshot)
+               const char *session_name, const char *hostname,
+               int session_live_timer, unsigned int snapshot,
+               uint64_t sessiond_session_id, const lttng_uuid sessiond_uuid)
 {
        int ret;
        struct lttcomm_relayd_create_session_2_11 *msg = NULL;
@@ -165,6 +167,9 @@ static int relayd_create_session_2_11(struct lttcomm_relayd_sock *rsock,
        msg->live_timer = htobe32(session_live_timer);
        msg->snapshot = !!snapshot;
 
+       lttng_uuid_copy(msg->sessiond_uuid, sessiond_uuid);
+       msg->session_id = htobe64(sessiond_session_id);
+
        /* Send command */
        ret = send_command(rsock, RELAYD_CREATE_SESSION, msg, msg_length, 0);
        if (ret < 0) {
@@ -179,8 +184,8 @@ error:
  * support the live reading capability.
  */
 static int relayd_create_session_2_4(struct lttcomm_relayd_sock *rsock,
-               char *session_name, char *hostname, int session_live_timer,
-               unsigned int snapshot)
+               const char *session_name, const char *hostname,
+               int session_live_timer, unsigned int snapshot)
 {
        int ret;
        struct lttcomm_relayd_create_session_2_4 msg;
@@ -231,15 +236,18 @@ error:
  * On success, return 0 else a negative value which is either an errno error or
  * a lttng error code from the relayd.
  */
-int relayd_create_session(struct lttcomm_relayd_sock *rsock, uint64_t *session_id,
-               char *session_name, char *hostname, int session_live_timer,
-               unsigned int snapshot)
+int relayd_create_session(struct lttcomm_relayd_sock *rsock,
+               uint64_t *relayd_session_id,
+               const char *session_name, const char *hostname,
+               int session_live_timer,
+               unsigned int snapshot, uint64_t sessiond_session_id,
+               const lttng_uuid sessiond_uuid)
 {
        int ret;
        struct lttcomm_relayd_status_session reply;
 
        assert(rsock);
-       assert(session_id);
+       assert(relayd_session_id);
 
        DBG("Relayd create session");
 
@@ -253,7 +261,8 @@ int relayd_create_session(struct lttcomm_relayd_sock *rsock, uint64_t *session_i
        } else {
                /* From 2.11 to ... */
                ret = relayd_create_session_2_11(rsock, session_name,
-                               hostname, session_live_timer, snapshot);
+                               hostname, session_live_timer, snapshot,
+                               sessiond_session_id, sessiond_uuid);
        }
 
        if (ret < 0) {
@@ -276,7 +285,7 @@ int relayd_create_session(struct lttcomm_relayd_sock *rsock, uint64_t *session_i
                goto error;
        } else {
                ret = 0;
-               *session_id = reply.session_id;
+               *relayd_session_id = reply.session_id;
        }
 
        DBG("Relayd session created with id %" PRIu64, reply.session_id);
@@ -408,7 +417,7 @@ 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 trace_archive_id)
+               struct lttng_trace_chunk *trace_chunk)
 {
        int ret;
        struct lttcomm_relayd_status_stream reply;
@@ -423,17 +432,27 @@ int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam
        /* Compat with relayd 2.1 */
        if (rsock->minor == 1) {
                /* For 2.1 */
+               assert(!trace_chunk);
                ret = relayd_add_stream_2_1(rsock, channel_name, pathname);
        
        } else if (rsock->minor > 1 && rsock->minor < 11) {
                /* From 2.2 to 2.10 */
+               assert(!trace_chunk);
                ret = relayd_add_stream_2_2(rsock, channel_name, pathname,
                                tracefile_size, tracefile_count);
        } else {
+               enum lttng_trace_chunk_status chunk_status;
+               uint64_t chunk_id;
+
+               assert(trace_chunk);
+               chunk_status = lttng_trace_chunk_get_id(trace_chunk,
+                               &chunk_id);
+               assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
+
                /* From 2.11 to ...*/
                ret = relayd_add_stream_2_11(rsock, channel_name, pathname,
                                tracefile_size, tracefile_count,
-                               trace_archive_id);
+                               chunk_id);
        }
 
        if (ret) {
@@ -1091,14 +1110,15 @@ error:
 }
 
 int relayd_rotate_stream(struct lttcomm_relayd_sock *rsock, uint64_t stream_id,
-               const char *new_pathname, uint64_t new_chunk_id,
-               uint64_t seq_num)
+               uint64_t new_chunk_id, uint64_t seq_num)
 {
        int ret;
        struct lttcomm_relayd_rotate_stream *msg = NULL;
        struct lttcomm_relayd_generic_reply reply;
        size_t len;
        int msg_len;
+       /* FIXME */
+       char *new_pathname = NULL;
 
        /* Code flow error. Safety net. */
        assert(rsock);