Clean-up: modernize pretty_xml.cpp

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

diff --git a/src/bin/lttng-sessiond/globals.cpp b/src/bin/lttng-sessiond/globals.cpp
index b4cedf337678b253de987e0f790405f7fc6d2edf..ad9a8bf850d461fc217ed3381ded5c3819661770 100644 (file)
--- a/src/bin/lttng-sessiond/globals.cpp
+++ b/src/bin/lttng-sessiond/globals.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
@@ -7,8 +7,9 @@
  *
  */
 
-#include "lttng-sessiond.h"
-#include <common/uuid.h>
+#include "lttng-sessiond.hpp"
+
+#include <common/uuid.hpp>
 
 lttng_uuid the_sessiond_uuid;
 
@@ -20,14 +21,15 @@ long the_page_size;
 struct health_app *the_health_sessiond;
 
 struct notification_thread_handle *the_notification_thread_handle;
+lttng::sessiond::rotation_thread::uptr the_rotation_thread_handle;
 
-struct lttng_ht *the_agent_apps_ht_by_sock = NULL;
-struct lttng_ht *the_trigger_agents_ht_by_domain = NULL;
+struct lttng_ht *the_agent_apps_ht_by_sock = nullptr;
+struct lttng_ht *the_trigger_agents_ht_by_domain = nullptr;
 
 struct lttng_kernel_abi_tracer_version the_kernel_tracer_version;
 struct lttng_kernel_abi_tracer_abi_version the_kernel_tracer_abi_version;
 
-int the_kernel_poll_pipe[2] = {-1, -1};
+int the_kernel_poll_pipe[2] = { -1, -1 };
 
 pid_t the_ppid;
 pid_t the_child_ppid;
@@ -41,7 +43,7 @@ consumer_data the_ustconsumer32_data(LTTNG_CONSUMER32_UST);
 enum consumerd_state the_ust_consumerd_state;
 enum consumerd_state the_kernel_consumerd_state;
 
-static void __attribute__((constructor)) init_sessiond_uuid(void)
+static void __attribute__((constructor)) init_sessiond_uuid()
 {
        if (lttng_uuid_generate(the_sessiond_uuid)) {
                ERR("Failed to generate a session daemon UUID");