X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=fff4b917c230e322e36df7caa0ae8a7ab8619bdc;hb=41e16a7c24eed8c602399781ff545b99930d73c6;hp=ea25a5e470a690182a2e0daed6f4777d511e4f47;hpb=14fb1ebe1000da2c3ccca45e7e97ad6637947cfe;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index ea25a5e47..fff4b917c 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -166,6 +166,8 @@ static void list_lttng_channels(int domain, struct ltt_session *session,
 			channels[i].attr.read_timer_interval =
 				uchan->attr.read_timer_interval;
 			channels[i].enabled = uchan->enabled;
+			channels[i].attr.tracefile_size = uchan->tracefile_size;
+			channels[i].attr.tracefile_count = uchan->tracefile_count;
 			switch (uchan->attr.output) {
 			case LTTNG_UST_MMAP:
 			default:
@@ -219,6 +221,8 @@ static int list_lttng_jul_events(struct jul_domain *dom,
 		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_type = event->loglevel_type;
 		i++;
 	}
 	rcu_read_unlock();
@@ -931,6 +935,16 @@ int cmd_enable_channel(struct ltt_session *session,
 		attr->attr.switch_timer_interval = 0;
 	}
 
+	/*
+	 * The ringbuffer (both in user space and kernel) behave badly in overwrite
+	 * mode and with less than 2 subbuf so block it right away and send back an
+	 * invalid attribute error.
+	 */
+	if (attr->attr.overwrite && attr->attr.num_subbuf < 2) {
+		ret = LTTNG_ERR_INVALID;
+		goto error;
+	}
+
 	switch (domain->type) {
 	case LTTNG_DOMAIN_KERNEL:
 	{
@@ -1445,16 +1459,16 @@ 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, NULL, wpipe);
+			&uevent, filter_expression, filter, NULL, wpipe);
 		if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_ENABLED) {
 			goto error;
 		}
 
 		/* The wild card * means that everything should be enabled. */
 		if (strncmp(event->name, "*", 1) == 0 && strlen(event->name) == 1) {
-			ret = event_jul_enable_all(usess, event);
+			ret = event_jul_enable_all(usess, event, filter);
 		} else {
-			ret = event_jul_enable(usess, event);
+			ret = event_jul_enable(usess, event, filter);
 		}
 		if (ret != LTTNG_OK) {
 			goto error;
@@ -1675,7 +1689,7 @@ int cmd_enable_event_all(struct ltt_session *session,
 		strncpy(event.name, "*", sizeof(event.name));
 		event.name[sizeof(event.name) - 1] = '\0';
 
-		ret = event_jul_enable_all(usess, &event);
+		ret = event_jul_enable_all(usess, &event, filter);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
@@ -1973,6 +1987,17 @@ int cmd_set_consumer_uri(int domain, struct ltt_session *session,
 		}
 	}
 
+	/*
+	 * Make sure to set the session in output mode after we set URI since a
+	 * session can be created without URL (thus flagged in no output mode).
+	 */
+	session->output_traces = 1;
+	if (ksess) {
+		ksess->output_traces = 1;
+	} else if (usess) {
+		usess->output_traces = 1;
+	}
+
 	/* All good! */
 	ret = LTTNG_OK;