Add default subbuf sizes getter functions

This patch adds functions to retrieve defaults subbuf sizes. It uses the
DEFAULT_*_SUBBUF_SIZE defines from defaults.h but also make sure that
the values are at least as big as the page size.

The functions are defined as static inline in defaults.h.

Signed-off-by: Simon Marchi <simon.marchi@polymtl.ca>
Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index b43b37676c181c783cb443624afc345f9d91f3d3..f91259c2a8729b334747b58528308a49293734ee 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -12,7 +12,7 @@ noinst_HEADERS = lttng-kernel.h defaults.h macros.h error.h futex.h \
 noinst_LTLIBRARIES = libcommon.la
 
 libcommon_la_SOURCES = error.h error.c utils.c utils.h runas.c runas.h \
-                       common.h futex.c futex.h uri.c uri.h
+                       common.h futex.c futex.h uri.c uri.h defaults.c
 
 # Consumer library
 noinst_LTLIBRARIES += libconsumer.la

diff --git a/src/common/defaults.c b/src/common/defaults.c
new file mode 100644 (file)
index 0000000..ccdbaf4
--- /dev/null
+++ b/src/common/defaults.c
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2012 - Simon Marchi <simon.marchi@polymtl.ca>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License, version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <stddef.h>
+#include <unistd.h>
+
+#include "defaults.h"
+#include "macros.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;
+
+static void __attribute__((constructor)) init_defaults(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);
+
+       if (page_size < 0) {
+               page_size = 0;
+       }
+
+       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);
+}

diff --git a/src/common/defaults.h b/src/common/defaults.h
index 0c0b6ac9c89628bb9fa7609bde99b9322d519c67..efcd7924b1ab16f38752eecca3ddfe6dabb05a92 100644 (file)
--- a/src/common/defaults.h
+++ b/src/common/defaults.h
@@ -160,4 +160,59 @@
 #define DEFAULT_APP_SOCKET_RW_TIMEOUT       5  /* sec */
 #define DEFAULT_APP_SOCKET_TIMEOUT_ENV      "LTTNG_APP_SOCKET_TIMEOUT"
 
+
+extern size_t default_channel_subbuf_size;
+extern size_t default_metadata_subbuf_size;
+extern size_t default_ust_channel_subbuf_size;
+extern size_t default_kernel_channel_subbuf_size;
+
+
+/*
+ * Returns the default subbuf size.
+ *
+ * This function depends on a value that is set at constructor time, so it is
+ * unsafe to call it from another constructor.
+ */
+static inline
+size_t default_get_channel_subbuf_size(void)
+{
+       return default_channel_subbuf_size;
+}
+
+/*
+ * Returns the default metadata subbuf size.
+ *
+ * This function depends on a value that is set at constructor time, so it is
+ * unsafe to call it from another constructor.
+ */
+static inline
+size_t default_get_metadata_subbuf_size(void)
+{
+       return default_metadata_subbuf_size;
+}
+
+/*
+ * Returns the default subbuf size for the kernel domain.
+ *
+ * This function depends on a value that is set at constructor time, so it is
+ * unsafe to call it from another constructor.
+ */
+static inline
+size_t default_get_kernel_channel_subbuf_size(void)
+{
+       return default_kernel_channel_subbuf_size;
+}
+
+/*
+ * Returns the default subbuf size for the UST domain.
+ *
+ * This function depends on a value that is set at constructor time, so it is
+ * unsafe to call it from another constructor.
+ */
+static inline
+size_t default_get_ust_channel_subbuf_size(void)
+{
+       return default_ust_channel_subbuf_size;
+}
+
 #endif /* _DEFAULTS_H */