X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=4b8d82efe255d398d9e5eba605be42d96cec5421;hp=dc465173e3521984f48b91f23e1782b83ba22b09;hb=6b453b5e07e90591c955ae14c60c13b7c1ed28a0;hpb=b2064f542c84041bf0b991d7d83f9e85db8adc19

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index dc465173e..4b8d82efe 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1309,6 +1309,7 @@ error:
  */
 int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 		char *channel_name, struct lttng_event *event,
+		char *filter_expression,
 		struct lttng_filter_bytecode *filter,
 		struct lttng_event_exclusion *exclusion,
 		int wpipe)
@@ -1424,7 +1425,8 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 		}
 
 		/* At this point, the session and channel exist on the tracer */
-		ret = event_ust_enable_tracepoint(usess, uchan, event, filter, exclusion);
+		ret = event_ust_enable_tracepoint(usess, uchan, event,
+				filter_expression, filter, exclusion);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
@@ -1442,7 +1444,13 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 		memset(&uevent, 0, sizeof(uevent));
 		uevent.type = LTTNG_EVENT_TRACEPOINT;
 		uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
-		strncpy(uevent.name, DEFAULT_JUL_EVENT_NAME, sizeof(uevent.name));
+		if (is_root) {
+			strncpy(uevent.name, DEFAULT_SYS_JUL_EVENT_NAME,
+					sizeof(uevent.name));
+		} else {
+			strncpy(uevent.name, DEFAULT_USER_JUL_EVENT_NAME,
+					sizeof(uevent.name));
+		}
 		uevent.name[sizeof(uevent.name) - 1] = '\0';
 
 		/*
@@ -1454,7 +1462,7 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 		tmp_dom.type = LTTNG_DOMAIN_UST;
 
 		ret = cmd_enable_event(session, &tmp_dom, DEFAULT_JUL_CHANNEL_NAME,
-				&uevent, NULL, NULL, wpipe);
+			&uevent, NULL, NULL, NULL, wpipe);
 		if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_ENABLED) {
 			goto error;
 		}
@@ -1493,6 +1501,7 @@ error:
  */
 int cmd_enable_event_all(struct ltt_session *session,
 		struct lttng_domain *domain, char *channel_name, int event_type,
+		char *filter_expression,
 		struct lttng_filter_bytecode *filter, int wpipe)
 {
 	int ret;
@@ -1626,7 +1635,8 @@ int cmd_enable_event_all(struct ltt_session *session,
 		switch (event_type) {
 		case LTTNG_EVENT_ALL:
 		case LTTNG_EVENT_TRACEPOINT:
-			ret = event_ust_enable_all_tracepoints(usess, uchan, filter);
+			ret = event_ust_enable_all_tracepoints(usess, uchan,
+				filter_expression, filter);
 			if (ret != LTTNG_OK) {
 				goto error;
 			}
@@ -1654,7 +1664,13 @@ int cmd_enable_event_all(struct ltt_session *session,
 		/* Create the default JUL tracepoint. */
 		uevent.type = LTTNG_EVENT_TRACEPOINT;
 		uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
-		strncpy(uevent.name, DEFAULT_JUL_EVENT_NAME, sizeof(uevent.name));
+		if (is_root) {
+			strncpy(uevent.name, DEFAULT_SYS_JUL_EVENT_NAME,
+					sizeof(uevent.name));
+		} else {
+			strncpy(uevent.name, DEFAULT_USER_JUL_EVENT_NAME,
+					sizeof(uevent.name));
+		}
 		uevent.name[sizeof(uevent.name) - 1] = '\0';
 
 		/*
@@ -1666,7 +1682,7 @@ int cmd_enable_event_all(struct ltt_session *session,
 		tmp_dom.type = LTTNG_DOMAIN_UST;
 
 		ret = cmd_enable_event(session, &tmp_dom, DEFAULT_JUL_CHANNEL_NAME,
-				&uevent, NULL, NULL, wpipe);
+			&uevent, NULL, NULL, NULL, wpipe);
 		if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_ENABLED) {
 			goto error;
 		}
@@ -1779,6 +1795,7 @@ error:
 int cmd_start_trace(struct ltt_session *session)
 {
 	int ret;
+	unsigned long nb_chan = 0;
 	struct ltt_kernel_session *ksession;
 	struct ltt_ust_session *usess;
 
@@ -1794,6 +1811,21 @@ int cmd_start_trace(struct ltt_session *session)
 		goto error;
 	}
 
+	/*
+	 * Starting a session without channel is useless since after that it's not
+	 * possible to enable channel thus inform the client.
+	 */
+	if (usess && usess->domain_global.channels) {
+		nb_chan += lttng_ht_get_count(usess->domain_global.channels);
+	}
+	if (ksession) {
+		nb_chan += ksession->channel_count;
+	}
+	if (!nb_chan) {
+		ret = LTTNG_ERR_NO_CHANNEL;
+		goto error;
+	}
+
 	session->enabled = 1;
 
 	/* Kernel tracing */
@@ -2478,6 +2510,7 @@ void cmd_list_lttng_sessions(struct lttng_session *sessions, uid_t uid,
 		sessions[i].name[NAME_MAX - 1] = '\0';
 		sessions[i].enabled = session->enabled;
 		sessions[i].snapshot_mode = session->snapshot_mode;
+		sessions[i].live_timer_interval = session->live_timer;
 		i++;
 	}
 }