X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcontext.c;h=402da2fd19f48c31ba5fcb6ec8e08f1c615a63d9;hp=b5345728a6a954b5bbe78c76f1ea9d4b7796c923;hb=f11e84c2c33f6e2f4da8436012bcc61b3291b0d7;hpb=9197c5c48e2d1db4c2f9318bbf0af0af9918fdc8

diff --git a/src/bin/lttng-sessiond/context.c b/src/bin/lttng-sessiond/context.c
index b5345728a..402da2fd1 100644
--- 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);
@@ -313,7 +338,7 @@ int context_ust_add(struct ltt_ust_session *usess, int domain,
 		char *channel_name)
 {
 	int ret = LTTCOMM_OK, have_event = 0;
-	struct lttng_ht_iter iter, uiter;
+	struct lttng_ht_iter iter;
 	struct lttng_ht *chan_ht;
 	struct ltt_ust_channel *uchan = NULL;
 	struct ltt_ust_event *uevent = NULL;
@@ -386,20 +411,9 @@ int context_ust_add(struct ltt_ust_session *usess, int domain,
 		cds_lfht_for_each_entry(chan_ht->ht, &iter.iter, uchan, node.node) {
 			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;
 			}
-
-			/* For all events in channel */
-			cds_lfht_for_each_entry(uchan->events->ht, &uiter.iter, uevent,
-					node.node) {
-				ret = add_uctx_to_event(usess, domain, uchan, uevent, ctx);
-				if (ret < 0) {
-					ERR("Context add to event %s in channel %s failed",
-							uevent->attr.name, uchan->name);
-					continue;
-				}
-			}
 		}
 	}
 
@@ -407,14 +421,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;
 }