X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcontext.c;h=1b87df2e90ab03a3d95192a5afc102fc21404397;hb=aa3514e96f12c13f681a81ea275dc51dd63473c8;hp=cee61f764ce192350583154df8e40d808ef7edac;hpb=e7fe706f887aa4d753b102a610f802f7dd816655;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/context.c b/src/bin/lttng-sessiond/context.c
index cee61f764..1b87df2e9 100644
--- a/src/bin/lttng-sessiond/context.c
+++ b/src/bin/lttng-sessiond/context.c
@@ -39,6 +39,9 @@ static int add_kctx_all_channels(struct ltt_kernel_session *ksession,
 	int ret;
 	struct ltt_kernel_channel *kchan;
 
+	assert(ksession);
+	assert(kctx);
+
 	DBG("Adding kernel context to all channels");
 
 	/* Go over all channels */
@@ -64,6 +67,9 @@ static int add_kctx_to_channel(struct lttng_kernel_context *kctx,
 {
 	int ret;
 
+	assert(kchan);
+	assert(kctx);
+
 	DBG("Add kernel context to channel '%s'", kchan->channel->name);
 
 	ret = kernel_add_channel_context(kchan, kctx);
@@ -86,8 +92,18 @@ 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;
+
+	assert(usess);
+	assert(uchan);
+	assert(ctx);
+
+	/* Check if context is duplicate */
+	cds_list_for_each_entry(uctx, &uchan->ctx_list, list) {
+		if (trace_ust_match_context(uctx, ctx)) {
+			ret = -EEXIST;
+			goto duplicate;
+		}
+	}
 
 	/* Create ltt UST context */
 	uctx = trace_ust_create_context(ctx);
@@ -110,18 +126,10 @@ static int add_uctx_to_channel(struct ltt_ust_session *usess, int domain,
 
 	rcu_read_lock();
 
-	/* 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;
-		rcu_read_unlock();
-		goto error;
-	}
-
 	/* Add ltt UST context node to ltt UST channel */
-	lttng_ht_add_unique_ulong(uchan->ctx, &uctx->node);
+	lttng_ht_add_ulong(uchan->ctx, &uctx->node);
 	rcu_read_unlock();
+	cds_list_add_tail(&uctx->list, &uchan->ctx_list);
 
 	DBG("Context UST %d added to channel %s", uctx->ctx.ctx, uchan->name);
 
@@ -129,6 +137,7 @@ static int add_uctx_to_channel(struct ltt_ust_session *usess, int domain,
 
 error:
 	free(uctx);
+duplicate:
 	return ret;
 }
 
@@ -142,14 +151,15 @@ int context_kernel_add(struct ltt_kernel_session *ksession,
 	struct ltt_kernel_channel *kchan;
 	struct lttng_kernel_context kctx;
 
+	assert(ksession);
+	assert(ctx);
+	assert(channel_name);
+
 	/* Setup kernel context structure */
 	switch (ctx->ctx) {
 	case LTTNG_EVENT_CONTEXT_PID:
 		kctx.ctx = LTTNG_KERNEL_CONTEXT_PID;
 		break;
-	case LTTNG_EVENT_CONTEXT_PERF_COUNTER:
-		kctx.ctx = LTTNG_KERNEL_CONTEXT_PERF_COUNTER;
-		break;
 	case LTTNG_EVENT_CONTEXT_PROCNAME:
 		kctx.ctx = LTTNG_KERNEL_CONTEXT_PROCNAME;
 		break;
@@ -177,6 +187,10 @@ int context_kernel_add(struct ltt_kernel_session *ksession,
 	case LTTNG_EVENT_CONTEXT_HOSTNAME:
 		kctx.ctx = LTTNG_KERNEL_CONTEXT_HOSTNAME;
 		break;
+	case LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER:
+	case LTTNG_EVENT_CONTEXT_PERF_COUNTER:
+		kctx.ctx = LTTNG_KERNEL_CONTEXT_PERF_CPU_COUNTER;
+		break;
 	default:
 		return LTTNG_ERR_KERN_CONTEXT_FAIL;
 	}
@@ -187,7 +201,7 @@ int context_kernel_add(struct ltt_kernel_session *ksession,
 			LTTNG_SYMBOL_NAME_LEN);
 	kctx.u.perf_counter.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
 
-	if (strlen(channel_name) == 0) {
+	if (*channel_name == '\0') {
 		ret = add_kctx_all_channels(ksession, &kctx);
 		if (ret != LTTNG_OK) {
 			goto error;
@@ -223,6 +237,12 @@ int context_ust_add(struct ltt_ust_session *usess, int domain,
 	struct lttng_ht *chan_ht;
 	struct ltt_ust_channel *uchan = NULL;
 
+	assert(usess);
+	assert(ctx);
+	assert(channel_name);
+
+	rcu_read_lock();
+
 	/*
 	 * Define which channel's hashtable to use from the domain or quit if
 	 * unknown domain.
@@ -242,7 +262,7 @@ int context_ust_add(struct ltt_ust_session *usess, int domain,
 	}
 
 	/* Get UST channel if defined */
-	if (strlen(channel_name) != 0) {
+	if (channel_name[0] != '\0') {
 		uchan = trace_ust_find_channel_by_name(chan_ht, channel_name);
 		if (uchan == NULL) {
 			ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
@@ -285,5 +305,6 @@ int context_ust_add(struct ltt_ust_session *usess, int domain,
 	}
 
 error:
+	rcu_read_unlock();
 	return ret;
 }