X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=4391b6a58c354c6445a8195c345bc7eb91b3a561;hb=d8366880cdb6583ca6c9a04fd022abbca26ff09a;hp=2ca22c2e9bb9af0bfc6f310433f410a55d9eacd6;hpb=ab24e5255a73329d5117669289ee95061dd498b5;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 2ca22c2e9..4391b6a58 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -236,7 +236,7 @@ static int list_lttng_agent_events(struct agent *agt,
 		strncpy(tmp_events[i].name, event->name, sizeof(tmp_events[i].name));
 		tmp_events[i].name[sizeof(tmp_events[i].name) - 1] = '\0';
 		tmp_events[i].enabled = event->enabled;
-		tmp_events[i].loglevel = event->loglevel;
+		tmp_events[i].loglevel = event->loglevel_value;
 		tmp_events[i].loglevel_type = event->loglevel_type;
 		i++;
 	}
@@ -1284,7 +1284,14 @@ int cmd_disable_event(struct ltt_session *session, int domain,
 
 		switch (event->type) {
 		case LTTNG_EVENT_ALL:
-			ret = event_ust_disable_tracepoint(usess, uchan, event_name);
+			if (strlen(event->name) == 1 &&
+					!strncmp(event->name, "*", 1)) {
+				ret = event_ust_disable_all_tracepoints(usess,
+						uchan);
+			} else {
+				ret = event_ust_disable_tracepoint(usess, uchan,
+						event_name);
+			}
 			if (ret != LTTNG_OK) {
 				goto error_unlock;
 			}
@@ -1521,13 +1528,13 @@ static int _cmd_enable_event(struct ltt_session *session,
 
 	DBG("Enable event command for event \'%s\'", event->name);
 
+	rcu_read_lock();
+
 	ret = validate_event_name(event->name);
 	if (ret) {
 		goto error;
 	}
 
-	rcu_read_lock();
-
 	switch (domain->type) {
 	case LTTNG_DOMAIN_KERNEL:
 	{
@@ -1619,9 +1626,10 @@ static int _cmd_enable_event(struct ltt_session *session,
 			event->type = LTTNG_EVENT_SYSCALL;	/* Hack */
 			ret = event_kernel_enable_event(kchan, event,
 				filter_expression_a, filter_a);
+			/* We have passed ownership */
+			filter_expression_a = NULL;
+			filter_a = NULL;
 			if (ret != LTTNG_OK) {
-				free(filter_expression_a);
-				free(filter_a);
 				goto error;
 			}
 			break;
@@ -1812,6 +1820,7 @@ static int _cmd_enable_event(struct ltt_session *session,
 				filter_copy = zmalloc(filter_size);
 				if (!filter_copy) {
 					ret = LTTNG_ERR_NOMEM;
+					goto error;
 				}
 				memcpy(filter_copy, filter, filter_size);
 
@@ -2344,7 +2353,7 @@ int cmd_create_session_snapshot(char *name, struct lttng_uri *uris,
 	 * Create session in no output mode with URIs set to NULL. The uris we've
 	 * received are for a default snapshot output if one.
 	 */
-	ret = cmd_create_session_uri(name, NULL, 0, creds, -1);
+	ret = cmd_create_session_uri(name, NULL, 0, creds, 0);
 	if (ret != LTTNG_OK) {
 		goto error;
 	}
@@ -2739,7 +2748,11 @@ ssize_t cmd_list_events(int domain, struct ltt_session *session,
 			rcu_read_lock();
 			cds_lfht_for_each_entry(session->ust_session->agents->ht,
 					&iter.iter, agt, node.node) {
-				nb_event = list_lttng_agent_events(agt, events);
+				if (agt->domain == domain) {
+					nb_event = list_lttng_agent_events(
+							agt, events);
+					break;
+				}
 			}
 			rcu_read_unlock();
 		}