X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=f43ee167ab535fd190fbedc75b60db7e8ebc5381;hp=b436777d671b74bb2165d97eae9a5e6a1c6604e7;hb=ebbf5ab7ebfa3774d5ca1a26d63013384f7e1407;hpb=2fa605f7de6b95f50fc864072bc1445c61eb2c79

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index b436777d6..f43ee167a 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -25,6 +25,7 @@
 #include <assert.h>
 
 #include <common/mi-lttng.h>
+#include <lttng/constant.h>
 
 #include "../command.h"
 
@@ -106,7 +107,8 @@ static char *get_cmdline_by_pid(pid_t pid)
 	int ret;
 	FILE *fp = NULL;
 	char *cmdline = NULL;
-	char path[20];	/* Can't go bigger than /proc/65535/cmdline */
+	/* Can't go bigger than /proc/LTTNG_MAX_PID/cmdline */
+	char path[sizeof("/proc//cmdline") + sizeof(LTTNG_MAX_PID_STR) - 1];
 
 	snprintf(path, sizeof(path), "/proc/%d/cmdline", pid);
 	fp = fopen(path, "r");
@@ -338,8 +340,8 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count,
 		goto end;
 	}
 
-	/* Open pids element */
-	ret = mi_lttng_pids_open(writer);
+	/* Open processes element */
+	ret = mi_lttng_processes_open(writer);
 	if (ret) {
 		goto end;
 	}
@@ -347,7 +349,7 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count,
 	for (i = 0; i < count; i++) {
 		if (cur_pid != events[i].pid) {
 			if (pid_element_open) {
-				/* Close the previous events and  pid element */
+				/* Close the previous events and pid element */
 				ret = mi_lttng_close_multi_element(writer, 2);
 				if (ret) {
 					goto end;
@@ -364,7 +366,7 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count,
 
 			if (!pid_element_open) {
 				/* Open and write a pid element */
-				ret = mi_lttng_pid(writer, cur_pid, cmdline, 1);
+				ret = mi_lttng_process(writer, cur_pid, cmdline, 1);
 				if (ret) {
 					goto error;
 				}
@@ -387,7 +389,7 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count,
 		}
 	}
 
-	/* Close pids */
+	/* Close processes */
 	ret = mi_lttng_writer_close_element(writer);
 	if (ret) {
 		goto end;
@@ -406,8 +408,8 @@ static int list_agent_events(void)
 {
 	int i, size, ret = CMD_SUCCESS;
 	struct lttng_domain domain;
-	struct lttng_handle *handle;
-	struct lttng_event *event_list;
+	struct lttng_handle *handle = NULL;
+	struct lttng_event *event_list = NULL;
 	pid_t cur_pid = 0;
 	char *cmdline = NULL;
 	const char *agent_domain_str;
@@ -419,6 +421,10 @@ static int list_agent_events(void)
 		domain.type = LTTNG_DOMAIN_LOG4J;
 	} else if (opt_python) {
 		domain.type = LTTNG_DOMAIN_PYTHON;
+	} else {
+		ERR("Invalid agent domain selected.");
+		ret = CMD_ERROR;
+		goto error;
 	}
 
 	agent_domain_str = get_domain_str(domain.type);
@@ -571,8 +577,8 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
 		goto end;
 	}
 
-	/* Open pids element */
-	ret = mi_lttng_pids_open(writer);
+	/* Open processes element */
+	ret = mi_lttng_processes_open(writer);
 	if (ret) {
 		goto end;
 	}
@@ -600,8 +606,8 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
 			cur_pid = fields[i].event.pid;
 			cmdline = get_cmdline_by_pid(cur_pid);
 			if (!pid_element_open) {
-				/* Open and write a pid element */
-				ret = mi_lttng_pid(writer, cur_pid, cmdline, 1);
+				/* Open and write a process element */
+				ret = mi_lttng_process(writer, cur_pid, cmdline, 1);
 				if (ret) {
 					goto error;
 				}
@@ -655,7 +661,7 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
 		}
 	}
 
-	/* Close pids, domain, domains */
+	/* Close processes, domain, domains */
 	ret = mi_lttng_close_multi_element(writer, 3);
 end:
 	return ret;
@@ -1237,7 +1243,8 @@ error_channels:
  */
 static int list_tracker_pids(void)
 {
-	int enabled, ret;
+	int ret = 0;
+	int enabled;
 	int *pids = NULL;
 	size_t nr_pids;
 
@@ -1250,16 +1257,76 @@ static int list_tracker_pids(void)
 		int i;
 		_MSG("PID tracker: [");
 
+		/* Mi tracker_pid element*/
+		if (writer) {
+			/* Open tracker_pid and targets elements */
+			ret = mi_lttng_pid_tracker_open(writer);
+			if (ret) {
+				goto end;
+			}
+		}
+
 		for (i = 0; i < nr_pids; i++) {
 			if (i) {
 				_MSG(",");
 			}
 			_MSG(" %d", pids[i]);
+
+			/* Mi */
+			if (writer) {
+				ret = mi_lttng_pid_target(writer, pids[i], 0);
+				if (ret) {
+					goto end;
+				}
+			}
 		}
 		_MSG(" ]\n\n");
+
+		/* Mi close tracker_pid and targets */
+		if (writer) {
+			ret = mi_lttng_close_multi_element(writer,2);
+			if (ret) {
+				goto end;
+			}
+		}
 	}
+end:
 	free(pids);
-	return 0;
+	return ret;
+
+}
+
+/*
+ * List all tracker of a domain
+ */
+static int list_trackers(void)
+{
+	int ret;
+
+	/* Trackers listing */
+	if (lttng_opt_mi) {
+		ret = mi_lttng_trackers_open(writer);
+		if (ret) {
+			goto end;
+		}
+	}
+
+	/* pid tracker */
+	ret = list_tracker_pids();
+	if (ret) {
+		goto end;
+	}
+
+	if (lttng_opt_mi) {
+		/* Close trackers element */
+		ret = mi_lttng_writer_close_element(writer);
+		if (ret) {
+			goto end;
+		}
+	}
+
+end:
+	return ret;
 }
 
 /*
@@ -1686,11 +1753,14 @@ int cmd_list(int argc, const char **argv)
 
 			}
 
-			ret = list_tracker_pids();
+
+			/* Trackers */
+			ret = list_trackers();
 			if (ret) {
 				goto end;
 			}
 
+			/* Channels */
 			ret = list_channels(opt_channel);
 			if (ret) {
 				goto end;
@@ -1781,7 +1851,7 @@ int cmd_list(int argc, const char **argv)
 				switch (domains[i].type) {
 				case LTTNG_DOMAIN_KERNEL:
 				case LTTNG_DOMAIN_UST:
-					ret = list_tracker_pids();
+					ret = list_trackers();
 					if (ret) {
 						goto end;
 					}