X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter.c;h=ee94a4ccc2498d4c1272935e67dda7e1eadbe979;hb=53569322d40ed45abe0368ddb08eb4a2738afc37;hp=d71485d166b30bc839b0b71dbd53307aae265def;hpb=5cf81d53e305c81517e48e0dc91620a916cdc0cc;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-filter.c b/liblttng-ust/lttng-filter.c
index d71485d1..ee94a4cc 100644
--- a/liblttng-ust/lttng-filter.c
+++ b/liblttng-ust/lttng-filter.c
@@ -228,20 +228,34 @@ int apply_context_reloc(struct lttng_event *event,
 	struct load_op *op;
 	struct lttng_ctx_field *ctx_field;
 	int idx;
+	struct lttng_session *session = runtime->p.session;
 
 	dbg_printf("Apply context reloc: %u %s\n", reloc_offset, context_name);
 
 	/* Get context index */
-	idx = lttng_get_context_index(lttng_static_ctx, context_name);
-	if (idx < 0)
-		return -ENOENT;
-
+	idx = lttng_get_context_index(session->ctx, context_name);
+	if (idx < 0) {
+		if (lttng_context_is_app(context_name)) {
+			int ret;
+
+			ret = lttng_ust_add_app_context_to_ctx_rcu(context_name,
+					&session->ctx);
+			if (ret)
+				return ret;
+			idx = lttng_get_context_index(session->ctx,
+				context_name);
+			if (idx < 0)
+				return -ENOENT;
+		} else {
+			return -ENOENT;
+		}
+	}
 	/* Check if idx is too large for 16-bit offset */
 	if (idx > FILTER_BYTECODE_MAX_LEN - 1)
 		return -EINVAL;
 
 	/* Get context return type */
-	ctx_field = &lttng_static_ctx->fields[idx];
+	ctx_field = &session->ctx->fields[idx];
 	op = (struct load_op *) &runtime->data[reloc_offset];
 	field_ref = (struct field_ref *) op->data;
 	switch (ctx_field->event_field.type.atype) {
@@ -258,6 +272,9 @@ int apply_context_reloc(struct lttng_event *event,
 	case atype_float:
 		op->op = FILTER_OP_GET_CONTEXT_REF_DOUBLE;
 		break;
+	case atype_dynamic:
+		op->op = FILTER_OP_GET_CONTEXT_REF;
+		break;
 	default:
 		return -EINVAL;
 	}
@@ -339,6 +356,7 @@ int _lttng_filter_event_link_bytecode(struct lttng_event *event,
 		goto alloc_error;
 	}
 	runtime->p.bc = filter_bytecode;
+	runtime->p.session = event->chan->session;
 	runtime->len = filter_bytecode->bc.reloc_offset;
 	/* copy original bytecode */
 	memcpy(runtime->data, filter_bytecode->bc.data, runtime->len);