X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=lttng-filter.h;h=6ce78ac49b2d138e84dcf1f57832caeb29eb8f52;hb=bbf3aef542f1d86cb2a2a304444ef7529d01eb6b;hp=7eea1487e5774bd74458c9243bac17e9ad7101cc;hpb=f127e61ee231d002fb9a7803643a157e06f6d2e2;p=lttng-modules.git

diff --git a/lttng-filter.h b/lttng-filter.h
index 7eea1487..6ce78ac4 100644
--- a/lttng-filter.h
+++ b/lttng-filter.h
@@ -6,27 +6,31 @@
  *
  * LTTng modules filter header.
  *
- * 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/kernel.h>
 
-#include "lttng-events.h"
-#include "filter-bytecode.h"
+#include <lttng-events.h>
+#include <filter-bytecode.h>
 
 /* Filter stack length, in number of entries */
 #define FILTER_STACK_LEN	10	/* includes 2 dummy */
@@ -139,19 +143,19 @@ struct estack {
 
 #define estack_ax(stack, top)					\
 	({							\
-		WARN_ON_ONCE((top) <= FILTER_STACK_EMPTY);	\
+		BUG_ON((top) <= FILTER_STACK_EMPTY);		\
 		&(stack)->e[top];				\
 	})
 
 #define estack_bx(stack, top)					\
 	({							\
-		WARN_ON_ONCE((top) <= FILTER_STACK_EMPTY + 1);	\
+		BUG_ON((top) <= FILTER_STACK_EMPTY + 1);	\
 		&(stack)->e[(top) - 1];				\
 	})
 
 #define estack_push(stack, top, ax, bx)				\
 	do {							\
-		WARN_ON_ONCE((top) >= FILTER_STACK_LEN - 1);	\
+		BUG_ON((top) >= FILTER_STACK_LEN - 1);		\
 		(stack)->e[(top) - 1].u.v = (bx);		\
 		(bx) = (ax);					\
 		++(top);					\
@@ -159,7 +163,7 @@ struct estack {
 
 #define estack_pop(stack, top, ax, bx)				\
 	do {							\
-		WARN_ON_ONCE((top) <= FILTER_STACK_EMPTY);	\
+		BUG_ON((top) <= FILTER_STACK_EMPTY);		\
 		(ax) = (bx);					\
 		(bx) = (stack)->e[(top) - 2].u.v;		\
 		(top)--;					\
@@ -171,8 +175,10 @@ int lttng_filter_validate_bytecode(struct bytecode_runtime *bytecode);
 int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode);
 
 uint64_t lttng_filter_false(void *filter_data,
+		struct lttng_probe_ctx *lttng_probe_ctx,
 		const char *filter_stack_data);
 uint64_t lttng_filter_interpret_bytecode(void *filter_data,
+		struct lttng_probe_ctx *lttng_probe_ctx,
 		const char *filter_stack_data);
 
 #endif /* _LTTNG_FILTER_H */