X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2Fltt-context.c;h=402f0c48ef4ba6337d6ffee989de7282aa89b906;hb=403c40b4b90356fddbb18cd12c6e6891c8bd317b;hp=634694b968d4c06f6cf5066b684c80efc10d68d9;hpb=8020ceb59ade464e7edfa07aa973a5d5fd955094;p=lttng-ust.git

diff --git a/libust/ltt-context.c b/libust/ltt-context.c
index 634694b9..402f0c48 100644
--- a/libust/ltt-context.c
+++ b/libust/ltt-context.c
@@ -16,6 +16,9 @@
 #include "ltt-events.h"
 #include "ltt-tracer.h"
 
+/*
+ * 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;
@@ -45,6 +48,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)
 {
@@ -52,6 +58,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);