X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fchannel.c;h=dfc7892674bbe1f15dc74d818175ea3c60c3c65d;hp=b5202fe6abe0807a35088e5b88ef8cd82e0779ce;hb=f73fabfda365d22e7dd180fb1614e37c446fbd9e;hpb=db7586006bc1a2b9057a2c108bf1e7d20fd6903f

diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c
index b5202fe6a..dfc789267 100644
--- a/src/bin/lttng-sessiond/channel.c
+++ b/src/bin/lttng-sessiond/channel.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; only version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _GNU_SOURCE
@@ -59,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;
@@ -87,17 +91,17 @@ int channel_kernel_disable(struct ltt_kernel_session *ksession,
 
 	kchan = trace_kernel_get_channel_by_name(channel_name, ksession);
 	if (kchan == NULL) {
-		ret = LTTCOMM_KERN_CHAN_NOT_FOUND;
+		ret = LTTNG_ERR_KERN_CHAN_NOT_FOUND;
 		goto error;
 	} else if (kchan->enabled == 1) {
 		ret = kernel_disable_channel(kchan);
 		if (ret < 0 && ret != -EEXIST) {
-			ret = LTTCOMM_KERN_CHAN_DISABLE_FAIL;
+			ret = LTTNG_ERR_KERN_CHAN_DISABLE_FAIL;
 			goto error;
 		}
 	}
 
-	ret = LTTCOMM_OK;
+	ret = LTTNG_OK;
 
 error:
 	return ret;
@@ -114,12 +118,15 @@ int channel_kernel_enable(struct ltt_kernel_session *ksession,
 	if (kchan->enabled == 0) {
 		ret = kernel_enable_channel(kchan);
 		if (ret < 0) {
-			ret = LTTCOMM_KERN_CHAN_ENABLE_FAIL;
+			ret = LTTNG_ERR_KERN_CHAN_ENABLE_FAIL;
 			goto error;
 		}
+	} else {
+		ret = LTTNG_ERR_KERN_CHAN_EXIST;
+		goto error;
 	}
 
-	ret = LTTCOMM_OK;
+	ret = LTTNG_OK;
 
 error:
 	return ret;
@@ -138,7 +145,7 @@ int channel_kernel_create(struct ltt_kernel_session *ksession,
 	if (attr == NULL) {
 		defattr = channel_new_default_attr(LTTNG_DOMAIN_KERNEL);
 		if (defattr == NULL) {
-			ret = LTTCOMM_FATAL;
+			ret = LTTNG_ERR_FATAL;
 			goto error;
 		}
 		attr = defattr;
@@ -147,18 +154,18 @@ int channel_kernel_create(struct ltt_kernel_session *ksession,
 	/* Channel not found, creating it */
 	ret = kernel_create_channel(ksession, attr, ksession->trace_path);
 	if (ret < 0) {
-		ret = LTTCOMM_KERN_CHAN_FAIL;
+		ret = LTTNG_ERR_KERN_CHAN_FAIL;
 		goto error;
 	}
 
 	/* Notify kernel thread that there is a new channel */
 	ret = notify_thread_pipe(kernel_pipe);
 	if (ret < 0) {
-		ret = LTTCOMM_FATAL;
+		ret = LTTNG_ERR_FATAL;
 		goto error;
 	}
 
-	ret = LTTCOMM_OK;
+	ret = LTTNG_OK;
 error:
 	free(defattr);
 	return ret;
@@ -170,11 +177,12 @@ error:
 int channel_ust_enable(struct ltt_ust_session *usess, int domain,
 		struct ltt_ust_channel *uchan)
 {
-	int ret = LTTCOMM_OK;
+	int ret = LTTNG_OK;
 
 	/* If already enabled, everything is OK */
 	if (uchan->enabled) {
 		DBG3("Channel %s already enabled. Skipping", uchan->name);
+		ret = LTTNG_ERR_UST_CHAN_EXIST;
 		goto end;
 	}
 
@@ -184,19 +192,22 @@ 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 = LTTNG_ERR_UND;
 		goto error;
 	}
 
 	if (ret < 0) {
 		if (ret != -EEXIST) {
-			ret = LTTCOMM_UST_CHAN_ENABLE_FAIL;
+			ret = LTTNG_ERR_UST_CHAN_ENABLE_FAIL;
 			goto error;
 		} else {
-			ret = LTTCOMM_OK;
+			ret = LTTNG_OK;
 		}
 	}
 
@@ -214,7 +225,7 @@ error:
 int channel_ust_create(struct ltt_ust_session *usess, int domain,
 		struct lttng_channel *attr)
 {
-	int ret = LTTCOMM_OK;
+	int ret = LTTNG_OK;
 	struct ltt_ust_channel *uchan = NULL;
 	struct lttng_channel *defattr = NULL;
 
@@ -222,16 +233,31 @@ int channel_ust_create(struct ltt_ust_session *usess, int domain,
 	if (attr == NULL) {
 		defattr = channel_new_default_attr(domain);
 		if (defattr == NULL) {
-			ret = LTTCOMM_FATAL;
+			ret = LTTNG_ERR_FATAL;
 			goto error;
 		}
 		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 = LTTNG_ERR_INVALID;
+		goto error;
+	}
+	if (!attr->attr.num_subbuf || (attr->attr.num_subbuf & (attr->attr.num_subbuf - 1))) {
+		ret = LTTNG_ERR_INVALID;
+		goto error;
+	}
+
 	/* Create UST channel */
 	uchan = trace_ust_create_channel(attr, usess->pathname);
 	if (uchan == NULL) {
-		ret = LTTCOMM_FATAL;
+		ret = LTTNG_ERR_FATAL;
 		goto error;
 	}
 	uchan->enabled = 1;
@@ -243,16 +269,18 @@ 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 = LTTNG_ERR_UND;
 		goto error_free_chan;
 	}
 
 	if (ret < 0 && ret != -EEXIST) {
-		ret = LTTCOMM_UST_CHAN_ENABLE_FAIL;
+		ret = LTTNG_ERR_UST_CHAN_FAIL;
 		goto error_free_chan;
 	}
 
@@ -264,7 +292,7 @@ int channel_ust_create(struct ltt_ust_session *usess, int domain,
 	DBG2("Channel %s created successfully", uchan->name);
 
 	free(defattr);
-	return LTTCOMM_OK;
+	return LTTNG_OK;
 
 error_free_chan:
 	/*
@@ -283,7 +311,7 @@ error:
 int channel_ust_disable(struct ltt_ust_session *usess, int domain,
 		struct ltt_ust_channel *uchan)
 {
-	int ret = LTTCOMM_OK;
+	int ret = LTTNG_OK;
 
 	/* Already disabled */
 	if (uchan->enabled == 0) {
@@ -298,15 +326,18 @@ 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 = LTTNG_ERR_UND;
 		goto error;
 	}
 
 	if (ret < 0 && ret != -EEXIST) {
-		ret = LTTCOMM_UST_DISABLE_FAIL;
+		ret = LTTNG_ERR_UST_CHAN_DISABLE_FAIL;
 		goto error;
 	}
 
@@ -314,7 +345,7 @@ int channel_ust_disable(struct ltt_ust_session *usess, int domain,
 
 	DBG2("Channel %s disabled successfully", uchan->name);
 
-	return LTTCOMM_OK;
+	return LTTNG_OK;
 
 end:
 error: