From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 27 Jul 2011 14:40:13 +0000 (-0400)
Subject: context: document and check that only last context is removed
X-Git-Tag: v1.9.1~321
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=b13d13b1ccb153fe37b46c0e0a39d24be9b89b90;p=lttng-ust.git

context: document and check that only last context is removed

Merge from lttng-modules:

commit 4cae220c1be2cc73008603a21152fce7643cfc35
Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date:   Sat Jul 23 12:37:54 2011 -0400

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

diff --git a/libust/ltt-context.c b/libust/ltt-context.c
index 634694b9..030a11b0 100644
--- a/libust/ltt-context.c
+++ b/libust/ltt-context.c
@@ -45,6 +45,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 +55,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);