X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-filter-interpreter.c;h=761926f748457e09752eec3b5160dccf0fe2d66a;hb=52a391bdd89e233e99cc3fbe1fdd7bbef694b876;hp=ffce2150af3aacdb62789a21e413f9d7bb50ccac;hpb=f127e61ee231d002fb9a7803643a157e06f6d2e2;p=lttng-modules.git

diff --git a/lttng-filter-interpreter.c b/lttng-filter-interpreter.c
index ffce2150..761926f7 100644
--- a/lttng-filter-interpreter.c
+++ b/lttng-filter-interpreter.c
@@ -3,26 +3,33 @@
  *
  * LTTng modules filter interpreter.
  *
- * Copyright (C) 2010-2014 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.
  */
 
 #include <linux/uaccess.h>
+#include <wrapper/frame.h>
 
-#include "lttng-filter.h"
+#include <lttng-filter.h>
+
+LTTNG_STACK_FRAME_NON_STANDARD(lttng_filter_interpret_bytecode);
 
 /*
  * get_char should be called with page fault handler disabled if it is expected
@@ -119,21 +126,16 @@ int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
 			}
 		}
 		if (unlikely(char_ax == '\0')) {
-			if (char_bx == '\0') {
-				diff = 0;
-				break;
-			} else {
-				if (estack_bx(stack, top)->u.s.literal) {
-					ret = parse_char(estack_bx(stack, top),
-						&char_bx, &offset_bx);
-					if (ret == -1) {
-						diff = 0;
-						break;
-					}
+			if (estack_bx(stack, top)->u.s.literal) {
+				ret = parse_char(estack_bx(stack, top),
+					&char_bx, &offset_bx);
+				if (ret == -1) {
+					diff = 0;
+					break;
 				}
-				diff = 1;
-				break;
 			}
+			diff = 1;
+			break;
 		}
 		if (estack_bx(stack, top)->u.s.literal) {
 			ret = parse_char(estack_bx(stack, top),
@@ -183,6 +185,7 @@ int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
 }
 
 uint64_t lttng_filter_false(void *filter_data,
+		struct lttng_probe_ctx *lttng_probe_ctx,
 		const char *filter_stack_data)
 {
 	return 0;
@@ -240,6 +243,7 @@ LABEL_##name
  * effect.
  */
 uint64_t lttng_filter_interpret_bytecode(void *filter_data,
+		struct lttng_probe_ctx *lttng_probe_ctx,
 		const char *filter_stack_data)
 {
 	struct bytecode_runtime *bytecode = filter_data;
@@ -766,7 +770,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			dbg_printk("get context ref offset %u type string\n",
 				ref->offset);
 			ctx_field = &lttng_static_ctx->fields[ref->offset];
-			ctx_field->get_value(ctx_field, &v);
+			ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
 			estack_push(stack, top, ax, bx);
 			estack_ax(stack, top)->u.s.str = v.str;
 			if (unlikely(!estack_ax(stack, top)->u.s.str)) {
@@ -792,7 +796,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			dbg_printk("get context ref offset %u type s64\n",
 				ref->offset);
 			ctx_field = &lttng_static_ctx->fields[ref->offset];
-			ctx_field->get_value(ctx_field, &v);
+			ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
 			estack_push(stack, top, ax, bx);
 			estack_ax_v = v.s64;
 			dbg_printk("ref get context s64 %lld\n",
@@ -816,7 +820,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			dbg_printk("load field ref offset %u type user string\n",
 				ref->offset);
 			estack_push(stack, top, ax, bx);
-			estack_ax(stack, top)->u.s.str =
+			estack_ax(stack, top)->u.s.user_str =
 				*(const char * const *) &filter_stack_data[ref->offset];
 			if (unlikely(!estack_ax(stack, top)->u.s.str)) {
 				dbg_printk("Filter warning: loading a NULL string.\n");
@@ -841,7 +845,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			estack_push(stack, top, ax, bx);
 			estack_ax(stack, top)->u.s.seq_len =
 				*(unsigned long *) &filter_stack_data[ref->offset];
-			estack_ax(stack, top)->u.s.str =
+			estack_ax(stack, top)->u.s.user_str =
 				*(const char **) (&filter_stack_data[ref->offset
 								+ sizeof(unsigned long)]);
 			if (unlikely(!estack_ax(stack, top)->u.s.str)) {