X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fchannel.c;h=d826125c9b8c7acaf5a57f294aeb7d29f78803ea;hb=1950109e7a08d8064ef5b1f446524274b4fa72d5;hp=bb5b3d1de32cc00c19cba668a060d26982dc774f;hpb=2e8269f7b53395c9c67a73756aa71b6baaff23aa;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c
index bb5b3d1de..d826125c9 100644
--- a/src/bin/lttng-sessiond/channel.c
+++ b/src/bin/lttng-sessiond/channel.c
@@ -25,6 +25,7 @@
 #include <common/sessiond-comm/sessiond-comm.h>
 
 #include "channel.h"
+#include "lttng-sessiond.h"
 #include "kernel.h"
 #include "ust-ctl.h"
 #include "utils.h"
@@ -33,7 +34,8 @@
 /*
  * Return allocated channel attributes.
  */
-struct lttng_channel *channel_new_default_attr(int dom)
+struct lttng_channel *channel_new_default_attr(int dom,
+		enum lttng_buffer_type type)
 {
 	struct lttng_channel *chan;
 
@@ -49,10 +51,14 @@ struct lttng_channel *channel_new_default_attr(int dom)
 		goto error;
 	}
 
+	/* Same for all domains. */
 	chan->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
+	chan->attr.tracefile_size = DEFAULT_CHANNEL_TRACEFILE_SIZE;
+	chan->attr.tracefile_count = DEFAULT_CHANNEL_TRACEFILE_COUNT;
 
 	switch (dom) {
 	case LTTNG_DOMAIN_KERNEL:
+		assert(type == LTTNG_BUFFER_GLOBAL);
 		chan->attr.subbuf_size =
 			default_get_kernel_channel_subbuf_size();
 		chan->attr.num_subbuf = DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM;
@@ -61,16 +67,27 @@ struct lttng_channel *channel_new_default_attr(int dom)
 		chan->attr.read_timer_interval = DEFAULT_KERNEL_CHANNEL_READ_TIMER;
 		break;
 	case LTTNG_DOMAIN_UST:
-#if 0
-	case LTTNG_DOMAIN_UST_PID:
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-#endif
-		chan->attr.subbuf_size = default_get_ust_channel_subbuf_size();
-		chan->attr.num_subbuf = DEFAULT_UST_CHANNEL_SUBBUF_NUM;
-		chan->attr.output = DEFAULT_UST_CHANNEL_OUTPUT;
-		chan->attr.switch_timer_interval = DEFAULT_UST_CHANNEL_SWITCH_TIMER;
-		chan->attr.read_timer_interval = DEFAULT_UST_CHANNEL_READ_TIMER;
+		switch (type) {
+		case LTTNG_BUFFER_PER_UID:
+			chan->attr.subbuf_size = default_get_ust_uid_channel_subbuf_size();
+			chan->attr.num_subbuf = DEFAULT_UST_UID_CHANNEL_SUBBUF_NUM;
+			chan->attr.output = DEFAULT_UST_UID_CHANNEL_OUTPUT;
+			chan->attr.switch_timer_interval =
+				DEFAULT_UST_UID_CHANNEL_SWITCH_TIMER;
+			chan->attr.read_timer_interval =
+				DEFAULT_UST_UID_CHANNEL_READ_TIMER;
+			break;
+		case LTTNG_BUFFER_PER_PID:
+		default:
+			chan->attr.subbuf_size = default_get_ust_pid_channel_subbuf_size();
+			chan->attr.num_subbuf = DEFAULT_UST_PID_CHANNEL_SUBBUF_NUM;
+			chan->attr.output = DEFAULT_UST_PID_CHANNEL_OUTPUT;
+			chan->attr.switch_timer_interval =
+				DEFAULT_UST_PID_CHANNEL_SWITCH_TIMER;
+			chan->attr.read_timer_interval =
+				DEFAULT_UST_PID_CHANNEL_READ_TIMER;
+			break;
+		}
 		break;
 	default:
 		goto error;	/* Not implemented */
@@ -158,7 +175,8 @@ int channel_kernel_create(struct ltt_kernel_session *ksession,
 
 	/* Creating channel attributes if needed */
 	if (attr == NULL) {
-		defattr = channel_new_default_attr(LTTNG_DOMAIN_KERNEL);
+		defattr = channel_new_default_attr(LTTNG_DOMAIN_KERNEL,
+				LTTNG_BUFFER_GLOBAL);
 		if (defattr == NULL) {
 			ret = LTTNG_ERR_FATAL;
 			goto error;
@@ -214,7 +232,7 @@ int channel_ust_enable(struct ltt_ust_session *usess,
 	 * successfully created on the session daemon side so the enable-channel
 	 * command is a success.
 	 */
-	(void) ust_app_create_channel_glb(usess, uchan);
+	(void) ust_app_enable_channel_glb(usess, uchan);
 
 	uchan->enabled = 1;
 	DBG2("Channel %s enabled successfully", uchan->name);
@@ -237,7 +255,7 @@ int channel_ust_create(struct ltt_ust_session *usess,
 
 	/* Creating channel attributes if needed */
 	if (attr == NULL) {
-		defattr = channel_new_default_attr(LTTNG_DOMAIN_UST);
+		defattr = channel_new_default_attr(LTTNG_DOMAIN_UST, type);
 		if (defattr == NULL) {
 			ret = LTTNG_ERR_FATAL;
 			goto error;
@@ -245,11 +263,6 @@ int channel_ust_create(struct ltt_ust_session *usess,
 		attr = defattr;
 	}
 
-	if (attr->attr.subbuf_size < DEFAULT_UST_CHANNEL_SUBBUF_SIZE) {
-		ret = LTTNG_ERR_INVALID;
-		goto error;
-	}
-
 	/*
 	 * Validate UST buffer size and number of buffers: must both be power of 2
 	 * and nonzero. We validate right here for UST, because applications will
@@ -261,6 +274,14 @@ int channel_ust_create(struct ltt_ust_session *usess,
 		goto error;
 	}
 
+	/*
+	 * Invalid subbuffer size if it's lower then the page size.
+	 */
+	if (attr->attr.subbuf_size < page_size) {
+		ret = LTTNG_ERR_INVALID;
+		goto error;
+	}
+
 	if (!attr->attr.num_subbuf ||
 			(attr->attr.num_subbuf & (attr->attr.num_subbuf - 1))) {
 		ret = LTTNG_ERR_INVALID;
@@ -285,6 +306,7 @@ int channel_ust_create(struct ltt_ust_session *usess,
 	/* Validate buffer type. */
 	switch (type) {
 	case LTTNG_BUFFER_PER_PID:
+		break;
 	case LTTNG_BUFFER_PER_UID:
 		break;
 	default:
@@ -293,7 +315,7 @@ int channel_ust_create(struct ltt_ust_session *usess,
 	}
 
 	/* Create UST channel */
-	uchan = trace_ust_create_channel(attr, usess->pathname);
+	uchan = trace_ust_create_channel(attr);
 	if (uchan == NULL) {
 		ret = LTTNG_ERR_FATAL;
 		goto error;