X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-bytecode.c;h=d4161fc3b451e0973af95729e823b08431ed9756;hb=5b4c6da4aa59719b613c612afc05aee91f4343a4;hp=a16b35cc2fd752c1375660903aed2010a76ef497;hpb=5469a374cdfeb3daa5d0f908f38ad427e3b753c9;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-bytecode.c b/liblttng-ust/lttng-bytecode.c
index a16b35cc..d4161fc3 100644
--- 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,33 @@ 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:
+		{
+			struct lttng_ust_type_array *array = (struct lttng_ust_type_array *) field->type;
+
+			if (array->encoding == lttng_ust_string_encoding_none)
+				return -EINVAL;
+			op->op = BYTECODE_OP_LOAD_FIELD_REF_SEQUENCE;
+			break;
+		}
+		case lttng_ust_type_sequence:
+		{
+			struct lttng_ust_type_sequence *sequence = (struct lttng_ust_type_sequence *) field->type;
+
+			if (sequence->encoding == lttng_ust_string_encoding_none)
+				return -EINVAL;
 			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 +288,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.pctx;
 
 	dbg_printf("Apply context reloc: %u %s\n", reloc_offset, context_name);
 
@@ -301,7 +316,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 +325,37 @@ 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:
+			/* Sequence and array supported only as string */
+		case lttng_ust_type_array:
+		{
+			struct lttng_ust_type_array *array = (struct lttng_ust_type_array *) ctx_field->event_field->type;
+
+			if (array->encoding == lttng_ust_string_encoding_none)
+				return -EINVAL;
 			op->op = BYTECODE_OP_GET_CONTEXT_REF_STRING;
 			break;
-		case atype_float:
+		}
+		case lttng_ust_type_sequence:
+		{
+			struct lttng_ust_type_sequence *sequence = (struct lttng_ust_type_sequence *) ctx_field->event_field->type;
+
+			if (sequence->encoding == lttng_ust_string_encoding_none)
+				return -EINVAL;
+			op->op = BYTECODE_OP_GET_CONTEXT_REF_STRING;
+			break;
+		}
+		case lttng_ust_type_string:
+			op->op = BYTECODE_OP_GET_CONTEXT_REF_STRING;
+			break;
+		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:
@@ -384,7 +415,7 @@ int bytecode_is_linked(struct lttng_ust_bytecode_node *bytecode,
 	struct lttng_ust_bytecode_runtime *bc_runtime;
 
 	cds_list_for_each_entry(bc_runtime, bytecode_runtime_head, node) {
-		if (bc_runtime->priv->bc == bytecode)
+		if (bc_runtime->bc == bytecode)
 			return 1;
 	}
 	return 0;
@@ -395,15 +426,14 @@ 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)
 {
 	int ret, offset, next_offset;
 	struct bytecode_runtime *runtime = NULL;
-	struct lttng_ust_bytecode_runtime_private *runtime_priv = NULL;
 	size_t runtime_alloc_len;
 
 	if (!bytecode)
@@ -421,18 +451,9 @@ int link_bytecode(const struct lttng_ust_event_desc *event_desc,
 		ret = -ENOMEM;
 		goto alloc_error;
 	}
-	runtime_priv = zmalloc(sizeof(struct lttng_ust_bytecode_runtime_private));
-	if (!runtime_priv) {
-		free(runtime);
-		runtime = NULL;
-		ret = -ENOMEM;
-		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;
+	runtime->p.type = bytecode->type;
+	runtime->p.bc = bytecode;
+	runtime->p.pctx = ctx;
 	runtime->len = bytecode->bc.reloc_offset;
 	/* copy original bytecode */
 	memcpy(runtime->code, bytecode->bc.data, runtime->len);
@@ -465,59 +486,29 @@ int link_bytecode(const struct lttng_ust_event_desc *event_desc,
 		goto link_error;
 	}
 
-	switch (bytecode->type) {
-	case LTTNG_UST_BYTECODE_NODE_TYPE_FILTER:
-		runtime->p.interpreter_funcs.filter = lttng_bytecode_filter_interpret;
-		break;
-	case LTTNG_UST_BYTECODE_NODE_TYPE_CAPTURE:
-		runtime->p.interpreter_funcs.capture = lttng_bytecode_capture_interpret;
-		break;
-	default:
-		abort();
-	}
-
-	runtime->p.priv->link_failed = 0;
+	runtime->p.interpreter_func = lttng_bytecode_interpret;
+	runtime->p.link_failed = 0;
 	cds_list_add_rcu(&runtime->p.node, insert_loc);
 	dbg_printf("Linking successful.\n");
 	return 0;
 
 link_error:
-	switch (bytecode->type) {
-	case LTTNG_UST_BYTECODE_NODE_TYPE_FILTER:
-		runtime->p.interpreter_funcs.filter = lttng_bytecode_filter_interpret_false;
-		break;
-	case LTTNG_UST_BYTECODE_NODE_TYPE_CAPTURE:
-		runtime->p.interpreter_funcs.capture = lttng_bytecode_capture_interpret_false;
-		break;
-	default:
-		abort();
-	}
-
-	runtime_priv->link_failed = 1;
+	runtime->p.interpreter_func = lttng_bytecode_interpret_error;
+	runtime->p.link_failed = 1;
 	cds_list_add_rcu(&runtime->p.node, insert_loc);
 alloc_error:
 	dbg_printf("Linking failed.\n");
 	return ret;
 }
 
-void lttng_bytecode_filter_sync_state(struct lttng_ust_bytecode_runtime *runtime)
-{
-	struct lttng_ust_bytecode_node *bc = runtime->priv->bc;
-
-	if (!bc->enabler->enabled || runtime->priv->link_failed)
-		runtime->interpreter_funcs.filter = lttng_bytecode_filter_interpret_false;
-	else
-		runtime->interpreter_funcs.filter = lttng_bytecode_filter_interpret;
-}
-
-void lttng_bytecode_capture_sync_state(struct lttng_ust_bytecode_runtime *runtime)
+void lttng_bytecode_sync_state(struct lttng_ust_bytecode_runtime *runtime)
 {
-	struct lttng_ust_bytecode_node *bc = runtime->priv->bc;
+	struct lttng_ust_bytecode_node *bc = runtime->bc;
 
-	if (!bc->enabler->enabled || runtime->priv->link_failed)
-		runtime->interpreter_funcs.capture = lttng_bytecode_capture_interpret_false;
+	if (!bc->enabler->enabled || runtime->link_failed)
+		runtime->interpreter_func = lttng_bytecode_interpret_error;
 	else
-		runtime->interpreter_funcs.capture = lttng_bytecode_capture_interpret;
+		runtime->interpreter_func = lttng_bytecode_interpret;
 }
 
 /*
@@ -528,8 +519,8 @@ void lttng_bytecode_capture_sync_state(struct lttng_ust_bytecode_runtime *runtim
  * 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)
 {
@@ -548,7 +539,7 @@ void lttng_enabler_link_bytecode(const struct lttng_ust_event_desc *event_desc,
 		 * linked with the instance.
 		 */
 		cds_list_for_each_entry(runtime, instance_bytecode_head, node) {
-			if (runtime->priv->bc == enabler_bc) {
+			if (runtime->bc == enabler_bc) {
 				found = 1;
 				break;
 			}
@@ -568,7 +559,7 @@ void lttng_enabler_link_bytecode(const struct lttng_ust_event_desc *event_desc,
 		 */
 		cds_list_for_each_entry_reverse(runtime,
 				instance_bytecode_head, node) {
-			if (runtime->priv->bc->bc.seqnum <= enabler_bc->bc.seqnum) {
+			if (runtime->bc->bc.seqnum <= enabler_bc->bc.seqnum) {
 				/* insert here */
 				insert_loc = &runtime->node;
 				goto add_within;
@@ -604,12 +595,11 @@ void free_filter_runtime(struct cds_list_head *bytecode_runtime_head)
 	cds_list_for_each_entry_safe(runtime, tmp, bytecode_runtime_head,
 			p.node) {
 		free(runtime->data);
-		free(runtime->p.priv);
 		free(runtime);
 	}
 }
 
 void lttng_free_event_filter_runtime(struct lttng_ust_event_common *event)
 {
-	free_filter_runtime(&event->filter_bytecode_runtime_head);
+	free_filter_runtime(&event->priv->filter_bytecode_runtime_head);
 }