From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 4 Feb 2016 00:17:35 +0000 (-0500)
Subject: Expect filter context identifiers starting with $ctx.
X-Git-Tag: v2.8.0-rc1~38
X-Git-Url: http://git.lttng.org/?a=commitdiff_plain;ds=sidebyside;h=0451bcec4a29bb6b8945bf80d58cfec1f35aee95;p=lttng-modules.git

Expect filter context identifiers starting with $ctx.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/lttng-context.c b/lttng-context.c
index 9bf4d800..1121f6ef 100644
--- a/lttng-context.c
+++ b/lttng-context.c
@@ -56,14 +56,20 @@ EXPORT_SYMBOL_GPL(lttng_find_context);
 int lttng_get_context_index(struct lttng_ctx *ctx, const char *name)
 {
 	unsigned int i;
+	const char *subname;
 
 	if (!ctx)
 		return -1;
+	if (strncmp(name, "$ctx.", strlen("$ctx.")) == 0) {
+		subname = name + strlen("$ctx.");
+	} else {
+		subname = name;
+	}
 	for (i = 0; i < ctx->nr_fields; i++) {
 		/* Skip allocated (but non-initialized) contexts */
 		if (!ctx->fields[i].event_field.name)
 			continue;
-		if (!strcmp(ctx->fields[i].event_field.name, name))
+		if (!strcmp(ctx->fields[i].event_field.name, subname))
 			return i;
 	}
 	return -1;