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

diff --git a/liblttng-ust/lttng-bytecode.c b/liblttng-ust/lttng-bytecode.c
index 81c83cef..a16b35cc 100644
--- a/liblttng-ust/lttng-bytecode.c
+++ b/liblttng-ust/lttng-bytecode.c
@@ -171,14 +171,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;
+	const struct lttng_ust_event_field **fields, *field = NULL;
 	unsigned int nr_fields, i;
 	struct load_op *op;
 	uint32_t field_offset = 0;
@@ -193,15 +193,15 @@ 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) {
+		switch (fields[i]->type.atype) {
 		case atype_integer:
 		case atype_enum_nestable:
 			field_offset += sizeof(int64_t);
@@ -225,7 +225,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 */
@@ -297,7 +297,7 @@ 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 */
@@ -341,7 +341,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,
@@ -381,7 +381,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,7 +395,7 @@ int bytecode_is_linked(struct lttng_ust_bytecode_node *bytecode,
  * bytecode runtime.
  */
 static
-int link_bytecode(const struct lttng_event_desc *event_desc,
+int link_bytecode(const struct lttng_ust_event_desc *event_desc,
 		struct lttng_ctx **ctx,
 		struct lttng_ust_bytecode_node *bytecode,
 		struct cds_list_head *bytecode_runtime_head,
@@ -429,6 +429,7 @@ int link_bytecode(const struct lttng_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 +500,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 +510,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 +528,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,
+void lttng_enabler_link_bytecode(const struct lttng_ust_event_desc *event_desc,
 		struct lttng_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);
 
@@ -608,13 +609,7 @@ void free_filter_runtime(struct cds_list_head *bytecode_runtime_head)
 	}
 }
 
-void lttng_free_event_filter_runtime(struct lttng_event *event)
+void lttng_free_event_filter_runtime(struct lttng_ust_event_common *event)
 {
 	free_filter_runtime(&event->filter_bytecode_runtime_head);
 }
-
-void lttng_free_event_notifier_filter_runtime(
-		struct lttng_event_notifier *event_notifier)
-{
-	free_filter_runtime(&event_notifier->filter_bytecode_runtime_head);
-}