X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt-context.c;h=60ea525bb3e6c17cfae94ed7736ac9651d73bdc1;hb=90f5546cd358bae1893eb5c098b16114726dfa75;hp=6c3890c3e4a7ba46d2c6f320610a069edbf7dbcd;hpb=44252f0fd51fd4bf28926dcef525355bceb08c5f;p=lttng-modules.git

diff --git a/ltt-context.c b/ltt-context.c
index 6c3890c3..60ea525b 100644
--- a/ltt-context.c
+++ b/ltt-context.c
@@ -21,6 +21,9 @@ int lttng_find_context(struct lttng_ctx *ctx, const char *name)
 	unsigned int i;
 
 	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))
 			return 1;
 	}
@@ -28,6 +31,9 @@ int lttng_find_context(struct lttng_ctx *ctx, const char *name)
 }
 EXPORT_SYMBOL_GPL(lttng_find_context);
 
+/*
+ * Note: as we append context information, the pointer location may change.
+ */
 struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx_p)
 {
 	struct lttng_ctx_field *field;
@@ -57,6 +63,9 @@ struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx_p)
 }
 EXPORT_SYMBOL_GPL(lttng_append_context);
 
+/*
+ * Remove last context field.
+ */
 void lttng_remove_context_field(struct lttng_ctx **ctx_p,
 				struct lttng_ctx_field *field)
 {
@@ -64,6 +73,7 @@ void lttng_remove_context_field(struct lttng_ctx **ctx_p,
 
 	ctx = *ctx_p;
 	ctx->nr_fields--;
+	WARN_ON_ONCE(&ctx->fields[ctx->nr_fields] != field);
 	memset(&ctx->fields[ctx->nr_fields], 0, sizeof(struct lttng_ctx_field));
 }
 EXPORT_SYMBOL_GPL(lttng_remove_context_field);