From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 9C4B441C52;
Thu, 9 Feb 2023 14:31:00 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 8B04742C54;
Thu, 9 Feb 2023 14:30:59 +0100 (CET)
Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com
[67.231.156.173])
by mails.dpdk.org (Postfix) with ESMTP id 04A1642D12
for <dev@dpdk.org>; Thu, 9 Feb 2023 14:30:57 +0100 (CET)
Received: from pps.filterd (m0045851.ppops.net [127.0.0.1])
by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id
319D6OWg011465; Thu, 9 Feb 2023 05:30:55 -0800
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;
h=from : to : cc :
subject : date : message-id : in-reply-to : references : mime-version :
content-transfer-encoding : content-type; s=pfpt0220;
bh=NCLObVBgSRpWlSLquJwICnyQgu2pFOl5KaYhDKJL5lE=;
b=WlwJc6D+S24d+hCPtc+p2xuZvtTf0Mqy7bvJQEg7493dNFJJZcTpYutWN2AbnxPYbKVK
eTNo0Zq2uNb/G0Fq+lsvXqGB81Rnzlyw3oFvRl9UJ4xCDo6MsJMI16snTQ4nYmGWCtV3
3HXdYs/8KvyP6uTMAb8JSVT+34oYqYQL90AuiIjkPI/5FwsKgfKZW72DD3oCpgeuL044
e4daLLHiG++uuFOPruAG5+Gud02kpik03LlJZK8mROv9KvEVI1uIzGKWXPteqQ6GD8gG
dQGKECcLy0XGE/GBCuLM42CinDSL+pZlfvSF4dJmMv7trHKDyhMqJcyABkco93fmJOvP iA==
Received: from dc5-exch01.marvell.com ([199.233.59.181])
by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3nm65m30x1-1
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);
Thu, 09 Feb 2023 05:30:54 -0800
Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com
(10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42;
Thu, 9 Feb 2023 05:30:52 -0800
Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com
(10.69.176.39) with Microsoft SMTP Server id 15.0.1497.42 via Frontend
Transport; Thu, 9 Feb 2023 05:30:52 -0800
Received: from localhost.localdomain (unknown [10.28.36.185])
by maili.marvell.com (Postfix) with ESMTP id C2F6F5B692A;
Thu, 9 Feb 2023 05:30:50 -0800 (PST)
From: Ankur Dwivedi <adwivedi@marvell.com>
To: <dev@dpdk.org>
CC: <thomas@monjalon.net>, <david.marchand@redhat.com>, <ferruh.yigit@amd.com>,
<jerinj@marvell.com>, Ankur Dwivedi <adwivedi@marvell.com>
Subject: [PATCH v1 3/5] eal: remove internal tracepoints from version map
Date: Thu, 9 Feb 2023 19:00:17 +0530
Message-ID: <20230209133019.933380-4-adwivedi@marvell.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20230209133019.933380-1-adwivedi@marvell.com>
References: <20230209133019.933380-1-adwivedi@marvell.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Proofpoint-GUID: KUJ54IL6yE_-yOpAxc02ufZTjUoEEBEN
X-Proofpoint-ORIG-GUID: KUJ54IL6yE_-yOpAxc02ufZTjUoEEBEN
X-Proofpoint-Virus-Version: vendor=baseguard
engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1
definitions=2023-02-09_10,2023-02-09_03,2022-06-22_01
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
The file rte_eal_trace.h contains some tracepoints which are internal to
the eal library. Those tracepoints are moved to a new file
eal_trace_internal.h. The internal tracepoints are removed from the
version.map file.
Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
---
lib/eal/common/eal_common_launch.c | 2 +-
lib/eal/common/eal_common_memzone.c | 2 +-
lib/eal/common/eal_common_thread.c | 2 +-
lib/eal/common/eal_common_trace_points.c | 2 +
lib/eal/common/rte_malloc.c | 2 +-
lib/eal/freebsd/eal_alarm.c | 2 +-
lib/eal/freebsd/eal_interrupts.c | 2 +-
lib/eal/include/eal_trace_internal.h | 182 +++++++++++++++++++++++
lib/eal/include/meson.build | 1 +
lib/eal/include/rte_eal_trace.h | 158 --------------------
lib/eal/linux/eal_alarm.c | 2 +-
lib/eal/linux/eal_interrupts.c | 2 +-
lib/eal/version.map | 15 --
lib/eal/windows/eal_alarm.c | 3 +-
14 files changed, 194 insertions(+), 183 deletions(-)
create mode 100644 lib/eal/include/eal_trace_internal.h
diff --git a/lib/eal/common/eal_common_launch.c b/lib/eal/common/eal_common_launch.c
index 487e58c124..050459857a 100644
--- a/lib/eal/common/eal_common_launch.c
+++ b/lib/eal/common/eal_common_launch.c
@@ -4,8 +4,8 @@
#include <errno.h>
+#include <eal_trace_internal.h>
#include <rte_launch.h>
-#include <rte_eal_trace.h>
#include <rte_pause.h>
#include <rte_lcore.h>
diff --git a/lib/eal/common/eal_common_memzone.c b/lib/eal/common/eal_common_memzone.c
index 860fb5fb64..a9cd91ffea 100644
--- a/lib/eal/common/eal_common_memzone.c
+++ b/lib/eal/common/eal_common_memzone.c
@@ -8,6 +8,7 @@
#include <string.h>
#include <errno.h>
+#include <eal_trace_internal.h>
#include <rte_log.h>
#include <rte_memory.h>
#include <rte_memzone.h>
@@ -15,7 +16,6 @@
#include <rte_errno.h>
#include <rte_string_fns.h>
#include <rte_common.h>
-#include <rte_eal_trace.h>
#include "malloc_heap.h"
#include "malloc_elem.h"
diff --git a/lib/eal/common/eal_common_thread.c b/lib/eal/common/eal_common_thread.c
index 3181515c5b..ff07f70f27 100644
--- a/lib/eal/common/eal_common_thread.c
+++ b/lib/eal/common/eal_common_thread.c
@@ -10,7 +10,7 @@
#include <assert.h>
#include <string.h>
-#include <rte_eal_trace.h>
+#include <eal_trace_internal.h>
#include <rte_errno.h>
#include <rte_lcore.h>
#include <rte_log.h>
diff --git a/lib/eal/common/eal_common_trace_points.c b/lib/eal/common/eal_common_trace_points.c
index 051f89809c..3f5bf5c55c 100644
--- a/lib/eal/common/eal_common_trace_points.c
+++ b/lib/eal/common/eal_common_trace_points.c
@@ -6,6 +6,8 @@
#include <rte_eal_trace.h>
+#include <eal_trace_internal.h>
+
RTE_TRACE_POINT_REGISTER(rte_eal_trace_generic_void,
lib.eal.generic.void)
RTE_TRACE_POINT_REGISTER(rte_eal_trace_generic_u64,
diff --git a/lib/eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c
index 48db264449..d39870bf3c 100644
--- a/lib/eal/common/rte_malloc.c
+++ b/lib/eal/common/rte_malloc.c
@@ -16,7 +16,7 @@
#include <rte_common.h>
#include <rte_spinlock.h>
-#include <rte_eal_trace.h>
+#include <eal_trace_internal.h>
#include <rte_malloc.h>
#include "malloc_elem.h"
diff --git a/lib/eal/freebsd/eal_alarm.c b/lib/eal/freebsd/eal_alarm.c
index 1023c32937..177897fbc4 100644
--- a/lib/eal/freebsd/eal_alarm.c
+++ b/lib/eal/freebsd/eal_alarm.c
@@ -11,13 +11,13 @@
#include <time.h>
#include <errno.h>
+#include <eal_trace_internal.h>
#include <rte_alarm.h>
#include <rte_cycles.h>
#include <rte_common.h>
#include <rte_errno.h>
#include <rte_interrupts.h>
#include <rte_spinlock.h>
-#include <rte_eal_trace.h>
#include "eal_private.h"
#include "eal_alarm_private.h"
diff --git a/lib/eal/freebsd/eal_interrupts.c b/lib/eal/freebsd/eal_interrupts.c
index 9f720bdc8f..ffcf97ad4c 100644
--- a/lib/eal/freebsd/eal_interrupts.c
+++ b/lib/eal/freebsd/eal_interrupts.c
@@ -8,12 +8,12 @@
#include <sys/queue.h>
#include <unistd.h>
+#include <eal_trace_internal.h>
#include <rte_errno.h>
#include <rte_lcore.h>
#include <rte_spinlock.h>
#include <rte_common.h>
#include <rte_interrupts.h>
-#include <rte_eal_trace.h>
#include "eal_private.h"
#include "eal_alarm_private.h"
diff --git a/lib/eal/include/eal_trace_internal.h b/lib/eal/include/eal_trace_internal.h
new file mode 100644
index 0000000000..9d678b3f76
--- /dev/null
+++ b/lib/eal/include/eal_trace_internal.h
@@ -0,0 +1,182 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Marvell International Ltd.
+ */
+
+#ifndef _EAL_TRACE_INTERNAL_H_
+#define _EAL_TRACE_INTERNAL_H_
+
+/**
+ * @file
+ *
+ * API for EAL trace support
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <rte_alarm.h>
+#include <rte_interrupts.h>
+#include <rte_trace_point.h>
+
+#include "eal_interrupts.h"
+
+/* Alarm */
+RTE_TRACE_POINT(
+ rte_eal_trace_alarm_set,
+ RTE_TRACE_POINT_ARGS(uint64_t us, rte_eal_alarm_callback cb_fn,
+ void *cb_arg, int rc),
+ rte_trace_point_emit_u64(us);
+ rte_trace_point_emit_ptr(cb_fn);
+ rte_trace_point_emit_ptr(cb_arg);
+ rte_trace_point_emit_int(rc);
+)
+
+RTE_TRACE_POINT(
+ rte_eal_trace_alarm_cancel,
+ RTE_TRACE_POINT_ARGS(rte_eal_alarm_callback cb_fn, void *cb_arg,
+ int count),
+ rte_trace_point_emit_ptr(cb_fn);
+ rte_trace_point_emit_ptr(cb_arg);
+ rte_trace_point_emit_int(count);
+)
+
+/* Interrupt */
+RTE_TRACE_POINT(
+ rte_eal_trace_intr_callback_register,
+ RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle,
+ rte_intr_callback_fn cb, void *cb_arg, int rc),
+ rte_trace_point_emit_int(rc);
+ rte_trace_point_emit_int(handle->dev_fd);
+ rte_trace_point_emit_int(handle->fd);
+ rte_trace_point_emit_int(handle->type);
+ rte_trace_point_emit_u32(handle->max_intr);
+ rte_trace_point_emit_u32(handle->nb_efd);
+ rte_trace_point_emit_ptr(cb);
+ rte_trace_point_emit_ptr(cb_arg);
+)
+RTE_TRACE_POINT(
+ rte_eal_trace_intr_callback_unregister,
+ RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle,
+ rte_intr_callback_fn cb, void *cb_arg, int rc),
+ rte_trace_point_emit_int(rc);
+ rte_trace_point_emit_int(handle->dev_fd);
+ rte_trace_point_emit_int(handle->fd);
+ rte_trace_point_emit_int(handle->type);
+ rte_trace_point_emit_u32(handle->max_intr);
+ rte_trace_point_emit_u32(handle->nb_efd);
+ rte_trace_point_emit_ptr(cb);
+ rte_trace_point_emit_ptr(cb_arg);
+)
+RTE_TRACE_POINT(
+ rte_eal_trace_intr_enable,
+ RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, int rc),
+ rte_trace_point_emit_int(rc);
+ rte_trace_point_emit_int(handle->dev_fd);
+ rte_trace_point_emit_int(handle->fd);
+ rte_trace_point_emit_int(handle->type);
+ rte_trace_point_emit_u32(handle->max_intr);
+ rte_trace_point_emit_u32(handle->nb_efd);
+)
+RTE_TRACE_POINT(
+ rte_eal_trace_intr_disable,
+ RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, int rc),
+ rte_trace_point_emit_int(rc);
+ rte_trace_point_emit_int(handle->dev_fd);
+ rte_trace_point_emit_int(handle->fd);
+ rte_trace_point_emit_int(handle->type);
+ rte_trace_point_emit_u32(handle->max_intr);
+ rte_trace_point_emit_u32(handle->nb_efd);
+)
+
+/* Memory */
+RTE_TRACE_POINT(
+ rte_eal_trace_mem_zmalloc,
+ RTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align,
+ int socket, void *ptr),
+ rte_trace_point_emit_string(type);
+ rte_trace_point_emit_size_t(size);
+ rte_trace_point_emit_u32(align);
+ rte_trace_point_emit_int(socket);
+ rte_trace_point_emit_ptr(ptr);
+)
+
+RTE_TRACE_POINT(
+ rte_eal_trace_mem_malloc,
+ RTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align,
+ int socket, void *ptr),
+ rte_trace_point_emit_string(type);
+ rte_trace_point_emit_size_t(size);
+ rte_trace_point_emit_u32(align);
+ rte_trace_point_emit_int(socket);
+ rte_trace_point_emit_ptr(ptr);
+)
+
+RTE_TRACE_POINT(
+ rte_eal_trace_mem_realloc,
+ RTE_TRACE_POINT_ARGS(size_t size, unsigned int align, int socket,
+ void *ptr),
+ rte_trace_point_emit_size_t(size);
+ rte_trace_point_emit_u32(align);
+ rte_trace_point_emit_int(socket);
+ rte_trace_point_emit_ptr(ptr);
+)
+
+RTE_TRACE_POINT(
+ rte_eal_trace_mem_free,
+ RTE_TRACE_POINT_ARGS(void *ptr),
+ rte_trace_point_emit_ptr(ptr);
+)
+
+/* Memzone */
+RTE_TRACE_POINT(
+ rte_eal_trace_memzone_reserve,
+ RTE_TRACE_POINT_ARGS(const char *name, size_t len, int socket_id,
+ unsigned int flags, unsigned int align, unsigned int bound,
+ const void *mz),
+ rte_trace_point_emit_string(name);
+ rte_trace_point_emit_size_t(len);
+ rte_trace_point_emit_int(socket_id);
+ rte_trace_point_emit_u32(flags);
+ rte_trace_point_emit_u32(align);
+ rte_trace_point_emit_u32(bound);
+ rte_trace_point_emit_ptr(mz);
+)
+
+RTE_TRACE_POINT(
+ rte_eal_trace_memzone_lookup,
+ RTE_TRACE_POINT_ARGS(const char *name, const void *memzone),
+ rte_trace_point_emit_string(name);
+ rte_trace_point_emit_ptr(memzone);
+)
+
+RTE_TRACE_POINT(
+ rte_eal_trace_memzone_free,
+ RTE_TRACE_POINT_ARGS(const char *name, void *addr, int rc),
+ rte_trace_point_emit_string(name);
+ rte_trace_point_emit_ptr(addr);
+ rte_trace_point_emit_int(rc);
+)
+
+/* Thread */
+RTE_TRACE_POINT(
+ rte_eal_trace_thread_remote_launch,
+ RTE_TRACE_POINT_ARGS(int (*f)(void *), void *arg,
+ unsigned int worker_id, int rc),
+ rte_trace_point_emit_ptr(f);
+ rte_trace_point_emit_ptr(arg);
+ rte_trace_point_emit_u32(worker_id);
+ rte_trace_point_emit_int(rc);
+)
+RTE_TRACE_POINT(
+ rte_eal_trace_thread_lcore_ready,
+ RTE_TRACE_POINT_ARGS(unsigned int lcore_id, const char *cpuset),
+ rte_trace_point_emit_u32(lcore_id);
+ rte_trace_point_emit_string(cpuset);
+)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _EAL_TRACE_INTERNAL_H_ */
diff --git a/lib/eal/include/meson.build b/lib/eal/include/meson.build
index cfcd40aaed..b515cfd0f3 100644
--- a/lib/eal/include/meson.build
+++ b/lib/eal/include/meson.build
@@ -58,6 +58,7 @@ headers += files(
driver_sdk_headers = files(
'bus_driver.h',
'dev_driver.h',
+ 'eal_trace_internal.h',
)
# special case install the generic headers, since they go in a subdir
diff --git a/lib/eal/include/rte_eal_trace.h b/lib/eal/include/rte_eal_trace.h
index 6f5c022558..c3d15bbe5e 100644
--- a/lib/eal/include/rte_eal_trace.h
+++ b/lib/eal/include/rte_eal_trace.h
@@ -15,32 +15,8 @@
extern "C" {
#endif
-#include <rte_alarm.h>
-#include <rte_interrupts.h>
#include <rte_trace_point.h>
-#include "eal_interrupts.h"
-
-/* Alarm */
-RTE_TRACE_POINT(
- rte_eal_trace_alarm_set,
- RTE_TRACE_POINT_ARGS(uint64_t us, rte_eal_alarm_callback cb_fn,
- void *cb_arg, int rc),
- rte_trace_point_emit_u64(us);
- rte_trace_point_emit_ptr(cb_fn);
- rte_trace_point_emit_ptr(cb_arg);
- rte_trace_point_emit_int(rc);
-)
-
-RTE_TRACE_POINT(
- rte_eal_trace_alarm_cancel,
- RTE_TRACE_POINT_ARGS(rte_eal_alarm_callback cb_fn, void *cb_arg,
- int count),
- rte_trace_point_emit_ptr(cb_fn);
- rte_trace_point_emit_ptr(cb_arg);
- rte_trace_point_emit_int(count);
-)
-
/* Generic */
RTE_TRACE_POINT(
rte_eal_trace_generic_void,
@@ -151,140 +127,6 @@ RTE_TRACE_POINT(
#define RTE_EAL_TRACE_GENERIC_FUNC rte_eal_trace_generic_func(__func__)
-/* Interrupt */
-RTE_TRACE_POINT(
- rte_eal_trace_intr_callback_register,
- RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle,
- rte_intr_callback_fn cb, void *cb_arg, int rc),
- rte_trace_point_emit_int(rc);
- rte_trace_point_emit_int(handle->dev_fd);
- rte_trace_point_emit_int(handle->fd);
- rte_trace_point_emit_int(handle->type);
- rte_trace_point_emit_u32(handle->max_intr);
- rte_trace_point_emit_u32(handle->nb_efd);
- rte_trace_point_emit_ptr(cb);
- rte_trace_point_emit_ptr(cb_arg);
-)
-RTE_TRACE_POINT(
- rte_eal_trace_intr_callback_unregister,
- RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle,
- rte_intr_callback_fn cb, void *cb_arg, int rc),
- rte_trace_point_emit_int(rc);
- rte_trace_point_emit_int(handle->dev_fd);
- rte_trace_point_emit_int(handle->fd);
- rte_trace_point_emit_int(handle->type);
- rte_trace_point_emit_u32(handle->max_intr);
- rte_trace_point_emit_u32(handle->nb_efd);
- rte_trace_point_emit_ptr(cb);
- rte_trace_point_emit_ptr(cb_arg);
-)
-RTE_TRACE_POINT(
- rte_eal_trace_intr_enable,
- RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, int rc),
- rte_trace_point_emit_int(rc);
- rte_trace_point_emit_int(handle->dev_fd);
- rte_trace_point_emit_int(handle->fd);
- rte_trace_point_emit_int(handle->type);
- rte_trace_point_emit_u32(handle->max_intr);
- rte_trace_point_emit_u32(handle->nb_efd);
-)
-RTE_TRACE_POINT(
- rte_eal_trace_intr_disable,
- RTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, int rc),
- rte_trace_point_emit_int(rc);
- rte_trace_point_emit_int(handle->dev_fd);
- rte_trace_point_emit_int(handle->fd);
- rte_trace_point_emit_int(handle->type);
- rte_trace_point_emit_u32(handle->max_intr);
- rte_trace_point_emit_u32(handle->nb_efd);
-)
-
-/* Memory */
-RTE_TRACE_POINT(
- rte_eal_trace_mem_zmalloc,
- RTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align,
- int socket, void *ptr),
- rte_trace_point_emit_string(type);
- rte_trace_point_emit_size_t(size);
- rte_trace_point_emit_u32(align);
- rte_trace_point_emit_int(socket);
- rte_trace_point_emit_ptr(ptr);
-)
-
-RTE_TRACE_POINT(
- rte_eal_trace_mem_malloc,
- RTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align,
- int socket, void *ptr),
- rte_trace_point_emit_string(type);
- rte_trace_point_emit_size_t(size);
- rte_trace_point_emit_u32(align);
- rte_trace_point_emit_int(socket);
- rte_trace_point_emit_ptr(ptr);
-)
-
-RTE_TRACE_POINT(
- rte_eal_trace_mem_realloc,
- RTE_TRACE_POINT_ARGS(size_t size, unsigned int align, int socket,
- void *ptr),
- rte_trace_point_emit_size_t(size);
- rte_trace_point_emit_u32(align);
- rte_trace_point_emit_int(socket);
- rte_trace_point_emit_ptr(ptr);
-)
-
-RTE_TRACE_POINT(
- rte_eal_trace_mem_free,
- RTE_TRACE_POINT_ARGS(void *ptr),
- rte_trace_point_emit_ptr(ptr);
-)
-
-/* Memzone */
-RTE_TRACE_POINT(
- rte_eal_trace_memzone_reserve,
- RTE_TRACE_POINT_ARGS(const char *name, size_t len, int socket_id,
- unsigned int flags, unsigned int align, unsigned int bound,
- const void *mz),
- rte_trace_point_emit_string(name);
- rte_trace_point_emit_size_t(len);
- rte_trace_point_emit_int(socket_id);
- rte_trace_point_emit_u32(flags);
- rte_trace_point_emit_u32(align);
- rte_trace_point_emit_u32(bound);
- rte_trace_point_emit_ptr(mz);
-)
-
-RTE_TRACE_POINT(
- rte_eal_trace_memzone_lookup,
- RTE_TRACE_POINT_ARGS(const char *name, const void *memzone),
- rte_trace_point_emit_string(name);
- rte_trace_point_emit_ptr(memzone);
-)
-
-RTE_TRACE_POINT(
- rte_eal_trace_memzone_free,
- RTE_TRACE_POINT_ARGS(const char *name, void *addr, int rc),
- rte_trace_point_emit_string(name);
- rte_trace_point_emit_ptr(addr);
- rte_trace_point_emit_int(rc);
-)
-
-/* Thread */
-RTE_TRACE_POINT(
- rte_eal_trace_thread_remote_launch,
- RTE_TRACE_POINT_ARGS(int (*f)(void *), void *arg,
- unsigned int worker_id, int rc),
- rte_trace_point_emit_ptr(f);
- rte_trace_point_emit_ptr(arg);
- rte_trace_point_emit_u32(worker_id);
- rte_trace_point_emit_int(rc);
-)
-RTE_TRACE_POINT(
- rte_eal_trace_thread_lcore_ready,
- RTE_TRACE_POINT_ARGS(unsigned int lcore_id, const char *cpuset),
- rte_trace_point_emit_u32(lcore_id);
- rte_trace_point_emit_string(cpuset);
-)
-
#ifdef __cplusplus
}
#endif
diff --git a/lib/eal/linux/eal_alarm.c b/lib/eal/linux/eal_alarm.c
index 9a68e4ce68..397f25d7d5 100644
--- a/lib/eal/linux/eal_alarm.c
+++ b/lib/eal/linux/eal_alarm.c
@@ -9,12 +9,12 @@
#include <sys/time.h>
#include <sys/timerfd.h>
+#include <eal_trace_internal.h>
#include <rte_interrupts.h>
#include <rte_alarm.h>
#include <rte_common.h>
#include <rte_errno.h>
#include <rte_spinlock.h>
-#include <rte_eal_trace.h>
#include <eal_private.h>
diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c
index d52ec8eb4c..c9881143be 100644
--- a/lib/eal/linux/eal_interrupts.c
+++ b/lib/eal/linux/eal_interrupts.c
@@ -16,6 +16,7 @@
#include <assert.h>
#include <stdbool.h>
+#include <eal_trace_internal.h>
#include <rte_common.h>
#include <rte_interrupts.h>
#include <rte_per_lcore.h>
@@ -27,7 +28,6 @@
#include <rte_spinlock.h>
#include <rte_pause.h>
#include <rte_vfio.h>
-#include <rte_eal_trace.h>
#include "eal_private.h"
diff --git a/lib/eal/version.map b/lib/eal/version.map
index 21aa1b8ce3..d0a0da7332 100644
--- a/lib/eal/version.map
+++ b/lib/eal/version.map
@@ -333,8 +333,6 @@ EXPERIMENTAL {
rte_dev_dma_unmap;
# added in 20.05
- __rte_eal_trace_alarm_cancel;
- __rte_eal_trace_alarm_set;
__rte_eal_trace_generic_double;
__rte_eal_trace_generic_float;
__rte_eal_trace_generic_func;
@@ -351,19 +349,6 @@ EXPERIMENTAL {
__rte_eal_trace_generic_u64;
__rte_eal_trace_generic_u8;
__rte_eal_trace_generic_void;
- __rte_eal_trace_intr_callback_register;
- __rte_eal_trace_intr_callback_unregister;
- __rte_eal_trace_intr_enable;
- __rte_eal_trace_intr_disable;
- __rte_eal_trace_mem_free;
- __rte_eal_trace_mem_malloc;
- __rte_eal_trace_mem_realloc;
- __rte_eal_trace_mem_zmalloc;
- __rte_eal_trace_memzone_free;
- __rte_eal_trace_memzone_lookup;
- __rte_eal_trace_memzone_reserve;
- __rte_eal_trace_thread_lcore_ready;
- __rte_eal_trace_thread_remote_launch;
__rte_trace_mem_per_thread_alloc;
__rte_trace_point_emit_field;
__rte_trace_point_register;
diff --git a/lib/eal/windows/eal_alarm.c b/lib/eal/windows/eal_alarm.c
index 51fe752c16..48203a2870 100644
--- a/lib/eal/windows/eal_alarm.c
+++ b/lib/eal/windows/eal_alarm.c
@@ -9,8 +9,7 @@
#include <rte_alarm.h>
#include <rte_spinlock.h>
-#include <rte_eal_trace.h>
-
+#include <eal_trace_internal.h>
#include "eal_windows.h"
enum alarm_state {
--
2.25.1