Decouple `struct lttng_session` from filter code

[deliverable/lttng-ust.git] / liblttng-ust / lttng-filter.c

diff --git a/liblttng-ust/lttng-filter.c b/liblttng-ust/lttng-filter.c
index ee562dd0f6a61a1193989ba7e27cf4cf046047cb..7dbe6f26e85c38667e872b7da94064ea06c94555 100644 (file)
--- a/liblttng-ust/lttng-filter.c
+++ b/liblttng-ust/lttng-filter.c
@@ -211,6 +211,9 @@ int apply_field_reloc(struct lttng_event *event,
                return -EINVAL;
        nr_fields = desc->nr_fields;
        for (i = 0; i < nr_fields; i++) {
+               if (fields[i].u.ext.nofilter) {
+                       continue;
+               }
                if (!strcmp(fields[i].name, field_name)) {
                        field = &fields[i];
                        break;
@@ -219,10 +222,13 @@ int apply_field_reloc(struct lttng_event *event,
                switch (fields[i].type.atype) {
                case atype_integer:
                case atype_enum:
+               case atype_enum_nestable:
                        field_offset += sizeof(int64_t);
                        break;
                case atype_array:
+               case atype_array_nestable:
                case atype_sequence:
+               case atype_sequence_nestable:
                        field_offset += sizeof(unsigned long);
                        field_offset += sizeof(void *);
                        break;
@@ -255,10 +261,13 @@ int apply_field_reloc(struct lttng_event *event,
                switch (field->type.atype) {
                case atype_integer:
                case atype_enum:
+               case atype_enum_nestable:
                        op->op = FILTER_OP_LOAD_FIELD_REF_S64;
                        break;
                case atype_array:
+               case atype_array_nestable:
                case atype_sequence:
+               case atype_sequence_nestable:
                        op->op = FILTER_OP_LOAD_FIELD_REF_SEQUENCE;
                        break;
                case atype_string:
@@ -291,22 +300,21 @@ int apply_context_reloc(struct lttng_event *event,
        struct load_op *op;
        struct lttng_ctx_field *ctx_field;
        int idx;
-       struct lttng_session *session = runtime->p.session;
+       struct lttng_ctx *ctx = *runtime->p.pctx;
 
        dbg_printf("Apply context reloc: %u %s\n", reloc_offset, context_name);
 
        /* Get context index */
-       idx = lttng_get_context_index(session->ctx, context_name);
+       idx = lttng_get_context_index(ctx, context_name);
        if (idx < 0) {
                if (lttng_context_is_app(context_name)) {
                        int ret;
 
                        ret = lttng_ust_add_app_context_to_ctx_rcu(context_name,
-                                       &session->ctx);
+                                       &ctx);
                        if (ret)
                                return ret;
-                       idx = lttng_get_context_index(session->ctx,
-                               context_name);
+                       idx = lttng_get_context_index(ctx, context_name);
                        if (idx < 0)
                                return -ENOENT;
                } else {
@@ -318,7 +326,7 @@ int apply_context_reloc(struct lttng_event *event,
                return -EINVAL;
 
        /* Get context return type */
-       ctx_field = &session->ctx->fields[idx];
+       ctx_field = &ctx->fields[idx];
        op = (struct load_op *) &runtime->code[reloc_offset];
 
        switch (filter_op) {
@@ -330,12 +338,15 @@ int apply_context_reloc(struct lttng_event *event,
                switch (ctx_field->event_field.type.atype) {
                case atype_integer:
                case atype_enum:
+               case atype_enum_nestable:
                        op->op = FILTER_OP_GET_CONTEXT_REF_S64;
                        break;
                        /* Sequence and array supported as string */
                case atype_string:
                case atype_array:
+               case atype_array_nestable:
                case atype_sequence:
+               case atype_sequence_nestable:
                        op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
                        break;
                case atype_float:
@@ -437,8 +448,7 @@ int _lttng_filter_event_link_bytecode(struct lttng_event *event,
                goto alloc_error;
        }
        runtime->p.bc = filter_bytecode;
-       runtime->p.session = event->chan->session;
-       runtime->p.event = event;
+       runtime->p.pctx = &event->chan->session->ctx;
        runtime->len = filter_bytecode->bc.reloc_offset;
        /* copy original bytecode */
        memcpy(runtime->code, filter_bytecode->bc.data, runtime->len);
@@ -525,11 +535,12 @@ void lttng_enabler_event_link_bytecode(struct lttng_event *event,
 
                /*
                 * Insert at specified priority (seqnum) in increasing
-                * order.
+                * order. If there already is a bytecode of the same priority,
+                * insert the new bytecode right after it.
                 */
                cds_list_for_each_entry_reverse(runtime,
                                &event->bytecode_runtime_head, node) {
-                       if (runtime->bc->bc.seqnum < bc->bc.seqnum) {
+                       if (runtime->bc->bc.seqnum <= bc->bc.seqnum) {
                                /* insert here */
                                insert_loc = &runtime->node;
                                goto add_within;
@@ -557,13 +568,19 @@ int lttng_filter_enabler_attach_bytecode(struct lttng_enabler *enabler,
        return 0;
 }
 
-void lttng_free_event_filter_runtime(struct lttng_event *event)
+static
+void free_filter_runtime(struct cds_list_head *bytecode_runtime_head)
 {
        struct bytecode_runtime *runtime, *tmp;
 
-       cds_list_for_each_entry_safe(runtime, tmp,
-                       &event->bytecode_runtime_head, p.node) {
+       cds_list_for_each_entry_safe(runtime, tmp, bytecode_runtime_head,
+                       p.node) {
                free(runtime->data);
                free(runtime);
        }
 }
+
+void lttng_free_event_filter_runtime(struct lttng_event *event)
+{
+       free_filter_runtime(&event->bytecode_runtime_head);
+}