From patchwork Fri Feb 10 10:34:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Dwivedi X-Patchwork-Id: 123673 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 805AE41C5F; Fri, 10 Feb 2023 11:35:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5504942C4D; Fri, 10 Feb 2023 11:35:37 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id AA53A40687 for ; Fri, 10 Feb 2023 11:35:35 +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 31A7tuJN020459; Fri, 10 Feb 2023 02:35:34 -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=iR57xXIEcA0VS3VCv5CeRI0tpq+z98ZAq/T6FgvBI6c=; b=A+eXu+SQ/0hNCCIt1C30GSE0MosCRpg3KdW0xdgKdqUZAVcd2DxeKGJkH/qmxozXMyWe WYd8y+SarpXp13JborGMwefsFciS4uRfb+qDwBFayvlxLxvfw1KfwmplnYfrN0x2VUnc c3q1UCGqKvrSXLsHX1VMjirrHJGRMU3JLJfbHZ/S3eK5HCWHlI55B4OOPki6dKm4jn2G gArHPXSYPecULAHP5IrVlJ5icVeW+Izlu5hO0GyuZHo+YeJ0to3/PHnU4oE+Fpr1yIsq R0dMQEs45zUM5h9Ft4jENoBE7PYtA0jDSm72CqMOJ+2UZTnACRSLnKnJCV/rUTNiJ0rd EA== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3nn71ckucd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 10 Feb 2023 02:35:33 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Fri, 10 Feb 2023 02:35:31 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Fri, 10 Feb 2023 02:35:31 -0800 Received: from localhost.localdomain (unknown [10.28.36.185]) by maili.marvell.com (Postfix) with ESMTP id 6288A5B6939; Fri, 10 Feb 2023 02:35:29 -0800 (PST) From: Ankur Dwivedi To: CC: , , , , Ankur Dwivedi Subject: [PATCH v2 3/5] eal: remove internal tracepoints from version map Date: Fri, 10 Feb 2023 16:04:44 +0530 Message-ID: <20230210103446.1126999-4-adwivedi@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230210103446.1126999-1-adwivedi@marvell.com> References: <20230209133019.933380-1-adwivedi@marvell.com> <20230210103446.1126999-1-adwivedi@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: 0HrfOuhjEziUH8HcgHxx5Rq8EQHCOERY X-Proofpoint-GUID: 0HrfOuhjEziUH8HcgHxx5Rq8EQHCOERY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-10_05,2023-02-09_03,2023-02-09_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 --- doc/guides/prog_guide/trace_lib.rst | 18 +-- 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/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, 202 insertions(+), 192 deletions(-) create mode 100644 lib/eal/include/eal_trace_internal.h diff --git a/doc/guides/prog_guide/trace_lib.rst b/doc/guides/prog_guide/trace_lib.rst index 3e0ea5835c..cc4de29774 100644 --- a/doc/guides/prog_guide/trace_lib.rst +++ b/doc/guides/prog_guide/trace_lib.rst @@ -118,15 +118,6 @@ convention. The ``rte_trace_point_register.h`` header must be included before any inclusion of the ``rte_trace_point.h`` header. -.. note:: - - The ``RTE_TRACE_POINT_REGISTER`` defines the placeholder for the - ``rte_trace_point_t`` tracepoint object. The user must export a - ``__`` symbol in the library ``.map`` file for this - tracepoint to be used out of the library, in shared builds. - For example, ``__app_trace_string`` will be the exported symbol in the - above example. - Fast path tracepoint -------------------- @@ -137,6 +128,15 @@ the user must use ``RTE_TRACE_POINT_FP`` instead of ``RTE_TRACE_POINT``. ``RTE_TRACE_POINT_FP`` is compiled out by default and it can be enabled using the ``enable_trace_fp`` option for meson build. +.. note:: + + The ``RTE_TRACE_POINT_REGISTER`` defines the placeholder for the + ``rte_trace_point_t`` tracepoint object. For fast path tracepoint, the user + must export a ``__`` symbol in the library ``.map`` + file for this tracepoint to be used out of the library, in shared builds. + For example, ``__app_trace_string`` will be the exported symbol in the + above example. + Event record mode ----------------- 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 +#include #include -#include #include #include 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 #include +#include #include #include #include @@ -15,7 +16,6 @@ #include #include #include -#include #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 #include -#include +#include #include #include #include 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 +#include + 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 #include -#include +#include #include #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 #include +#include #include #include #include #include #include #include -#include #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 #include +#include #include #include #include #include #include -#include #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 +#include +#include + +#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/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 -#include #include -#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 #include +#include #include #include #include #include #include -#include #include 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 #include +#include #include #include #include @@ -27,7 +28,6 @@ #include #include #include -#include #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 #include -#include - +#include #include "eal_windows.h" enum alarm_state {