X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=1b89ef642f797f92d7fbc758a4f3fcb0768fd5e6;hp=580b13f1f88d9943162078e0655a2bb47448599b;hb=4adbcc726eda1a14966e9f9ea7c0381a048ae8f6;hpb=d58bb91784d4930d031ccce485d99a865820cb78

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 580b13f1f..1b89ef642 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -15,7 +15,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <inttypes.h>
 #include <popt.h>
 #include <stdio.h>
@@ -24,20 +24,19 @@
 #include <assert.h>
 
 #include <common/mi-lttng.h>
+#include <lttng/constant.h>
 
 #include "../command.h"
 
 static int opt_userspace;
 static int opt_kernel;
 static int opt_jul;
+static int opt_log4j;
+static int opt_python;
 static char *opt_channel;
 static int opt_domain;
 static int opt_fields;
-#if 0
-/* Not implemented yet */
-static char *opt_cmd_name;
-static pid_t opt_pid;
-#endif
+static int opt_syscall;
 
 const char *indent4 = "    ";
 const char *indent6 = "      ";
@@ -54,19 +53,16 @@ static struct mi_writer *writer;
 
 static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-	{"help",      'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
-	{"kernel",    'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
-	{"jul",       'j', POPT_ARG_VAL, &opt_jul, 1, 0, 0},
-#if 0
-	/* Not implemented yet */
-	{"userspace",      'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 0, 0},
-	{"pid",            'p', POPT_ARG_INT, &opt_pid, 0, 0, 0},
-#else
-	{"userspace",      'u', POPT_ARG_NONE, 0, OPT_USERSPACE, 0, 0},
-#endif
-	{"channel",   'c', POPT_ARG_STRING, &opt_channel, 0, 0, 0},
-	{"domain",    'd', POPT_ARG_VAL, &opt_domain, 1, 0, 0},
-	{"fields",    'f', POPT_ARG_VAL, &opt_fields, 1, 0, 0},
+	{"help",	'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
+	{"kernel",	'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
+	{"jul",	'j', POPT_ARG_VAL, &opt_jul, 1, 0, 0},
+	{"log4j",	'l', POPT_ARG_VAL, &opt_log4j, 1, 0, 0},
+	{"python",	'p', POPT_ARG_VAL, &opt_python, 1, 0, 0},
+	{"userspace",	'u', POPT_ARG_NONE, 0, OPT_USERSPACE, 0, 0},
+	{"channel",	'c', POPT_ARG_STRING, &opt_channel, 0, 0, 0},
+	{"domain",	'd', POPT_ARG_VAL, &opt_domain, 1, 0, 0},
+	{"fields",	'f', POPT_ARG_VAL, &opt_fields, 1, 0, 0},
+	{"syscall",	'S', POPT_ARG_VAL, &opt_syscall, 1, 0, 0},
 	{"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
 	{0, 0, 0, 0, 0, 0, 0}
 };
@@ -88,10 +84,10 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "  -k, --kernel            Select kernel domain\n");
 	fprintf(ofp, "  -u, --userspace         Select user-space domain.\n");
 	fprintf(ofp, "  -j, --jul               Apply for Java application using JUL\n");
+	fprintf(ofp, "  -l, --log4j             Apply for Java application using LOG4J\n");
+	fprintf(ofp, "  -p, --python            Apply for Python application using logging\n");
 	fprintf(ofp, "  -f, --fields            List event fields.\n");
-#if 0
-	fprintf(ofp, "  -p, --pid PID           List user-space events by PID\n");
-#endif
+	fprintf(ofp, "      --syscall           List available system calls.\n");
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Session Options:\n");
 	fprintf(ofp, "  -c, --channel NAME      List details of a channel\n");
@@ -108,9 +104,10 @@ static void usage(FILE *ofp)
 static char *get_cmdline_by_pid(pid_t pid)
 {
 	int ret;
-	FILE *fp;
+	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");
@@ -119,18 +116,20 @@ static char *get_cmdline_by_pid(pid_t pid)
 	}
 
 	/* Caller must free() *cmdline */
-	cmdline = malloc(PATH_MAX);
+	cmdline = zmalloc(PATH_MAX);
 	if (!cmdline) {
-		perror("malloc cmdline");
+		PERROR("malloc cmdline");
 		goto end;
 	}
 	ret = fread(cmdline, 1, PATH_MAX, fp);
 	if (ret < 0) {
-		perror("fread proc list");
+		PERROR("fread proc list");
 	}
-	fclose(fp);
 
 end:
+	if (fp) {
+		fclose(fp);
+	}
 	return cmdline;
 }
 
@@ -167,12 +166,9 @@ const char *enabled_string(int value)
 }
 
 static
-const char *filter_string(int value)
+const char *filter_message(const char *filter_msg)
 {
-	switch (value) {
-	case 1:	return " [with filter]";
-	default: return "";
-	}
+	return filter_msg ? filter_msg : "";
 }
 
 static
@@ -198,11 +194,45 @@ static const char *logleveltype_string(enum lttng_loglevel_type value)
 	}
 }
 
+static const char *bitness_event(enum lttng_event_flag flags)
+{
+	if (flags & LTTNG_EVENT_FLAG_SYSCALL_32) {
+		if (flags & LTTNG_EVENT_FLAG_SYSCALL_64) {
+			return " [32/64-bit]";
+		} else {
+			return " [32-bit]";
+		}
+	} else if (flags & LTTNG_EVENT_FLAG_SYSCALL_64) {
+		return " [64-bit]";
+	} else {
+		return "";
+	}
+}
+
 /*
  * Pretty print single event.
  */
 static void print_events(struct lttng_event *event)
 {
+	int ret;
+	const char *filter_str;
+	char *filter_msg = NULL;
+
+	ret = lttng_event_get_filter_string(event, &filter_str);
+
+	if (ret) {
+		filter_msg = strdup(" [failed to retrieve filter]");
+	} else if (filter_str) {
+		const char * const filter_fmt = " [filter: '%s']";
+
+		filter_msg = malloc(strlen(filter_str) +
+				strlen(filter_fmt) + 1);
+		if (filter_msg) {
+			sprintf(filter_msg, filter_fmt,
+					filter_str);
+		}
+	}
+
 	switch (event->type) {
 	case LTTNG_EVENT_TRACEPOINT:
 	{
@@ -211,25 +241,25 @@ static void print_events(struct lttng_event *event)
 				indent6,
 				event->name,
 				logleveltype_string(event->loglevel_type),
-				mi_lttng_loglevel_string(event->loglevel),
+				mi_lttng_loglevel_string(event->loglevel, handle->domain.type),
 				event->loglevel,
 				enabled_string(event->enabled),
 				exclusion_string(event->exclusion),
-				filter_string(event->filter));
+				filter_message(filter_msg));
 		} else {
 			MSG("%s%s (type: tracepoint)%s%s%s",
 				indent6,
 				event->name,
 				enabled_string(event->enabled),
 				exclusion_string(event->exclusion),
-				filter_string(event->filter));
+				filter_message(filter_msg));
 		}
 		break;
 	}
 	case LTTNG_EVENT_FUNCTION:
 		MSG("%s%s (type: function)%s%s", indent6,
 				event->name, enabled_string(event->enabled),
-				filter_string(event->filter));
+				filter_message(filter_msg));
 		if (event->attr.probe.addr != 0) {
 			MSG("%saddr: 0x%" PRIx64, indent8, event->attr.probe.addr);
 		} else {
@@ -240,7 +270,7 @@ static void print_events(struct lttng_event *event)
 	case LTTNG_EVENT_PROBE:
 		MSG("%s%s (type: probe)%s%s", indent6,
 				event->name, enabled_string(event->enabled),
-				filter_string(event->filter));
+				filter_message(filter_msg));
 		if (event->attr.probe.addr != 0) {
 			MSG("%saddr: 0x%" PRIx64, indent8, event->attr.probe.addr);
 		} else {
@@ -251,24 +281,27 @@ static void print_events(struct lttng_event *event)
 	case LTTNG_EVENT_FUNCTION_ENTRY:
 		MSG("%s%s (type: function)%s%s", indent6,
 				event->name, enabled_string(event->enabled),
-				filter_string(event->filter));
+				filter_message(filter_msg));
 		MSG("%ssymbol: \"%s\"", indent8, event->attr.ftrace.symbol_name);
 		break;
 	case LTTNG_EVENT_SYSCALL:
-		MSG("%ssyscalls (type: syscall)%s%s", indent6,
+		MSG("%s%s%s%s%s", indent6, event->name,
+				(opt_syscall ? "" : " (type:syscall)"),
 				enabled_string(event->enabled),
-				filter_string(event->filter));
+				bitness_event(event->flags));
 		break;
 	case LTTNG_EVENT_NOOP:
 		MSG("%s (type: noop)%s%s", indent6,
 				enabled_string(event->enabled),
-				filter_string(event->filter));
+				filter_message(filter_msg));
 		break;
 	case LTTNG_EVENT_ALL:
 		/* We should never have "all" events in list. */
 		assert(0);
 		break;
 	}
+
+	free(filter_msg);
 }
 
 static const char *field_type(struct lttng_event_field *field)
@@ -304,7 +337,7 @@ static void print_event_field(struct lttng_event_field *field)
  * Machine interface
  * Jul and ust event listing
  */
-static int mi_list_jul_ust_events(struct lttng_event *events, int count,
+static int mi_list_agent_ust_events(struct lttng_event *events, int count,
 		struct lttng_domain *domain)
 {
 	int ret, i;
@@ -324,7 +357,7 @@ static int mi_list_jul_ust_events(struct lttng_event *events, int count,
 		goto end;
 	}
 
-	/* Open pids element */
+	/* Open pids element element */
 	ret = mi_lttng_pids_open(writer);
 	if (ret) {
 		goto end;
@@ -333,7 +366,7 @@ static int mi_list_jul_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;
@@ -367,7 +400,7 @@ static int mi_list_jul_ust_events(struct lttng_event *events, int count,
 		}
 
 		/* Write an event */
-		ret = mi_lttng_event(writer, &events[i], 0);
+		ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
 		if (ret) {
 			goto end;
 		}
@@ -388,19 +421,32 @@ error:
 	return ret;
 }
 
-static int list_jul_events(void)
+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;
-
-	DBG("Getting JUL tracing events");
+	const char *agent_domain_str;
 
 	memset(&domain, 0, sizeof(domain));
-	domain.type = LTTNG_DOMAIN_JUL;
+	if (opt_jul) {
+		domain.type = LTTNG_DOMAIN_JUL;
+	} else if (opt_log4j) {
+		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);
+
+	DBG("Getting %s tracing events", agent_domain_str);
 
 	handle = lttng_create_handle(NULL, &domain);
 	if (handle == NULL) {
@@ -410,21 +456,23 @@ static int list_jul_events(void)
 
 	size = lttng_list_tracepoints(handle, &event_list);
 	if (size < 0) {
-		ERR("Unable to list JUL events: %s", lttng_strerror(size));
+		ERR("Unable to list %s events: %s", agent_domain_str,
+				lttng_strerror(size));
 		ret = CMD_ERROR;
 		goto end;
 	}
 
 	if (lttng_opt_mi) {
 		/* Mi print */
-		ret = mi_list_jul_ust_events(event_list, size, &domain);
+		ret = mi_list_agent_ust_events(event_list, size, &domain);
 		if (ret) {
 			ret = CMD_ERROR;
 			goto error;
 		}
 	} else {
 		/* Pretty print */
-		MSG("JUL events (Logger name):\n-------------------------");
+		MSG("%s events (Logger name):\n-------------------------",
+				agent_domain_str);
 
 		if (size == 0) {
 			MSG("None");
@@ -462,7 +510,7 @@ static int list_ust_events(void)
 	int i, size, ret = CMD_SUCCESS;
 	struct lttng_domain domain;
 	struct lttng_handle *handle;
-	struct lttng_event *event_list;
+	struct lttng_event *event_list = NULL;
 	pid_t cur_pid = 0;
 	char *cmdline = NULL;
 
@@ -487,7 +535,7 @@ static int list_ust_events(void)
 
 	if (lttng_opt_mi) {
 		/* Mi print */
-		ret = mi_list_jul_ust_events(event_list, size, &domain);
+		ret = mi_list_agent_ust_events(event_list, size, &domain);
 	} else {
 		/* Pretty print */
 		MSG("UST events:\n-------------");
@@ -608,7 +656,8 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
 
 			if (!event_element_open) {
 				/* Open and write the event */
-				ret = mi_lttng_event(writer, &cur_event, 1);
+				ret = mi_lttng_event(writer, &cur_event, 1,
+						handle->domain.type);
 				if (ret) {
 					goto end;
 				}
@@ -629,7 +678,7 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
 		}
 	}
 
-	/* Close pids, domain, domains */
+	/* Close pid, domain, domains */
 	ret = mi_lttng_close_multi_element(writer, 3);
 end:
 	return ret;
@@ -746,7 +795,7 @@ static int mi_list_kernel_events(struct lttng_event *events, int count,
 	}
 
 	for (i = 0; i < count; i++) {
-		ret = mi_lttng_event(writer, &events[i], 0);
+		ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
 		if (ret) {
 			goto end;
 		}
@@ -819,11 +868,84 @@ error:
 	return ret;
 }
 
+/*
+ * Machine interface
+ * Print a list of system calls.
+ */
+static int mi_list_syscalls(struct lttng_event *events, int count)
+{
+	int ret, i;
+
+	/* Open events */
+	ret = mi_lttng_events_open(writer);
+	if (ret) {
+		goto end;
+	}
+
+	for (i = 0; i < count; i++) {
+		ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
+		if (ret) {
+			goto end;
+		}
+	}
+
+	/* Close events. */
+	ret = mi_lttng_writer_close_element(writer);
+	if (ret) {
+		goto end;
+	}
+
+end:
+	return ret;
+}
+
+/*
+ * Ask for kernel system calls.
+ */
+static int list_syscalls(void)
+{
+	int i, size, ret = CMD_SUCCESS;
+	struct lttng_event *event_list;
+
+	DBG("Getting kernel system call events");
+
+	size = lttng_list_syscalls(&event_list);
+	if (size < 0) {
+		ERR("Unable to list system calls: %s", lttng_strerror(size));
+		ret = CMD_ERROR;
+		goto error;
+	}
+
+	if (lttng_opt_mi) {
+		/* Mi print */
+		ret = mi_list_syscalls(event_list, size);
+		if (ret) {
+			ret = CMD_ERROR;
+			goto end;
+		}
+	} else {
+		MSG("System calls:\n-------------");
+
+		for (i = 0; i < size; i++) {
+			print_events(&event_list[i]);
+		}
+
+		MSG("");
+	}
+
+end:
+	free(event_list);
+	return ret;
+
+error:
+	return ret;
+}
+
 /*
  * Machine Interface
- * Print a list of jul events
+ * Print a list of agent events
  */
-static int mi_list_session_jul_events(struct lttng_event *events, int count)
+static int mi_list_session_agent_events(struct lttng_event *events, int count)
 {
 	int ret, i;
 
@@ -834,7 +956,7 @@ static int mi_list_session_jul_events(struct lttng_event *events, int count)
 	}
 
 	for (i = 0; i < count; i++) {
-		ret = mi_lttng_event(writer, &events[i], 0);
+		ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
 		if (ret) {
 			goto end;
 		}
@@ -848,11 +970,11 @@ end:
 }
 
 /*
- * List JUL events for a specific session using the handle.
+ * List agent events for a specific session using the handle.
  *
  * Return CMD_SUCCESS on success else a negative value.
  */
-static int list_session_jul_events(void)
+static int list_session_agent_events(void)
 {
 	int ret = CMD_SUCCESS, count, i;
 	struct lttng_event *events = NULL;
@@ -866,7 +988,7 @@ static int list_session_jul_events(void)
 
 	if (lttng_opt_mi) {
 		/* Mi print */
-		ret = mi_list_session_jul_events(events, count);
+		ret = mi_list_session_agent_events(events, count);
 		if (ret) {
 			ret = CMD_ERROR;
 			goto end;
@@ -880,10 +1002,21 @@ static int list_session_jul_events(void)
 		}
 
 		for (i = 0; i < count; i++) {
-			MSG("%s- %s%s (loglevel%s %s)", indent4, events[i].name,
-					enabled_string(events[i].enabled),
-					logleveltype_string(events[i].loglevel_type),
-					mi_lttng_loglevel_string(events[i].loglevel));
+			if (events[i].loglevel_type !=
+					LTTNG_EVENT_LOGLEVEL_ALL) {
+				MSG("%s- %s%s (loglevel%s %s)", indent4,
+						events[i].name,
+						enabled_string(
+							events[i].enabled),
+						logleveltype_string(
+							events[i].loglevel_type),
+						mi_lttng_loglevel_string(
+							events[i].loglevel,
+							handle->domain.type));
+			} else {
+				MSG("%s- %s%s", indent4, events[i].name,
+				    enabled_string(events[i].enabled));
+			}
 		}
 
 		MSG("");
@@ -910,7 +1043,7 @@ static int mi_list_events(struct lttng_event *events, int count)
 	}
 
 	for (i = 0; i < count; i++) {
-		ret = mi_lttng_event(writer, &events[i], 0);
+		ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
 		if (ret) {
 			goto end;
 		}
@@ -1094,7 +1227,7 @@ static int list_channels(const char *channel_name)
 		}
 	} else {
 		/* Pretty print */
-		if (channel_name == NULL) {
+		if (count) {
 			MSG("Channels:\n-------------");
 		}
 
@@ -1132,6 +1265,97 @@ error_channels:
 	return ret;
 }
 
+/*
+ * List tracker PID(s) of session and domain.
+ */
+static int list_tracker_pids(void)
+{
+	int ret = 0;
+	int enabled;
+	int *pids = NULL;
+	size_t nr_pids;
+
+	ret = lttng_list_tracker_pids(handle,
+		&enabled, &pids, &nr_pids);
+	if (ret) {
+		return ret;
+	}
+	if (enabled) {
+		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 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;
+}
+
 /*
  * Machine interface
  * Find the session with session_name as name
@@ -1240,7 +1464,6 @@ static int list_sessions(const char *session_name)
 		/* Pretty print */
 		if (count == 0) {
 			MSG("Currently no available tracing session");
-			ret = CMD_ERROR;
 			goto end;
 		}
 
@@ -1265,9 +1488,11 @@ static int list_sessions(const char *session_name)
 						active_string(sessions[i].enabled),
 						snapshot_string(sessions[i].snapshot_mode));
 				MSG("%sTrace path: %s", indent4, sessions[i].path);
-				MSG("%sLive timer interval (usec): %u\n", indent4,
-						sessions[i].live_timer_interval);
-				break;
+				if (sessions[i].live_timer_interval != 0) {
+					MSG("%sLive timer interval (usec): %u", indent4,
+							sessions[i].live_timer_interval);
+				}
+				MSG("");
 			}
 		}
 
@@ -1360,6 +1585,12 @@ static int list_domains(const char *session_name)
 			case LTTNG_DOMAIN_JUL:
 				MSG("  - JUL (Java Util Logging)");
 				break;
+			case LTTNG_DOMAIN_LOG4J:
+				MSG("  - LOG4j (Logging for Java)");
+				break;
+			case LTTNG_DOMAIN_PYTHON:
+				MSG("  - Python (logging)");
+				break;
 			default:
 				break;
 			}
@@ -1450,9 +1681,19 @@ int cmd_list(int argc, const char **argv)
 	} else if (opt_jul) {
 		DBG2("Listing JUL domain");
 		domain.type = LTTNG_DOMAIN_JUL;
+	} else if (opt_log4j) {
+		domain.type = LTTNG_DOMAIN_LOG4J;
+	} else if (opt_python) {
+		domain.type = LTTNG_DOMAIN_PYTHON;
+	}
+
+	if (!opt_kernel && opt_syscall) {
+		WARN("--syscall will only work with the Kernel domain (-k)");
+		ret = CMD_ERROR;
+		goto end;
 	}
 
-	if (opt_kernel || opt_userspace || opt_jul) {
+	if (opt_kernel || opt_userspace || opt_jul || opt_log4j || opt_python) {
 		handle = lttng_create_handle(session_name, &domain);
 		if (handle == NULL) {
 			ret = CMD_FATAL;
@@ -1461,16 +1702,24 @@ int cmd_list(int argc, const char **argv)
 	}
 
 	if (session_name == NULL) {
-		if (!opt_kernel && !opt_userspace && !opt_jul) {
+		if (!opt_kernel && !opt_userspace && !opt_jul && !opt_log4j
+				&& !opt_python) {
 			ret = list_sessions(NULL);
 			if (ret) {
 				goto end;
 			}
 		}
 		if (opt_kernel) {
-			ret = list_kernel_events();
-			if (ret) {
-				goto end;
+			if (opt_syscall) {
+				ret = list_syscalls();
+				if (ret) {
+					goto end;
+				}
+			} else {
+				ret = list_kernel_events();
+				if (ret) {
+					goto end;
+				}
 			}
 		}
 		if (opt_userspace) {
@@ -1483,8 +1732,8 @@ int cmd_list(int argc, const char **argv)
 				goto end;
 			}
 		}
-		if (opt_jul) {
-			ret = list_jul_events();
+		if (opt_jul || opt_log4j || opt_python) {
+			ret = list_agent_events();
 			if (ret) {
 				goto end;
 			}
@@ -1531,6 +1780,14 @@ int cmd_list(int argc, const char **argv)
 
 			}
 
+
+			/* Trackers */
+			ret = list_trackers();
+			if (ret) {
+				goto end;
+			}
+
+			/* Channels */
 			ret = list_channels(opt_channel);
 			if (ret) {
 				goto end;
@@ -1578,6 +1835,12 @@ int cmd_list(int argc, const char **argv)
 				case LTTNG_DOMAIN_JUL:
 					MSG("=== Domain: JUL (Java Util Logging) ===\n");
 					break;
+				case LTTNG_DOMAIN_LOG4J:
+					MSG("=== Domain: LOG4j (Logging for Java) ===\n");
+					break;
+				case LTTNG_DOMAIN_PYTHON:
+					MSG("=== Domain: Python (logging) ===\n");
+					break;
 				default:
 					MSG("=== Domain: Unimplemented ===\n");
 					break;
@@ -1602,12 +1865,27 @@ int cmd_list(int argc, const char **argv)
 					goto end;
 				}
 
-				if (domains[i].type == LTTNG_DOMAIN_JUL) {
-					ret = list_session_jul_events();
+				if (domains[i].type == LTTNG_DOMAIN_JUL ||
+						domains[i].type == LTTNG_DOMAIN_LOG4J ||
+						domains[i].type == LTTNG_DOMAIN_PYTHON) {
+					ret = list_session_agent_events();
 					if (ret) {
 						goto end;
 					}
-					continue;
+
+					goto next_domain;
+				}
+
+				switch (domains[i].type) {
+				case LTTNG_DOMAIN_KERNEL:
+				case LTTNG_DOMAIN_UST:
+					ret = list_trackers();
+					if (ret) {
+						goto end;
+					}
+					break;
+				default:
+					break;
 				}
 
 				ret = list_channels(opt_channel);
@@ -1615,6 +1893,7 @@ int cmd_list(int argc, const char **argv)
 					goto end;
 				}
 
+next_domain:
 				if (lttng_opt_mi) {
 					/* Close domain element */
 					ret = mi_lttng_writer_close_element(writer);