projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: do not set quiescent state on channel destroy
[lttng-modules.git]
/
lttng-filter-interpreter.c
diff --git
a/lttng-filter-interpreter.c
b/lttng-filter-interpreter.c
index c288cc024ad90bcbc58f02a849aa074632f04ec3..bd838ccbca7d3fe72eb62b04c4439f785f71303f 100644
(file)
--- a/
lttng-filter-interpreter.c
+++ b/
lttng-filter-interpreter.c
@@
-20,9
+20,12
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <linux/uaccess.h>
+#include <wrapper/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
/*
* get_char should be called with page fault handler disabled if it is expected
@@
-37,7
+40,7
@@
char get_char(struct estack_entry *reg, size_t offset)
char c;
/* Handle invalid access as end of string. */
char c;
/* Handle invalid access as end of string. */
- if (unlikely(!access_ok(VERIFY_READ,
+ if (unlikely(!
lttng_
access_ok(VERIFY_READ,
reg->u.s.user_str + offset,
sizeof(c))))
return '\0';
reg->u.s.user_str + offset,
sizeof(c))))
return '\0';
@@
-119,21
+122,16
@@
int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
}
}
if (unlikely(char_ax == '\0')) {
}
}
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),
}
if (estack_bx(stack, top)->u.s.literal) {
ret = parse_char(estack_bx(stack, top),
@@
-818,7
+816,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);
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");
*(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");
@@
-843,7
+841,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_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)) {
*(const char **) (&filter_stack_data[ref->offset
+ sizeof(unsigned long)]);
if (unlikely(!estack_ax(stack, top)->u.s.str)) {
This page took
0.027553 seconds
and
4
git commands to generate.