Run clang-format on the whole tree

[lttng-tools.git] / src / bin / lttng-sessiond / manage-consumer.cpp

diff --git a/src/bin/lttng-sessiond/manage-consumer.cpp b/src/bin/lttng-sessiond/manage-consumer.cpp
index ae1529e9be5a76c851db52a8aad28e0d5cfd5b7f..1c8e08e18d95107490c979051ce418cbb3b104fb 100644 (file)
--- a/src/bin/lttng-sessiond/manage-consumer.cpp
+++ b/src/bin/lttng-sessiond/manage-consumer.cpp
@@ -7,17 +7,17 @@
  *
  */
 
-#include <signal.h>
-
-#include <common/pipe.hpp>
-#include <common/utils.hpp>
-
+#include "health-sessiond.hpp"
 #include "manage-consumer.hpp"
 #include "testpoint.hpp"
-#include "health-sessiond.hpp"
-#include "utils.hpp"
 #include "thread.hpp"
 #include "ust-consumer.hpp"
+#include "utils.hpp"
+
+#include <common/pipe.hpp>
+#include <common/utils.hpp>
+
+#include <signal.h>
 
 namespace {
 struct thread_notifiers {
@@ -35,8 +35,7 @@ static void mark_thread_as_ready(struct thread_notifiers *notifiers)
        sem_post(&notifiers->ready);
 }
 
-static void mark_thread_intialization_as_failed(
-               struct thread_notifiers *notifiers)
+static void mark_thread_intialization_as_failed(struct thread_notifiers *notifiers)
 {
        ERR("Consumer management thread entering error state");
        notifiers->initialization_result = -1;
@@ -165,8 +164,7 @@ static void *thread_consumer_management(void *data)
        DBG2("Receiving code from consumer err_sock");
 
        /* Getting status code from kconsumerd */
-       ret = lttcomm_recv_unix_sock(sock, &code,
-                       sizeof(enum lttcomm_return_code));
+       ret = lttcomm_recv_unix_sock(sock, &code, sizeof(enum lttcomm_return_code));
        if (ret <= 0) {
                mark_thread_intialization_as_failed(notifiers);
                goto error;
@@ -175,18 +173,14 @@ static void *thread_consumer_management(void *data)
        health_code_update();
        if (code != LTTCOMM_CONSUMERD_COMMAND_SOCK_READY) {
                ERR("consumer error when waiting for SOCK_READY : %s",
-                               lttcomm_get_readable_code((lttcomm_return_code) -code));
+                   lttcomm_get_readable_code((lttcomm_return_code) -code));
                mark_thread_intialization_as_failed(notifiers);
                goto error;
        }
 
        /* Connect both command and metadata sockets. */
-       consumer_data->cmd_sock =
-                       lttcomm_connect_unix_sock(
-                               consumer_data->cmd_unix_sock_path);
-       consumer_data->metadata_fd =
-                       lttcomm_connect_unix_sock(
-                               consumer_data->cmd_unix_sock_path);
+       consumer_data->cmd_sock = lttcomm_connect_unix_sock(consumer_data->cmd_unix_sock_path);
+       consumer_data->metadata_fd = lttcomm_connect_unix_sock(consumer_data->cmd_unix_sock_path);
        if (consumer_data->cmd_sock < 0 || consumer_data->metadata_fd < 0) {
                PERROR("consumer connect cmd socket");
                mark_thread_intialization_as_failed(notifiers);
@@ -205,8 +199,7 @@ static void *thread_consumer_management(void *data)
        pthread_mutex_init(consumer_data->metadata_sock.lock, NULL);
 
        DBG("Consumer command socket ready (fd: %d)", consumer_data->cmd_sock);
-       DBG("Consumer metadata socket ready (fd: %d)",
-                       consumer_data->metadata_fd);
+       DBG("Consumer metadata socket ready (fd: %d)", consumer_data->metadata_fd);
 
        /*
         * Remove the consumerd error sock since we've established a connection.
@@ -225,8 +218,7 @@ static void *thread_consumer_management(void *data)
        }
 
        /* Add metadata socket that is successfully connected. */
-       ret = lttng_poll_add(&events, consumer_data->metadata_fd,
-                       LPOLLIN | LPOLLRDHUP);
+       ret = lttng_poll_add(&events, consumer_data->metadata_fd, LPOLLIN | LPOLLRDHUP);
        if (ret < 0) {
                mark_thread_intialization_as_failed(notifiers);
                goto error;
@@ -256,7 +248,7 @@ static void *thread_consumer_management(void *data)
        pthread_mutex_unlock(cmd_socket_wrapper->lock);
 
        ret = consumer_send_channel_monitor_pipe(cmd_socket_wrapper,
-                       consumer_data->channel_monitor_pipe);
+                                                consumer_data->channel_monitor_pipe);
        if (ret) {
                mark_thread_intialization_as_failed(notifiers);
                goto error;
@@ -305,33 +297,32 @@ static void *thread_consumer_management(void *data)
                                should_quit = 1;
                        } else if (pollfd == sock) {
                                /* Event on the consumerd socket */
-                               if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)
-                                               && !(revents & LPOLLIN)) {
+                               if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP) &&
+                                   !(revents & LPOLLIN)) {
                                        ERR("consumer err socket second poll error");
                                        goto error;
                                }
                                health_code_update();
                                /* Wait for any kconsumerd error */
-                               ret = lttcomm_recv_unix_sock(sock, &code,
-                                               sizeof(enum lttcomm_return_code));
+                               ret = lttcomm_recv_unix_sock(
+                                       sock, &code, sizeof(enum lttcomm_return_code));
                                if (ret <= 0) {
                                        ERR("consumer closed the command socket");
                                        goto error;
                                }
 
                                ERR("consumer return code : %s",
-                                               lttcomm_get_readable_code((lttcomm_return_code) -code));
+                                   lttcomm_get_readable_code((lttcomm_return_code) -code));
 
                                goto exit;
                        } else if (pollfd == consumer_data->metadata_fd) {
-                               if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)
-                                               && !(revents & LPOLLIN)) {
+                               if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP) &&
+                                   !(revents & LPOLLIN)) {
                                        ERR("consumer err metadata socket second poll error");
                                        goto error;
                                }
                                /* UST metadata requests */
-                               ret = ust_consumer_metadata_request(
-                                               &consumer_data->metadata_sock);
+                               ret = ust_consumer_metadata_request(&consumer_data->metadata_sock);
                                if (ret < 0) {
                                        ERR("Handling metadata request");
                                        goto error;
@@ -355,7 +346,7 @@ error:
        if (consumer_data->type == LTTNG_CONSUMER_KERNEL) {
                uatomic_set(&the_kernel_consumerd_state, CONSUMER_ERROR);
        } else if (consumer_data->type == LTTNG_CONSUMER64_UST ||
-                       consumer_data->type == LTTNG_CONSUMER32_UST) {
+                  consumer_data->type == LTTNG_CONSUMER32_UST) {
                uatomic_set(&the_ust_consumerd_state, CONSUMER_ERROR);
        } else {
                /* Code flow error... */
@@ -376,8 +367,7 @@ error:
                }
                consumer_data->cmd_sock = -1;
        }
-       if (consumer_data->metadata_sock.fd_ptr &&
-           *consumer_data->metadata_sock.fd_ptr >= 0) {
+       if (consumer_data->metadata_sock.fd_ptr && *consumer_data->metadata_sock.fd_ptr >= 0) {
                ret = close(*consumer_data->metadata_sock.fd_ptr);
                if (ret) {
                        PERROR("close");
@@ -454,10 +444,10 @@ bool launch_consumer_management_thread(struct consumer_data *consumer_data)
        sem_init(&notifiers->ready, 0, 0);
 
        thread = lttng_thread_create("Consumer management",
-                       thread_consumer_management,
-                       shutdown_consumer_management_thread,
-                       cleanup_consumer_management_thread,
-                       notifiers);
+                                    thread_consumer_management,
+                                    shutdown_consumer_management_thread,
+                                    cleanup_consumer_management_thread,
+                                    notifiers);
        if (!thread) {
                goto error;
        }