projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
liblttng-ctl: use export list to define exported symbols
[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 f0ab4ce0423530b25a6de8beb599a46fcd08ecec..707e57950f69ed5635bd46ab874624c84e0bb8c0 100644
(file)
--- 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 "version.h"
#include "sessiond-config.h"
-#include <assert.h>
#include "lttng-ust-ctl.h"
#include <common/defaults.h>
#include <limits.h>
#include "lttng-ust-ctl.h"
#include <common/defaults.h>
#include <limits.h>
-#include <errno.h>
#include <ctype.h>
#include <common/error.h>
#include <common/utils.h>
#include <ctype.h>
#include <common/error.h>
#include <common/utils.h>
+#include <common/compat/errno.h>
#include <common/compat/getenv.h>
static
#include <common/compat/getenv.h>
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 },
.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,
.app_socket_timeout = DEFAULT_APP_SOCKET_RW_TIMEOUT,
.no_kernel = false,
@@
-79,10
+80,9
@@
void config_string_set_static(struct config_string *config_str,
}
/* Only use for dynamically-allocated strings. */
}
/* Only use for dynamically-allocated strings. */
-LTTNG_HIDDEN
void config_string_set(struct config_string *config_str, char *value)
{
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;
if (config_str->should_free) {
free(config_str->value);
config_str->should_free = false;
@@
-92,7
+92,6
@@
void config_string_set(struct config_string *config_str, char *value)
config_str->value = value;
}
config_str->value = value;
}
-LTTNG_HIDDEN
int sessiond_config_apply_env_config(struct sessiond_config *config)
{
int ret = 0;
int sessiond_config_apply_env_config(struct sessiond_config *config)
{
int ret = 0;
@@
-245,14
+244,13
@@
end:
return ret;
}
return ret;
}
-LTTNG_HIDDEN
int sessiond_config_init(struct sessiond_config *config)
{
int ret;
bool is_root = (getuid() == 0);
char *str;
int sessiond_config_init(struct sessiond_config *config)
{
int ret;
bool is_root = (getuid() == 0);
char *str;
-
assert
(config);
+
LTTNG_ASSERT
(config);
memcpy(config, &sessiond_config_build_defaults, sizeof(*config));
if (is_root) {
memcpy(config, &sessiond_config_build_defaults, sizeof(*config));
if (is_root) {
@@
-400,7
+398,6
@@
error:
return ret;
}
return ret;
}
-LTTNG_HIDDEN
void sessiond_config_fini(struct sessiond_config *config)
{
config_string_fini(&config->tracing_group_name);
void sessiond_config_fini(struct sessiond_config *config)
{
config_string_fini(&config->tracing_group_name);
@@
-456,7
+453,6
@@
end:
if (resolve_path(path_config_str)) \
return -1
if (resolve_path(path_config_str)) \
return -1
-LTTNG_HIDDEN
int sessiond_config_resolve_paths(struct sessiond_config *config)
{
RESOLVE_CHECK(&config->apps_unix_sock_path);
int sessiond_config_resolve_paths(struct sessiond_config *config)
{
RESOLVE_CHECK(&config->apps_unix_sock_path);
@@
-484,7
+480,6
@@
int sessiond_config_resolve_paths(struct sessiond_config *config)
return 0;
}
return 0;
}
-LTTNG_HIDDEN
void sessiond_config_log(struct sessiond_config *config)
{
DBG_NO_LOC("[sessiond configuration]");
void sessiond_config_log(struct sessiond_config *config)
{
DBG_NO_LOC("[sessiond configuration]");
This page took
0.025992 seconds
and
4
git commands to generate.