projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare for '-Wunused-parameter'
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
main.cpp
diff --git
a/src/bin/lttng-relayd/main.cpp
b/src/bin/lttng-relayd/main.cpp
index d3f8b3c9e30234a98eed30f49831028a3f9a99bf..99f7920103df184faf75075d7db9ce47979f6422 100644
(file)
--- a/
src/bin/lttng-relayd/main.cpp
+++ b/
src/bin/lttng-relayd/main.cpp
@@
-49,6
+49,7
@@
#include <common/sessiond-comm/relayd.h>
#include <common/uri.h>
#include <common/utils.h>
#include <common/sessiond-comm/relayd.h>
#include <common/uri.h>
#include <common/utils.h>
+#include <common/path.h>
#include <common/align.h>
#include <common/ini-config/ini-config.h>
#include <common/dynamic-buffer.h>
#include <common/align.h>
#include <common/ini-config/ini-config.h>
#include <common/dynamic-buffer.h>
@@
-404,7
+405,8
@@
end:
* See config_entry_handler_cb comment in common/config/session-config.h for the
* return value conventions.
*/
* See config_entry_handler_cb comment in common/config/session-config.h for the
* return value conventions.
*/
-static int config_entry_handler(const struct config_entry *entry, void *unused)
+static int config_entry_handler(const struct config_entry *entry,
+ void *unused __attribute__((unused)))
{
int ret = 0, i;
{
int ret = 0, i;
@@
-675,7
+677,8
@@
static void print_global_objects(void)
print_sessions();
}
print_sessions();
}
-static int noop_close(void *data, int *fds)
+static int noop_close(void *data __attribute__((unused)),
+ int *fds __attribute__((unused)))
{
return 0;
}
{
return 0;
}
@@
-972,7
+975,7
@@
end:
return ret;
}
return ret;
}
-static int close_sock(void *data, int *in_fd)
+static int close_sock(void *data, int *in_fd
__attribute__((unused))
)
{
struct lttcomm_sock *sock = (lttcomm_sock *) data;
{
struct lttcomm_sock *sock = (lttcomm_sock *) data;
@@
-1084,7
+1087,7
@@
end:
/*
* This thread manages the listening for new connections on the network
*/
/*
* This thread manages the listening for new connections on the network
*/
-static void *relay_thread_listener(void *data)
+static void *relay_thread_listener(void *data
__attribute__((unused))
)
{
int i, ret, pollfd, err = -1;
uint32_t revents, nb_fd;
{
int i, ret, pollfd, err = -1;
uint32_t revents, nb_fd;
@@
-1288,7
+1291,7
@@
error_sock_control:
/*
* This thread manages the dispatching of the requests to worker threads
*/
/*
* This thread manages the dispatching of the requests to worker threads
*/
-static void *relay_thread_dispatcher(void *data)
+static void *relay_thread_dispatcher(void *data
__attribute__((unused))
)
{
int err = -1;
ssize_t ret;
{
int err = -1;
ssize_t ret;
@@
-1375,7
+1378,8
@@
static bool session_streams_have_index(const struct relay_session *session)
*
* On success, send back the session id or else return a negative value.
*/
*
* On success, send back the session id or else return a negative value.
*/
-static int relay_create_session(const struct lttcomm_relayd_hdr *recv_hdr,
+static int relay_create_session(
+ const struct lttcomm_relayd_hdr *recv_hdr __attribute__((unused)),
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
@@
-1567,7
+1571,8
@@
end:
/*
* relay_add_stream: allocate a new stream for a session
*/
/*
* relay_add_stream: allocate a new stream for a session
*/
-static int relay_add_stream(const struct lttcomm_relayd_hdr *recv_hdr,
+static int relay_add_stream(
+ const struct lttcomm_relayd_hdr *recv_hdr __attribute__((unused)),
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
@@
-1706,7
+1711,8
@@
end_no_session:
/*
* relay_close_stream: close a specific stream
*/
/*
* relay_close_stream: close a specific stream
*/
-static int relay_close_stream(const struct lttcomm_relayd_hdr *recv_hdr,
+static int relay_close_stream(
+ const struct lttcomm_relayd_hdr *recv_hdr __attribute__((unused)),
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
@@
-1784,7
+1790,8
@@
end_no_session:
* relay_reset_metadata: reset a metadata stream
*/
static
* relay_reset_metadata: reset a metadata stream
*/
static
-int relay_reset_metadata(const struct lttcomm_relayd_hdr *recv_hdr,
+int relay_reset_metadata(
+ const struct lttcomm_relayd_hdr *recv_hdr __attribute__((unused)),
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
@@
-1883,9
+1890,10
@@
static void relay_unknown_command(struct relay_connection *conn)
* relay_start: send an acknowledgment to the client to tell if we are
* ready to receive data. We are ready if a session is established.
*/
* relay_start: send an acknowledgment to the client to tell if we are
* ready to receive data. We are ready if a session is established.
*/
-static int relay_start(const struct lttcomm_relayd_hdr *recv_hdr,
+static int relay_start(
+ const struct lttcomm_relayd_hdr *recv_hdr __attribute__((unused)),
struct relay_connection *conn,
struct relay_connection *conn,
- const struct lttng_buffer_view *payload)
+ const struct lttng_buffer_view *payload
__attribute__((unused))
)
{
int ret = 0;
ssize_t send_ret;
{
int ret = 0;
ssize_t send_ret;
@@
-1976,7
+1984,8
@@
end:
/*
* relay_send_version: send relayd version number
*/
/*
* relay_send_version: send relayd version number
*/
-static int relay_send_version(const struct lttcomm_relayd_hdr *recv_hdr,
+static int relay_send_version(
+ const struct lttcomm_relayd_hdr *recv_hdr __attribute__((unused)),
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
@@
-2046,7
+2055,8
@@
end:
/*
* Check for data pending for a given stream id from the session daemon.
*/
/*
* Check for data pending for a given stream id from the session daemon.
*/
-static int relay_data_pending(const struct lttcomm_relayd_hdr *recv_hdr,
+static int relay_data_pending(
+ const struct lttcomm_relayd_hdr *recv_hdr __attribute__((unused)),
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
@@
-2135,7
+2145,8
@@
end_no_session:
* the control socket has been handled. So, this is why we simply return
* OK here.
*/
* the control socket has been handled. So, this is why we simply return
* OK here.
*/
-static int relay_quiescent_control(const struct lttcomm_relayd_hdr *recv_hdr,
+static int relay_quiescent_control(
+ const struct lttcomm_relayd_hdr *recv_hdr __attribute__((unused)),
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
@@
-2275,7
+2286,8
@@
end_no_session:
*
* Return to the client if there is data in flight or not with a ret_code.
*/
*
* Return to the client if there is data in flight or not with a ret_code.
*/
-static int relay_end_data_pending(const struct lttcomm_relayd_hdr *recv_hdr,
+static int relay_end_data_pending(
+ const struct lttcomm_relayd_hdr *recv_hdr __attribute__((unused)),
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
@@
-2367,7
+2379,8
@@
end_no_session:
*
* Return 0 on success else a negative value.
*/
*
* Return 0 on success else a negative value.
*/
-static int relay_recv_index(const struct lttcomm_relayd_hdr *recv_hdr,
+static int relay_recv_index(
+ const struct lttcomm_relayd_hdr *recv_hdr __attribute__((unused)),
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
@@
-2455,9
+2468,10
@@
end_no_session:
*
* Return 0 on success else a negative value.
*/
*
* Return 0 on success else a negative value.
*/
-static int relay_streams_sent(const struct lttcomm_relayd_hdr *recv_hdr,
+static int relay_streams_sent(
+ const struct lttcomm_relayd_hdr *recv_hdr __attribute__((unused)),
struct relay_connection *conn,
struct relay_connection *conn,
- const struct lttng_buffer_view *payload)
+ const struct lttng_buffer_view *payload
__attribute__((unused))
)
{
int ret;
ssize_t send_ret;
{
int ret;
ssize_t send_ret;
@@
-2619,7
+2633,7
@@
error:
* session rotation feature (not the tracefile rotation feature).
*/
static int relay_rotate_session_streams(
* session rotation feature (not the tracefile rotation feature).
*/
static int relay_rotate_session_streams(
- const struct lttcomm_relayd_hdr *recv_hdr,
+ const struct lttcomm_relayd_hdr *recv_hdr
__attribute__((unused))
,
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
@@
-2663,7
+2677,10
@@
static int relay_rotate_session_streams(
*/
next_trace_chunk = sessiond_trace_chunk_registry_get_chunk(
sessiond_trace_chunk_registry,
*/
next_trace_chunk = sessiond_trace_chunk_registry_get_chunk(
sessiond_trace_chunk_registry,
- session->sessiond_uuid, session->id,
+ session->sessiond_uuid,
+ conn->session->id_sessiond.is_set ?
+ conn->session->id_sessiond.value :
+ conn->session->id,
rotate_streams.new_chunk_id.value);
if (!next_trace_chunk) {
char uuid_str[LTTNG_UUID_STR_LEN];
rotate_streams.new_chunk_id.value);
if (!next_trace_chunk) {
char uuid_str[LTTNG_UUID_STR_LEN];
@@
-2754,7
+2771,8
@@
end_no_reply:
/*
* relay_create_trace_chunk: create a new trace chunk
*/
/*
* relay_create_trace_chunk: create a new trace chunk
*/
-static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
+static int relay_create_trace_chunk(
+ const struct lttcomm_relayd_hdr *recv_hdr __attribute__((unused)),
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
@@
-2885,7
+2903,9
@@
static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
published_chunk = sessiond_trace_chunk_registry_publish_chunk(
sessiond_trace_chunk_registry,
conn->session->sessiond_uuid,
published_chunk = sessiond_trace_chunk_registry_publish_chunk(
sessiond_trace_chunk_registry,
conn->session->sessiond_uuid,
- conn->session->id,
+ conn->session->id_sessiond.is_set ?
+ conn->session->id_sessiond.value :
+ conn->session->id,
chunk);
if (!published_chunk) {
char uuid_str[LTTNG_UUID_STR_LEN];
chunk);
if (!published_chunk) {
char uuid_str[LTTNG_UUID_STR_LEN];
@@
-2938,7
+2958,8
@@
end_no_reply:
/*
* relay_close_trace_chunk: close a trace chunk
*/
/*
* relay_close_trace_chunk: close a trace chunk
*/
-static int relay_close_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
+static int relay_close_trace_chunk(
+ const struct lttcomm_relayd_hdr *recv_hdr __attribute__((unused)),
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
@@
-2991,7
+3012,9
@@
static int relay_close_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
chunk = sessiond_trace_chunk_registry_get_chunk(
sessiond_trace_chunk_registry,
conn->session->sessiond_uuid,
chunk = sessiond_trace_chunk_registry_get_chunk(
sessiond_trace_chunk_registry,
conn->session->sessiond_uuid,
- conn->session->id,
+ conn->session->id_sessiond.is_set ?
+ conn->session->id_sessiond.value :
+ conn->session->id,
chunk_id);
if (!chunk) {
char uuid_str[LTTNG_UUID_STR_LEN];
chunk_id);
if (!chunk) {
char uuid_str[LTTNG_UUID_STR_LEN];
@@
-3192,7
+3215,8
@@
end_no_reply:
/*
* relay_trace_chunk_exists: check if a trace chunk exists
*/
/*
* relay_trace_chunk_exists: check if a trace chunk exists
*/
-static int relay_trace_chunk_exists(const struct lttcomm_relayd_hdr *recv_hdr,
+static int relay_trace_chunk_exists(
+ const struct lttcomm_relayd_hdr *recv_hdr __attribute__((unused)),
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
@@
-3255,7
+3279,8
@@
end_no_reply:
/*
* relay_get_configuration: query whether feature is available
*/
/*
* relay_get_configuration: query whether feature is available
*/
-static int relay_get_configuration(const struct lttcomm_relayd_hdr *recv_hdr,
+static int relay_get_configuration(
+ const struct lttcomm_relayd_hdr *recv_hdr __attribute__((unused)),
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
struct relay_connection *conn,
const struct lttng_buffer_view *payload)
{
@@
-3397,7
+3422,10
@@
static enum relay_connection_status relay_process_control_receive_payload(
reception_buffer->data + state->received,
state->left_to_receive, MSG_DONTWAIT);
if (ret < 0) {
reception_buffer->data + state->received,
state->left_to_receive, MSG_DONTWAIT);
if (ret < 0) {
+ DIAGNOSTIC_PUSH
+ DIAGNOSTIC_IGNORE_LOGICAL_OP
if (errno != EAGAIN && errno != EWOULDBLOCK) {
if (errno != EAGAIN && errno != EWOULDBLOCK) {
+ DIAGNOSTIC_POP
PERROR("Unable to receive command payload on sock %d",
conn->sock->fd);
status = RELAY_CONNECTION_STATUS_ERROR;
PERROR("Unable to receive command payload on sock %d",
conn->sock->fd);
status = RELAY_CONNECTION_STATUS_ERROR;
@@
-3470,7
+3498,10
@@
static enum relay_connection_status relay_process_control_receive_header(
reception_buffer->data + state->received,
state->left_to_receive, MSG_DONTWAIT);
if (ret < 0) {
reception_buffer->data + state->received,
state->left_to_receive, MSG_DONTWAIT);
if (ret < 0) {
+ DIAGNOSTIC_PUSH
+ DIAGNOSTIC_IGNORE_LOGICAL_OP
if (errno != EAGAIN && errno != EWOULDBLOCK) {
if (errno != EAGAIN && errno != EWOULDBLOCK) {
+ DIAGNOSTIC_POP
PERROR("Unable to receive control command header on sock %d",
conn->sock->fd);
status = RELAY_CONNECTION_STATUS_ERROR;
PERROR("Unable to receive control command header on sock %d",
conn->sock->fd);
status = RELAY_CONNECTION_STATUS_ERROR;
@@
-3581,7
+3612,10
@@
static enum relay_connection_status relay_process_data_receive_header(
state->header_reception_buffer + state->received,
state->left_to_receive, MSG_DONTWAIT);
if (ret < 0) {
state->header_reception_buffer + state->received,
state->left_to_receive, MSG_DONTWAIT);
if (ret < 0) {
+ DIAGNOSTIC_PUSH
+ DIAGNOSTIC_IGNORE_LOGICAL_OP
if (errno != EAGAIN && errno != EWOULDBLOCK) {
if (errno != EAGAIN && errno != EWOULDBLOCK) {
+ DIAGNOSTIC_POP
PERROR("Unable to receive data header on sock %d", conn->sock->fd);
status = RELAY_CONNECTION_STATUS_ERROR;
}
PERROR("Unable to receive data header on sock %d", conn->sock->fd);
status = RELAY_CONNECTION_STATUS_ERROR;
}
@@
-3708,7
+3742,10
@@
static enum relay_connection_status relay_process_data_receive_payload(
ret = conn->sock->ops->recvmsg(conn->sock, data_buffer,
recv_size, MSG_DONTWAIT);
if (ret < 0) {
ret = conn->sock->ops->recvmsg(conn->sock, data_buffer,
recv_size, MSG_DONTWAIT);
if (ret < 0) {
+ DIAGNOSTIC_PUSH
+ DIAGNOSTIC_IGNORE_LOGICAL_OP
if (errno != EAGAIN && errno != EWOULDBLOCK) {
if (errno != EAGAIN && errno != EWOULDBLOCK) {
+ DIAGNOSTIC_POP
PERROR("Socket %d error", conn->sock->fd);
status = RELAY_CONNECTION_STATUS_ERROR;
}
PERROR("Socket %d error", conn->sock->fd);
status = RELAY_CONNECTION_STATUS_ERROR;
}
@@
-3877,7
+3914,7
@@
static void relay_thread_close_connection(struct lttng_poll_event *events,
/*
* This thread does the actual work
*/
/*
* This thread does the actual work
*/
-static void *relay_thread_worker(void *data)
+static void *relay_thread_worker(void *data
__attribute__((unused))
)
{
int ret, err = -1, last_seen_data_fd = -1;
uint32_t nb_fd;
{
int ret, err = -1, last_seen_data_fd = -1;
uint32_t nb_fd;
@@
-4205,7
+4242,7
@@
static int create_relay_conn_pipe(void)
"Relayd connection pipe", relay_conn_pipe);
}
"Relayd connection pipe", relay_conn_pipe);
}
-static int stdio_open(void *data, int *fds)
+static int stdio_open(void *data
__attribute__((unused))
, int *fds)
{
fds[0] = fileno(stdout);
fds[1] = fileno(stderr);
{
fds[0] = fileno(stdout);
fds[1] = fileno(stderr);
@@
-4404,7
+4441,7
@@
int main(int argc, char **argv)
/* Create thread to manage the client socket */
ret = pthread_create(&health_thread, default_pthread_attr(),
/* Create thread to manage the client socket */
ret = pthread_create(&health_thread, default_pthread_attr(),
- thread_manage_health, (void *) NULL);
+ thread_manage_health
_relayd
, (void *) NULL);
if (ret) {
errno = ret;
PERROR("pthread_create health");
if (ret) {
errno = ret;
PERROR("pthread_create health");
This page took
0.027212 seconds
and
4
git commands to generate.