projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
relayd: send sessiond uuid and session id as part of create session
[lttng-tools.git]
/
src
/
common
/
relayd
/
relayd.c
diff --git
a/src/common/relayd/relayd.c
b/src/common/relayd/relayd.c
index b88a536b95a7b6d5edd95d6096959b4806f821cc..ff0be32a17190f2a45ae1a4b91987f5a1a774619 100644
(file)
--- a/
src/common/relayd/relayd.c
+++ b/
src/common/relayd/relayd.c
@@
-26,6
+26,7
@@
#include <common/common.h>
#include <common/defaults.h>
#include <common/compat/endian.h>
#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/sessiond-comm/relayd.h>
#include <common/index/ctf-index.h>
@@
-126,7
+127,8
@@
error:
*/
static int relayd_create_session_2_11(struct lttcomm_relayd_sock *rsock,
char *session_name, char *hostname,
*/
static int relayd_create_session_2_11(struct lttcomm_relayd_sock *rsock,
char *session_name, char *hostname,
- int session_live_timer, unsigned int snapshot)
+ 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;
{
int ret;
struct lttcomm_relayd_create_session_2_11 *msg = NULL;
@@
-164,6
+166,9
@@
static int relayd_create_session_2_11(struct lttcomm_relayd_sock *rsock,
msg->live_timer = htobe32(session_live_timer);
msg->snapshot = !!snapshot;
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) {
/* Send command */
ret = send_command(rsock, RELAYD_CREATE_SESSION, msg, msg_length, 0);
if (ret < 0) {
@@
-230,15
+235,16
@@
error:
* On success, return 0 else a negative value which is either an errno error or
* a lttng error code from the relayd.
*/
* 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,
+int relayd_create_session(struct lttcomm_relayd_sock *rsock, uint64_t *
relayd_
session_id,
char *session_name, char *hostname, int session_live_timer,
char *session_name, char *hostname, int session_live_timer,
- unsigned int snapshot)
+ unsigned int snapshot, uint64_t sessiond_session_id,
+ const lttng_uuid sessiond_uuid)
{
int ret;
struct lttcomm_relayd_status_session reply;
assert(rsock);
{
int ret;
struct lttcomm_relayd_status_session reply;
assert(rsock);
- assert(session_id);
+ assert(
relayd_
session_id);
DBG("Relayd create session");
DBG("Relayd create session");
@@
-252,7
+258,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,
} 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) {
}
if (ret < 0) {
@@
-275,7
+282,7
@@
int relayd_create_session(struct lttcomm_relayd_sock *rsock, uint64_t *session_i
goto error;
} else {
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);
}
DBG("Relayd session created with id %" PRIu64, reply.session_id);
@@
-348,7
+355,8
@@
error:
static int relayd_add_stream_2_11(struct lttcomm_relayd_sock *rsock,
const char *channel_name, const char *pathname,
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;
{
int ret;
struct lttcomm_relayd_add_stream_2_11 *msg = NULL;
@@
-385,6
+393,7
@@
static int relayd_add_stream_2_11(struct lttcomm_relayd_sock *rsock,
msg->tracefile_size = htobe64(tracefile_size);
msg->tracefile_count = htobe64(tracefile_count);
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);
/* Send command */
ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) msg, msg_length, 0);
@@
-429,7
+438,8
@@
int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam
} else {
/* From 2.11 to ...*/
ret = relayd_add_stream_2_11(rsock, channel_name, pathname,
} else {
/* From 2.11 to ...*/
ret = relayd_add_stream_2_11(rsock, channel_name, pathname,
- tracefile_size, tracefile_count);
+ tracefile_size, tracefile_count,
+ trace_archive_id);
}
if (ret) {
}
if (ret) {
@@
-1102,7
+1112,7
@@
int relayd_rotate_stream(struct lttcomm_relayd_sock *rsock, uint64_t stream_id,
DBG("Sending rotate stream id %" PRIu64 " command to relayd", stream_id);
/* Account for the trailing NULL. */
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;
if (len > LTTNG_PATH_MAX) {
ERR("Path used in relayd rotate stream command exceeds the maximal allowed length");
ret = -1;
This page took
0.027817 seconds
and
5
git commands to generate.