X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=5ebe9917a049bc9ae43ee01fbc6348d2fed2c609;hb=6a6b20683ccf29e16baceef5d29357001c2c713a;hp=4a7fadaf5231d4f3c84d33d7956f68f11dd998d5;hpb=68808f4e0bbb3adccff72ff9dab6ec9f3a9e6866;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 4a7fadaf5..5ebe9917a 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -1923,6 +1923,74 @@ error:
 	return ret;
 }
 
+/*
+ * Match function for a hash table lookup of ust_app_ctx.
+ *
+ * It matches an ust app context based on the context type and, in the case
+ * of perf counters, their name.
+ */
+static int ht_match_ust_app_ctx(struct cds_lfht_node *node, const void *_key)
+{
+	struct ust_app_ctx *ctx;
+	const struct lttng_ust_context *key;
+
+	assert(node);
+	assert(_key);
+
+	ctx = caa_container_of(node, struct ust_app_ctx, node.node);
+	key = _key;
+
+	/* Context type */
+	if (ctx->ctx.ctx != key->ctx) {
+		goto no_match;
+	}
+
+	/* Check the name in the case of perf thread counters. */
+	if (key->ctx == LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER) {
+		if (strncmp(key->u.perf_counter.name,
+			ctx->ctx.u.perf_counter.name,
+			sizeof(key->u.perf_counter.name))) {
+			goto no_match;
+		}
+	}
+
+	/* Match. */
+	return 1;
+
+no_match:
+	return 0;
+}
+
+/*
+ * Lookup for an ust app context from an lttng_ust_context.
+ *
+ * Return an ust_app_ctx object or NULL on error.
+ */
+static
+struct ust_app_ctx *find_ust_app_context(struct lttng_ht *ht,
+		struct lttng_ust_context *uctx)
+{
+	struct lttng_ht_iter iter;
+	struct lttng_ht_node_ulong *node;
+	struct ust_app_ctx *app_ctx = NULL;
+
+	assert(uctx);
+	assert(ht);
+
+	/* Lookup using the lttng_ust_context_type and a custom match fct. */
+	cds_lfht_lookup(ht->ht, ht->hash_fct((void *) uctx->ctx, lttng_ht_seed),
+			ht_match_ust_app_ctx, uctx, &iter.iter);
+	node = lttng_ht_iter_get_node_ulong(&iter);
+	if (!node) {
+		goto end;
+	}
+
+	app_ctx = caa_container_of(node, struct ust_app_ctx, node);
+
+end:
+	return app_ctx;
+}
+
 /*
  * Create a context for the channel on the tracer.
  *
@@ -1934,15 +2002,12 @@ int create_ust_app_channel_context(struct ust_app_session *ua_sess,
 		struct ust_app *app)
 {
 	int ret = 0;
-	struct lttng_ht_iter iter;
-	struct lttng_ht_node_ulong *node;
 	struct ust_app_ctx *ua_ctx;
 
 	DBG2("UST app adding context to channel %s", ua_chan->name);
 
-	lttng_ht_lookup(ua_chan->ctx, (void *)((unsigned long)uctx->ctx), &iter);
-	node = lttng_ht_iter_get_node_ulong(&iter);
-	if (node != NULL) {
+	ua_ctx = find_ust_app_context(ua_chan->ctx, uctx);
+	if (ua_ctx) {
 		ret = -EEXIST;
 		goto error;
 	}
@@ -2450,6 +2515,8 @@ static int create_channel_per_uid(struct ust_app *app,
 		/* Create the buffer registry channel object. */
 		ret = create_buffer_reg_channel(reg_uid->registry, ua_chan, &reg_chan);
 		if (ret < 0) {
+			ERR("Error creating the UST channel \"%s\" registry instance",
+				ua_chan->name);
 			goto error;
 		}
 		assert(reg_chan);
@@ -2461,6 +2528,9 @@ static int create_channel_per_uid(struct ust_app *app,
 		ret = do_consumer_create_channel(usess, ua_sess, ua_chan,
 				app->bits_per_long, reg_uid->registry->reg.ust);
 		if (ret < 0) {
+			ERR("Error creating UST channel \"%s\" on the consumer daemon",
+				ua_chan->name);
+
 			/*
 			 * Let's remove the previously created buffer registry channel so
 			 * it's not visible anymore in the session registry.
@@ -2477,6 +2547,8 @@ static int create_channel_per_uid(struct ust_app *app,
 		 */
 		ret = setup_buffer_reg_channel(reg_uid->registry, ua_chan, reg_chan);
 		if (ret < 0) {
+			ERR("Error setting up UST channel \"%s\"",
+				ua_chan->name);
 			goto error;
 		}
 
@@ -2485,6 +2557,10 @@ static int create_channel_per_uid(struct ust_app *app,
 	/* Send buffers to the application. */
 	ret = send_channel_uid_to_ust(reg_chan, app, ua_sess, ua_chan);
 	if (ret < 0) {
+		/*
+		 * Don't report error to the console, since it may be
+		 * caused by application concurrently exiting.
+		 */
 		goto error;
 	}
 
@@ -2519,6 +2595,8 @@ static int create_channel_per_pid(struct ust_app *app,
 	/* Create and add a new channel registry to session. */
 	ret = ust_registry_channel_add(registry, ua_chan->key);
 	if (ret < 0) {
+		ERR("Error creating the UST channel \"%s\" registry instance",
+			ua_chan->name);
 		goto error;
 	}
 
@@ -2526,11 +2604,17 @@ static int create_channel_per_pid(struct ust_app *app,
 	ret = do_consumer_create_channel(usess, ua_sess, ua_chan,
 			app->bits_per_long, registry);
 	if (ret < 0) {
+		ERR("Error creating UST channel \"%s\" on the consumer daemon",
+			ua_chan->name);
 		goto error;
 	}
 
 	ret = send_channel_pid_to_ust(app, ua_sess, ua_chan);
 	if (ret < 0) {
+		/*
+		 * Don't report error to the console, since it may be
+		 * caused by application concurrently exiting.
+		 */
 		goto error;
 	}