X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=334d4daf1f6bf02d8d77084e10d8ccbdacddfc53;hp=fb891beb727a529c1724c034f502a82e6dd89955;hb=ac41e67e39946acd97752ce52b964976890c5e87;hpb=83d6d6c4496e692df39843142cb8cf96279eaa20

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index fb891beb7..334d4daf1 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
  *
- * 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
@@ -26,6 +16,7 @@
 #include <common/mi-lttng.h>
 #include <common/time.h>
 #include <lttng/constant.h>
+#include <lttng/tracker.h>
 
 #include "../command.h"
 
@@ -1538,16 +1529,29 @@ static int list_tracker_ids(enum lttng_tracker_type tracker_type)
 {
 	int ret = 0;
 	int enabled = 1;
-	struct lttng_tracker_id *ids = NULL;
-	size_t nr_ids, i;
+	struct lttng_tracker_ids *ids = NULL;
+	unsigned int nr_ids, i;
+	const struct lttng_tracker_id *id;
+	enum lttng_tracker_id_status status;
 
-	ret = lttng_list_tracker_ids(handle, tracker_type, &ids, &nr_ids);
+	ret = lttng_list_tracker_ids(handle, tracker_type, &ids);
 	if (ret) {
 		return ret;
 	}
-	if (nr_ids == 1 && ids[0].type == LTTNG_ID_ALL) {
-		enabled = 0;
+
+	status = lttng_tracker_ids_get_count(ids, &nr_ids);
+	if (status != LTTNG_TRACKER_ID_STATUS_OK) {
+		ret = CMD_ERROR;
+		goto end;
+	}
+
+	if (nr_ids == 1) {
+		id = lttng_tracker_ids_get_at_index(ids, 0);
+		if (id && lttng_tracker_id_get_type(id) == LTTNG_ID_ALL) {
+			enabled = 0;
+		}
 	}
+
 	if (enabled) {
 		_MSG("%s tracker: [", get_tracker_str(tracker_type));
 
@@ -1561,23 +1565,55 @@ static int list_tracker_ids(enum lttng_tracker_type tracker_type)
 		}
 
 		for (i = 0; i < nr_ids; i++) {
-			struct lttng_tracker_id *id = &ids[i];
+			enum lttng_tracker_id_status status =
+					LTTNG_TRACKER_ID_STATUS_OK;
+			int value;
+			const char *value_string;
+
+			id = lttng_tracker_ids_get_at_index(ids, i);
+			if (!id) {
+				ret = CMD_ERROR;
+				goto end;
+			}
+
+			switch (lttng_tracker_id_get_type(id)) {
+			case LTTNG_ID_ALL:
+				break;
+			case LTTNG_ID_VALUE:
+				status = lttng_tracker_id_get_value(id, &value);
+				break;
+			case LTTNG_ID_STRING:
+				status = lttng_tracker_id_get_string(
+						id, &value_string);
+				break;
+			case LTTNG_ID_UNKNOWN:
+				ret = CMD_ERROR;
+				goto end;
+			}
+
+			if (status != LTTNG_TRACKER_ID_STATUS_OK) {
+				ERR("Invalid state for tracker id");
+				ret = CMD_ERROR;
+				goto end;
+			}
 
 			if (i) {
 				_MSG(",");
 			}
-			switch (id->type) {
+			switch (lttng_tracker_id_get_type(id)) {
 			case LTTNG_ID_ALL:
 				_MSG(" *");
 				break;
 			case LTTNG_ID_VALUE:
-				_MSG(" %d", ids[i].value);
+				_MSG(" %d", value);
 				break;
 			case LTTNG_ID_STRING:
-				_MSG(" %s", ids[i].string);
+				_MSG(" %s", value_string);
 				break;
 			case LTTNG_ID_UNKNOWN:
-				return CMD_ERROR;
+				ERR("Invalid state for tracker id");
+				ret = CMD_ERROR;
+				goto end;
 			}
 
 			/* Mi */
@@ -1600,10 +1636,7 @@ static int list_tracker_ids(enum lttng_tracker_type tracker_type)
 		}
 	}
 end:
-	for (i = 0; i < nr_ids; i++) {
-		free(ids[i].string);
-	}
-	free(ids);
+	lttng_tracker_ids_destroy(ids);
 	return ret;
 }
 
@@ -1612,7 +1645,7 @@ end:
  */
 static int list_trackers(const struct lttng_domain *domain)
 {
-	int ret;
+	int ret = 0;
 
 	/* Trackers listing */
 	if (lttng_opt_mi) {
@@ -2311,22 +2344,22 @@ int cmd_list(int argc, const char **argv)
 			for (i = 0; i < nb_domain; i++) {
 				switch (domains[i].type) {
 				case LTTNG_DOMAIN_KERNEL:
-					MSG("=== Domain: Kernel ===\n");
+					MSG("=== Domain: Linux kernel ===\n");
 					break;
 				case LTTNG_DOMAIN_UST:
-					MSG("=== Domain: UST global ===\n");
-					MSG("Buffer type: %s\n",
+					MSG("=== Domain: User space ===\n");
+					MSG("Buffering scheme: %s\n",
 							domains[i].buf_type ==
-							LTTNG_BUFFER_PER_PID ? "per PID" : "per UID");
+							LTTNG_BUFFER_PER_PID ? "per-process" : "per-user");
 					break;
 				case LTTNG_DOMAIN_JUL:
-					MSG("=== Domain: JUL (Java Util Logging) ===\n");
+					MSG("=== Domain: java.util.logging (JUL) ===\n");
 					break;
 				case LTTNG_DOMAIN_LOG4J:
-					MSG("=== Domain: LOG4j (Logging for Java) ===\n");
+					MSG("=== Domain: log4j ===\n");
 					break;
 				case LTTNG_DOMAIN_PYTHON:
-					MSG("=== Domain: Python (logging) ===\n");
+					MSG("=== Domain: Python logging ===\n");
 					break;
 				default:
 					MSG("=== Domain: Unimplemented ===\n");