#include <common/common.h>
#include <common/defaults.h>
#include <common/compat/endian.h>
+#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"
* 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;
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) {
* 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;
* 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");
} 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) {
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);
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)
+ uint64_t tracefile_size, uint64_t tracefile_count,
+ uint64_t trace_archive_id)
{
int ret;
struct lttcomm_relayd_add_stream_2_11 *msg = NULL;
msg->tracefile_size = htobe64(tracefile_size);
msg->tracefile_count = htobe64(tracefile_count);
+ msg->trace_archive_id = htobe64(trace_archive_id);
/* Send command */
ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) msg, msg_length, 0);
*/
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,
+ struct lttng_trace_chunk *trace_chunk)
{
int ret;
struct lttcomm_relayd_status_stream reply;
/* 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);
+ tracefile_size, tracefile_count,
+ chunk_id);
}
if (ret) {
}
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);
DBG("Sending rotate stream id %" PRIu64 " command to relayd", stream_id);
/* Account for the trailing NULL. */
- len = strnlen(new_pathname, LTTNG_PATH_MAX) + 1;
+ len = lttng_strnlen(new_pathname, LTTNG_PATH_MAX) + 1;
if (len > LTTNG_PATH_MAX) {
ERR("Path used in relayd rotate stream command exceeds the maximal allowed length");
ret = -1;