Fix add-context returned error

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

diff --git a/src/bin/lttng-sessiond/context.c b/src/bin/lttng-sessiond/context.c
index 19eaa714521764de1bda512bde33f6123ddfe6d0..e4c9a51bfb94679339ec94077d4155ddf53261b1 100644 (file)
--- a/src/bin/lttng-sessiond/context.c
+++ b/src/bin/lttng-sessiond/context.c
@@ -158,11 +158,13 @@ static int add_uctx_to_channel(struct ltt_ust_session *usess, int domain,
 {
        int ret;
        struct ltt_ust_context *uctx;
+       struct lttng_ht_iter iter;
+       struct lttng_ht_node_ulong *uctx_node;
 
        /* Create ltt UST context */
        uctx = trace_ust_create_context(ctx);
        if (uctx == NULL) {
-               ret = LTTCOMM_FATAL;
+               ret = -EINVAL;
                goto error;
        }
 
@@ -174,14 +176,24 @@ static int add_uctx_to_channel(struct ltt_ust_session *usess, int domain,
                }
                break;
        default:
-               ret = LTTCOMM_UND;
+               ret = -ENOSYS;
+               goto error;
+       }
+
+       /* Lookup context before adding it */
+       lttng_ht_lookup(uchan->ctx, (void *)((unsigned long)uctx->ctx.ctx), &iter);
+       uctx_node = lttng_ht_iter_get_node_ulong(&iter);
+       if (uctx_node != NULL) {
+               ret = -EEXIST;
                goto error;
        }
 
        /* Add ltt UST context node to ltt UST channel */
        lttng_ht_add_unique_ulong(uchan->ctx, &uctx->node);
 
-       return LTTCOMM_OK;
+       DBG("Context UST %d added to channel %s", uctx->ctx.ctx, uchan->name);
+
+       return 0;
 
 error:
        free(uctx);
@@ -197,11 +209,14 @@ static int add_uctx_to_event(struct ltt_ust_session *usess, int domain,
 {
        int ret;
        struct ltt_ust_context *uctx;
+       struct lttng_ht_iter iter;
+       struct lttng_ht_node_ulong *uctx_node;
 
        /* Create ltt UST context */
        uctx = trace_ust_create_context(ctx);
        if (uctx == NULL) {
-               ret = LTTCOMM_FATAL;
+               /* Context values are invalid. */
+               ret = -EINVAL;
                goto error;
        }
 
@@ -213,14 +228,24 @@ static int add_uctx_to_event(struct ltt_ust_session *usess, int domain,
                }
                break;
        default:
-               ret = LTTCOMM_UND;
+               ret = -ENOSYS;
+               goto error;
+       }
+
+       /* Lookup context before adding it */
+       lttng_ht_lookup(uevent->ctx, (void *)((unsigned long)uctx->ctx.ctx), &iter);
+       uctx_node = lttng_ht_iter_get_node_ulong(&iter);
+       if (uctx_node != NULL) {
+               ret = -EEXIST;
                goto error;
        }
 
        /* Add ltt UST context node to ltt UST event */
        lttng_ht_add_unique_ulong(uevent->ctx, &uctx->node);
 
-       return LTTCOMM_OK;
+       DBG("Context UST %d added to event %s", uctx->ctx.ctx, uevent->attr.name);
+
+       return 0;
 
 error:
        free(uctx);
@@ -312,7 +337,7 @@ int context_ust_add(struct ltt_ust_session *usess, int domain,
                struct lttng_event_context *ctx, char *event_name,
                char *channel_name)
 {
-       int ret = LTTCOMM_OK, have_event = 0;
+       int ret = LTTCOMM_OK, have_event = 0, no_chan = 1;
        struct lttng_ht_iter iter;
        struct lttng_ht *chan_ht;
        struct ltt_ust_channel *uchan = NULL;
@@ -384,9 +409,10 @@ int context_ust_add(struct ltt_ust_session *usess, int domain,
        } else if (!uchan && !have_event) {     /* Add ctx all events, all channels */
                /* For all channels */
                cds_lfht_for_each_entry(chan_ht->ht, &iter.iter, uchan, node.node) {
+                       no_chan = 0;
                        ret = add_uctx_to_channel(usess, domain, uchan, ctx);
                        if (ret < 0) {
-                               ERR("Context added to channel %s failed", uchan->name);
+                               ERR("Context failed for channel %s", uchan->name);
                                continue;
                        }
                }
@@ -396,14 +422,21 @@ end:
        switch (ret) {
        case -EEXIST:
                ret = LTTCOMM_UST_CONTEXT_EXIST;
-               goto error;
+               break;
        case -ENOMEM:
                ret = LTTCOMM_FATAL;
-               goto error;
+               break;
+       case -EINVAL:
+               ret = LTTCOMM_UST_CONTEXT_INVAL;
+               break;
+       case -ENOSYS:
+               ret = LTTCOMM_UNKNOWN_DOMAIN;
+               break;
+       default:
+               ret = LTTCOMM_OK;
+               break;
        }
 
-       return LTTCOMM_OK;
-
 error:
        return ret;
 }