X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsessiond-config.c;h=2cdbbad52792190f6c7ea09b6e8f19ea2342ae3f;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=d908da9727452c215e308f208acd5bcaa7afacc2;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/sessiond-config.c b/src/bin/lttng-sessiond/sessiond-config.c index d908da972..2cdbbad52 100644 --- a/src/bin/lttng-sessiond/sessiond-config.c +++ b/src/bin/lttng-sessiond/sessiond-config.c @@ -7,14 +7,13 @@ #include "version.h" #include "sessiond-config.h" -#include #include "lttng-ust-ctl.h" #include #include -#include #include #include #include +#include #include static @@ -24,6 +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_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, @@ -31,7 +32,7 @@ struct sessiond_config sessiond_config_build_defaults = { .daemonize = false, .sig_parent = false, - .tracing_group_name.value = DEFAULT_TRACING_GROUP, + .tracing_group_name.value = (char *) DEFAULT_TRACING_GROUP, .kmod_probes_list.value = NULL, .kmod_extra_probes_list.value = NULL, @@ -82,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; @@ -252,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) {