X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.h;h=9b42d518d30f2e619ea7f89c5e4dc307454b37b7;hb=90aa04a116a8be510b9d256b47de6bbb4144fb8b;hp=449173cd36a94a2f965a6a31c2ee351732e8fc22;hpb=da8734126339713603c25799dcd1dd72726730de;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
index 449173cd3..9b42d518d 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,8 +39,8 @@ struct ust_app_notify_sock_obj {
 
 struct ust_app_ht_key {
 	const char *name;
-	const struct lttng_filter_bytecode *filter;
-	enum lttng_ust_loglevel_type loglevel_type;
+	const struct lttng_bytecode *filter;
+	enum lttng_ust_abi_loglevel_type loglevel_type;
 	const struct lttng_event_exclusion *exclusion;
 };
 
@@ -96,7 +96,7 @@ struct ust_app_stream_list {
 struct ust_app_ctx {
 	int handle;
 	struct lttng_ust_context_attr ctx;
-	struct lttng_ust_object_data *obj;
+	struct lttng_ust_abi_object_data *obj;
 	struct lttng_ht_node_ulong node;
 	struct cds_list_head list;
 };
@@ -104,20 +104,37 @@ struct ust_app_ctx {
 struct ust_app_event {
 	int enabled;
 	int handle;
-	struct lttng_ust_object_data *obj;
-	struct lttng_ust_event attr;
-	char name[LTTNG_UST_SYM_NAME_LEN];
+	struct lttng_ust_abi_object_data *obj;
+	struct lttng_ust_abi_event attr;
+	char name[LTTNG_UST_ABI_SYM_NAME_LEN];
 	struct lttng_ht_node_str node;
-	struct lttng_filter_bytecode *filter;
+	struct lttng_bytecode *filter;
 	struct lttng_event_exclusion *exclusion;
 };
 
+struct ust_app_event_notifier_rule {
+	int enabled;
+	int handle;
+	struct lttng_ust_abi_object_data *obj;
+	/* Holds a strong reference. */
+	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 trigger object owns the filter. */
+	const struct lttng_bytecode *filter;
+	/* Owned by this. */
+	struct lttng_event_exclusion *exclusion;
+	/* For delayed reclaim. */
+	struct rcu_head rcu_head;
+};
+
 struct ust_app_stream {
 	int handle;
 	char pathname[PATH_MAX];
 	/* Format is %s_%d respectively channel name and CPU number. */
 	char name[DEFAULT_STREAM_NAME_LEN];
-	struct lttng_ust_object_data *obj;
+	struct lttng_ust_abi_object_data *obj;
 	/* Using a list of streams to keep order. */
 	struct cds_list_head list;
 };
@@ -137,8 +154,8 @@ struct ust_app_channel {
 	uint64_t tracing_channel_id;
 	/* Number of stream that this channel is expected to receive. */
 	unsigned int expected_stream_count;
-	char name[LTTNG_UST_SYM_NAME_LEN];
-	struct lttng_ust_object_data *obj;
+	char name[LTTNG_UST_ABI_SYM_NAME_LEN];
+	struct lttng_ust_abi_object_data *obj;
 	struct ustctl_consumer_channel_attr attr;
 	struct ust_app_stream_list streams;
 	/* Session pointer that owns this object. */
@@ -250,7 +267,7 @@ struct ust_app {
 	int compatible; /* If the lttng-ust tracer version does not match the
 					   supported version of the session daemon, this flag is
 					   set to 0 (NOT compatible) else 1. */
-	struct lttng_ust_tracer_version version;
+	struct lttng_ust_abi_tracer_version version;
 	uint32_t v_major;    /* Version major number */
 	uint32_t v_minor;    /* Version minor number */
 	/* Extra for the NULL byte. */
@@ -300,9 +317,14 @@ struct ust_app {
 		 * Handle to the lttng_ust object representing the event
 		 * notifier group.
 		 */
-		struct lttng_ust_object_data *object;
+		struct lttng_ust_abi_object_data *object;
 		struct lttng_pipe *event_pipe;
 	} event_notifier_group;
+	/*
+	 * Hashtable indexing the application's event notifier rule's
+	 * (ust_app_event_notifier_rule) by their token's value.
+	 */
+	struct lttng_ht *token_to_event_notifier_rule_ht;
 };
 
 #ifdef HAVE_LIBLTTNG_UST_CTL
@@ -330,6 +352,8 @@ int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan, struct ltt_ust_context *uctx);
 void ust_app_global_update(struct ltt_ust_session *usess, struct ust_app *app);
 void ust_app_global_update_all(struct ltt_ust_session *usess);
+void ust_app_global_update_event_notifier_rules(struct ust_app *app);
+void ust_app_global_update_all_event_notifier_rules(void);
 
 void ust_app_clean_list(void);
 int ust_app_ht_alloc(void);
@@ -363,7 +387,7 @@ enum lttng_error_code ust_app_rotate_session(struct ltt_session *session);
 enum lttng_error_code ust_app_create_channel_subdirectories(
 		const struct ltt_ust_session *session);
 int ust_app_release_object(struct ust_app *app,
-		struct lttng_ust_object_data *data);
+		struct lttng_ust_abi_object_data *data);
 enum lttng_error_code ust_app_clear_session(struct ltt_session *session);
 enum lttng_error_code ust_app_open_packets(struct ltt_session *session);
 
@@ -457,7 +481,10 @@ static inline
 void ust_app_global_update(struct ltt_ust_session *usess, struct ust_app *app)
 {}
 static inline
-void ust_app_global_update_tokens(struct ust_app *app)
+void ust_app_global_update_event_notifier_rules(struct ust_app *app)
+{}
+static inline
+void ust_app_global_update_all_event_notifier_rules(void)
 {}
 static inline
 int ust_app_setup_event_notifier_group(struct ust_app *app)
@@ -611,7 +638,7 @@ enum lttng_error_code ust_app_create_channel_subdirectories(
 }
 
 static inline
-int ust_app_release_object(struct ust_app *app, struct lttng_ust_object_data *data)
+int ust_app_release_object(struct ust_app *app, struct lttng_ust_abi_object_data *data)
 {
 	return 0;
 }