From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 8 Nov 2021 16:51:09 +0000 (-0500)
Subject: Refactoring: combine recorder/counter common code in lttng_create_event_if_missing
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=960f8d7e2729444052eefbbf1912fd869fff5fdb;p=lttng-ust.git

Refactoring: combine recorder/counter common code in lttng_create_event_if_missing

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

diff --git a/src/lib/lttng-ust/lttng-events.c b/src/lib/lttng-ust/lttng-events.c
index 9721249f..4124def9 100644
--- a/src/lib/lttng-ust/lttng-events.c
+++ b/src/lib/lttng-ust/lttng-events.c
@@ -1339,56 +1339,18 @@ void lttng_create_event_if_missing(struct lttng_event_enabler_session_common *ev
 			desc = probe_desc->event_desc[i];
 			if (!lttng_desc_match_enabler(desc, &event_enabler->parent))
 				continue;
-			switch (event_enabler->parent.enabler_type) {
-			case LTTNG_EVENT_ENABLER_TYPE_RECORDER:
-			{
-				struct lttng_event_recorder_enabler *event_recorder_enabler =
-					caa_container_of(event_enabler,
-						struct lttng_event_recorder_enabler,
-						parent);
-
-				/*
-				 * We need to create an event for this
-				 * event probe.
-				 */
-				ret = lttng_ust_event_create(&event_recorder_enabler->parent.parent,
-						probe_desc->event_desc[i]);
-				/* Skip if already found. */
-				if (ret == -EEXIST)
-					continue;
-				if (ret) {
-					DBG("Unable to create event \"%s:%s\", error %d\n",
-						probe_desc->provider_name,
-						probe_desc->event_desc[i]->event_name, ret);
-				}
-				break;
-			}
-			case LTTNG_EVENT_ENABLER_TYPE_COUNTER:
-			{
-				struct lttng_event_counter_enabler *event_counter_enabler =
-					caa_container_of(event_enabler,
-						struct lttng_event_counter_enabler,
-						parent);
-
-				/*
-				 * We need to create an event for this
-				 * event probe.
-				 */
-				ret = lttng_ust_event_create(&event_counter_enabler->parent.parent,
-						probe_desc->event_desc[i]);
-				/* Skip if already found. */
-				if (ret == -EEXIST)
-					continue;
-				if (ret) {
-					DBG("Unable to create event \"%s:%s\", error %d\n",
-						probe_desc->provider_name,
-						probe_desc->event_desc[i]->event_name, ret);
-				}
-				break;
-			}
-			default:
-				abort();	/* Unexpected */
+			/*
+			 * We need to create an event for this event probe.
+			 */
+			ret = lttng_ust_event_create(&event_enabler->parent,
+					probe_desc->event_desc[i]);
+			/* Skip if already found. */
+			if (ret == -EEXIST)
 				continue;
+			if (ret) {
+				DBG("Unable to create event \"%s:%s\", error %d\n",
+					probe_desc->provider_name,
+					probe_desc->event_desc[i]->event_name, ret);
 			}
 		}
 	}