X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=69671bd714d1c6854d2303a08e7fe9044a4c5bbc;hb=f1f887c09fa00f365bd56c025159524aa0d3ac50;hp=b73d5209f7f023408048fa27f90f9e0a3a45aeb3;hpb=441c16a7f0bbab56a5e783059d0cddab68544a9a;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index b73d5209f..69671bd71 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -175,15 +175,14 @@ static const char *loglevel_string(int value)
 	case 4: return "TRACE_WARNING";
 	case 5: return "TRACE_NOTICE";
 	case 6: return "TRACE_INFO";
-	case 7: return "TRACE_SYSTEM";
-	case 8: return "TRACE_PROGRAM";
-	case 9: return "TRACE_PROCESS";
-	case 10: return "TRACE_MODULE";
-	case 11: return "TRACE_UNIT";
-	case 12: return "TRACE_FUNCTION";
-	case 13: return "TRACE_DEFAULT";
-	case 14: return "TRACE_VERBOSE";
-	case 15: return "TRACE_DEBUG";
+	case 7: return "TRACE_DEBUG_SYSTEM";
+	case 8: return "TRACE_DEBUG_PROGRAM";
+	case 9: return "TRACE_DEBUG_PROCESS";
+	case 10: return "TRACE_DEBUG_MODULE";
+	case 11: return "TRACE_DEBUG_UNIT";
+	case 12: return "TRACE_DEBUG_FUNCTION";
+	case 13: return "TRACE_DEBUG_LINE";
+	case 14: return "TRACE_DEBUG";
 	default: return "<<UNKNOWN>>";
 	}
 }
@@ -221,7 +220,7 @@ static void print_events(struct lttng_event *event)
 		MSG("%ssymbol: \"%s\"", indent8, event->attr.ftrace.symbol_name);
 		break;
 	case LTTNG_EVENT_SYSCALL:
-		MSG("%s (type: syscall)%s", indent6,
+		MSG("%ssyscalls (type: syscall)%s", indent6,
 				enabled_string(event->enabled));
 		break;
 	case LTTNG_EVENT_NOOP:
@@ -260,6 +259,7 @@ static int list_ust_events(void)
 	size = lttng_list_tracepoints(handle, &event_list);
 	if (size < 0) {
 		ERR("Unable to list UST events");
+		lttng_destroy_handle(handle);
 		return size;
 	}
 
@@ -280,10 +280,12 @@ static int list_ust_events(void)
 	MSG("");
 
 	free(event_list);
+	lttng_destroy_handle(handle);
 
 	return CMD_SUCCESS;
 
 error:
+	lttng_destroy_handle(handle);
 	return -1;
 }
 
@@ -311,6 +313,7 @@ static int list_kernel_events(void)
 	size = lttng_list_tracepoints(handle, &event_list);
 	if (size < 0) {
 		ERR("Unable to list kernel events");
+		lttng_destroy_handle(handle);
 		return size;
 	}
 
@@ -324,9 +327,11 @@ static int list_kernel_events(void)
 
 	free(event_list);
 
+	lttng_destroy_handle(handle);
 	return CMD_SUCCESS;
 
 error:
+	lttng_destroy_handle(handle);
 	return -1;
 }
 
@@ -600,10 +605,12 @@ int cmd_list(int argc, const char **argv)
 		domain.type = LTTNG_DOMAIN_UST;
 	}
 
-	handle = lttng_create_handle(session_name, &domain);
-	if (handle == NULL) {
-		ret = CMD_FATAL;
-		goto end;
+	if (opt_kernel || opt_userspace) {
+		handle = lttng_create_handle(session_name, &domain);
+		if (handle == NULL) {
+			ret = CMD_FATAL;
+			goto end;
+		}
 	}
 
 	if (session_name == NULL) {
@@ -666,7 +673,9 @@ int cmd_list(int argc, const char **argv)
 				}
 
 				/* Clean handle before creating a new one */
-				lttng_destroy_handle(handle);
+				if (handle) {
+					lttng_destroy_handle(handle);
+				}
 
 				handle = lttng_create_handle(session_name, &domains[i]);
 				if (handle == NULL) {
@@ -686,7 +695,9 @@ end:
 	if (domains) {
 		free(domains);
 	}
-	lttng_destroy_handle(handle);
+	if (handle) {
+		lttng_destroy_handle(handle);
+	}
 
 	poptFreeContext(pc);
 	return ret;