projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: accept override flag even without a load path
[lttng-tools.git]
/
src
/
common
/
config
/
config.c
diff --git
a/src/common/config/config.c
b/src/common/config/config.c
index cdc044d6dc72fda892f9f2d3239140714ad61eb0..c9777d63f673728313c9f1d0fb0d8cc783e6af21 100644
(file)
--- a/
src/common/config/config.c
+++ b/
src/common/config/config.c
@@
-154,6
+154,7
@@
const char * const config_event_context_vppid = "VPPID";
const char * const config_event_context_pthread_id = "PTHREAD_ID";
const char * const config_event_context_hostname = "HOSTNAME";
const char * const config_event_context_ip = "IP";
const char * const config_event_context_pthread_id = "PTHREAD_ID";
const char * const config_event_context_hostname = "HOSTNAME";
const char * const config_event_context_ip = "IP";
+const char * const config_event_context_perf_thread_counter = "PERF_THREAD_COUNTER";
struct consumer_output {
int enabled;
struct consumer_output {
int enabled;
@@
-2155,7
+2156,7
@@
int process_session_node(xmlNodePtr session_node, const char *session_name,
xmlChar *node_content = xmlNodeGetContent(node);
if (!node_content) {
ret = -LTTNG_ERR_NOMEM;
xmlChar *node_content = xmlNodeGetContent(node);
if (!node_content) {
ret = -LTTNG_ERR_NOMEM;
- goto e
nd
;
+ goto e
rror
;
}
name = (char *) node_content;
}
name = (char *) node_content;
@@
-2169,14
+2170,14
@@
int process_session_node(xmlNodePtr session_node, const char *session_name,
xmlChar *node_content = xmlNodeGetContent(node);
if (!node_content) {
ret = -LTTNG_ERR_NOMEM;
xmlChar *node_content = xmlNodeGetContent(node);
if (!node_content) {
ret = -LTTNG_ERR_NOMEM;
- goto e
nd
;
+ goto e
rror
;
}
ret = parse_bool(node_content, &started);
free(node_content);
if (ret) {
ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
}
ret = parse_bool(node_content, &started);
free(node_content);
if (ret) {
ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
- goto e
nd
;
+ goto e
rror
;
}
} else if (!output_node && !strcmp((const char *) node->name,
config_element_output)) {
}
} else if (!output_node && !strcmp((const char *) node->name,
config_element_output)) {
@@
-2194,14
+2195,14
@@
int process_session_node(xmlNodePtr session_node, const char *session_name,
xmlNodeGetContent(attributes_child);
if (!snapshot_mode_content) {
ret = -LTTNG_ERR_NOMEM;
xmlNodeGetContent(attributes_child);
if (!snapshot_mode_content) {
ret = -LTTNG_ERR_NOMEM;
- goto e
nd
;
+ goto e
rror
;
}
ret = parse_bool(snapshot_mode_content, &snapshot_mode);
free(snapshot_mode_content);
if (ret) {
ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
}
ret = parse_bool(snapshot_mode_content, &snapshot_mode);
free(snapshot_mode_content);
if (ret) {
ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
- goto e
nd
;
+ goto e
rror
;
}
} else {
/* live_timer_interval */
}
} else {
/* live_timer_interval */
@@
-2209,14
+2210,14
@@
int process_session_node(xmlNodePtr session_node, const char *session_name,
xmlNodeGetContent(attributes_child);
if (!timer_interval_content) {
ret = -LTTNG_ERR_NOMEM;
xmlNodeGetContent(attributes_child);
if (!timer_interval_content) {
ret = -LTTNG_ERR_NOMEM;
- goto e
nd
;
+ goto e
rror
;
}
ret = parse_uint(timer_interval_content, &live_timer_interval);
free(timer_interval_content);
if (ret) {
ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
}
ret = parse_uint(timer_interval_content, &live_timer_interval);
free(timer_interval_content);
if (ret) {
ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
- goto e
nd
;
+ goto e
rror
;
}
}
}
}
}
}
@@
-2225,13
+2226,13
@@
int process_session_node(xmlNodePtr session_node, const char *session_name,
if (!name) {
/* Mandatory attribute, as defined in the session XSD */
ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
if (!name) {
/* Mandatory attribute, as defined in the session XSD */
ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
- goto e
nd
;
+ goto e
rror
;
}
if (session_name && strcmp(name, session_name)) {
/* This is not the session we are looking for */
}
if (session_name && strcmp(name, session_name)) {
/* This is not the session we are looking for */
- ret = -LTTNG_ERR_
LOAD_SESSION_NOENT
;
- goto e
nd
;
+ ret = -LTTNG_ERR_
NO_SESSION
;
+ goto e
rror
;
}
/* Init domains to create the session handles */
}
/* Init domains to create the session handles */
@@
-2242,7
+2243,7
@@
int process_session_node(xmlNodePtr session_node, const char *session_name,
domain = zmalloc(sizeof(*domain));
if (!domain) {
ret = -LTTNG_ERR_NOMEM;
domain = zmalloc(sizeof(*domain));
if (!domain) {
ret = -LTTNG_ERR_NOMEM;
- goto e
nd
;
+ goto e
rror
;
}
ret = init_domain(node, domain);
}
ret = init_domain(node, domain);
@@
-2280,7
+2281,7
@@
int process_session_node(xmlNodePtr session_node, const char *session_name,
domain_init_error:
free(domain);
ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
domain_init_error:
free(domain);
ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
- goto e
nd
;
+ goto e
rror
;
}
if (override) {
}
if (override) {
@@
-2288,7
+2289,7
@@
domain_init_error:
ret = lttng_destroy_session(name);
if (ret && ret != -LTTNG_ERR_SESS_NOT_FOUND) {
ERR("Failed to destroy existing session.");
ret = lttng_destroy_session(name);
if (ret && ret != -LTTNG_ERR_SESS_NOT_FOUND) {
ERR("Failed to destroy existing session.");
- goto e
nd
;
+ goto e
rror
;
}
}
}
}
@@
-2304,9
+2305,8
@@
domain_init_error:
ret = create_session(name, kernel_domain, ust_domain, jul_domain,
output_node, UINT64_MAX);
}
ret = create_session(name, kernel_domain, ust_domain, jul_domain,
output_node, UINT64_MAX);
}
-
if (ret) {
if (ret) {
- goto e
nd
;
+ goto e
rror
;
}
for (node = xmlFirstElementChild(domains_node); node;
}
for (node = xmlFirstElementChild(domains_node); node;
@@
-2323,12
+2323,14
@@
domain_init_error:
goto end;
}
}
goto end;
}
}
+
end:
if (ret < 0) {
ERR("Failed to load session %s: %s", name, lttng_strerror(ret));
lttng_destroy_session(name);
}
end:
if (ret < 0) {
ERR("Failed to load session %s: %s", name, lttng_strerror(ret));
lttng_destroy_session(name);
}
+error:
free(kernel_domain);
free(ust_domain);
free(jul_domain);
free(kernel_domain);
free(ust_domain);
free(jul_domain);
@@
-2527,7
+2529,7
@@
int config_load_session(const char *path, const char *session_name,
}
ret = load_session_from_path(path, session_name,
}
ret = load_session_from_path(path, session_name,
- &validation_ctx,
0
);
+ &validation_ctx,
override
);
if (!ret || (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT)) {
/* Session found or an error occured */
free(path);
if (!ret || (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT)) {
/* Session found or an error occured */
free(path);
@@
-2539,7
+2541,7
@@
int config_load_session(const char *path, const char *session_name,
/* Try system session configuration path */
ret = load_session_from_path(DEFAULT_SESSION_SYSTEM_CONFIGPATH,
/* Try system session configuration path */
ret = load_session_from_path(DEFAULT_SESSION_SYSTEM_CONFIGPATH,
- session_name, &validation_ctx,
0
);
+ session_name, &validation_ctx,
override
);
if (!ret || (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT)) {
/* Session found or an error occured */
goto end;
if (!ret || (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT)) {
/* Session found or an error occured */
goto end;
This page took
0.029892 seconds
and
4
git commands to generate.