X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession-config.h;h=c6439f756fc431c636a4383c589d6d43c929dff0;hb=2aaf5fc72b69cddad0144166edbdae424153eb82;hp=a53a8f91c753339daa28e29afffebd6c507c58b3;hpb=e10b6a1c2fad4f300523cf8cfb57aba2bfa101c0;p=lttng-tools.git

diff --git a/src/common/config/session-config.h b/src/common/config/session-config.h
index a53a8f91c..c6439f756 100644
--- a/src/common/config/session-config.h
+++ b/src/common/config/session-config.h
@@ -30,6 +30,13 @@ struct config_entry {
 	const char *value;
 };
 
+struct config_load_session_override_attr {
+	char *path_url;
+	char *ctrl_url;
+	char *data_url;
+	char *session_name;
+};
+
 /* Instance of a configuration writer. */
 struct config_writer;
 
@@ -57,7 +64,7 @@ typedef int (*config_entry_handler_cb)(const struct config_entry *, void *);
  * "", only the global entries are relayed.
  *
  * Returns 0 on success. Negative values are error codes. If the return value
- * is positive, it represents the line number on which a parsing error occured.
+ * is positive, it represents the line number on which a parsing error occurred.
  */
 LTTNG_HIDDEN
 int config_get_section_entries(const char *path, const char *section,
@@ -215,14 +222,16 @@ int config_writer_write_element_string(struct config_writer *writer,
  * session_name Name of the session to load. Will load all
  * sessions from path if NULL.
  *
- * override Override current session configuration if it exists.
+ * overwrite Overwrite current session configuration if it exists.
  * autoload Tell to load the auto session(s).
+ * overrides The override attribute structure specifying override parameters.
  *
  * Returns zero if the session could be loaded successfully. Returns
  * a negative LTTNG_ERR code on error.
  */
 LTTNG_HIDDEN
 int config_load_session(const char *path, const char *session_name,
-		int override, unsigned int autoload);
+		int overwrite, unsigned int autoload,
+		const struct config_load_session_override_attr *overrides);
 
 #endif /* _CONFIG_H */