From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 12 Mar 2021 22:01:36 +0000 (-0500)
Subject: Rename struct lttng_event_notifier to struct lttng_ust_event_notifier
X-Git-Tag: v2.13.0-rc1~299
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=d7d45c0dc2815c77a947c745dfa79ed4060cc1c5;p=lttng-ust.git

Rename struct lttng_event_notifier to struct lttng_ust_event_notifier

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: Iadedb3dec4a8746f7a67f43f3e15c9f2e19c5063
---

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index d102b0b5..9a74ed4d 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -44,7 +44,6 @@ struct lttng_channel;
 struct lttng_session;
 struct lttng_ust_lib_ring_buffer_ctx;
 struct lttng_event_field;
-struct lttng_event_notifier;
 struct lttng_event_notifier_group;
 
 /*
@@ -375,12 +374,12 @@ struct lttng_ust_event_recorder {
 
 struct lttng_ust_event_notifier_private;
 
-struct lttng_event_notifier {
+struct lttng_ust_event_notifier {
 	uint32_t struct_size;				/* Size of this structure. */
 	struct lttng_ust_event_common *parent;
 	struct lttng_ust_event_notifier_private *priv;	/* Private event notifier interface */
 
-	void (*notification_send)(struct lttng_event_notifier *event_notifier,
+	void (*notification_send)(struct lttng_ust_event_notifier *event_notifier,
 		const char *stack_data);
 	struct cds_list_head capture_bytecode_runtime_head;
 };
diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index b30a6dc4..53c9103b 100644
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -935,7 +935,7 @@ void __event_notifier_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))
 static									      \
 void __event_notifier_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))     \
 {									      \
-	struct lttng_event_notifier *__event_notifier = (struct lttng_event_notifier *) __tp_data; \
+	struct lttng_ust_event_notifier *__event_notifier = (struct lttng_ust_event_notifier *) __tp_data; \
 	const size_t __num_fields = _TP_ARRAY_SIZE(__event_fields___##_provider##___##_name) - 1;\
 	union {								      \
 		size_t __dynamic_len[__num_fields];			      \
diff --git a/liblttng-ust/event-notifier-notification.c b/liblttng-ust/event-notifier-notification.c
index ffb13321..570e5861 100644
--- a/liblttng-ust/event-notifier-notification.c
+++ b/liblttng-ust/event-notifier-notification.c
@@ -210,7 +210,7 @@ void capture_sequence(struct lttng_msgpack_writer *writer,
 
 static
 void notification_init(struct lttng_event_notifier_notification *notif,
-		struct lttng_event_notifier *event_notifier)
+		struct lttng_ust_event_notifier *event_notifier)
 {
 	struct lttng_msgpack_writer *writer = &notif->writer;
 
@@ -266,7 +266,7 @@ void notification_append_empty_capture(
 	lttng_msgpack_write_nil(&notif->writer);
 }
 
-static void record_error(struct lttng_event_notifier *event_notifier)
+static void record_error(struct lttng_ust_event_notifier *event_notifier)
 {
 	struct lttng_event_notifier_group *event_notifier_group =
 			event_notifier->priv->group;
@@ -296,7 +296,7 @@ static void record_error(struct lttng_event_notifier *event_notifier)
 
 static
 void notification_send(struct lttng_event_notifier_notification *notif,
-		struct lttng_event_notifier *event_notifier)
+		struct lttng_ust_event_notifier *event_notifier)
 {
 	ssize_t ret;
 	size_t content_len;
@@ -356,7 +356,7 @@ void notification_send(struct lttng_event_notifier_notification *notif,
 }
 
 void lttng_event_notifier_notification_send(
-		struct lttng_event_notifier *event_notifier,
+		struct lttng_ust_event_notifier *event_notifier,
 		const char *stack_data)
 {
 	/*
diff --git a/liblttng-ust/lttng-bytecode.c b/liblttng-ust/lttng-bytecode.c
index 69dcd76b..0818b39b 100644
--- a/liblttng-ust/lttng-bytecode.c
+++ b/liblttng-ust/lttng-bytecode.c
@@ -614,7 +614,7 @@ void lttng_free_event_recorder_filter_runtime(struct lttng_ust_event_recorder *e
 }
 
 void lttng_free_event_notifier_filter_runtime(
-		struct lttng_event_notifier *event_notifier)
+		struct lttng_ust_event_notifier *event_notifier)
 {
 	free_filter_runtime(&event_notifier->parent->filter_bytecode_runtime_head);
 }
diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 52ed43cc..8762b24b 100644
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -72,7 +72,7 @@ struct cds_list_head *lttng_get_sessions(void)
 
 static void _lttng_event_recorder_destroy(struct lttng_ust_event_recorder *event_recorder);
 static void _lttng_event_notifier_destroy(
-		struct lttng_event_notifier *event_notifier);
+		struct lttng_ust_event_notifier *event_notifier);
 static void _lttng_enum_destroy(struct lttng_enum *_enum);
 
 static
@@ -265,7 +265,7 @@ void register_event_recorder(struct lttng_ust_event_recorder *event_recorder)
 }
 
 static
-void register_event_notifier(struct lttng_event_notifier *event_notifier)
+void register_event_notifier(struct lttng_ust_event_notifier *event_notifier)
 {
 	int ret;
 	const struct lttng_event_desc *desc;
@@ -296,7 +296,7 @@ void unregister_event_recorder(struct lttng_ust_event_recorder *event_recorder)
 }
 
 static
-void unregister_event_notifier(struct lttng_event_notifier *event_notifier)
+void unregister_event_notifier(struct lttng_ust_event_notifier *event_notifier)
 {
 	int ret;
 	const struct lttng_event_desc *desc;
@@ -324,7 +324,7 @@ void _lttng_event_recorder_unregister(struct lttng_ust_event_recorder *event_rec
  * Only used internally at session destruction.
  */
 static
-void _lttng_event_notifier_unregister(struct lttng_event_notifier *event_notifier)
+void _lttng_event_notifier_unregister(struct lttng_ust_event_notifier *event_notifier)
 {
 	if (event_notifier->parent->priv->registered)
 		unregister_event_notifier(event_notifier);
@@ -847,7 +847,7 @@ int lttng_event_notifier_create(const struct lttng_event_desc *desc,
 		uint64_t token, uint64_t error_counter_index,
 		struct lttng_event_notifier_group *event_notifier_group)
 {
-	struct lttng_event_notifier *event_notifier;
+	struct lttng_ust_event_notifier *event_notifier;
 	struct lttng_ust_event_notifier_private *event_notifier_priv;
 	struct cds_hlist_head *head;
 	int ret = 0;
@@ -860,12 +860,12 @@ int lttng_event_notifier_create(const struct lttng_event_desc *desc,
 		event_notifier_group->event_notifiers_ht.table,
 		LTTNG_UST_EVENT_NOTIFIER_HT_SIZE, desc);
 
-	event_notifier = zmalloc(sizeof(struct lttng_event_notifier));
+	event_notifier = zmalloc(sizeof(struct lttng_ust_event_notifier));
 	if (!event_notifier) {
 		ret = -ENOMEM;
 		goto error;
 	}
-	event_notifier->struct_size = sizeof(struct lttng_event_notifier);
+	event_notifier->struct_size = sizeof(struct lttng_ust_event_notifier);
 
 	event_notifier->parent = zmalloc(sizeof(struct lttng_ust_event_common));
 	if (!event_notifier->parent) {
@@ -913,7 +913,7 @@ error:
 }
 
 static
-void _lttng_event_notifier_destroy(struct lttng_event_notifier *event_notifier)
+void _lttng_event_notifier_destroy(struct lttng_ust_event_notifier *event_notifier)
 {
 	struct lttng_enabler_ref *enabler_ref, *tmp_enabler_ref;
 
@@ -1033,7 +1033,7 @@ int lttng_event_enabler_match_event(struct lttng_event_enabler *event_enabler,
 static
 int lttng_event_notifier_enabler_match_event_notifier(
 		struct lttng_event_notifier_enabler *event_notifier_enabler,
-		struct lttng_event_notifier *event_notifier)
+		struct lttng_ust_event_notifier *event_notifier)
 {
 	int desc_matches = lttng_desc_match_enabler(event_notifier->priv->parent.desc,
 		lttng_event_notifier_enabler_as_enabler(event_notifier_enabler));
@@ -1123,7 +1123,7 @@ static
 void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc,
 		void (*event_func)(struct lttng_session *session,
 			struct lttng_ust_event_recorder *event_recorder),
-		void (*event_notifier_func)(struct lttng_event_notifier *event_notifier))
+		void (*event_notifier_func)(struct lttng_ust_event_notifier *event_notifier))
 {
 	struct cds_hlist_node *node, *tmp_node;
 	struct cds_list_head *sessionsp;
diff --git a/liblttng-ust/lttng-tracer-core.h b/liblttng-ust/lttng-tracer-core.h
index 2e44d978..e9d5622f 100644
--- a/liblttng-ust/lttng-tracer-core.h
+++ b/liblttng-ust/lttng-tracer-core.h
@@ -32,7 +32,7 @@ struct lttng_event;
 struct lttng_ctx_field;
 struct lttng_ust_lib_ring_buffer_ctx;
 struct lttng_ctx_value;
-struct lttng_event_notifier;
+struct lttng_ust_event_notifier;
 
 LTTNG_HIDDEN
 int ust_lock(void) __attribute__ ((warn_unused_result));
@@ -90,7 +90,7 @@ void lttng_ust_dummy_get_value(struct lttng_ctx_field *field,
 
 LTTNG_HIDDEN
 void lttng_event_notifier_notification_send(
-		struct lttng_event_notifier *event_notifier,
+		struct lttng_ust_event_notifier *event_notifier,
 		const char *stack_data);
 
 LTTNG_HIDDEN
diff --git a/liblttng-ust/ust-events-internal.h b/liblttng-ust/ust-events-internal.h
index c434f94b..effd747d 100644
--- a/liblttng-ust/ust-events-internal.h
+++ b/liblttng-ust/ust-events-internal.h
@@ -221,7 +221,7 @@ struct lttng_ust_event_recorder_private {
 struct lttng_ust_event_notifier_private {
 	struct lttng_ust_event_common_private parent;
 
-	struct lttng_event_notifier *pub;	/* Public event notifier interface */
+	struct lttng_ust_event_notifier *pub;	/* Public event notifier interface */
 	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 */
@@ -434,7 +434,7 @@ void lttng_free_event_recorder_filter_runtime(struct lttng_ust_event_recorder *e
 
 LTTNG_HIDDEN
 void lttng_free_event_notifier_filter_runtime(
-		struct lttng_event_notifier *event_notifier);
+		struct lttng_ust_event_notifier *event_notifier);
 
 /*
  * Connect the probe on all enablers matching this event description.