X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=ea9427f4770f158458f6e8e79456f2f7d7b6c91b;hp=62ed042f999cd43768fd3e5f147cdce20f508efe;hb=79865500b89925b61767294821e0706a57d493d5;hpb=834978fd9e2392f20867351ca99bf7bdf31b4f56

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 62ed042f9..ea9427f47 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -92,6 +92,7 @@ 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, "  -f, --fields            List event fields.\n");
 	fprintf(ofp, "      --syscall           List available system calls.\n");
 #if 0
@@ -233,7 +234,7 @@ 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),
@@ -390,7 +391,7 @@ static int mi_list_agent_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;
 		}
@@ -640,7 +641,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;
 				}
@@ -778,7 +780,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;
 		}
@@ -866,7 +868,7 @@ static int mi_list_syscalls(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;
 		}
@@ -939,7 +941,7 @@ static int mi_list_session_agent_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;
 		}
@@ -988,7 +990,8 @@ static int list_session_agent_events(void)
 			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));
+					mi_lttng_loglevel_string(events[i].loglevel,
+						handle->domain.type));
 		}
 
 		MSG("");
@@ -1015,7 +1018,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;
 		}