X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Flttng-bytecode-interpreter.c;h=cb128a692adda5de9901429964c2bdf96d535bc8;hb=6ba6fd60507f8e045bdc4f1be14e9d99c6a15f7f;hp=4ca1338a1b431519d6a6b1c90f655528981f8a34;hpb=60864af02c63fdaaf9264b4f14bfbc9f9fba64bd;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-bytecode-interpreter.c b/liblttng-ust/lttng-bytecode-interpreter.c
index 4ca1338a..cb128a69 100644
--- a/liblttng-ust/lttng-bytecode-interpreter.c
+++ b/liblttng-ust/lttng-bytecode-interpreter.c
@@ -57,7 +57,8 @@ size_t get_str_or_seq_len(const struct estack_entry *entry)
 }
 
 static
-int stack_star_glob_match(struct estack *stack, int top, const char *cmp_type)
+int stack_star_glob_match(struct estack *stack, int top,
+		const char *cmp_type __attribute__((unused)))
 {
 	const char *pattern;
 	const char *candidate;
@@ -83,7 +84,7 @@ int stack_star_glob_match(struct estack *stack, int top, const char *cmp_type)
 }
 
 static
-int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
+int stack_strcmp(struct estack *stack, int top, const char *cmp_type __attribute__((unused)))
 {
 	const char *p = estack_bx(stack, top)->u.s.str, *q = estack_ax(stack, top)->u.s.str;
 	int ret;
@@ -149,9 +150,10 @@ int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
 	return diff;
 }
 
-int lttng_bytecode_interpret_error(struct lttng_ust_bytecode_runtime *bytecode_runtime,
-		const char *stack_data,
-		void *ctx)
+int lttng_bytecode_interpret_error(
+		struct lttng_ust_bytecode_runtime *bytecode_runtime __attribute__((unused)),
+		const char *stack_data __attribute__((unused)),
+		void *ctx __attribute__((unused)))
 {
 	return LTTNG_UST_BYTECODE_INTERPRETER_ERROR;
 }
@@ -217,18 +219,18 @@ static int context_get_index(struct lttng_ust_ctx *ctx,
 		uint32_t idx)
 {
 
-	struct lttng_ust_ctx_field *ctx_field;
-	struct lttng_ust_event_field *field;
+	const struct lttng_ust_ctx_field *ctx_field;
+	const struct lttng_ust_event_field *field;
 	struct lttng_ust_ctx_value v;
 
-	ctx_field = ctx->fields[idx];
+	ctx_field = &ctx->fields[idx];
 	field = ctx_field->event_field;
 	ptr->type = LOAD_OBJECT;
 	ptr->field = field;
 
 	switch (field->type->type) {
 	case lttng_ust_type_integer:
-		ctx_field->get_value(ctx_field, &v);
+		ctx_field->get_value(ctx_field->priv, &v);
 		if (lttng_ust_get_type_integer(field->type)->signedness) {
 			ptr->object_type = OBJECT_TYPE_S64;
 			ptr->u.s64 = v.u.s64;
@@ -244,7 +246,7 @@ static int context_get_index(struct lttng_ust_ctx *ctx,
 		const struct lttng_ust_type_integer *itype;
 
 		itype = lttng_ust_get_type_integer(lttng_ust_get_type_enum(field->type)->container_type);
-		ctx_field->get_value(ctx_field, &v);
+		ctx_field->get_value(ctx_field->priv, &v);
 		if (itype->signedness) {
 			ptr->object_type = OBJECT_TYPE_SIGNED_ENUM;
 			ptr->u.s64 = v.u.s64;
@@ -266,7 +268,7 @@ static int context_get_index(struct lttng_ust_ctx *ctx,
 			return -EINVAL;
 		}
 		ptr->object_type = OBJECT_TYPE_STRING;
-		ctx_field->get_value(ctx_field, &v);
+		ctx_field->get_value(ctx_field->priv, &v);
 		ptr->ptr = v.u.str;
 		break;
 	case lttng_ust_type_sequence:
@@ -279,22 +281,22 @@ static int context_get_index(struct lttng_ust_ctx *ctx,
 			return -EINVAL;
 		}
 		ptr->object_type = OBJECT_TYPE_STRING;
-		ctx_field->get_value(ctx_field, &v);
+		ctx_field->get_value(ctx_field->priv, &v);
 		ptr->ptr = v.u.str;
 		break;
 	case lttng_ust_type_string:
 		ptr->object_type = OBJECT_TYPE_STRING;
-		ctx_field->get_value(ctx_field, &v);
+		ctx_field->get_value(ctx_field->priv, &v);
 		ptr->ptr = v.u.str;
 		break;
 	case lttng_ust_type_float:
 		ptr->object_type = OBJECT_TYPE_DOUBLE;
-		ctx_field->get_value(ctx_field, &v);
+		ctx_field->get_value(ctx_field->priv, &v);
 		ptr->u.d = v.u.d;
 		ptr->ptr = &ptr->u.d;
 		break;
 	case lttng_ust_type_dynamic:
-		ctx_field->get_value(ctx_field, &v);
+		ctx_field->get_value(ctx_field->priv, &v);
 		switch (v.sel) {
 		case LTTNG_UST_DYNAMIC_TYPE_NONE:
 			return -EINVAL;
@@ -2130,13 +2132,13 @@ int lttng_bytecode_interpret(struct lttng_ust_bytecode_runtime *ust_bytecode,
 		{
 			struct load_op *insn = (struct load_op *) pc;
 			struct field_ref *ref = (struct field_ref *) insn->data;
-			struct lttng_ust_ctx_field *ctx_field;
+			const struct lttng_ust_ctx_field *ctx_field;
 			struct lttng_ust_ctx_value v;
 
 			dbg_printf("get context ref offset %u type dynamic\n",
 				ref->offset);
-			ctx_field = ctx->fields[ref->offset];
-			ctx_field->get_value(ctx_field, &v);
+			ctx_field = &ctx->fields[ref->offset];
+			ctx_field->get_value(ctx_field->priv, &v);
 			estack_push(stack, top, ax, bx, ax_t, bx_t);
 			switch (v.sel) {
 			case LTTNG_UST_DYNAMIC_TYPE_NONE:
@@ -2178,13 +2180,13 @@ int lttng_bytecode_interpret(struct lttng_ust_bytecode_runtime *ust_bytecode,
 		{
 			struct load_op *insn = (struct load_op *) pc;
 			struct field_ref *ref = (struct field_ref *) insn->data;
-			struct lttng_ust_ctx_field *ctx_field;
+			const struct lttng_ust_ctx_field *ctx_field;
 			struct lttng_ust_ctx_value v;
 
 			dbg_printf("get context ref offset %u type string\n",
 				ref->offset);
-			ctx_field = ctx->fields[ref->offset];
-			ctx_field->get_value(ctx_field, &v);
+			ctx_field = &ctx->fields[ref->offset];
+			ctx_field->get_value(ctx_field->priv, &v);
 			estack_push(stack, top, ax, bx, ax_t, bx_t);
 			estack_ax(stack, top)->u.s.str = v.u.str;
 			if (unlikely(!estack_ax(stack, top)->u.s.str)) {
@@ -2205,13 +2207,13 @@ int lttng_bytecode_interpret(struct lttng_ust_bytecode_runtime *ust_bytecode,
 		{
 			struct load_op *insn = (struct load_op *) pc;
 			struct field_ref *ref = (struct field_ref *) insn->data;
-			struct lttng_ust_ctx_field *ctx_field;
+			const struct lttng_ust_ctx_field *ctx_field;
 			struct lttng_ust_ctx_value v;
 
 			dbg_printf("get context ref offset %u type s64\n",
 				ref->offset);
-			ctx_field = ctx->fields[ref->offset];
-			ctx_field->get_value(ctx_field, &v);
+			ctx_field = &ctx->fields[ref->offset];
+			ctx_field->get_value(ctx_field->priv, &v);
 			estack_push(stack, top, ax, bx, ax_t, bx_t);
 			estack_ax_v = v.u.s64;
 			estack_ax_t = REG_S64;
@@ -2224,13 +2226,13 @@ int lttng_bytecode_interpret(struct lttng_ust_bytecode_runtime *ust_bytecode,
 		{
 			struct load_op *insn = (struct load_op *) pc;
 			struct field_ref *ref = (struct field_ref *) insn->data;
-			struct lttng_ust_ctx_field *ctx_field;
+			const struct lttng_ust_ctx_field *ctx_field;
 			struct lttng_ust_ctx_value v;
 
 			dbg_printf("get context ref offset %u type double\n",
 				ref->offset);
-			ctx_field = ctx->fields[ref->offset];
-			ctx_field->get_value(ctx_field, &v);
+			ctx_field = &ctx->fields[ref->offset];
+			ctx_field->get_value(ctx_field->priv, &v);
 			estack_push(stack, top, ax, bx, ax_t, bx_t);
 			memcpy(&estack_ax(stack, top)->u.d, &v.u.d, sizeof(struct literal_double));
 			estack_ax_t = REG_DOUBLE;
@@ -2511,7 +2513,7 @@ end:
  */
 int lttng_ust_interpret_event_filter(struct lttng_ust_event_common *event,
 		const char *interpreter_stack_data,
-		void *event_filter_ctx)
+		void *event_filter_ctx __attribute__((unused)))
 {
 	struct lttng_ust_bytecode_runtime *filter_bc_runtime;
 	struct cds_list_head *filter_bytecode_runtime_head = &event->priv->filter_bytecode_runtime_head;