X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter.h;h=d7105aff3008fca75f1d9ac645457f7bda644867;hb=702d1b7d91bc75f4fc01415fc625af1b834ddec4;hp=7b7213c988162b20398acb0309b63575d17a47c6;hpb=f488575f3420027d33050e779e1e3916e3b91c8c;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-filter.h b/liblttng-ust/lttng-filter.h
index 7b7213c9..d7105aff 100644
--- a/liblttng-ust/lttng-filter.h
+++ b/liblttng-ust/lttng-filter.h
@@ -6,27 +6,32 @@
  *
  * LTTng UST filter header.
  *
- * 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.
  */
 
 #include <errno.h>
 #include <stdio.h>
 #include <helper.h>
 #include <lttng/ust-events.h>
+#include <lttng/ust-context-provider.h>
 #include <stdint.h>
 #include <assert.h>
 #include <errno.h>
@@ -78,7 +83,8 @@ enum entry_type {
 	REG_S64,
 	REG_DOUBLE,
 	REG_STRING,
-	REG_TYPE_UNKNOWN,
+	REG_STAR_GLOB_STRING,
+	REG_UNKNOWN,
 };
 
 /* Validation stack */
@@ -136,7 +142,14 @@ int vstack_pop(struct vstack *stack)
 }
 
 /* Execution stack */
+enum estack_string_literal_type {
+	ESTACK_STRING_LITERAL_TYPE_NONE,
+	ESTACK_STRING_LITERAL_TYPE_PLAIN,
+	ESTACK_STRING_LITERAL_TYPE_STAR_GLOB,
+};
+
 struct estack_entry {
+	enum entry_type type;	/* For dynamic typing. */
 	union {
 		int64_t v;
 		double d;
@@ -144,7 +157,7 @@ struct estack_entry {
 		struct {
 			const char *str;
 			size_t seq_len;
-			int literal;		/* is string literal ? */
+			enum estack_string_literal_type literal_type;
 		} s;
 	} u;
 };
@@ -154,9 +167,18 @@ struct estack {
 	struct estack_entry e[FILTER_STACK_LEN];
 };
 
+/*
+ * Always use aliased type for ax/bx (top of stack).
+ * When ax/bx are S64, use aliased value.
+ */
 #define estack_ax_v	ax
 #define estack_bx_v	bx
+#define estack_ax_t	ax_t
+#define estack_bx_t	bx_t
 
+/*
+ * ax and bx registers can hold either integer, double or string.
+ */
 #define estack_ax(stack, top)					\
 	({							\
 		assert((top) > FILTER_STACK_EMPTY);		\
@@ -169,19 +191,26 @@ struct estack {
 		&(stack)->e[(top) - 1];				\
 	})
 
-#define estack_push(stack, top, ax, bx)				\
+/*
+ * Currently, only integers (REG_S64) can be pushed into the stack.
+ */
+#define estack_push(stack, top, ax, bx, ax_t, bx_t)		\
 	do {							\
 		assert((top) < FILTER_STACK_LEN - 1);		\
 		(stack)->e[(top) - 1].u.v = (bx);		\
+		(stack)->e[(top) - 1].type = (bx_t);		\
 		(bx) = (ax);					\
+		(bx_t) = (ax_t);				\
 		++(top);					\
 	} while (0)
 
-#define estack_pop(stack, top, ax, bx)				\
+#define estack_pop(stack, top, ax, bx, ax_t, bx_t)		\
 	do {							\
 		assert((top) > FILTER_STACK_EMPTY);		\
 		(ax) = (bx);					\
+		(ax_t) = (bx_t);				\
 		(bx) = (stack)->e[(top) - 2].u.v;		\
+		(bx_t) = (stack)->e[(top) - 2].type;		\
 		(top)--;					\
 	} while (0)
 
@@ -190,9 +219,9 @@ const char *print_op(enum filter_op op);
 int lttng_filter_validate_bytecode(struct bytecode_runtime *bytecode);
 int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode);
 
-int lttng_filter_false(void *filter_data,
+uint64_t lttng_filter_false(void *filter_data,
 		const char *filter_stack_data);
-int lttng_filter_interpret_bytecode(void *filter_data,
+uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 		const char *filter_stack_data);
 
 #endif /* _LTTNG_FILTER_H */