From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 27 Jan 2022 19:17:28 +0000 (-0500)
Subject: Rename session events field to events_head
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=ba5ed2bc1a70e5a28e36d4abf9cbf4ee6502d64f;p=lttng-modules.git

Rename session events field to events_head

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

diff --git a/include/lttng/events-internal.h b/include/lttng/events-internal.h
index 0f715d2d..5cb751f6 100644
--- a/include/lttng/events-internal.h
+++ b/include/lttng/events-internal.h
@@ -515,7 +515,7 @@ struct lttng_kernel_session_private {
 	int been_active;			/* Has trace session been active ? */
 	struct file *file;			/* File associated to session */
 	struct list_head chan_head;		/* Channel list head */
-	struct list_head events;		/* Event list head */
+	struct list_head events_head;		/* Event list head */
 	struct list_head list;			/* Session list */
 	unsigned int free_chan_id;		/* Next chan ID to allocate */
 	guid_t uuid;				/* Trace session unique ID */
@@ -673,7 +673,7 @@ struct list_head *lttng_get_event_list_head_from_enabler(struct lttng_event_enab
 	{
 		struct lttng_event_recorder_enabler *event_recorder_enabler =
 			container_of(event_enabler, struct lttng_event_recorder_enabler, parent.parent);
-		return &event_recorder_enabler->chan->parent.session->priv->events;
+		return &event_recorder_enabler->chan->parent.session->priv->events_head;
 	}
 	case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER:
 	{
diff --git a/src/lttng-events.c b/src/lttng-events.c
index bbd353a6..abd46ddf 100644
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -160,7 +160,7 @@ struct lttng_kernel_session *lttng_session_create(void)
 	session_priv->pub = session;
 
 	INIT_LIST_HEAD(&session_priv->chan_head);
-	INIT_LIST_HEAD(&session_priv->events);
+	INIT_LIST_HEAD(&session_priv->events_head);
 	lttng_guid_gen(&session_priv->uuid);
 
 	metadata_cache = kzalloc(sizeof(struct lttng_metadata_cache),
@@ -359,7 +359,7 @@ void lttng_session_destroy(struct lttng_kernel_session *session)
 		ret = lttng_syscalls_unregister_syscall_table(&chan_priv->parent.syscall_table);
 		WARN_ON(ret);
 	}
-	list_for_each_entry(event_recorder_priv, &session->priv->events, parent.parent.node)
+	list_for_each_entry(event_recorder_priv, &session->priv->events_head, parent.parent.node)
 		_lttng_event_unregister(&event_recorder_priv->pub->parent);
 	synchronize_trace();	/* Wait for in-flight events to complete */
 	list_for_each_entry(chan_priv, &session->priv->chan_head, node) {
@@ -368,7 +368,7 @@ void lttng_session_destroy(struct lttng_kernel_session *session)
 	}
 	list_for_each_entry_safe(event_enabler, tmp_event_enabler, &session->priv->enablers_head, node)
 		lttng_event_enabler_destroy(event_enabler);
-	list_for_each_entry_safe(event_recorder_priv, tmpevent_recorder_priv, &session->priv->events, parent.parent.node)
+	list_for_each_entry_safe(event_recorder_priv, tmpevent_recorder_priv, &session->priv->events_head, parent.parent.node)
 		_lttng_event_destroy(&event_recorder_priv->pub->parent);
 	list_for_each_entry_safe(chan_priv, tmpchan_priv, &session->priv->chan_head, node) {
 		BUG_ON(chan_priv->channel_type == METADATA_CHANNEL);
@@ -559,7 +559,7 @@ int lttng_session_metadata_regenerate(struct lttng_kernel_session *session)
 		chan_priv->metadata_dumped = 0;
 	}
 
-	list_for_each_entry(event_recorder_priv, &session->priv->events, parent.parent.node) {
+	list_for_each_entry(event_recorder_priv, &session->priv->events_head, parent.parent.node) {
 		event_recorder_priv->metadata_dumped = 0;
 	}
 
@@ -2653,7 +2653,7 @@ void lttng_sync_event_list(struct list_head *event_enabler_list,
 static
 void lttng_session_sync_event_enablers(struct lttng_kernel_session *session)
 {
-	lttng_sync_event_list(&session->priv->enablers_head, &session->priv->events);
+	lttng_sync_event_list(&session->priv->enablers_head, &session->priv->events_head);
 }
 
 /*
@@ -3929,7 +3929,7 @@ skip_session:
 			goto end;
 	}
 
-	list_for_each_entry(event_recorder_priv, &session->priv->events, parent.parent.node) {
+	list_for_each_entry(event_recorder_priv, &session->priv->events_head, parent.parent.node) {
 		ret = _lttng_event_recorder_metadata_statedump(&event_recorder_priv->pub->parent);
 		if (ret)
 			goto end;