X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter.c;h=c74127520c4af5b377fa6db1e7ad439c12cab164;hb=7e50015d099795fcce0602bdb670fd6ae0510026;hp=d71485d166b30bc839b0b71dbd53307aae265def;hpb=a0a3bef9e447a220a36fb7cb4c3f60e4eafdec4d;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-filter.c b/liblttng-ust/lttng-filter.c
index d71485d1..c7412752 100644
--- a/liblttng-ust/lttng-filter.c
+++ b/liblttng-ust/lttng-filter.c
@@ -3,23 +3,28 @@
  *
  * LTTng UST filter code.
  *
- * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2010-2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
+#define _LGPL_SOURCE
 #include <urcu/rculist.h>
 #include "lttng-filter.h"
 
@@ -228,20 +233,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 +277,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 +361,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);