X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lttng-context.c;h=933732266e9eb076ff26d0adefa1381a351b6399;hb=f513b2bf88afa9a36a725fbf8e91e3a3f3efebc9;hp=9bf4d80087bff96438d1919fbb1fb583abf401a6;hpb=79150a4903b5f31695fcd1d9655555ba6dc4bfa4;p=lttng-modules.git

diff --git a/lttng-context.c b/lttng-context.c
index 9bf4d800..93373226 100644
--- a/lttng-context.c
+++ b/lttng-context.c
@@ -24,9 +24,9 @@
 #include <linux/list.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
-#include "wrapper/vmalloc.h"	/* for wrapper_vmalloc_sync_all() */
-#include "lttng-events.h"
-#include "lttng-tracer.h"
+#include <wrapper/vmalloc.h>	/* for wrapper_vmalloc_sync_all() */
+#include <lttng-events.h>
+#include <lttng-tracer.h>
 
 /*
  * The filter implementation requires that two consecutive "get" for the
@@ -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;
@@ -135,6 +141,9 @@ void lttng_context_update(struct lttng_ctx *ctx)
 
 			case atype_array:
 			case atype_sequence:
+			case atype_struct:
+			case atype_array_compound:
+			case atype_sequence_compound:
 			default:
 				WARN_ON_ONCE(1);
 				break;
@@ -154,6 +163,9 @@ void lttng_context_update(struct lttng_ctx *ctx)
 			case atype_string:
 			case atype_array:
 			case atype_sequence:
+			case atype_struct:
+			case atype_array_compound:
+			case atype_sequence_compound:
 			default:
 				WARN_ON_ONCE(1);
 				break;
@@ -172,6 +184,9 @@ void lttng_context_update(struct lttng_ctx *ctx)
 
 			case atype_array:
 			case atype_sequence:
+			case atype_struct:
+			case atype_array_compound:
+			case atype_sequence_compound:
 			default:
 				WARN_ON_ONCE(1);
 				break;
@@ -181,6 +196,11 @@ void lttng_context_update(struct lttng_ctx *ctx)
 		case atype_string:
 			break;
 
+		case atype_struct:
+		case atype_array_compound:
+		case atype_sequence_compound:
+			break;
+
 		case atype_enum:
 		default:
 			WARN_ON_ONCE(1);