X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fchannel.c;h=58a36b97c8b2f54085ed0b2ad463ef005c68d53a;hb=b024d072031acc6eec7e083de606fbce11aab882;hp=d7fdbaec634d439b02de77a87c4054709256d1ff;hpb=990570edd474b304d4c935d82be6201d872025e4;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c
index d7fdbaec6..58a36b97c 100644
--- a/src/bin/lttng-sessiond/channel.c
+++ b/src/bin/lttng-sessiond/channel.c
@@ -19,10 +19,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/lttngerr.h>
 #include <common/common.h>
 #include <common/defaults.h>
+#include <common/sessiond-comm/sessiond-comm.h>
 
 #include "channel.h"
 #include "kernel.h"
@@ -60,7 +59,11 @@ struct lttng_channel *channel_new_default_attr(int dom)
 		chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
 		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_UST_CHANNEL_SUBBUF_SIZE;
 		chan->attr.num_subbuf = DEFAULT_UST_CHANNEL_SUBBUF_NUM;
 		chan->attr.output = DEFAULT_UST_CHANNEL_OUTPUT;
@@ -185,10 +188,13 @@ int channel_ust_enable(struct ltt_ust_session *usess, int domain,
 		/* Enable channel for global domain */
 		ret = ust_app_enable_channel_glb(usess, uchan);
 		break;
+#if 0
 	case LTTNG_DOMAIN_UST_PID:
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 	case LTTNG_DOMAIN_UST_EXEC_NAME:
-		ret = LTTCOMM_NOT_IMPLEMENTED;
+#endif
+	default:
+		ret = LTTCOMM_UND;
 		goto error;
 	}
 
@@ -229,6 +235,21 @@ int channel_ust_create(struct ltt_ust_session *usess, int domain,
 		attr = defattr;
 	}
 
+	/*
+	 * 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 not report the error to the user
+	 * (unlike kernel tracing).
+	 */
+	if (!attr->attr.subbuf_size || (attr->attr.subbuf_size & (attr->attr.subbuf_size - 1))) {
+		ret = LTTCOMM_INVALID;
+		goto error;
+	}
+	if (!attr->attr.num_subbuf || (attr->attr.num_subbuf & (attr->attr.num_subbuf - 1))) {
+		ret = LTTCOMM_INVALID;
+		goto error;
+	}
+
 	/* Create UST channel */
 	uchan = trace_ust_create_channel(attr, usess->pathname);
 	if (uchan == NULL) {
@@ -244,11 +265,13 @@ int channel_ust_create(struct ltt_ust_session *usess, int domain,
 		/* Enable channel for global domain */
 		ret = ust_app_create_channel_glb(usess, uchan);
 		break;
+#if 0
 	case LTTNG_DOMAIN_UST_PID:
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 	case LTTNG_DOMAIN_UST_EXEC_NAME:
+#endif
 	default:
-		ret = LTTCOMM_NOT_IMPLEMENTED;
+		ret = LTTCOMM_UND;
 		goto error_free_chan;
 	}
 
@@ -299,10 +322,13 @@ int channel_ust_disable(struct ltt_ust_session *usess, int domain,
 		/* Disable channel for global domain */
 		ret = ust_app_disable_channel_glb(usess, uchan);
 		break;
+#if 0
 	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 	case LTTNG_DOMAIN_UST_EXEC_NAME:
 	case LTTNG_DOMAIN_UST_PID:
-		ret = LTTCOMM_NOT_IMPLEMENTED;
+#endif
+	default:
+		ret = LTTCOMM_UND;
 		goto error;
 	}