X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=d882b074d54cd4f0348365ab4adb218ce263c48b;hp=dcb79dda2ab9be31cb75f523691640d3055b6293;hb=0e1155633b00241b8b1e5a9bb683cf91b28f5eeb;hpb=ba45d9f035c9601a47e2903b16746eb0804059f3

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index dcb79dda2..d882b074d 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;
@@ -2489,6 +2504,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;