X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-bytecode-specialize.c;h=44eafb858ac45b24eb44a07240920b9fb1eb0753;hb=2208d8b5689264e35ed0a660d8c3c82021cc0367;hp=28b0ea721381eb63c70f602c22184edcef4a779c;hpb=3d3a2bb817fcab854dc3a90dd80e073869bbccb4;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-bytecode-specialize.c b/liblttng-ust/lttng-bytecode-specialize.c
index 28b0ea72..44eafb85 100644
--- a/liblttng-ust/lttng-bytecode-specialize.c
+++ b/liblttng-ust/lttng-bytecode-specialize.c
@@ -7,10 +7,11 @@
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 
-#include <lttng/ust-align.h>
+#include <lttng/ust-utils.h>
 
 #include "context-internal.h"
 #include "lttng-bytecode.h"
@@ -374,7 +375,7 @@ static int specialize_context_lookup_name(struct lttng_ust_ctx *ctx,
 	const char *name;
 
 	offset = ((struct get_symbol *) insn->data)->offset;
-	name = bytecode->p.priv->bc->bc.data + bytecode->p.priv->bc->bc.reloc_offset + offset;
+	name = bytecode->p.bc->bc.data + bytecode->p.bc->bc.reloc_offset + offset;
 	return lttng_get_context_index(ctx, name);
 }
 
@@ -503,7 +504,7 @@ static int specialize_app_context_lookup(struct lttng_ust_ctx **pctx,
 	ssize_t data_offset;
 
 	offset = ((struct get_symbol *) insn->data)->offset;
-	orig_name = runtime->p.priv->bc->bc.data + runtime->p.priv->bc->bc.reloc_offset + offset;
+	orig_name = runtime->p.bc->bc.data + runtime->p.bc->bc.reloc_offset + offset;
 	name = zmalloc(strlen(orig_name) + strlen("$app.") + 1);
 	if (!name) {
 		ret = -ENOMEM;
@@ -564,7 +565,7 @@ static int specialize_payload_lookup(struct lttng_ust_event_desc *event_desc,
 
 	nr_fields = event_desc->nr_fields;
 	offset = ((struct get_symbol *) insn->data)->offset;
-	name = runtime->p.priv->bc->bc.data + runtime->p.priv->bc->bc.reloc_offset + offset;
+	name = runtime->p.bc->bc.data + runtime->p.bc->bc.reloc_offset + offset;
 	for (i = 0; i < nr_fields; i++) {
 		field = event_desc->fields[i];
 		if (field->nofilter) {
@@ -631,7 +632,7 @@ int lttng_bytecode_specialize(struct lttng_ust_event_desc *event_desc,
 	int ret = -EINVAL;
 	struct vstack _stack;
 	struct vstack *stack = &_stack;
-	struct lttng_ust_ctx **pctx = bytecode->p.priv->pctx;
+	struct lttng_ust_ctx **pctx = bytecode->p.pctx;
 
 	vstack_init(stack);