projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Launch the application notification thread using lttng_thread
[lttng-tools.git]
/
src
/
common
/
relayd
/
relayd.c
diff --git
a/src/common/relayd/relayd.c
b/src/common/relayd/relayd.c
index b88a536b95a7b6d5edd95d6096959b4806f821cc..78ed85558c8cf24cc1048924ce4db794e0dfeef9 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>
@@
-348,7
+349,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
+387,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
+432,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
+1106,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.024425 seconds
and
4
git commands to generate.