X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=include%2Flttng%2Fload.h;h=794f04fad68733bc56140f0f702a2acc9b9fe703;hp=9f4c7ab8ee81f3f47c5de4a96f3d9cd56d53bb9c;hb=2463b7879c00298daa79744cdaae82ac061a4ed8;hpb=a2a75fa4301617ab0d2b97614a989e3ad6efa4bb

diff --git a/include/lttng/load.h b/include/lttng/load.h
index 9f4c7ab8e..794f04fad 100644
--- a/include/lttng/load.h
+++ b/include/lttng/load.h
@@ -1,19 +1,9 @@
 /*
- * Copyright (C) 2014 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *                      David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2014 David Goulet <dgoulet@efficios.com>
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef LTTNG_LOAD_H
@@ -70,8 +60,6 @@ int lttng_load_session_attr_get_overwrite(
  * 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);
@@ -82,24 +70,31 @@ const char *lttng_load_session_attr_get_override_url(
  * 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
+ * indicates 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);
 
+/*
+ * Return the configuration override session name attribute.
+ * This attribute indicates a session name override to be applied during
+ * the loading of the configuration(s).
+ *
+ * NULL indicates no session name override will be applied on configuration
+ * load.
+ */
+const char *lttng_load_session_attr_get_override_session_name(
+	struct lttng_load_session_attr *attr);
+
 /*
  * Load session attribute setter family of functions.
  *
@@ -138,20 +133,21 @@ int lttng_load_session_attr_set_overwrite(
  * */
 
 /*
- * Set the control url override attribute.
+ * Set the url override attribute.
  *
  * Supported format:
- *     NETPROTO://(HOST | IPADDR)[:PORT][/TRACEPATH]
+ *    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_ctrl_url(
+int lttng_load_session_attr_set_override_url(
 	struct lttng_load_session_attr *attr, const char *url);
 
 /*
- * Set the data url override attribute.
+ * Set the control url override attribute.
  *
  * Supported format:
  *     NETPROTO://(HOST | IPADDR)[:PORT][/TRACEPATH]
@@ -160,23 +156,31 @@ int lttng_load_session_attr_set_override_ctrl_url(
  *
  * See lttng-create(1) for more detail.
  */
-int lttng_load_session_attr_set_override_data_url(
+int lttng_load_session_attr_set_override_ctrl_url(
 	struct lttng_load_session_attr *attr, const char *url);
 
 /*
- * Set the url override attribute.
+ * Set the data url override attribute.
  *
  * Supported format:
- *    file://TRACEPATH
- *    NETPROTO://(HOST | IPADDR)[:CTRLPORT[:DATAPORT]][/TRACEPATH]
+ *     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_url(
+int lttng_load_session_attr_set_override_data_url(
 	struct lttng_load_session_attr *attr, const char *url);
 
+/*
+ * Set the session name override attribute.
+ *
+ * Loading a configuration file defining multiple sessions will fail if a
+ * session name is provided.
+ */
+int lttng_load_session_attr_set_override_session_name(
+	struct lttng_load_session_attr *attr, const char *session_name);
+
 /*
  * Load session configuration(s).
  *