Fix: lttng UI exit value and error message

[lttng-tools.git] / src / bin / lttng-sessiond / channel.c

diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c
index b5202fe6abe0807a35088e5b88ef8cd82e0779ce..4ec12302b027e83ea3f63b5da862ce04737ecab0 100644 (file)
--- 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;
@@ -117,6 +121,9 @@ int channel_kernel_enable(struct ltt_kernel_session *ksession,
                        ret = LTTCOMM_KERN_CHAN_ENABLE_FAIL;
                        goto error;
                }
+       } else {
+               ret = LTTCOMM_KERN_CHAN_EXIST;
+               goto error;
        }
 
        ret = LTTCOMM_OK;
@@ -175,6 +182,7 @@ int channel_ust_enable(struct ltt_ust_session *usess, int domain,
        /* If already enabled, everything is OK */
        if (uchan->enabled) {
                DBG3("Channel %s already enabled. Skipping", uchan->name);
+               ret = LTTCOMM_UST_CHAN_EXIST;
                goto end;
        }
 
@@ -184,10 +192,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;
        }
 
@@ -228,6 +239,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) {
@@ -243,11 +269,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;
        }
 
@@ -298,10 +326,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;
        }