X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fdefaults.c;h=bd6e18351bc0e05ee0821e08139729cecac439f3;hp=ccdbaf499f0719641538ae71c415c9536aa7b9cb;hb=994902b6923005548ccf4237dea0478bbcc53c65;hpb=8b3bd7a32e514aae56e718491a10f582b03140c3

diff --git a/src/common/defaults.c b/src/common/defaults.c
index ccdbaf499..bd6e18351 100644
--- a/src/common/defaults.c
+++ b/src/common/defaults.c
@@ -15,35 +15,40 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#define _LGPL_SOURCE
 #include <stddef.h>
 #include <unistd.h>
 
 #include "defaults.h"
 #include "macros.h"
+#include "align.h"
 
-size_t default_channel_subbuf_size;
-size_t default_metadata_subbuf_size;
-size_t default_kernel_channel_subbuf_size;
-size_t default_ust_channel_subbuf_size;
+LTTNG_HIDDEN
+size_t default_get_channel_subbuf_size(void)
+{
+	return max(_DEFAULT_CHANNEL_SUBBUF_SIZE, PAGE_SIZE);
+}
 
-static void __attribute__((constructor)) init_defaults(void)
+LTTNG_HIDDEN
+size_t default_get_metadata_subbuf_size(void)
 {
-	/*
-	 * The libringbuffer won't accept subbuf sizes smaller than the page size.
-	 * If the default subbuf size is smaller, replace it by the page size.
-	 */
-	long page_size = sysconf(_SC_PAGESIZE);
+	return max(DEFAULT_METADATA_SUBBUF_SIZE, PAGE_SIZE);
+}
 
-	if (page_size < 0) {
-		page_size = 0;
-	}
+LTTNG_HIDDEN
+size_t default_get_kernel_channel_subbuf_size(void)
+{
+	return max(DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE, PAGE_SIZE);
+}
 
-	default_channel_subbuf_size =
-		max(DEFAULT_CHANNEL_SUBBUF_SIZE, page_size);
-	default_metadata_subbuf_size =
-		max(DEFAULT_METADATA_SUBBUF_SIZE, page_size);
-	default_kernel_channel_subbuf_size =
-		max(DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE, page_size);
-	default_ust_channel_subbuf_size =
-		max(DEFAULT_UST_CHANNEL_SUBBUF_SIZE, page_size);
+LTTNG_HIDDEN
+size_t default_get_ust_pid_channel_subbuf_size(void)
+{
+	return max(DEFAULT_UST_PID_CHANNEL_SUBBUF_SIZE, PAGE_SIZE);
+}
+
+LTTNG_HIDDEN
+size_t default_get_ust_uid_channel_subbuf_size(void)
+{
+	return max(DEFAULT_UST_UID_CHANNEL_SUBBUF_SIZE, PAGE_SIZE);
 }