Clean-up: relayd: change space to tabs

[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 12b7b74f6d8ad7cc5d43799396ee4ba27d456bc2..10ce291978227acf5d5e35eb5e623cbba80b82fb 100644 (file)
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -507,7 +507,7 @@ static int set_fd_pool_size(void)
                goto end;
        }
 
                goto end;
        }
 

-       DBG("File descriptor pool size argument (%u) adjusted to %u to accomodate transient fd uses",
+       DBG("File descriptor pool size argument (%u) adjusted to %u to accommodates transient fd uses",

                        lttng_opt_fd_pool_size,
                        lttng_opt_fd_pool_size - DEFAULT_RELAYD_FD_POOL_SIZE_RESERVE);
        lttng_opt_fd_pool_size -= DEFAULT_RELAYD_FD_POOL_SIZE_RESERVE;
                        lttng_opt_fd_pool_size,
                        lttng_opt_fd_pool_size - DEFAULT_RELAYD_FD_POOL_SIZE_RESERVE);
        lttng_opt_fd_pool_size -= DEFAULT_RELAYD_FD_POOL_SIZE_RESERVE;


@@ -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);


@@ -1632,7 +1632,8 @@ static int relay_add_stream(const struct lttcomm_relayd_hdr *recv_hdr,
                        group_by_session_path_name =
                                        backward_compat_group_by_session(
                                                        path_name,
                        group_by_session_path_name =
                                        backward_compat_group_by_session(
                                                        path_name,

-                                                       session->session_name);
+                                                       session->session_name,
+                                                       session->creation_time.value);

                        if (!group_by_session_path_name) {
                                ERR("Failed to apply group by session to stream of session %" PRIu64,
                                                session->id);
                        if (!group_by_session_path_name) {
                                ERR("Failed to apply group by session to stream of session %" PRIu64,
                                                session->id);