X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=include%2Flttng%2Fload.h;h=694c20b9292a078cbdfe1eaecc9dc3d9823b67aa;hp=6b7d68339ff0121244fa279f85354d60f95c8866;hb=d5d2ef2bb32a27bf45f76c9abd0ffbb764f4cf27;hpb=c4fc6c6cefa763e2674e794bef5b997718704afc

diff --git a/include/lttng/load.h b/include/lttng/load.h
index 6b7d68339..694c20b92 100644
--- a/include/lttng/load.h
+++ b/include/lttng/load.h
@@ -25,7 +25,7 @@ extern "C" {
 
 /*
  * The lttng_load_session_attr object is opaque to the user. Use the helper
- * functions below to use them.
+ * functions below to use it.
  */
 struct lttng_load_session_attr;
 
@@ -41,10 +41,10 @@ void lttng_load_session_attr_destroy(struct lttng_load_session_attr *attr);
 
 
 /*
- * Load session attribute getter family functions.
+ * Load session attribute getter family of functions.
  */
 
-/* Return session name. NULL indicated all sessions must be loaded. */
+/* Return session name. NULL indicates all sessions must be loaded. */
 const char *lttng_load_session_attr_get_session_name(
 	struct lttng_load_session_attr *attr);
 /*
@@ -57,15 +57,51 @@ const char *lttng_load_session_attr_get_input_url(
 
 /*
  * Return the configuration overwrite attribute. This attribute indicates
- * whether or not the loaded session is loaded even if a session with the same
- * name already exist. If so the existing session is deleted before the
- * replacement is loaded.
+ * whether or not the loaded session should be loaded even if a session with the
+ * same name already exists. If such a session exists, it is destroyed before
+ * the replacement is loaded.
  */
 int lttng_load_session_attr_get_overwrite(
 	struct lttng_load_session_attr *attr);
 
 /*
- * Load session attribute setter family functions.
+ * Return the destination URL configuration override attribute. This attribute
+ * indicates a destination URL override to be applied during the loading of the
+ * configuration.
+ *
+ * NULL indicates no override will be applied on configuration load.
+ *
+ * Caller is responsible for freeing the return value.
+ */
+const char *lttng_load_session_attr_get_override_url(
+	struct lttng_load_session_attr *attr);
+
+/*
+ * Return the configuration override control URL attribute. This attribute
+ * indicates a control URL override to be applied during the loading of the
+ * configuration(s).
+ *
+ * NULL indicates no control URL override will be applied on configuration load.
+ *
+ * Caller is responsible for freeing the return value.
+ */
+const char *lttng_load_session_attr_get_override_ctrl_url(
+	struct lttng_load_session_attr *attr);
+
+/*
+ * Return the configuration override data URL attribute. This attribute
+ * indicate a data URL override to be applied during the loading of the
+ * configuration(s).
+ *
+ * NULL indicates no data URL override will be applied on configuration load.
+ *
+ * Caller is responsible for freeing the return value.
+ */
+const char *lttng_load_session_attr_get_override_data_url(
+	struct lttng_load_session_attr *attr);
+
+/*
+ * Load session attribute setter family of functions.
  *
  * For every set* call, 0 is returned on success or else -LTTNG_ERR_INVALID is
  * returned indicating that at least one given parameter is invalid.
@@ -73,14 +109,14 @@ int lttng_load_session_attr_get_overwrite(
 
 /*
  * Set the name of the session to load. A NULL name means all sessions
- * known to the session daemon will be loaded.
+ * found at the input URL will be loaded.
  */
 int lttng_load_session_attr_set_session_name(
 	struct lttng_load_session_attr *attr, const char *session_name);
 
 /*
  * Set the URL of the session configuration to load. A NULL value indicates the
- * use of the default location being the session one.
+ * use of the default session configuration location.
  *
  * Note that file:// is the only supported URL format.
  */
@@ -88,12 +124,59 @@ int lttng_load_session_attr_set_input_url(
 	struct lttng_load_session_attr *attr, const char *url);
 
 /*
- * Set the overwrite attribute. If set to true, current session matching the
- * loaded sessions will be deleted and the loaded sessions created.
+ * Set the overwrite attribute. If set to true, current sessions matching the
+ * loaded sessions will be destroyed and be replaced by the session(s) being
+ * loaded.
  */
 int lttng_load_session_attr_set_overwrite(
 	struct lttng_load_session_attr *attr, int overwrite);
 
+/*
+ * The following setter are for overriding sessions attributes during the
+ * loading of a configuration files. Those attributes prevail upon those
+ * specified in the loaded configuration file.
+ * */
+
+/*
+ * Set the url override attribute.
+ *
+ * Supported format:
+ *    file://TRACEPATH
+ *    NETPROTO://(HOST | IPADDR)[:CTRLPORT[:DATAPORT]][/TRACEPATH]
+ *
+ *     Where NETPROTO is one of {tcp, tcp6}
+ *
+ * See lttng-create(1) for more detail.
+ */
+int lttng_load_session_attr_set_override_url(
+	struct lttng_load_session_attr *attr, const char *url);
+
+/*
+ * Set the control url override attribute.
+ *
+ * Supported format:
+ *     NETPROTO://(HOST | IPADDR)[:PORT][/TRACEPATH]
+ *
+ *     Where NETPROTO is one of {tcp, tcp6}
+ *
+ * See lttng-create(1) for more detail.
+ */
+int lttng_load_session_attr_set_override_ctrl_url(
+	struct lttng_load_session_attr *attr, const char *url);
+
+/*
+ * Set the data url override attribute.
+ *
+ * Supported format:
+ *     NETPROTO://(HOST | IPADDR)[:PORT][/TRACEPATH]
+ *
+ *     Where NETPROTO is one of {tcp, tcp6}
+ *
+ * See lttng-create(1) for more detail.
+ */
+int lttng_load_session_attr_set_override_data_url(
+	struct lttng_load_session_attr *attr, const char *url);
+
 /*
  * Load session configuration(s).
  *