Hide internal session configuration symbols

[lttng-tools.git] / src / common / config / session-config.c

diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c
index adb49bd08ee94b68c9cea8ef46b93b9d93898a15..5d0c236550f61090e6acf838c226e0c8f089345d 100644 (file)
--- a/src/common/config/session-config.c
+++ b/src/common/config/session-config.c
@@ -91,6 +91,8 @@ 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";
+LTTNG_HIDDEN const char * const config_element_monitor_timer_interval = "monitor_timer_interval";
+LTTNG_HIDDEN const char * const config_element_blocking_timeout = "blocking_timeout";
 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 +1259,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 +1378,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;
@@ -2618,6 +2629,21 @@ domain_init_error:
                goto error;
        }
 
+       /* Apply overrides */
+       if (overrides) {
+               if (overrides->session_name) {
+                       xmlChar *name_override = xmlStrdup(BAD_CAST(overrides->session_name));
+                       if (!name_override) {
+                               ret = -LTTNG_ERR_NOMEM;
+                               goto error;
+                       }
+
+                       /* Overrides the session name to the provided name */
+                       xmlFree(name);
+                       name = name_override;
+               }
+       }
+
        if (overwrite) {
                /* Destroy session if it exists */
                ret = lttng_destroy_session((const char *) name);