X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=d89ddea6147a5659b694af6b53d11dba71861a85;hb=d8d2416dab454962b90222ba46c82cdce0c666a4;hp=365346953ce9b6520934613775f417784ee258e5;hpb=d871c65bcb2e94c69e0a46e7e0dcd2dae2fce7af;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 36534695..d89ddea6 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -360,6 +360,7 @@ struct lttng_event_desc {
 	union {
 		struct {
 			const char **model_emf_uri;
+			void (*event_notifier_callback)(void);
 		} ext;
 		char padding[LTTNG_UST_EVENT_DESC_PADDING];
 	} u;
@@ -424,25 +425,6 @@ struct lttng_ust_field_list {
 struct ust_pending_probe;
 struct lttng_event;
 
-struct lttng_ust_filter_bytecode_node {
-	struct cds_list_head node;
-	struct lttng_enabler *enabler;
-	/*
-	 * struct lttng_ust_filter_bytecode has var. sized array, must
-	 * be last field.
-	 */
-	struct lttng_ust_filter_bytecode bc;
-};
-
-struct lttng_ust_excluder_node {
-	struct cds_list_head node;
-	struct lttng_enabler *enabler;
-	/*
-	 * struct lttng_ust_event_exclusion had variable sized array,
-	 * must be last field.
-	 */
-	struct lttng_ust_event_exclusion excluder;
-};
 /*
  * Filter return value masks.
  */
@@ -465,14 +447,20 @@ struct lttng_bytecode_runtime {
 	int link_failed;
 	struct cds_list_head node;	/* list of bytecode runtime in event */
 	/*
-	 * Pointer to a `struct lttng_session`-owned and URCU-protected
-	 * pointer.
+	 * Pointer to a URCU-protected pointer owned by an `struct
+	 * lttng_session`or `struct lttng_event_notifier_group`.
 	 */
 	struct lttng_ctx **pctx;
 };
 
 /*
- * Objects in a linked-list of enablers, owned by an event.
+ * Objects in a linked-list of enablers, owned by an event or event_notifier.
+ * This is used because an event (or a event_notifier) can be enabled by more
+ * than one enabler and we want a quick way to iterate over all enablers of an
+ * object.
+ *
+ * For example, event rules "my_app:a*" and "my_app:ab*" will both match the
+ * event with the name "my_app:abc".
  */
 struct lttng_enabler_ref {
 	struct cds_list_head node;		/* enabler ref list */
@@ -511,6 +499,19 @@ struct lttng_event {
 	int registered;			/* has reg'd tracepoint probe */
 };
 
+struct lttng_event_notifier {
+	uint64_t user_token;
+	int enabled;
+	int registered;			/* has reg'd tracepoint probe */
+	struct cds_list_head filter_bytecode_runtime_head;
+	int has_enablers_without_bytecode;
+	struct cds_list_head enablers_ref_head;
+	const struct lttng_event_desc *desc;
+	struct cds_hlist_node hlist;	/* hashtable of event_notifiers */
+	struct cds_list_head node;	/* event_notifier list in session */
+	struct lttng_event_notifier_group *group; /* weak ref */
+};
+
 struct lttng_enum {
 	const struct lttng_enum_desc *desc;
 	struct lttng_session *session;
@@ -619,6 +620,12 @@ struct lttng_ust_event_ht {
 	struct cds_hlist_head table[LTTNG_UST_EVENT_HT_SIZE];
 };
 
+#define LTTNG_UST_EVENT_NOTIFIER_HT_BITS		12
+#define LTTNG_UST_EVENT_NOTIFIER_HT_SIZE		(1U << LTTNG_UST_EVENT_NOTIFIER_HT_BITS)
+struct lttng_ust_event_notifier_ht {
+	struct cds_hlist_head table[LTTNG_UST_EVENT_NOTIFIER_HT_SIZE];
+};
+
 #define LTTNG_UST_ENUM_HT_BITS		12
 #define LTTNG_UST_ENUM_HT_SIZE		(1U << LTTNG_UST_ENUM_HT_BITS)
 
@@ -659,6 +666,17 @@ struct lttng_session {
 	struct lttng_ctx *ctx;			/* contexts for filters. */
 };
 
+struct lttng_event_notifier_group {
+	int objd;
+	void *owner;
+	int notification_fd;
+	struct cds_list_head node;		/* Event notifier group handle list */
+	struct cds_list_head enablers_head;
+	struct cds_list_head event_notifiers_head;	/* list of event_notifiers */
+	struct lttng_ust_event_notifier_ht event_notifiers_ht; /* hashtable of event_notifiers */
+	struct lttng_ctx *ctx;			/* contexts for filters. */
+};
+
 struct lttng_transport {
 	char *name;
 	struct cds_list_head node;
@@ -672,6 +690,9 @@ int lttng_session_disable(struct lttng_session *session);
 int lttng_session_statedump(struct lttng_session *session);
 void lttng_session_destroy(struct lttng_session *session);
 
+void lttng_event_notifier_notification_send(
+		struct lttng_event_notifier *event_notifier);
+
 struct lttng_channel *lttng_channel_create(struct lttng_session *session,
 				       const char *transport_name,
 				       void *buf_addr,
@@ -807,6 +828,8 @@ void lttng_ust_fixup_fd_tracker_tls(void);
 
 /* For backward compatibility. Leave those exported symbols in place. */
 extern struct lttng_ctx *lttng_static_ctx;
+struct lttng_ust_filter_bytecode_node;
+struct lttng_ust_excluder_node;
 void lttng_context_init(void);
 void lttng_context_exit(void);
 void lttng_filter_event_link_bytecode(struct lttng_event *event);