X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-bytecode.c;h=ef458055f14f7eec51f2a74c1acf9c8e107ebf60;hb=dc11f93f7d30cd383e35be41483cc024da59c7b8;hp=c5b3c13366ade08c03aa5ec34c2013fac1344473;hpb=115db533af4d56a1b5c8b3a5ff6a15dc58579cd8;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-bytecode.c b/liblttng-ust/lttng-bytecode.c
index c5b3c133..ef458055 100644
--- a/liblttng-ust/lttng-bytecode.c
+++ b/liblttng-ust/lttng-bytecode.c
@@ -171,7 +171,7 @@ 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,
@@ -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,
@@ -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,
@@ -527,7 +527,7 @@ 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)
@@ -608,13 +608,7 @@ void free_filter_runtime(struct cds_list_head *bytecode_runtime_head)
 	}
 }
 
-void lttng_free_event_recorder_filter_runtime(struct lttng_ust_event_recorder *event_recorder)
+void lttng_free_event_filter_runtime(struct lttng_ust_event_common *event)
 {
-	free_filter_runtime(&event_recorder->parent->filter_bytecode_runtime_head);
-}
-
-void lttng_free_event_notifier_filter_runtime(
-		struct lttng_event_notifier *event_notifier)
-{
-	free_filter_runtime(&event_notifier->parent->filter_bytecode_runtime_head);
+	free_filter_runtime(&event->filter_bytecode_runtime_head);
 }