Fix bad channel handling on enable-event

[lttng-tools.git] / ltt-sessiond / channel.c

diff --git a/ltt-sessiond/channel.c b/ltt-sessiond/channel.c
index ab9bf6c6d4fcbafbbe48d085b0143de0949e76f4..10635536c0fbcf5726a666ad9a25ce8d5897752b 100644 (file)
--- a/ltt-sessiond/channel.c
+++ b/ltt-sessiond/channel.c
@@ -15,6 +15,7 @@
  * Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#include <string.h>
 #include <unistd.h>
 
 #include <lttng/lttng.h>
@@ -23,12 +24,13 @@
 
 #include "channel.h"
 #include "kernel-ctl.h"
+#include "ust-ctl.h"
 #include "utils.h"
 
 /*
  * Return allocated channel attributes.
  */
-static struct lttng_channel *init_default_attr(int dom, char *name)
+struct lttng_channel *channel_new_default_attr(int dom)
 {
        struct lttng_channel *chan;
 
@@ -38,8 +40,9 @@ static struct lttng_channel *init_default_attr(int dom, char *name)
                goto error_alloc;
        }
 
-       if (snprintf(chan->name, sizeof(chan->name), "%s", name) < 0) {
-               perror("snprintf channel name");
+       if (snprintf(chan->name, sizeof(chan->name), "%s",
+                               DEFAULT_CHANNEL_NAME) < 0) {
+               perror("snprintf default channel name");
                goto error;
        }
 
@@ -53,7 +56,11 @@ static struct lttng_channel *init_default_attr(int dom, char *name)
                        chan->attr.num_subbuf = DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM;
                        chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
                        break;
-                       /* TODO: add UST */
+               case LTTNG_DOMAIN_UST_PID:
+                       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;
+                       break;
                default:
                        goto error;     /* Not implemented */
        }
@@ -66,6 +73,35 @@ error_alloc:
        return NULL;
 }
 
+/*
+ * Copy two ltt ust channel. Dst and src must be already allocated.
+ */
+int channel_ust_copy(struct ltt_ust_channel *dst,
+               struct ltt_ust_channel *src)
+{
+       struct ltt_ust_event *uevent, *new_uevent;
+
+       memcpy(dst, src, sizeof(struct ltt_ust_channel));
+       CDS_INIT_LIST_HEAD(&dst->events.head);
+
+       cds_list_for_each_entry(uevent, &src->events.head, list) {
+               new_uevent = malloc(sizeof(struct ltt_ust_event));
+               if (new_uevent == NULL) {
+                       perror("malloc ltt_ust_event");
+                       goto error;
+               }
+
+               memcpy(new_uevent, uevent, sizeof(struct ltt_ust_event));
+               cds_list_add(&new_uevent->list, &dst->events.head);
+               dst->events.count++;
+       }
+
+       return 0;
+
+error:
+       return -1;
+}
+
 /*
  * Disable kernel channel of the kernel session.
  */
@@ -121,14 +157,14 @@ error:
  * Create kernel channel of the kernel session and notify kernel thread.
  */
 int channel_kernel_create(struct ltt_kernel_session *ksession,
-               char *channel_name, struct lttng_channel *chan, int kernel_pipe)
+               struct lttng_channel *chan, int kernel_pipe)
 {
        int ret;
        struct lttng_channel *attr = chan;
 
        /* Creating channel attributes if needed */
        if (attr == NULL) {
-               attr = init_default_attr(LTTNG_DOMAIN_KERNEL, channel_name);
+               attr = channel_new_default_attr(LTTNG_DOMAIN_KERNEL);
                if (attr == NULL) {
                        ret = LTTCOMM_FATAL;
                        goto error;
@@ -154,3 +190,77 @@ int channel_kernel_create(struct ltt_kernel_session *ksession,
 error:
        return ret;
 }
+
+/*
+ * Create UST channel and enable it on the tracer.
+ */
+int channel_ust_create(struct ltt_ust_session *usession,
+               struct lttng_channel *chan, int sock)
+{
+       int ret;
+       struct lttng_channel *attr = chan;
+
+       /* Creating channel attributes if needed */
+       if (attr == NULL) {
+               attr = channel_new_default_attr(LTTNG_DOMAIN_UST_PID);
+               if (attr == NULL) {
+                       ret = LTTCOMM_FATAL;
+                       goto error;
+               }
+       }
+
+       ret = ustctl_create_channel(sock, usession, attr);
+       if (ret < 0) {
+               ret = LTTCOMM_UST_CHAN_FAIL;
+               goto error;
+       }
+
+       DBG2("Channel %s UST create successfully for sock:%d", attr->name, sock);
+
+       ret = LTTCOMM_OK;
+
+error:
+       return ret;
+}
+
+/*
+ * Enable UST channel on the tracer.
+ */
+int channel_ust_enable(struct ltt_ust_session *usession,
+               struct ltt_ust_channel *uchan, int sock)
+{
+       int ret;
+       ret = LTTCOMM_OK;
+
+       ret = ustctl_enable_channel(sock, usession, uchan);
+       if (ret < 0) {
+               ret = LTTCOMM_UST_CHAN_FAIL;
+               goto error;
+       }
+
+       ret = LTTCOMM_OK;
+
+error:
+       return ret;
+}
+
+/*
+ * Disable UST channel on the tracer.
+ */
+int channel_ust_disable(struct ltt_ust_session *usession,
+               struct ltt_ust_channel *uchan, int sock)
+{
+       int ret;
+       ret = LTTCOMM_OK;
+
+       ret = ustctl_disable_channel(sock, usession, uchan);
+       if (ret < 0) {
+               ret = LTTCOMM_UST_CHAN_FAIL;
+               goto error;
+       }
+
+       ret = LTTCOMM_OK;
+
+error:
+       return ret;
+}