Move event context to private structures

[lttng-ust.git] / liblttng-ust / lttng-bytecode.c

diff --git a/liblttng-ust/lttng-bytecode.c b/liblttng-ust/lttng-bytecode.c
index 39881be021d896420c97b45aa074da227a1a0cfd..d75600baee9a92e83e68cdae30a981bfd8c416f0 100644 (file)
--- a/liblttng-ust/lttng-bytecode.c
+++ b/liblttng-ust/lttng-bytecode.c
@@ -15,6 +15,7 @@
 #include "context-internal.h"
 #include "lttng-bytecode.h"
 #include "ust-events-internal.h"
+#include "ust-helper.h"
 
 static const char *opnames[] = {
        [ BYTECODE_OP_UNKNOWN ] = "UNKNOWN",
@@ -178,7 +179,7 @@ int apply_field_reloc(const struct lttng_ust_event_desc *event_desc,
                const char *field_name,
                enum bytecode_op bytecode_op)
 {
-       const struct lttng_ust_event_field **fields, *field = NULL;
+       struct lttng_ust_event_field **fields, *field = NULL;
        unsigned int nr_fields, i;
        struct load_op *op;
        uint32_t field_offset = 0;
@@ -201,20 +202,20 @@ int apply_field_reloc(const struct lttng_ust_event_desc *event_desc,
                        break;
                }
                /* compute field offset */
-               switch (fields[i]->type.atype) {
-               case atype_integer:
-               case atype_enum_nestable:
+               switch (fields[i]->type->type) {
+               case lttng_ust_type_integer:
+               case lttng_ust_type_enum:
                        field_offset += sizeof(int64_t);
                        break;
-               case atype_array_nestable:
-               case atype_sequence_nestable:
+               case lttng_ust_type_array:
+               case lttng_ust_type_sequence:
                        field_offset += sizeof(unsigned long);
                        field_offset += sizeof(void *);
                        break;
-               case atype_string:
+               case lttng_ust_type_string:
                        field_offset += sizeof(void *);
                        break;
-               case atype_float:
+               case lttng_ust_type_float:
                        field_offset += sizeof(double);
                        break;
                default:
@@ -237,19 +238,19 @@ int apply_field_reloc(const struct lttng_ust_event_desc *event_desc,
                struct field_ref *field_ref;
 
                field_ref = (struct field_ref *) op->data;
-               switch (field->type.atype) {
-               case atype_integer:
-               case atype_enum_nestable:
+               switch (field->type->type) {
+               case lttng_ust_type_integer:
+               case lttng_ust_type_enum:
                        op->op = BYTECODE_OP_LOAD_FIELD_REF_S64;
                        break;
-               case atype_array_nestable:
-               case atype_sequence_nestable:
+               case lttng_ust_type_array:
+               case lttng_ust_type_sequence:
                        op->op = BYTECODE_OP_LOAD_FIELD_REF_SEQUENCE;
                        break;
-               case atype_string:
+               case lttng_ust_type_string:
                        op->op = BYTECODE_OP_LOAD_FIELD_REF_STRING;
                        break;
-               case atype_float:
+               case lttng_ust_type_float:
                        op->op = BYTECODE_OP_LOAD_FIELD_REF_DOUBLE;
                        break;
                default:
@@ -273,9 +274,9 @@ int apply_context_reloc(struct bytecode_runtime *runtime,
                enum bytecode_op bytecode_op)
 {
        struct load_op *op;
-       struct lttng_ctx_field *ctx_field;
+       struct lttng_ust_ctx_field *ctx_field;
        int idx;
-       struct lttng_ctx **pctx = runtime->p.priv->pctx;
+       struct lttng_ust_ctx **pctx = runtime->p.priv->pctx;
 
        dbg_printf("Apply context reloc: %u %s\n", reloc_offset, context_name);
 
@@ -301,7 +302,7 @@ int apply_context_reloc(struct bytecode_runtime *runtime,
                return -EINVAL;
 
        /* Get context return type */
-       ctx_field = &(*pctx)->fields[idx];
+       ctx_field = (*pctx)->fields[idx];
        op = (struct load_op *) &runtime->code[reloc_offset];
 
        switch (bytecode_op) {
@@ -310,21 +311,21 @@ int apply_context_reloc(struct bytecode_runtime *runtime,
                struct field_ref *field_ref;
 
                field_ref = (struct field_ref *) op->data;
-               switch (ctx_field->event_field.type.atype) {
-               case atype_integer:
-               case atype_enum_nestable:
+               switch (ctx_field->event_field->type->type) {
+               case lttng_ust_type_integer:
+               case lttng_ust_type_enum:
                        op->op = BYTECODE_OP_GET_CONTEXT_REF_S64;
                        break;
                        /* Sequence and array supported as string */
-               case atype_string:
-               case atype_array_nestable:
-               case atype_sequence_nestable:
+               case lttng_ust_type_string:
+               case lttng_ust_type_array:
+               case lttng_ust_type_sequence:
                        op->op = BYTECODE_OP_GET_CONTEXT_REF_STRING;
                        break;
-               case atype_float:
+               case lttng_ust_type_float:
                        op->op = BYTECODE_OP_GET_CONTEXT_REF_DOUBLE;
                        break;
-               case atype_dynamic:
+               case lttng_ust_type_dynamic:
                        op->op = BYTECODE_OP_GET_CONTEXT_REF;
                        break;
                default:
@@ -381,7 +382,7 @@ static
 int bytecode_is_linked(struct lttng_ust_bytecode_node *bytecode,
                struct cds_list_head *bytecode_runtime_head)
 {
-       struct lttng_bytecode_runtime *bc_runtime;
+       struct lttng_ust_bytecode_runtime *bc_runtime;
 
        cds_list_for_each_entry(bc_runtime, bytecode_runtime_head, node) {
                if (bc_runtime->priv->bc == bytecode)
@@ -395,8 +396,8 @@ int bytecode_is_linked(struct lttng_ust_bytecode_node *bytecode,
  * bytecode runtime.
  */
 static
-int link_bytecode(const struct lttng_ust_event_desc *event_desc,
-               struct lttng_ctx **ctx,
+int link_bytecode(struct lttng_ust_event_desc *event_desc,
+               struct lttng_ust_ctx **ctx,
                struct lttng_ust_bytecode_node *bytecode,
                struct cds_list_head *bytecode_runtime_head,
                struct cds_list_head *insert_loc)
@@ -429,6 +430,7 @@ int link_bytecode(const struct lttng_ust_event_desc *event_desc,
                goto alloc_error;
        }
        runtime->p.priv = runtime_priv;
+       runtime->p.struct_size = sizeof(struct lttng_ust_bytecode_runtime);
        runtime_priv->pub = runtime;
        runtime_priv->bc = bytecode;
        runtime_priv->pctx = ctx;
@@ -499,7 +501,7 @@ alloc_error:
        return ret;
 }
 
-void lttng_bytecode_filter_sync_state(struct lttng_bytecode_runtime *runtime)
+void lttng_bytecode_filter_sync_state(struct lttng_ust_bytecode_runtime *runtime)
 {
        struct lttng_ust_bytecode_node *bc = runtime->priv->bc;
 
@@ -509,7 +511,7 @@ void lttng_bytecode_filter_sync_state(struct lttng_bytecode_runtime *runtime)
                runtime->interpreter_funcs.filter = lttng_bytecode_filter_interpret;
 }
 
-void lttng_bytecode_capture_sync_state(struct lttng_bytecode_runtime *runtime)
+void lttng_bytecode_capture_sync_state(struct lttng_ust_bytecode_runtime *runtime)
 {
        struct lttng_ust_bytecode_node *bc = runtime->priv->bc;
 
@@ -527,13 +529,13 @@ void lttng_bytecode_capture_sync_state(struct lttng_bytecode_runtime *runtime)
  * This function is called after we confirmed that name enabler and the
  * instance are name matching (or glob pattern matching).
  */
-void lttng_enabler_link_bytecode(const struct lttng_ust_event_desc *event_desc,
-               struct lttng_ctx **ctx,
+void lttng_enabler_link_bytecode(struct lttng_ust_event_desc *event_desc,
+               struct lttng_ust_ctx **ctx,
                struct cds_list_head *instance_bytecode_head,
                struct cds_list_head *enabler_bytecode_head)
 {
        struct lttng_ust_bytecode_node *enabler_bc;
-       struct lttng_bytecode_runtime *runtime;
+       struct lttng_ust_bytecode_runtime *runtime;
 
        assert(event_desc);