projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
relayd: logging of `trace chunk exists` command refers to the wrong command
[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 5f70df481d9f60f0aec35d1aa1d34894aeed577b..a250100d12acc7e8ca87f6dc4108642f8c6b1a73 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-917,7
+917,7
@@
static int create_named_thread_poll_set(struct lttng_poll_event *events,
}
ret = fd_tracker_util_poll_create(the_fd_tracker,
}
ret = fd_tracker_util_poll_create(the_fd_tracker,
- name, events, 1, LTTNG_CLOEXEC);
+ name, events, 1, LTTNG_CLOEXEC);
if (ret) {
PERROR("Failed to create \"%s\" poll file descriptor", name);
goto error;
if (ret) {
PERROR("Failed to create \"%s\" poll file descriptor", name);
goto error;
@@
-978,7
+978,7
@@
static int accept_sock(void *data, int *out_fd)
struct lttcomm_sock **socks = data;
struct lttcomm_sock *in_sock = socks[0];
struct lttcomm_sock **socks = data;
struct lttcomm_sock *in_sock = socks[0];
-
socks[1] = in_sock->ops->accept(in_sock);
+ socks[1] = in_sock->ops->accept(in_sock);
if (!socks[1]) {
ret = -1;
goto end;
if (!socks[1]) {
ret = -1;
goto end;
@@
-1060,7
+1060,7
@@
struct lttcomm_sock *accept_relayd_sock(struct lttcomm_sock *listening_sock,
struct lttcomm_sock *socks[2] = { listening_sock, NULL };
struct lttcomm_sock *new_sock = NULL;
struct lttcomm_sock *socks[2] = { listening_sock, NULL };
struct lttcomm_sock *new_sock = NULL;
-
ret = fd_tracker_open_unsuspendable_fd(
+ ret = fd_tracker_open_unsuspendable_fd(
the_fd_tracker, &out_fd,
(const char **) &name,
1, accept_sock, &socks);
the_fd_tracker, &out_fd,
(const char **) &name,
1, accept_sock, &socks);
@@
-3105,20
+3105,20
@@
static int relay_trace_chunk_exists(const struct lttcomm_relayd_hdr *recv_hdr,
bool chunk_exists;
if (!session || !conn->version_check_done) {
bool chunk_exists;
if (!session || !conn->version_check_done) {
- ERR("Trying to c
lose
a trace chunk before version check");
+ ERR("Trying to c
heck for the existance of
a trace chunk before version check");
ret = -1;
goto end_no_reply;
}
if (session->major == 2 && session->minor < 11) {
ret = -1;
goto end_no_reply;
}
if (session->major == 2 && session->minor < 11) {
- ERR("Chunk
close
command is unsupported before 2.11");
+ ERR("Chunk
exists
command is unsupported before 2.11");
ret = -1;
goto end_no_reply;
}
header_view = lttng_buffer_view_from_view(payload, 0, sizeof(*msg));
if (!header_view.data) {
ret = -1;
goto end_no_reply;
}
header_view = lttng_buffer_view_from_view(payload, 0, sizeof(*msg));
if (!header_view.data) {
- ERR("Failed to receive payload of chunk
close
command");
+ ERR("Failed to receive payload of chunk
exists
command");
ret = -1;
goto end_no_reply;
}
ret = -1;
goto end_no_reply;
}
This page took
0.024129 seconds
and
4
git commands to generate.