X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Flttng-bytecode.c;h=94edbab63312cf1a4bc954b4f06f35fb5b64144d;hb=93cfd247467ce0816d502eb713fb14926d5b57fa;hp=6cc3179d3df19aa9e468e976eb8fed629ca58d07;hpb=8c3470eaadb6e01fe65e1b852907467c0527ba05;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-bytecode.c b/liblttng-ust/lttng-bytecode.c
index 6cc3179d..94edbab6 100644
--- a/liblttng-ust/lttng-bytecode.c
+++ b/liblttng-ust/lttng-bytecode.c
@@ -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 */
@@ -398,6 +398,7 @@ static
 int link_bytecode(const struct lttng_event_desc *event_desc,
 		struct lttng_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;
@@ -408,7 +409,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");
@@ -577,7 +578,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");
 		}
@@ -607,13 +608,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);
-}