X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=4a53968740bd789aa8216bfda39029396c346b72;hb=aa5de748c1150c17624abce3cc74839fea3234f6;hp=da287f5caf9c4a7658b30f4419cf1be7aebb66bb;hpb=6d1fcf1c029c10dd79c3be0686b1fae567604406;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index da287f5ca..4a5396874 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -176,13 +176,13 @@ static const char *loglevel_string(int value)
 	case 5: return "TRACE_NOTICE";
 	case 6: return "TRACE_INFO";
 	case 7: return "TRACE_SYSTEM";
-	case 8: return "TRACE_PROCESS";
-	case 9: return "TRACE_MODULE";
-	case 10: return "TRACE_UNIT";
-	case 11: return "TRACE_CLASS";
-	case 12: return "TRACE_OBJECT";
-	case 13: return "TRACE_FUNCTION";
-	case 14: return "TRACE_PRINTF";
+	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";
 	default: return "<<UNKNOWN>>";
 	}
@@ -196,11 +196,10 @@ static void print_events(struct lttng_event *event)
 	switch (event->type) {
 	case LTTNG_EVENT_TRACEPOINT:
 	{
-		MSG("%s%s%s%s%d%s (type: tracepoint)%s", indent6,
+		MSG("%s%s%s%s%s (type: tracepoint)%s", indent6,
 				event->name,
 				loglevel_string_pre(event->loglevel),
 				loglevel_string(event->loglevel),
-				event->loglevel,
 				loglevel_string_post(event->loglevel),
 				enabled_string(event->enabled));
 		break;
@@ -247,6 +246,8 @@ static int list_ust_events(void)
 	struct lttng_event *event_list;
 	pid_t cur_pid = 0;
 
+	memset(&domain, 0, sizeof(domain));
+
 	DBG("Getting UST tracing events");
 
 	domain.type = LTTNG_DOMAIN_UST;
@@ -259,6 +260,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;
 	}
 
@@ -279,10 +281,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;
 }
 
@@ -296,6 +300,8 @@ static int list_kernel_events(void)
 	struct lttng_handle *handle;
 	struct lttng_event *event_list;
 
+	memset(&domain, 0, sizeof(domain));
+
 	DBG("Getting kernel tracing events");
 
 	domain.type = LTTNG_DOMAIN_KERNEL;
@@ -308,6 +314,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;
 	}
 
@@ -321,9 +328,11 @@ static int list_kernel_events(void)
 
 	free(event_list);
 
+	lttng_destroy_handle(handle);
 	return CMD_SUCCESS;
 
 error:
+	lttng_destroy_handle(handle);
 	return -1;
 }
 
@@ -480,7 +489,8 @@ static int list_sessions(const char *session_name)
 			continue;
 		}
 
-		MSG("  %d) %s (%s)%s", i + 1, sessions[i].name, sessions[i].path, active_string(sessions[i].enabled));
+		MSG("  %d) %s (%s)%s", i + 1, sessions[i].name, sessions[i].path,
+				active_string(sessions[i].enabled));
 
 		if (session_found) {
 			break;
@@ -490,7 +500,9 @@ static int list_sessions(const char *session_name)
 	free(sessions);
 
 	if (!session_found && session_name != NULL) {
-		ERR("Session %s not found", session_name);
+		ERR("Session '%s' not found", session_name);
+		ret = CMD_ERROR;
+		goto error;
 	}
 
 	if (session_name == NULL) {
@@ -554,6 +566,8 @@ int cmd_list(int argc, const char **argv)
 	struct lttng_domain domain;
 	struct lttng_domain *domains = NULL;
 
+	memset(&domain, 0, sizeof(domain));
+
 	if (argc < 1) {
 		usage(stderr);
 		ret = CMD_ERROR;
@@ -592,46 +606,43 @@ 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) {
 		if (!opt_kernel && !opt_userspace) {
 			ret = list_sessions(NULL);
-			if (ret < 0) {
+			if (ret != 0) {
 				goto end;
 			}
 		}
 		if (opt_kernel) {
 			ret = list_kernel_events();
 			if (ret < 0) {
-				ret = CMD_ERROR;
 				goto end;
 			}
 		}
 		if (opt_userspace) {
 			ret = list_ust_events();
 			if (ret < 0) {
-				ret = CMD_ERROR;
 				goto end;
 			}
 		}
 	} else {
 		/* List session attributes */
 		ret = list_sessions(session_name);
-		if (ret < 0) {
+		if (ret != 0) {
 			goto end;
 		}
 
 		/* Domain listing */
 		if (opt_domain) {
 			ret = list_domains(session_name);
-			if (ret < 0) {
-				ret = CMD_ERROR;
-			}
 			goto end;
 		}
 
@@ -639,14 +650,13 @@ int cmd_list(int argc, const char **argv)
 			/* Channel listing */
 			ret = list_channels(opt_channel);
 			if (ret < 0) {
-				ret = CMD_ERROR;
 				goto end;
 			}
 		} else {
 			/* We want all domain(s) */
 			nb_domain = lttng_list_domains(session_name, &domains);
 			if (nb_domain < 0) {
-				ret = CMD_ERROR;
+				ret = nb_domain;
 				goto end;
 			}
 
@@ -664,7 +674,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) {
@@ -674,7 +686,6 @@ int cmd_list(int argc, const char **argv)
 
 				ret = list_channels(opt_channel);
 				if (ret < 0) {
-					ret = CMD_ERROR;
 					goto end;
 				}
 			}
@@ -685,7 +696,9 @@ end:
 	if (domains) {
 		free(domains);
 	}
-	lttng_destroy_handle(handle);
+	if (handle) {
+		lttng_destroy_handle(handle);
+	}
 
 	poptFreeContext(pc);
 	return ret;