X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fdefaults.cpp;h=5ecb435bb630af685be875ebf257fb6d6e46bd0b;hp=830720bd2698645e9d8f6e320a6d3d5aa54927f2;hb=HEAD;hpb=c922647daed3dd022be11980063b5fb816d8c091

diff --git a/src/common/defaults.cpp b/src/common/defaults.cpp
index 830720bd2..e5d70b9e6 100644
--- a/src/common/defaults.cpp
+++ b/src/common/defaults.cpp
@@ -6,21 +6,21 @@
  */
 
 #define _LGPL_SOURCE
-#include <stddef.h>
-#include <unistd.h>
+#include "defaults.hpp"
+#include "error.hpp"
+#include "macros.hpp"
+
+#include <algorithm>
+#include <pthread.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <sys/resource.h>
-#include <pthread.h>
-#include <algorithm>
-
-#include "defaults.h"
-#include "macros.h"
-#include "error.h"
+#include <unistd.h>
 
 static int pthread_attr_init_done;
 static pthread_attr_t tattr;
 
-static size_t get_page_size(void)
+static size_t get_page_size()
 {
 	const long ret = sysconf(_SC_PAGE_SIZE);
 
@@ -35,42 +35,42 @@ static size_t get_page_size(void)
 	return (size_t) ret;
 }
 
-size_t default_get_channel_subbuf_size(void)
+size_t default_get_channel_subbuf_size()
 {
 	return std::max<size_t>(_DEFAULT_CHANNEL_SUBBUF_SIZE, get_page_size());
 }
 
-size_t default_get_metadata_subbuf_size(void)
+size_t default_get_metadata_subbuf_size()
 {
 	return std::max<size_t>(DEFAULT_METADATA_SUBBUF_SIZE, get_page_size());
 }
 
-size_t default_get_kernel_channel_subbuf_size(void)
+size_t default_get_kernel_channel_subbuf_size()
 {
 	return std::max<size_t>(DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE, get_page_size());
 }
 
-size_t default_get_ust_pid_channel_subbuf_size(void)
+size_t default_get_ust_pid_channel_subbuf_size()
 {
 	return std::max<size_t>(DEFAULT_UST_PID_CHANNEL_SUBBUF_SIZE, get_page_size());
 }
 
-size_t default_get_ust_uid_channel_subbuf_size(void)
+size_t default_get_ust_uid_channel_subbuf_size()
 {
 	return std::max<size_t>(DEFAULT_UST_UID_CHANNEL_SUBBUF_SIZE, get_page_size());
 }
 
-pthread_attr_t *default_pthread_attr(void)
+pthread_attr_t *default_pthread_attr()
 {
 	if (pthread_attr_init_done) {
 		return &tattr;
 	}
 
 	WARN("Uninitialized pthread attributes, using libc defaults.");
-	return NULL;
+	return nullptr;
 }
 
-static void __attribute__((constructor)) init_default_pthread_attr(void)
+static void __attribute__((constructor)) init_default_pthread_attr()
 {
 	int ret;
 	struct rlimit rlim;
@@ -90,16 +90,15 @@ static void __attribute__((constructor)) init_default_pthread_attr(void)
 		goto error_destroy;
 	}
 	DBG("Stack size limits: soft %lld, hard %lld bytes",
-			(long long) rlim.rlim_cur,
-			(long long) rlim.rlim_max);
+	    (long long) rlim.rlim_cur,
+	    (long long) rlim.rlim_max);
 
 	/*
 	 * getrlimit() may return a stack size of "-1", meaning "unlimited".
 	 * In this case, we impose a known-good default minimum value which will
 	 * override the libc's default stack size if it is smaller.
 	 */
-	system_ss = rlim.rlim_cur != -1 ? rlim.rlim_cur :
-			DEFAULT_LTTNG_THREAD_STACK_SIZE;
+	system_ss = rlim.rlim_cur != -1 ? rlim.rlim_cur : DEFAULT_LTTNG_THREAD_STACK_SIZE;
 
 	/* Get pthread default thread stack size. */
 	ret = pthread_attr_getstacksize(&tattr, &pthread_ss);
@@ -112,13 +111,14 @@ static void __attribute__((constructor)) init_default_pthread_attr(void)
 	selected_ss = std::max(pthread_ss, system_ss);
 	if (selected_ss < DEFAULT_LTTNG_THREAD_STACK_SIZE) {
 		DBG("Default stack size is too small, setting it to %zu bytes",
-			(size_t) DEFAULT_LTTNG_THREAD_STACK_SIZE);
+		    (size_t) DEFAULT_LTTNG_THREAD_STACK_SIZE);
 		selected_ss = DEFAULT_LTTNG_THREAD_STACK_SIZE;
 	}
 
 	if (rlim.rlim_max > 0 && selected_ss > rlim.rlim_max) {
 		WARN("Your system's stack size restrictions (%zu bytes) may be too low for the LTTng daemons to function properly, please set the stack size limit to at least %zu bytes to ensure reliable operation",
-			(size_t) rlim.rlim_max, (size_t) DEFAULT_LTTNG_THREAD_STACK_SIZE);
+		     (size_t) rlim.rlim_max,
+		     (size_t) DEFAULT_LTTNG_THREAD_STACK_SIZE);
 		selected_ss = (size_t) rlim.rlim_max;
 	}
 
@@ -138,7 +138,7 @@ error_destroy:
 	}
 }
 
-static void __attribute__((destructor)) fini_default_pthread_attr(void)
+static void __attribute__((destructor)) fini_default_pthread_attr()
 {
 	int ret;