X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-events.c;h=acf5f3b6c0744f44d7d5a2a2d50b1bf519c67d66;hb=e494a9cdf17705bddf2169adf3945ed2ae335db9;hp=c80ecbfdadc92a94be63e0c541d38e02d1a330e2;hpb=9560f5ebf55ec70baefe6da3e3d644fc7d497b63;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index c80ecbfd..acf5f3b6 100644
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -869,6 +869,7 @@ int lttng_event_notifier_create(const struct lttng_event_desc *desc,
 	CDS_INIT_LIST_HEAD(&event_notifier->capture_bytecode_runtime_head);
 	CDS_INIT_LIST_HEAD(&event_notifier->enablers_ref_head);
 	event_notifier->desc = desc;
+	event_notifier->notification_send = lttng_event_notifier_notification_send;
 
 	cds_list_add(&event_notifier->node,
 			&event_notifier_group->event_notifiers_head);
@@ -1455,14 +1456,16 @@ int lttng_event_enabler_disable(struct lttng_event_enabler *event_enabler)
 
 static
 void _lttng_enabler_attach_filter_bytecode(struct lttng_enabler *enabler,
-		struct lttng_ust_bytecode_node *bytecode)
+		struct lttng_ust_bytecode_node **bytecode)
 {
-	bytecode->enabler = enabler;
-	cds_list_add_tail(&bytecode->node, &enabler->filter_bytecode_head);
+	(*bytecode)->enabler = enabler;
+	cds_list_add_tail(&(*bytecode)->node, &enabler->filter_bytecode_head);
+	/* Take ownership of bytecode */
+	*bytecode = NULL;
 }
 
 int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler *event_enabler,
-		struct lttng_ust_bytecode_node *bytecode)
+		struct lttng_ust_bytecode_node **bytecode)
 {
 	_lttng_enabler_attach_filter_bytecode(
 		lttng_event_enabler_as_enabler(event_enabler), bytecode);
@@ -1473,14 +1476,16 @@ int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler *event
 
 static
 void _lttng_enabler_attach_exclusion(struct lttng_enabler *enabler,
-		struct lttng_ust_excluder_node *excluder)
+		struct lttng_ust_excluder_node **excluder)
 {
-	excluder->enabler = enabler;
-	cds_list_add_tail(&excluder->node, &enabler->excluder_head);
+	(*excluder)->enabler = enabler;
+	cds_list_add_tail(&(*excluder)->node, &enabler->excluder_head);
+	/* Take ownership of excluder */
+	*excluder = NULL;
 }
 
 int lttng_event_enabler_attach_exclusion(struct lttng_event_enabler *event_enabler,
-		struct lttng_ust_excluder_node *excluder)
+		struct lttng_ust_excluder_node **excluder)
 {
 	_lttng_enabler_attach_exclusion(
 		lttng_event_enabler_as_enabler(event_enabler), excluder);
@@ -1509,7 +1514,7 @@ int lttng_event_notifier_enabler_disable(
 
 int lttng_event_notifier_enabler_attach_filter_bytecode(
 		struct lttng_event_notifier_enabler *event_notifier_enabler,
-		struct lttng_ust_bytecode_node *bytecode)
+		struct lttng_ust_bytecode_node **bytecode)
 {
 	_lttng_enabler_attach_filter_bytecode(
 		lttng_event_notifier_enabler_as_enabler(event_notifier_enabler),
@@ -1521,12 +1526,14 @@ int lttng_event_notifier_enabler_attach_filter_bytecode(
 
 int lttng_event_notifier_enabler_attach_capture_bytecode(
 		struct lttng_event_notifier_enabler *event_notifier_enabler,
-		struct lttng_ust_bytecode_node *bytecode)
+		struct lttng_ust_bytecode_node **bytecode)
 {
-	bytecode->enabler = lttng_event_notifier_enabler_as_enabler(
+	(*bytecode)->enabler = lttng_event_notifier_enabler_as_enabler(
 			event_notifier_enabler);
-	cds_list_add_tail(&bytecode->node,
+	cds_list_add_tail(&(*bytecode)->node,
 			&event_notifier_enabler->capture_bytecode_head);
+	/* Take ownership of bytecode */
+	*bytecode = NULL;
 	event_notifier_enabler->num_captures++;
 
 	lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group);
@@ -1535,7 +1542,7 @@ int lttng_event_notifier_enabler_attach_capture_bytecode(
 
 int lttng_event_notifier_enabler_attach_exclusion(
 		struct lttng_event_notifier_enabler *event_notifier_enabler,
-		struct lttng_ust_excluder_node *excluder)
+		struct lttng_ust_excluder_node **excluder)
 {
 	_lttng_enabler_attach_exclusion(
 		lttng_event_notifier_enabler_as_enabler(event_notifier_enabler),
@@ -1707,6 +1714,13 @@ void lttng_session_sync_event_enablers(struct lttng_session *session)
 	__tracepoint_probe_prune_release_queue();
 }
 
+/* Support for event notifier is introduced by probe provider major version 2. */
+static
+bool lttng_ust_probe_supports_event_notifier(struct lttng_probe_desc *probe_desc)
+{
+	return probe_desc->major >= 2;
+}
+
 static
 void lttng_create_event_notifier_if_missing(
 		struct lttng_event_notifier_enabler *event_notifier_enabler)
@@ -1758,6 +1772,18 @@ void lttng_create_event_notifier_if_missing(
 			if (found)
 				continue;
 
+			/* Check that the probe supports event notifiers, else report the error. */
+			if (!lttng_ust_probe_supports_event_notifier(probe_desc)) {
+				ERR("Probe \"%s\" contains event \"%s\" which matches an enabled event notifier, "
+					"but its version (%u.%u) is too old and does not implement event notifiers. "
+					"It needs to be recompiled against a newer version of LTTng-UST, otherwise "
+					"this event will not generate any notification.",
+					probe_desc->provider,
+					desc->name,
+					probe_desc->major,
+					probe_desc->minor);
+				continue;
+			}
 			/*
 			 * We need to create a event_notifier for this event probe.
 			 */