projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the sessiond "ready" counter mechanism
[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 d514aefc75e8ba85639cf0f80a3e9f5ec54b51fd..72845d0de3923786ff75f2012295c1e79f0219d9 100644
(file)
--- a/
src/bin/lttng-sessiond/sessiond-config.c
+++ b/
src/bin/lttng-sessiond/sessiond-config.c
@@
-270,7
+270,7
@@
int sessiond_config_init(struct sessiond_config *config)
ret = config_set_paths_non_root(config);
}
if (ret < 0) {
ret = config_set_paths_non_root(config);
}
if (ret < 0) {
- goto e
nd
;
+ goto e
rror
;
}
/* 32 bits consumerd path setup */
}
/* 32 bits consumerd path setup */
@@
-278,7
+278,7
@@
int sessiond_config_init(struct sessiond_config *config)
config->rundir.value);
if (ret < 0) {
ERR("Failed to set 32-bit consumer path");
config->rundir.value);
if (ret < 0) {
ERR("Failed to set 32-bit consumer path");
- goto e
nd
;
+ goto e
rror
;
}
config_string_set(&config->consumerd32_path, str);
str = NULL;
}
config_string_set(&config->consumerd32_path, str);
str = NULL;
@@
-287,7
+287,7
@@
int sessiond_config_init(struct sessiond_config *config)
config->rundir.value);
if (ret < 0) {
ERR("Failed to set 32-bit consumer error socket path");
config->rundir.value);
if (ret < 0) {
ERR("Failed to set 32-bit consumer error socket path");
- goto e
nd
;
+ goto e
rror
;
}
config_string_set(&config->consumerd32_err_unix_sock_path, str);
str = NULL;
}
config_string_set(&config->consumerd32_err_unix_sock_path, str);
str = NULL;
@@
-296,7
+296,7
@@
int sessiond_config_init(struct sessiond_config *config)
config->rundir.value);
if (ret < 0) {
ERR("Failed to set 32-bit consumer command socket path");
config->rundir.value);
if (ret < 0) {
ERR("Failed to set 32-bit consumer command socket path");
- goto e
nd
;
+ goto e
rror
;
}
config_string_set(&config->consumerd32_cmd_unix_sock_path, str);
str = NULL;
}
config_string_set(&config->consumerd32_cmd_unix_sock_path, str);
str = NULL;
@@
-306,7
+306,7
@@
int sessiond_config_init(struct sessiond_config *config)
config->rundir.value);
if (ret < 0) {
ERR("Failed to set 64-bit consumer path");
config->rundir.value);
if (ret < 0) {
ERR("Failed to set 64-bit consumer path");
- goto e
nd
;
+ goto e
rror
;
}
config_string_set(&config->consumerd64_path, str);
str = NULL;
}
config_string_set(&config->consumerd64_path, str);
str = NULL;
@@
-315,7
+315,7
@@
int sessiond_config_init(struct sessiond_config *config)
config->rundir.value);
if (ret < 0) {
ERR("Failed to set 64-bit consumer error socket path");
config->rundir.value);
if (ret < 0) {
ERR("Failed to set 64-bit consumer error socket path");
- goto e
nd
;
+ goto e
rror
;
}
config_string_set(&config->consumerd64_err_unix_sock_path, str);
str = NULL;
}
config_string_set(&config->consumerd64_err_unix_sock_path, str);
str = NULL;
@@
-324,7
+324,7
@@
int sessiond_config_init(struct sessiond_config *config)
config->rundir.value);
if (ret < 0) {
ERR("Failed to set 64-bit consumer command socket path");
config->rundir.value);
if (ret < 0) {
ERR("Failed to set 64-bit consumer command socket path");
- goto e
nd
;
+ goto e
rror
;
}
config_string_set(&config->consumerd64_cmd_unix_sock_path, str);
str = NULL;
}
config_string_set(&config->consumerd64_cmd_unix_sock_path, str);
str = NULL;
@@
-334,7
+334,7
@@
int sessiond_config_init(struct sessiond_config *config)
config->rundir.value);
if (ret < 0) {
ERR("Failed to set kernel consumer path");
config->rundir.value);
if (ret < 0) {
ERR("Failed to set kernel consumer path");
- goto e
nd
;
+ goto e
rror
;
}
config_string_set(&config->kconsumerd_path, str);
str = NULL;
}
config_string_set(&config->kconsumerd_path, str);
str = NULL;
@@
-343,7
+343,7
@@
int sessiond_config_init(struct sessiond_config *config)
config->rundir.value);
if (ret < 0) {
ERR("Failed to set kernel consumer error socket path");
config->rundir.value);
if (ret < 0) {
ERR("Failed to set kernel consumer error socket path");
- goto e
nd
;
+ goto e
rror
;
}
config_string_set(&config->kconsumerd_err_unix_sock_path, str);
str = NULL;
}
config_string_set(&config->kconsumerd_err_unix_sock_path, str);
str = NULL;
@@
-352,7
+352,7
@@
int sessiond_config_init(struct sessiond_config *config)
config->rundir.value);
if (ret < 0) {
ERR("Failed to set kernel consumer command socket path");
config->rundir.value);
if (ret < 0) {
ERR("Failed to set kernel consumer command socket path");
- goto e
nd
;
+ goto e
rror
;
}
config_string_set(&config->kconsumerd_cmd_unix_sock_path, str);
str = NULL;
}
config_string_set(&config->kconsumerd_cmd_unix_sock_path, str);
str = NULL;
@@
-361,7
+361,7
@@
int sessiond_config_init(struct sessiond_config *config)
DEFAULT_LTTNG_SESSIOND_PIDFILE);
if (ret < 0) {
ERR("Failed to set PID file path");
DEFAULT_LTTNG_SESSIOND_PIDFILE);
if (ret < 0) {
ERR("Failed to set PID file path");
- goto e
nd
;
+ goto e
rror
;
}
config_string_set(&config->pid_file_path, str);
str = NULL;
}
config_string_set(&config->pid_file_path, str);
str = NULL;
@@
-370,7
+370,7
@@
int sessiond_config_init(struct sessiond_config *config)
DEFAULT_LTTNG_SESSIOND_LOCKFILE);
if (ret < 0) {
ERR("Failed to set lock file path");
DEFAULT_LTTNG_SESSIOND_LOCKFILE);
if (ret < 0) {
ERR("Failed to set lock file path");
- goto e
nd
;
+ goto e
rror
;
}
config_string_set(&config->lock_file_path, str);
str = NULL;
}
config_string_set(&config->lock_file_path, str);
str = NULL;
@@
-379,7
+379,7
@@
int sessiond_config_init(struct sessiond_config *config)
DEFAULT_LTTNG_SESSIOND_AGENTPORT_FILE);
if (ret < 0) {
ERR("Failed to set agent port file path");
DEFAULT_LTTNG_SESSIOND_AGENTPORT_FILE);
if (ret < 0) {
ERR("Failed to set agent port file path");
- goto e
nd
;
+ goto e
rror
;
}
config_string_set(&config->agent_port_file_path, str);
str = NULL;
}
config_string_set(&config->agent_port_file_path, str);
str = NULL;
@@
-403,7
+403,9
@@
int sessiond_config_init(struct sessiond_config *config)
#error "Unknown bitness"
#endif
ret = 0;
#error "Unknown bitness"
#endif
ret = 0;
-end:
+ return ret;
+error:
+ sessiond_config_fini(config);
return ret;
}
return ret;
}
This page took
0.029555 seconds
and
4
git commands to generate.