X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.h;h=29024b4de897872dd33637b2f36d78220027e031;hb=1a3d8cf37eaa418f7c4a7629cd9fe058db3d1054;hp=65ed6a2551eb96c63db64c900032a8faed233da3;hpb=993578ff7c4fce4d9a834918d192f896ba3021c7;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
index 65ed6a255..29024b4de 100644
--- a/src/bin/lttng-sessiond/ust-app.h
+++ b/src/bin/lttng-sessiond/ust-app.h
@@ -22,7 +22,7 @@
 /* Process name (short). */
 #define UST_APP_PROCNAME_LEN	16
 
-struct lttng_filter_bytecode;
+struct lttng_bytecode;
 struct lttng_ust_filter_bytecode;
 
 extern int ust_consumerd64_fd, ust_consumerd32_fd;
@@ -39,7 +39,7 @@ struct ust_app_notify_sock_obj {
 
 struct ust_app_ht_key {
 	const char *name;
-	const struct lttng_filter_bytecode *filter;
+	const struct lttng_bytecode *filter;
 	enum lttng_ust_loglevel_type loglevel_type;
 	const struct lttng_event_exclusion *exclusion;
 };
@@ -108,7 +108,7 @@ struct ust_app_event {
 	struct lttng_ust_event attr;
 	char name[LTTNG_UST_SYM_NAME_LEN];
 	struct lttng_ht_node_str node;
-	struct lttng_filter_bytecode *filter;
+	struct lttng_bytecode *filter;
 	struct lttng_event_exclusion *exclusion;
 };
 
@@ -117,12 +117,12 @@ struct ust_app_event_notifier_rule {
 	int handle;
 	struct lttng_ust_object_data *obj;
 	/* Holds a strong reference. */
-	struct lttng_event_rule *event_rule;
+	struct lttng_trigger *trigger;
 	/* Unique ID returned by the tracer to identify this event notifier. */
 	uint64_t token;
 	struct lttng_ht_node_u64 node;
-	/* The event_rule object owns the filter. */
-	const struct lttng_filter_bytecode *filter;
+	/* The trigger object owns the filter. */
+	const struct lttng_bytecode *filter;
 	/* Owned by this. */
 	struct lttng_event_exclusion *exclusion;
 	/* For delayed reclaim. */