Force usage of assert() condition when NDEBUG is defined

[lttng-tools.git] / src / bin / lttng-sessiond / sessiond-config.c

diff --git a/src/bin/lttng-sessiond/sessiond-config.c b/src/bin/lttng-sessiond/sessiond-config.c
index f8dba15e7c4c3f7fa158b35bb09d67fd695db8f8..2cdbbad52792190f6c7ea09b6e8f19ea2342ae3f 100644 (file)
--- a/src/bin/lttng-sessiond/sessiond-config.c
+++ b/src/bin/lttng-sessiond/sessiond-config.c
@@ -7,7 +7,6 @@
 
 #include "version.h"
 #include "sessiond-config.h"
-#include <assert.h>
 #include "lttng-ust-ctl.h"
 #include <common/defaults.h>
 #include <limits.h>
@@ -24,7 +23,8 @@ struct sessiond_config sessiond_config_build_defaults = {
        .verbose_consumer =                     0,
 
        .agent_tcp_port =                       { .begin = DEFAULT_AGENT_TCP_PORT_RANGE_BEGIN, .end = DEFAULT_AGENT_TCP_PORT_RANGE_END },
-       .event_notifier_error_counter_bucket =  DEFAULT_EVENT_NOTIFIER_ERROR_COUNT_MAP_SIZE,
+       .event_notifier_buffer_size_kernel =    DEFAULT_EVENT_NOTIFIER_ERROR_COUNT_MAP_SIZE,
+       .event_notifier_buffer_size_userspace = DEFAULT_EVENT_NOTIFIER_ERROR_COUNT_MAP_SIZE,
        .app_socket_timeout =                   DEFAULT_APP_SOCKET_RW_TIMEOUT,
 
        .no_kernel =                            false,
@@ -83,7 +83,7 @@ void config_string_set_static(struct config_string *config_str,
 LTTNG_HIDDEN
 void config_string_set(struct config_string *config_str, char *value)
 {
-       assert(config_str);
+       LTTNG_ASSERT(config_str);
        if (config_str->should_free) {
                free(config_str->value);
                config_str->should_free = false;
@@ -253,7 +253,7 @@ int sessiond_config_init(struct sessiond_config *config)
        bool is_root = (getuid() == 0);
        char *str;
 
-       assert(config);
+       LTTNG_ASSERT(config);
        memcpy(config, &sessiond_config_build_defaults, sizeof(*config));
 
        if (is_root) {