X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=c2b0248ea5210e4506b9086d2228b89fbf89c1ff;hb=f8be902b22054782d4cc7b67781617030c49225e;hp=1fd799f0d819e375fdc05e672dfec14cccc275e6;hpb=834978fd9e2392f20867351ca99bf7bdf31b4f56;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 1fd799f0d..c2b0248ea 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1138,6 +1138,7 @@ int cmd_disable_event(struct ltt_session *session, int domain,
 	}
 	case LTTNG_DOMAIN_LOG4J:
 	case LTTNG_DOMAIN_JUL:
+	case LTTNG_DOMAIN_PYTHON:
 	{
 		struct agent *agt;
 		struct ltt_ust_session *usess = session->ust_session;
@@ -1462,6 +1463,9 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 
 		switch (event->type) {
 		case LTTNG_EVENT_ALL:
+		case LTTNG_EVENT_PROBE:
+		case LTTNG_EVENT_FUNCTION:
+		case LTTNG_EVENT_FUNCTION_ENTRY:
 		case LTTNG_EVENT_TRACEPOINT:
 			ret = event_kernel_enable_tracepoint(kchan, event);
 			if (ret != LTTNG_OK) {
@@ -1539,6 +1543,7 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 	}
 	case LTTNG_DOMAIN_LOG4J:
 	case LTTNG_DOMAIN_JUL:
+	case LTTNG_DOMAIN_PYTHON:
 	{
 		const char *default_event_name, *default_chan_name;
 		struct agent *agt;
@@ -1578,10 +1583,19 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 		memcpy(&tmp_dom, domain, sizeof(tmp_dom));
 		tmp_dom.type = LTTNG_DOMAIN_UST;
 
-		if (domain->type == LTTNG_DOMAIN_LOG4J) {
+		switch (domain->type) {
+		case LTTNG_DOMAIN_LOG4J:
 			default_chan_name = DEFAULT_LOG4J_CHANNEL_NAME;
-		} else {
+			break;
+		case LTTNG_DOMAIN_JUL:
 			default_chan_name = DEFAULT_JUL_CHANNEL_NAME;
+			break;
+		case LTTNG_DOMAIN_PYTHON:
+			default_chan_name = DEFAULT_PYTHON_CHANNEL_NAME;
+			break;
+		default:
+			/* The switch/case we are in should avoid this else big problem */
+			assert(0);
 		}
 
 		ret = cmd_enable_event(session, &tmp_dom, (char *) default_chan_name,
@@ -1753,6 +1767,7 @@ ssize_t cmd_list_tracepoints(int domain, struct lttng_event **events)
 		break;
 	case LTTNG_DOMAIN_LOG4J:
 	case LTTNG_DOMAIN_JUL:
+	case LTTNG_DOMAIN_PYTHON:
 		nb_events = agent_list_events(events, domain);
 		if (nb_events < 0) {
 			ret = LTTNG_ERR_UST_LIST_FAIL;
@@ -1833,7 +1848,9 @@ int cmd_start_trace(struct ltt_session *session)
 	 * possible to enable channel thus inform the client.
 	 */
 	if (usess && usess->domain_global.channels) {
+		rcu_read_lock();
 		nb_chan += lttng_ht_get_count(usess->domain_global.channels);
+		rcu_read_unlock();
 	}
 	if (ksession) {
 		nb_chan += ksession->channel_count;
@@ -2373,6 +2390,10 @@ ssize_t cmd_list_domains(struct ltt_session *session,
 		}
 	}
 
+	if (!nb_dom) {
+		goto end;
+	}
+
 	*domains = zmalloc(nb_dom * sizeof(struct lttng_domain));
 	if (*domains == NULL) {
 		ret = LTTNG_ERR_FATAL;
@@ -2398,7 +2419,7 @@ ssize_t cmd_list_domains(struct ltt_session *session,
 			}
 		}
 	}
-
+end:
 	return nb_dom;
 
 error:
@@ -2432,12 +2453,12 @@ ssize_t cmd_list_channels(int domain, struct ltt_session *session,
 					session->ust_session->domain_global.channels);
 		}
 		DBG3("Number of UST global channels %zd", nb_chan);
-		if (nb_chan <= 0) {
+		if (nb_chan < 0) {
 			ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
+			goto error;
 		}
 		break;
 	default:
-		*channels = NULL;
 		ret = LTTNG_ERR_UND;
 		goto error;
 	}
@@ -2450,10 +2471,6 @@ ssize_t cmd_list_channels(int domain, struct ltt_session *session,
 		}
 
 		list_lttng_channels(domain, session, *channels);
-	} else {
-		*channels = NULL;
-		/* Ret value was set in the domain switch case */
-		goto error;
 	}
 
 	return nb_chan;
@@ -2489,6 +2506,7 @@ ssize_t cmd_list_events(int domain, struct ltt_session *session,
 	}
 	case LTTNG_DOMAIN_LOG4J:
 	case LTTNG_DOMAIN_JUL:
+	case LTTNG_DOMAIN_PYTHON:
 		if (session->ust_session) {
 			struct lttng_ht_iter iter;
 			struct agent *agt;
@@ -3055,6 +3073,7 @@ int cmd_snapshot_record(struct ltt_session *session,
 	uint64_t session_max_size = 0, max_stream_size = 0;
 
 	assert(session);
+	assert(output);
 
 	DBG("Cmd snapshot record for session %s", session->name);
 
@@ -3074,7 +3093,7 @@ int cmd_snapshot_record(struct ltt_session *session,
 	}
 
 	/* Use temporary output for the session. */
-	if (output && *output->ctrl_url != '\0') {
+	if (*output->ctrl_url != '\0') {
 		ret = snapshot_output_init(output->max_size, output->name,
 				output->ctrl_url, output->data_url, session->consumer,
 				&tmp_output, NULL);