* 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
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';
}
}
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),
}
uint64_t lttng_filter_false(void *filter_data,
+ struct lttng_probe_ctx *lttng_probe_ctx,
const char *filter_stack_data)
{
return 0;
* 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;
dbg_printk("get context ref offset %u type string\n",
ref->offset);
ctx_field = <tng_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)) {
dbg_printk("get context ref offset %u type s64\n",
ref->offset);
ctx_field = <tng_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",
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");
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)) {