projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: thread exit vs futex wait/wakeup race
[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 ea46ec72276117359b32fa499b584357b5aeb401..0eb8e28251f2451ab229dc41cf0e62726fddc7c5 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-71,6
+71,14
@@
#include "connection.h"
#include "tracefile-array.h"
#include "connection.h"
#include "tracefile-array.h"
+static const char *help_msg =
+#ifdef LTTNG_EMBED_HELP
+#include <lttng-relayd.8.h>
+#else
+NULL
+#endif
+;
+
/* command line options */
char *opt_output_path;
static int opt_daemon, opt_background;
/* command line options */
char *opt_output_path;
static int opt_daemon, opt_background;
@@
-161,10
+169,11
@@
static struct option long_options[] = {
{ "output", 1, 0, 'o', },
{ "verbose", 0, 0, 'v', },
{ "config", 1, 0, 'f' },
{ "output", 1, 0, 'o', },
{ "verbose", 0, 0, 'v', },
{ "config", 1, 0, 'f' },
+ { "version", 0, 0, 'V' },
{ NULL, 0, 0, 0, },
};
{ NULL, 0, 0, 0, },
};
-static const char *config_ignore_options[] = { "help", "config" };
+static const char *config_ignore_options[] = { "help", "config"
, "version"
};
/*
* Take an option from the getopt output and set it in the right variable to be
/*
* Take an option from the getopt output and set it in the right variable to be
@@
-249,12
+258,15
@@
static int set_option(int opt, const char *arg, const char *optname)
}
break;
case 'h':
}
break;
case 'h':
- ret = utils_show_
man_page(8, "lttng-relayd"
);
+ ret = utils_show_
help(8, "lttng-relayd", help_msg
);
if (ret) {
if (ret) {
- ERR("Cannot
view man page lttng-relayd(8)
");
+ ERR("Cannot
show --help for `lttng-relayd`
");
perror("exec");
}
exit(EXIT_FAILURE);
perror("exec");
}
exit(EXIT_FAILURE);
+ case 'V':
+ fprintf(stdout, "%s\n", VERSION);
+ exit(EXIT_SUCCESS);
case 'o':
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
case 'o':
if (lttng_is_setuid_setgid()) {
WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
@@
-965,12
+977,16
@@
static void *relay_thread_dispatcher(void *data)
health_code_update();
health_code_update();
-
while (!CMM_LOAD_SHARED(dispatch_thread_exit)
) {
+
for (;;
) {
health_code_update();
/* Atomically prepare the queue futex */
futex_nto1_prepare(&relay_conn_queue.futex);
health_code_update();
/* Atomically prepare the queue futex */
futex_nto1_prepare(&relay_conn_queue.futex);
+ if (CMM_LOAD_SHARED(dispatch_thread_exit)) {
+ break;
+ }
+
do {
health_code_update();
do {
health_code_update();
@@
-1942,6
+1958,7
@@
static int relay_recv_index(struct lttcomm_relayd_hdr *recv_hdr,
struct lttcomm_relayd_generic_reply reply;
struct relay_stream *stream;
uint64_t net_seq_num;
struct lttcomm_relayd_generic_reply reply;
struct relay_stream *stream;
uint64_t net_seq_num;
+ size_t msg_len;
assert(conn);
assert(conn);
@@
-1953,9
+1970,12
@@
static int relay_recv_index(struct lttcomm_relayd_hdr *recv_hdr,
goto end_no_session;
}
goto end_no_session;
}
+ msg_len = lttcomm_relayd_index_len(
+ lttng_to_index_major(conn->major, conn->minor),
+ lttng_to_index_minor(conn->major, conn->minor));
ret = conn->sock->ops->recvmsg(conn->sock, &index_info,
ret = conn->sock->ops->recvmsg(conn->sock, &index_info,
-
sizeof(index_info)
, 0);
- if (ret <
sizeof(index_info)
) {
+
msg_len
, 0);
+ if (ret <
msg_len
) {
if (ret == 0) {
/* Orderly shutdown. Not necessary to print an error. */
DBG("Socket %d did an orderly shutdown", conn->sock->fd);
if (ret == 0) {
/* Orderly shutdown. Not necessary to print an error. */
DBG("Socket %d did an orderly shutdown", conn->sock->fd);
@@
-2179,41
+2199,36
@@
static int handle_index_data(struct relay_stream *stream, uint64_t net_seq_num,
goto end;
}
goto end;
}
- if (rotate_index || !stream->index_f
d
) {
-
int fd
;
+ if (rotate_index || !stream->index_f
ile
) {
+
uint32_t major, minor
;
- /* Put ref on previous index_f
d
. */
- if (stream->index_f
d
) {
-
stream_fd_put(stream->index_fd
);
- stream->index_f
d
= NULL;
+ /* Put ref on previous index_f
ile
. */
+ if (stream->index_f
ile
) {
+
lttng_index_file_put(stream->index_file
);
+ stream->index_f
ile
= NULL;
}
}
-
- fd = index_create_file(stream->path_name, stream->channel_name,
+ major = stream->trace->session->major;
+ minor = stream->trace->session->minor;
+ stream->index_file = lttng_index_file_create(stream->path_name,
+ stream->channel_name,
-1, -1, stream->tracefile_size,
-1, -1, stream->tracefile_size,
- tracefile_array_get_file_index_head(stream->tfa));
- if (fd < 0) {
- ret = -1;
- /* Put self-ref for this index due to error. */
- relay_index_put(index);
- goto end;
- }
- stream->index_fd = stream_fd_create(fd);
- if (!stream->index_fd) {
+ tracefile_array_get_file_index_head(stream->tfa),
+ lttng_to_index_major(major, minor),
+ lttng_to_index_minor(major, minor));
+ if (!stream->index_file) {
ret = -1;
ret = -1;
- if (close(fd)) {
- PERROR("Error closing FD %d", fd);
- }
/* Put self-ref for this index due to error. */
relay_index_put(index);
/* Put self-ref for this index due to error. */
relay_index_put(index);
- /* Will put the local ref. */
+ index = NULL;
goto end;
}
}
goto end;
}
}
- if (relay_index_set_f
d(index, stream->index_fd
, data_offset)) {
+ if (relay_index_set_f
ile(index, stream->index_file
, data_offset)) {
ret = -1;
/* Put self-ref for this index due to error. */
relay_index_put(index);
ret = -1;
/* Put self-ref for this index due to error. */
relay_index_put(index);
+ index = NULL;
goto end;
}
goto end;
}
@@
-2227,6
+2242,7
@@
static int handle_index_data(struct relay_stream *stream, uint64_t net_seq_num,
} else {
/* Put self-ref for this index due to error. */
relay_index_put(index);
} else {
/* Put self-ref for this index due to error. */
relay_index_put(index);
+ index = NULL;
ret = -1;
}
end:
ret = -1;
}
end:
@@
-2676,6
+2692,11
@@
error:
destroy_conn,
sock_n.node) {
health_code_update();
destroy_conn,
sock_n.node) {
health_code_update();
+
+ if (session_abort(destroy_conn->session)) {
+ assert(0);
+ }
+
/*
* No need to grab another ref, because we own
* destroy_conn.
/*
* No need to grab another ref, because we own
* destroy_conn.
@@
-2928,6
+2949,12
@@
exit_init_data:
health_app_destroy(health_relayd);
exit_health_app_create:
exit_options:
health_app_destroy(health_relayd);
exit_health_app_create:
exit_options:
+ /*
+ * Wait for all pending call_rcu work to complete before tearing
+ * down data structures. call_rcu worker may be trying to
+ * perform lookups in those structures.
+ */
+ rcu_barrier();
relayd_cleanup();
/* Ensure all prior call_rcu are done. */
relayd_cleanup();
/* Ensure all prior call_rcu are done. */
This page took
0.027014 seconds
and
4
git commands to generate.