X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession-config.c;h=69b62d7523b6cd286df13f6bddb918bba5f726ce;hb=cf0bcb51ea857687a353d2851e572dba6cc63cb0;hp=f8eb37393ff8e73510e401961ab0313c50fab922;hpb=2aaf5fc72b69cddad0144166edbdae424153eb82;p=lttng-tools.git diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c index f8eb37393..69b62d752 100644 --- a/src/common/config/session-config.c +++ b/src/common/config/session-config.c @@ -91,6 +91,7 @@ const char * const config_element_subbuf_size = "subbuffer_size"; const char * const config_element_num_subbuf = "subbuffer_count"; const char * const config_element_switch_timer_interval = "switch_timer_interval"; const char * const config_element_read_timer_interval = "read_timer_interval"; +const char * const config_element_monitor_timer_interval = "monitor_timer_interval"; const char * const config_element_output = "output"; const char * const config_element_output_type = "output_type"; const char * const config_element_tracefile_size = "tracefile_size"; @@ -1257,24 +1258,28 @@ int create_snapshot_session(const char *session_name, xmlNodePtr output_node, } } + control_uri = output.control_uri; + data_uri = output.data_uri; + path = output.path; + if (overrides) { if (overrides->path_url) { - /* Control/data_uri are null */ path = overrides->path_url; + /* Control/data_uri are null */ + control_uri = NULL; + data_uri = NULL; } else { if (overrides->ctrl_url) { - /* path is null */ control_uri = overrides->ctrl_url; + /* path is null */ + path = NULL; } if (overrides->data_url) { - /* path is null */ data_uri = overrides->data_url; + /* path is null */ + path = NULL; } } - } else { - control_uri = output.control_uri; - data_uri = output.data_uri; - path = output.path; } snapshot_output = lttng_snapshot_output_create(); @@ -1372,27 +1377,32 @@ int create_session(const char *name, } } + control_uri = output.control_uri; + data_uri = output.data_uri; + path = output.path; + /* Check for override and apply them */ if (overrides) { if (overrides->path_url) { - /* control/data_uri are null */; path = overrides->path_url; + /* control/data_uri are null */; + control_uri = NULL; + data_uri = NULL; } else { if (overrides->ctrl_url) { - /* path is null */ control_uri = overrides->ctrl_url; + /* path is null */ + path = NULL; } if (overrides->data_url) { - /* path is null */ data_uri = overrides->data_url; + /* path is null */ + path = NULL; } } - } else { - control_uri = output.control_uri; - data_uri = output.data_uri; - path = output.path; } + if (live_timer_interval != UINT64_MAX && !control_uri && !data_uri) { ret = -LTTNG_ERR_LOAD_INVALID_CONFIG; goto end;