projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: test_kernel rotation: expect 60 rather than 64
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
main.c
diff --git
a/src/bin/lttng-relayd/main.c
b/src/bin/lttng-relayd/main.c
index a3e2509d2865f733fc81675c1272a92136eae4c3..8fe3dd96deabe322f7e634bbd51aa78ffcfd70d0 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-37,6
+37,7
@@
#include <inttypes.h>
#include <urcu/futex.h>
#include <urcu/uatomic.h>
#include <inttypes.h>
#include <urcu/futex.h>
#include <urcu/uatomic.h>
+#include <urcu/rculist.h>
#include <unistd.h>
#include <fcntl.h>
#include <unistd.h>
#include <fcntl.h>
@@
-58,7
+59,7
@@
#include <common/config/session-config.h>
#include <common/dynamic-buffer.h>
#include <common/buffer-view.h>
#include <common/config/session-config.h>
#include <common/dynamic-buffer.h>
#include <common/buffer-view.h>
-#include <
urcu/rculis
t.h>
+#include <
common/string-utils/forma
t.h>
#include "cmd.h"
#include "ctf-trace.h"
#include "cmd.h"
#include "ctf-trace.h"
@@
-2127,6
+2128,8
@@
static int relay_rotate_session_streams(
const size_t header_len = sizeof(struct lttcomm_relayd_rotate_streams);
struct lttng_trace_chunk *next_trace_chunk = NULL;
struct lttng_buffer_view stream_positions;
const size_t header_len = sizeof(struct lttcomm_relayd_rotate_streams);
struct lttng_trace_chunk *next_trace_chunk = NULL;
struct lttng_buffer_view stream_positions;
+ char chunk_id_buf[MAX_INT_DEC_LEN(uint64_t)];
+ const char *chunk_id_str = "none";
if (!session || !conn->version_check_done) {
ERR("Trying to rotate a stream before version check");
if (!session || !conn->version_check_done) {
ERR("Trying to rotate a stream before version check");
@@
-2180,8
+2183,20
@@
static int relay_rotate_session_streams(
ret = -1;
goto end;
}
ret = -1;
goto end;
}
+
+ ret = snprintf(chunk_id_buf, sizeof(chunk_id_buf), "%" PRIu64,
+ rotate_streams.new_chunk_id.value);
+ if (ret < 0 || ret >= sizeof(chunk_id_buf)) {
+ chunk_id_str = "formatting error";
+ } else {
+ chunk_id_str = chunk_id_buf;
+ }
}
}
+ DBG("Rotate %" PRIu32 " streams of session \"%s\" to chunk \"%s\"",
+ rotate_streams.stream_count, session->session_name,
+ chunk_id_str);
+
stream_positions = lttng_buffer_view_from_view(payload,
sizeof(rotate_streams), -1);
if (!stream_positions.data ||
stream_positions = lttng_buffer_view_from_view(payload,
sizeof(rotate_streams), -1);
if (!stream_positions.data ||
@@
-2237,6
+2252,7
@@
end:
ret = -1;
}
ret = -1;
}
+ ret = 0;
end_no_reply:
lttng_trace_chunk_put(next_trace_chunk);
return ret;
end_no_reply:
lttng_trace_chunk_put(next_trace_chunk);
return ret;
This page took
0.024236 seconds
and
4
git commands to generate.