X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession-config.c;h=123123ee6caafae747505d5e89a68acc48e6f6fc;hb=65e663fa0c098f8f8ddd0f0f3d91dbd25d1daa4d;hp=e625f316a96e735ff77485b1830926c38b663f9d;hpb=55c9e7cac24318259d4f2549c97f7577b7b52db4;p=lttng-tools.git

diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c
index e625f316a..123123ee6 100644
--- a/src/common/config/session-config.c
+++ b/src/common/config/session-config.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2013 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program 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 General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -2745,6 +2735,7 @@ static int process_id_tracker_node(xmlNodePtr id_tracker_node,
 	const char *element_id;
 	const char *element_id_alias;
 	const char *element_name;
+	enum lttng_tracker_id_status status;
 
 	assert(handle);
 	assert(id_tracker_node);
@@ -2774,11 +2765,21 @@ static int process_id_tracker_node(xmlNodePtr id_tracker_node,
 	/* Go through all id target node */
 	child = xmlChildElementCount(targets_node);
 	if (child == 0) {
-		struct lttng_tracker_id tracker_id;
+		struct lttng_tracker_id *tracker_id = NULL;
+		tracker_id = lttng_tracker_id_create();
+		if (tracker_id == NULL) {
+			ret = LTTNG_ERR_NOMEM;
+			goto end;
+		}
+		status = lttng_tracker_id_set_all(tracker_id);
+		if (status != LTTNG_TRACKER_ID_STATUS_OK) {
+			ret = LTTNG_ERR_INVALID;
+			goto end;
+		}
 
-		tracker_id.type = LTTNG_ID_ALL;
 		/* The session is explicitly set to target nothing. */
-		ret = lttng_untrack_id(handle, tracker_type, &tracker_id);
+		ret = lttng_untrack_id(handle, tracker_type, tracker_id);
+		lttng_tracker_id_destroy(tracker_id);
 		if (ret) {
 			goto end;
 		}
@@ -2796,7 +2797,7 @@ static int process_id_tracker_node(xmlNodePtr id_tracker_node,
 									element_id_alias))) {
 				int64_t id;
 				xmlChar *content = NULL;
-				struct lttng_tracker_id tracker_id;
+				struct lttng_tracker_id *tracker_id = NULL;
 
 				content = xmlNodeGetContent(node);
 				if (!content) {
@@ -2811,10 +2812,23 @@ static int process_id_tracker_node(xmlNodePtr id_tracker_node,
 					goto end;
 				}
 
-				tracker_id.type = LTTNG_ID_VALUE;
-				tracker_id.value = (int) id;
+				tracker_id = lttng_tracker_id_create();
+				if (tracker_id == NULL) {
+					ret = LTTNG_ERR_NOMEM;
+					goto end;
+				}
+
+				status = lttng_tracker_id_set_value(
+						tracker_id, id);
+				if (status != LTTNG_TRACKER_ID_STATUS_OK) {
+					lttng_tracker_id_destroy(tracker_id);
+					ret = LTTNG_ERR_LOAD_INVALID_CONFIG;
+					goto end;
+				}
+
 				ret = lttng_track_id(handle, tracker_type,
-						&tracker_id);
+						tracker_id);
+				lttng_tracker_id_destroy(tracker_id);
 				if (ret) {
 					goto end;
 				}
@@ -2822,17 +2836,31 @@ static int process_id_tracker_node(xmlNodePtr id_tracker_node,
 			if (element_name && !strcmp((const char *) node->name,
 							    element_name)) {
 				xmlChar *content = NULL;
-				struct lttng_tracker_id tracker_id;
+				struct lttng_tracker_id *tracker_id = NULL;
 
 				content = xmlNodeGetContent(node);
 				if (!content) {
 					ret = LTTNG_ERR_LOAD_INVALID_CONFIG;
 					goto end;
 				}
-				tracker_id.type = LTTNG_ID_STRING;
-				tracker_id.string = (char *) content;
+
+				tracker_id = lttng_tracker_id_create();
+				if (tracker_id == NULL) {
+					ret = LTTNG_ERR_NOMEM;
+					goto end;
+				}
+
+				status = lttng_tracker_id_set_string(tracker_id,
+						(const char *) content);
+				if (status != LTTNG_TRACKER_ID_STATUS_OK) {
+					lttng_tracker_id_destroy(tracker_id);
+					ret = LTTNG_ERR_LOAD_INVALID_CONFIG;
+					goto end;
+				}
+
 				ret = lttng_track_id(handle, tracker_type,
-						&tracker_id);
+						tracker_id);
+				lttng_tracker_id_destroy(tracker_id);
 				free(content);
 				if (ret) {
 					goto end;