X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-bytecode.c;h=d4161fc3b451e0973af95729e823b08431ed9756;hb=d0c8f180cac01b888a81ce8abb47ce9e57925a53;hp=793495700758d1edfc22bd7b736f3c88e2d86783;hpb=bf617e2041b908520b7e167b3401f277c9d4b4d4;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-bytecode.c b/liblttng-ust/lttng-bytecode.c
index 79349570..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",
@@ -171,14 +172,14 @@ const char *lttng_bytecode_print_op(enum bytecode_op op)
 }
 
 static
-int apply_field_reloc(const struct lttng_event_desc *event_desc,
+int apply_field_reloc(const struct lttng_ust_event_desc *event_desc,
 		struct bytecode_runtime *runtime,
 		uint32_t runtime_len,
 		uint32_t reloc_offset,
 		const char *field_name,
 		enum bytecode_op bytecode_op)
 {
-	const struct lttng_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;
@@ -193,31 +194,28 @@ int apply_field_reloc(const struct lttng_event_desc *event_desc,
 		return -EINVAL;
 	nr_fields = event_desc->nr_fields;
 	for (i = 0; i < nr_fields; i++) {
-		if (fields[i].u.ext.nofilter) {
+		if (fields[i]->nofilter) {
 			continue;
 		}
-		if (!strcmp(fields[i].name, field_name)) {
-			field = &fields[i];
+		if (!strcmp(fields[i]->name, field_name)) {
+			field = fields[i];
 			break;
 		}
 		/* compute field offset */
-		switch (fields[i].type.atype) {
-		case atype_integer:
-		case atype_enum:
-		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:
-		case atype_array_nestable:
-		case atype_sequence:
-		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:
@@ -228,7 +226,7 @@ int apply_field_reloc(const struct lttng_event_desc *event_desc,
 		return -EINVAL;
 
 	/* Check if field offset is too large for 16-bit offset */
-	if (field_offset > FILTER_BYTECODE_MAX_LEN - 1)
+	if (field_offset > LTTNG_UST_ABI_FILTER_BYTECODE_MAX_LEN - 1)
 		return -EINVAL;
 
 	/* set type */
@@ -240,22 +238,33 @@ int apply_field_reloc(const struct lttng_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:
-		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:
-		case atype_array_nestable:
-		case atype_sequence:
-		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:
@@ -279,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.pctx;
+	struct lttng_ust_ctx **pctx = runtime->p.pctx;
 
 	dbg_printf("Apply context reloc: %u %s\n", reloc_offset, context_name);
 
@@ -303,11 +312,11 @@ int apply_context_reloc(struct bytecode_runtime *runtime,
 		}
 	}
 	/* Check if idx is too large for 16-bit offset */
-	if (idx > FILTER_BYTECODE_MAX_LEN - 1)
+	if (idx > LTTNG_UST_ABI_FILTER_BYTECODE_MAX_LEN - 1)
 		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) {
@@ -316,24 +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:
-		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:
-		case atype_array_nestable:
-		case atype_sequence:
-		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:
@@ -350,7 +372,7 @@ int apply_context_reloc(struct bytecode_runtime *runtime,
 }
 
 static
-int apply_reloc(const struct lttng_event_desc *event_desc,
+int apply_reloc(const struct lttng_ust_event_desc *event_desc,
 		struct bytecode_runtime *runtime,
 		uint32_t runtime_len,
 		uint32_t reloc_offset,
@@ -390,7 +412,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->bc == bytecode)
@@ -404,9 +426,10 @@ int bytecode_is_linked(struct lttng_ust_bytecode_node *bytecode,
  * bytecode runtime.
  */
 static
-int link_bytecode(const struct lttng_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;
@@ -416,7 +439,7 @@ int link_bytecode(const struct lttng_event_desc *event_desc,
 	if (!bytecode)
 		return 0;
 	/* Bytecode already linked */
-	if (bytecode_is_linked(bytecode, insert_loc))
+	if (bytecode_is_linked(bytecode, bytecode_runtime_head))
 		return 0;
 
 	dbg_printf("Linking...\n");
@@ -428,6 +451,7 @@ int link_bytecode(const struct lttng_event_desc *event_desc,
 		ret = -ENOMEM;
 		goto alloc_error;
 	}
+	runtime->p.type = bytecode->type;
 	runtime->p.bc = bytecode;
 	runtime->p.pctx = ctx;
 	runtime->len = bytecode->bc.reloc_offset;
@@ -462,34 +486,14 @@ int link_bytecode(const struct lttng_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.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->p.interpreter_func = lttng_bytecode_interpret_error;
 	runtime->p.link_failed = 1;
 	cds_list_add_rcu(&runtime->p.node, insert_loc);
 alloc_error:
@@ -497,24 +501,14 @@ alloc_error:
 	return ret;
 }
 
-void lttng_bytecode_filter_sync_state(struct lttng_bytecode_runtime *runtime)
+void lttng_bytecode_sync_state(struct lttng_ust_bytecode_runtime *runtime)
 {
 	struct lttng_ust_bytecode_node *bc = runtime->bc;
 
 	if (!bc->enabler->enabled || runtime->link_failed)
-		runtime->interpreter_funcs.filter = lttng_bytecode_filter_interpret_false;
+		runtime->interpreter_func = lttng_bytecode_interpret_error;
 	else
-		runtime->interpreter_funcs.filter = lttng_bytecode_filter_interpret;
-}
-
-void lttng_bytecode_capture_sync_state(struct lttng_bytecode_runtime *runtime)
-{
-	struct lttng_ust_bytecode_node *bc = runtime->bc;
-
-	if (!bc->enabler->enabled || runtime->link_failed)
-		runtime->interpreter_funcs.capture = lttng_bytecode_capture_interpret_false;
-	else
-		runtime->interpreter_funcs.capture = lttng_bytecode_capture_interpret;
+		runtime->interpreter_func = lttng_bytecode_interpret;
 }
 
 /*
@@ -525,13 +519,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_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);
 
@@ -576,7 +570,7 @@ void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc,
 		insert_loc = instance_bytecode_head;
 	add_within:
 		dbg_printf("linking bytecode\n");
-		ret = link_bytecode(event_desc, ctx, enabler_bc, insert_loc);
+		ret = link_bytecode(event_desc, ctx, enabler_bc, instance_bytecode_head, insert_loc);
 		if (ret) {
 			dbg_printf("[lttng filter] warning: cannot link event bytecode\n");
 		}
@@ -605,13 +599,7 @@ void free_filter_runtime(struct cds_list_head *bytecode_runtime_head)
 	}
 }
 
-void lttng_free_event_filter_runtime(struct lttng_event *event)
-{
-	free_filter_runtime(&event->filter_bytecode_runtime_head);
-}
-
-void lttng_free_event_notifier_filter_runtime(
-		struct lttng_event_notifier *event_notifier)
+void lttng_free_event_filter_runtime(struct lttng_ust_event_common *event)
 {
-	free_filter_runtime(&event_notifier->filter_bytecode_runtime_head);
+	free_filter_runtime(&event->priv->filter_bytecode_runtime_head);
 }