X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=d1bf6f0c034d7a96e266c06fc6dbf6c9925e4fbc;hb=13b5639ddc159b1a0396ae0bbca3674192107ed4;hp=bb9329f308ac90d56dd28c0e66254a3378b0022b;hpb=9b21e6d59ee650f44a0db24cf7f75e08fbd0fe9c;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index bb9329f30..d1bf6f0c0 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:
 	{
@@ -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;