Implement filter bytecode support in lttng-session, and parse filter string

[lttng-tools.git] / src / lib / lttng-ctl / filter-visitor-generate-bytecode.c

diff --git a/src/lib/lttng-ctl/filter-visitor-generate-bytecode.c b/src/lib/lttng-ctl/filter-visitor-generate-bytecode.c
index e940e2c81ab6f85ea8313018d58f5fc7d51f8e6e..25128b6a2fc6b9f2bd1826f66efbe8909d8f4a23 100644 (file)
--- a/src/lib/lttng-ctl/filter-visitor-generate-bytecode.c
+++ b/src/lib/lttng-ctl/filter-visitor-generate-bytecode.c
@@ -39,9 +39,9 @@ int recursive_visit_gen_bytecode(struct filter_parser_ctx *ctx,
                struct ir_op *node);
 
 static
                struct ir_op *node);
 
 static

-int bytecode_init(struct filter_bytecode_alloc **fb)
+int bytecode_init(struct lttng_filter_bytecode_alloc **fb)

 {
 {

-       *fb = calloc(sizeof(struct filter_bytecode_alloc) + INIT_ALLOC_SIZE, 1);
+       *fb = calloc(sizeof(struct lttng_filter_bytecode_alloc) + INIT_ALLOC_SIZE, 1);

        if (!*fb) {
                return -ENOMEM;
        } else {
        if (!*fb) {
                return -ENOMEM;
        } else {


@@ -51,7 +51,7 @@ int bytecode_init(struct filter_bytecode_alloc **fb)
 }
 
 static
 }
 
 static

-int32_t bytecode_reserve(struct filter_bytecode_alloc **fb, uint32_t align, uint32_t len)
+int32_t bytecode_reserve(struct lttng_filter_bytecode_alloc **fb, uint32_t align, uint32_t len)

 {
        int32_t ret;
        uint32_t padding = offset_align((*fb)->b.len, align);
 {
        int32_t ret;
        uint32_t padding = offset_align((*fb)->b.len, align);


@@ -64,7 +64,7 @@ int32_t bytecode_reserve(struct filter_bytecode_alloc **fb, uint32_t align, uint
 
                if (new_len > 0xFFFF)
                        return -EINVAL;
 
                if (new_len > 0xFFFF)
                        return -EINVAL;

-               *fb = realloc(*fb, sizeof(struct filter_bytecode_alloc) + new_len);
+               *fb = realloc(*fb, sizeof(struct lttng_filter_bytecode_alloc) + new_len);

                if (!*fb)
                        return -ENOMEM;
                memset(&(*fb)->b.data[old_len], 0, new_len - old_len);
                if (!*fb)
                        return -ENOMEM;
                memset(&(*fb)->b.data[old_len], 0, new_len - old_len);


@@ -77,7 +77,7 @@ int32_t bytecode_reserve(struct filter_bytecode_alloc **fb, uint32_t align, uint
 }
 
 static
 }
 
 static

-int bytecode_push(struct filter_bytecode_alloc **fb, const void *data,
+int bytecode_push(struct lttng_filter_bytecode_alloc **fb, const void *data,

                uint32_t align, uint32_t len)
 {
        int32_t offset;
                uint32_t align, uint32_t len)
 {
        int32_t offset;


@@ -90,7 +90,7 @@ int bytecode_push(struct filter_bytecode_alloc **fb, const void *data,
 }
 
 static
 }
 
 static

-int bytecode_push_logical(struct filter_bytecode_alloc **fb,
+int bytecode_push_logical(struct lttng_filter_bytecode_alloc **fb,

                struct logical_op *data,
                uint32_t align, uint32_t len,
                uint16_t *skip_offset)
                struct logical_op *data,
                uint32_t align, uint32_t len,
                uint16_t *skip_offset)


@@ -108,7 +108,7 @@ int bytecode_push_logical(struct filter_bytecode_alloc **fb,
 }
 
 static
 }
 
 static

-int bytecode_patch(struct filter_bytecode_alloc **fb,
+int bytecode_patch(struct lttng_filter_bytecode_alloc **fb,

                const void *data,
                uint16_t offset,
                uint32_t len)
                const void *data,
                uint16_t offset,
                uint32_t len)