Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/123939/?format=api
{ "id": 123939, "url": "http://patches.dpdk.org/api/patches/123939/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230215094228.1452656-4-adwivedi@marvell.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230215094228.1452656-4-adwivedi@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230215094228.1452656-4-adwivedi@marvell.com", "date": "2023-02-15T09:42:26", "name": "[v3,3/5] eal: remove internal tracepoints from version map", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "e244fb5fd46f3862ce7cb0b5dd6495eef74a608b", "submitter": { "id": 1561, "url": "http://patches.dpdk.org/api/people/1561/?format=api", "name": "Ankur Dwivedi", "email": "adwivedi@marvell.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20230215094228.1452656-4-adwivedi@marvell.com/mbox/", "series": [ { "id": 27014, "url": "http://patches.dpdk.org/api/series/27014/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=27014", "date": "2023-02-15T09:42:23", "name": "remove internal tracepoints from version map", "version": 3, "mbox": "http://patches.dpdk.org/series/27014/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/123939/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/123939/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 8A51441CA4;\n\tWed, 15 Feb 2023 10:43:07 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 275B442FFE;\n\tWed, 15 Feb 2023 10:43:06 +0100 (CET)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n [67.231.148.174])\n by mails.dpdk.org (Postfix) with ESMTP id 1681843006\n for <dev@dpdk.org>; Wed, 15 Feb 2023 10:43:03 +0100 (CET)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id\n 31F7GTFC009828; Wed, 15 Feb 2023 01:43:02 -0800", "from dc5-exch01.marvell.com ([199.233.59.181])\n by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3nr7f5uuj6-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Wed, 15 Feb 2023 01:43:01 -0800", "from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42;\n Wed, 15 Feb 2023 01:43:00 -0800", "from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend\n Transport; Wed, 15 Feb 2023 01:43:00 -0800", "from localhost.localdomain (unknown [10.28.36.185])\n by maili.marvell.com (Postfix) with ESMTP id 2E8CE3F7040;\n Wed, 15 Feb 2023 01:42:57 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding : content-type; s=pfpt0220;\n bh=0gnSWfKIwbl70hsDIj06ODdRiuLg6A1ZgAnQbS++Pyo=;\n b=coER/KF7mdu1G4xrzmm5ne6EF/V5ZKWF1hCK012jufI0HTe5AO7A7C9hoRVUxw5qYXMA\n JRTleCZ90OgRUDT0pZNGPay2d2xeWncwTKc3Nr5vk9QKyukj7BuU6c0vr5nuNwIIZ2f7\n yir6I3k55ZG4cwx95IS8zsUxRPm8H1AUIZQxCAeA6Zz3O9aWGYB8ZtyOO46EFxwQ59tj\n R0NpmY3xwBT8ReQqHWhsQY5Aro+m7YRnvFXkbVTId5dPQ94eYEXFwD+olpKytqSE2Lo+\n EcTie5/lddxYKVSzfNaCZHUtTQkZesoIJ4Nlq0l2d/3lUFo/mrlEhpj6/OF4BkoNnC1J aQ==", "From": "Ankur Dwivedi <adwivedi@marvell.com>", "To": "<dev@dpdk.org>", "CC": "<thomas@monjalon.net>, <david.marchand@redhat.com>,\n <ferruh.yigit@amd.com>,\n <jerinj@marvell.com>, Ankur Dwivedi <adwivedi@marvell.com>", "Subject": "[PATCH v3 3/5] eal: remove internal tracepoints from version map", "Date": "Wed, 15 Feb 2023 15:12:26 +0530", "Message-ID": "<20230215094228.1452656-4-adwivedi@marvell.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20230215094228.1452656-1-adwivedi@marvell.com>", "References": "<20230210103446.1126999-1-adwivedi@marvell.com>\n <20230215094228.1452656-1-adwivedi@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-GUID": "a9aWHpL9xTKaL1-WMIbAurENP47ohVyQ", "X-Proofpoint-ORIG-GUID": "a9aWHpL9xTKaL1-WMIbAurENP47ohVyQ", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22\n definitions=2023-02-15_06,2023-02-14_01,2023-02-09_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>,\n <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>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "The file rte_eal_trace.h contains some tracepoints which are internal to\nthe eal library. Those tracepoints are moved to a new file\neal_trace_internal.h. The internal tracepoints are removed from the\nversion.map file.\n\nSigned-off-by: Ankur Dwivedi <adwivedi@marvell.com>\nAcked-by: Jerin Jacob <jerinj@marvell.com>\n---\n doc/guides/prog_guide/trace_lib.rst | 3 +-\n lib/eal/common/eal_common_launch.c | 2 +-\n lib/eal/common/eal_common_memzone.c | 2 +-\n lib/eal/common/eal_common_thread.c | 2 +-\n lib/eal/common/eal_common_trace_points.c | 2 +\n lib/eal/common/rte_malloc.c | 2 +-\n lib/eal/freebsd/eal_alarm.c | 2 +-\n lib/eal/freebsd/eal_interrupts.c | 2 +-\n lib/eal/include/eal_trace_internal.h | 182 +++++++++++++++++++++++\n lib/eal/include/rte_eal_trace.h | 158 --------------------\n lib/eal/linux/eal_alarm.c | 2 +-\n lib/eal/linux/eal_interrupts.c | 2 +-\n lib/eal/version.map | 15 --\n lib/eal/windows/eal_alarm.c | 3 +-\n 14 files changed, 195 insertions(+), 184 deletions(-)\n create mode 100644 lib/eal/include/eal_trace_internal.h", "diff": "diff --git a/doc/guides/prog_guide/trace_lib.rst b/doc/guides/prog_guide/trace_lib.rst\nindex 3e0ea5835c..6f19efb3f9 100644\n--- a/doc/guides/prog_guide/trace_lib.rst\n+++ b/doc/guides/prog_guide/trace_lib.rst\n@@ -121,7 +121,8 @@ convention.\n .. note::\n \n The ``RTE_TRACE_POINT_REGISTER`` defines the placeholder for the\n- ``rte_trace_point_t`` tracepoint object. The user must export a\n+ ``rte_trace_point_t`` tracepoint object. For generic tracepoint or for\n+ tracepoint used in public header files, the user must export a\n ``__<trace_function_name>`` symbol in the library ``.map`` file for this\n tracepoint to be used out of the library, in shared builds.\n For example, ``__app_trace_string`` will be the exported symbol in the\ndiff --git a/lib/eal/common/eal_common_launch.c b/lib/eal/common/eal_common_launch.c\nindex 487e58c124..050459857a 100644\n--- a/lib/eal/common/eal_common_launch.c\n+++ b/lib/eal/common/eal_common_launch.c\n@@ -4,8 +4,8 @@\n \n #include <errno.h>\n \n+#include <eal_trace_internal.h>\n #include <rte_launch.h>\n-#include <rte_eal_trace.h>\n #include <rte_pause.h>\n #include <rte_lcore.h>\n \ndiff --git a/lib/eal/common/eal_common_memzone.c b/lib/eal/common/eal_common_memzone.c\nindex 860fb5fb64..a9cd91ffea 100644\n--- a/lib/eal/common/eal_common_memzone.c\n+++ b/lib/eal/common/eal_common_memzone.c\n@@ -8,6 +8,7 @@\n #include <string.h>\n #include <errno.h>\n \n+#include <eal_trace_internal.h>\n #include <rte_log.h>\n #include <rte_memory.h>\n #include <rte_memzone.h>\n@@ -15,7 +16,6 @@\n #include <rte_errno.h>\n #include <rte_string_fns.h>\n #include <rte_common.h>\n-#include <rte_eal_trace.h>\n \n #include \"malloc_heap.h\"\n #include \"malloc_elem.h\"\ndiff --git a/lib/eal/common/eal_common_thread.c b/lib/eal/common/eal_common_thread.c\nindex 7d60eaf1df..edb9d4ead2 100644\n--- a/lib/eal/common/eal_common_thread.c\n+++ b/lib/eal/common/eal_common_thread.c\n@@ -10,7 +10,7 @@\n #include <assert.h>\n #include <string.h>\n \n-#include <rte_eal_trace.h>\n+#include <eal_trace_internal.h>\n #include <rte_errno.h>\n #include <rte_lcore.h>\n #include <rte_log.h>\ndiff --git a/lib/eal/common/eal_common_trace_points.c b/lib/eal/common/eal_common_trace_points.c\nindex 051f89809c..3f5bf5c55c 100644\n--- a/lib/eal/common/eal_common_trace_points.c\n+++ b/lib/eal/common/eal_common_trace_points.c\n@@ -6,6 +6,8 @@\n \n #include <rte_eal_trace.h>\n \n+#include <eal_trace_internal.h>\n+\n RTE_TRACE_POINT_REGISTER(rte_eal_trace_generic_void,\n \tlib.eal.generic.void)\n RTE_TRACE_POINT_REGISTER(rte_eal_trace_generic_u64,\ndiff --git a/lib/eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c\nindex 48db264449..d39870bf3c 100644\n--- a/lib/eal/common/rte_malloc.c\n+++ b/lib/eal/common/rte_malloc.c\n@@ -16,7 +16,7 @@\n #include <rte_common.h>\n #include <rte_spinlock.h>\n \n-#include <rte_eal_trace.h>\n+#include <eal_trace_internal.h>\n \n #include <rte_malloc.h>\n #include \"malloc_elem.h\"\ndiff --git a/lib/eal/freebsd/eal_alarm.c b/lib/eal/freebsd/eal_alarm.c\nindex 1023c32937..177897fbc4 100644\n--- a/lib/eal/freebsd/eal_alarm.c\n+++ b/lib/eal/freebsd/eal_alarm.c\n@@ -11,13 +11,13 @@\n #include <time.h>\n #include <errno.h>\n \n+#include <eal_trace_internal.h>\n #include <rte_alarm.h>\n #include <rte_cycles.h>\n #include <rte_common.h>\n #include <rte_errno.h>\n #include <rte_interrupts.h>\n #include <rte_spinlock.h>\n-#include <rte_eal_trace.h>\n \n #include \"eal_private.h\"\n #include \"eal_alarm_private.h\"\ndiff --git a/lib/eal/freebsd/eal_interrupts.c b/lib/eal/freebsd/eal_interrupts.c\nindex 9f720bdc8f..ffcf97ad4c 100644\n--- a/lib/eal/freebsd/eal_interrupts.c\n+++ b/lib/eal/freebsd/eal_interrupts.c\n@@ -8,12 +8,12 @@\n #include <sys/queue.h>\n #include <unistd.h>\n \n+#include <eal_trace_internal.h>\n #include <rte_errno.h>\n #include <rte_lcore.h>\n #include <rte_spinlock.h>\n #include <rte_common.h>\n #include <rte_interrupts.h>\n-#include <rte_eal_trace.h>\n \n #include \"eal_private.h\"\n #include \"eal_alarm_private.h\"\ndiff --git a/lib/eal/include/eal_trace_internal.h b/lib/eal/include/eal_trace_internal.h\nnew file mode 100644\nindex 0000000000..9d678b3f76\n--- /dev/null\n+++ b/lib/eal/include/eal_trace_internal.h\n@@ -0,0 +1,182 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(C) 2023 Marvell International Ltd.\n+ */\n+\n+#ifndef _EAL_TRACE_INTERNAL_H_\n+#define _EAL_TRACE_INTERNAL_H_\n+\n+/**\n+ * @file\n+ *\n+ * API for EAL trace support\n+ */\n+\n+#ifdef __cplusplus\n+extern \"C\" {\n+#endif\n+\n+#include <rte_alarm.h>\n+#include <rte_interrupts.h>\n+#include <rte_trace_point.h>\n+\n+#include \"eal_interrupts.h\"\n+\n+/* Alarm */\n+RTE_TRACE_POINT(\n+\trte_eal_trace_alarm_set,\n+\tRTE_TRACE_POINT_ARGS(uint64_t us, rte_eal_alarm_callback cb_fn,\n+\t\tvoid *cb_arg, int rc),\n+\trte_trace_point_emit_u64(us);\n+\trte_trace_point_emit_ptr(cb_fn);\n+\trte_trace_point_emit_ptr(cb_arg);\n+\trte_trace_point_emit_int(rc);\n+)\n+\n+RTE_TRACE_POINT(\n+\trte_eal_trace_alarm_cancel,\n+\tRTE_TRACE_POINT_ARGS(rte_eal_alarm_callback cb_fn, void *cb_arg,\n+\t\tint count),\n+\trte_trace_point_emit_ptr(cb_fn);\n+\trte_trace_point_emit_ptr(cb_arg);\n+\trte_trace_point_emit_int(count);\n+)\n+\n+/* Interrupt */\n+RTE_TRACE_POINT(\n+\trte_eal_trace_intr_callback_register,\n+\tRTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle,\n+\t\trte_intr_callback_fn cb, void *cb_arg, int rc),\n+\trte_trace_point_emit_int(rc);\n+\trte_trace_point_emit_int(handle->dev_fd);\n+\trte_trace_point_emit_int(handle->fd);\n+\trte_trace_point_emit_int(handle->type);\n+\trte_trace_point_emit_u32(handle->max_intr);\n+\trte_trace_point_emit_u32(handle->nb_efd);\n+\trte_trace_point_emit_ptr(cb);\n+\trte_trace_point_emit_ptr(cb_arg);\n+)\n+RTE_TRACE_POINT(\n+\trte_eal_trace_intr_callback_unregister,\n+\tRTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle,\n+\t\trte_intr_callback_fn cb, void *cb_arg, int rc),\n+\trte_trace_point_emit_int(rc);\n+\trte_trace_point_emit_int(handle->dev_fd);\n+\trte_trace_point_emit_int(handle->fd);\n+\trte_trace_point_emit_int(handle->type);\n+\trte_trace_point_emit_u32(handle->max_intr);\n+\trte_trace_point_emit_u32(handle->nb_efd);\n+\trte_trace_point_emit_ptr(cb);\n+\trte_trace_point_emit_ptr(cb_arg);\n+)\n+RTE_TRACE_POINT(\n+\trte_eal_trace_intr_enable,\n+\tRTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, int rc),\n+\trte_trace_point_emit_int(rc);\n+\trte_trace_point_emit_int(handle->dev_fd);\n+\trte_trace_point_emit_int(handle->fd);\n+\trte_trace_point_emit_int(handle->type);\n+\trte_trace_point_emit_u32(handle->max_intr);\n+\trte_trace_point_emit_u32(handle->nb_efd);\n+)\n+RTE_TRACE_POINT(\n+\trte_eal_trace_intr_disable,\n+\tRTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, int rc),\n+\trte_trace_point_emit_int(rc);\n+\trte_trace_point_emit_int(handle->dev_fd);\n+\trte_trace_point_emit_int(handle->fd);\n+\trte_trace_point_emit_int(handle->type);\n+\trte_trace_point_emit_u32(handle->max_intr);\n+\trte_trace_point_emit_u32(handle->nb_efd);\n+)\n+\n+/* Memory */\n+RTE_TRACE_POINT(\n+\trte_eal_trace_mem_zmalloc,\n+\tRTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align,\n+\t\tint socket, void *ptr),\n+\trte_trace_point_emit_string(type);\n+\trte_trace_point_emit_size_t(size);\n+\trte_trace_point_emit_u32(align);\n+\trte_trace_point_emit_int(socket);\n+\trte_trace_point_emit_ptr(ptr);\n+)\n+\n+RTE_TRACE_POINT(\n+\trte_eal_trace_mem_malloc,\n+\tRTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align,\n+\t\tint socket, void *ptr),\n+\trte_trace_point_emit_string(type);\n+\trte_trace_point_emit_size_t(size);\n+\trte_trace_point_emit_u32(align);\n+\trte_trace_point_emit_int(socket);\n+\trte_trace_point_emit_ptr(ptr);\n+)\n+\n+RTE_TRACE_POINT(\n+\trte_eal_trace_mem_realloc,\n+\tRTE_TRACE_POINT_ARGS(size_t size, unsigned int align, int socket,\n+\t\tvoid *ptr),\n+\trte_trace_point_emit_size_t(size);\n+\trte_trace_point_emit_u32(align);\n+\trte_trace_point_emit_int(socket);\n+\trte_trace_point_emit_ptr(ptr);\n+)\n+\n+RTE_TRACE_POINT(\n+\trte_eal_trace_mem_free,\n+\tRTE_TRACE_POINT_ARGS(void *ptr),\n+\trte_trace_point_emit_ptr(ptr);\n+)\n+\n+/* Memzone */\n+RTE_TRACE_POINT(\n+\trte_eal_trace_memzone_reserve,\n+\tRTE_TRACE_POINT_ARGS(const char *name, size_t len, int socket_id,\n+\t\tunsigned int flags, unsigned int align, unsigned int bound,\n+\t\tconst void *mz),\n+\trte_trace_point_emit_string(name);\n+\trte_trace_point_emit_size_t(len);\n+\trte_trace_point_emit_int(socket_id);\n+\trte_trace_point_emit_u32(flags);\n+\trte_trace_point_emit_u32(align);\n+\trte_trace_point_emit_u32(bound);\n+\trte_trace_point_emit_ptr(mz);\n+)\n+\n+RTE_TRACE_POINT(\n+\trte_eal_trace_memzone_lookup,\n+\tRTE_TRACE_POINT_ARGS(const char *name, const void *memzone),\n+\trte_trace_point_emit_string(name);\n+\trte_trace_point_emit_ptr(memzone);\n+)\n+\n+RTE_TRACE_POINT(\n+\trte_eal_trace_memzone_free,\n+\tRTE_TRACE_POINT_ARGS(const char *name, void *addr, int rc),\n+\trte_trace_point_emit_string(name);\n+\trte_trace_point_emit_ptr(addr);\n+\trte_trace_point_emit_int(rc);\n+)\n+\n+/* Thread */\n+RTE_TRACE_POINT(\n+\trte_eal_trace_thread_remote_launch,\n+\tRTE_TRACE_POINT_ARGS(int (*f)(void *), void *arg,\n+\t\tunsigned int worker_id, int rc),\n+\trte_trace_point_emit_ptr(f);\n+\trte_trace_point_emit_ptr(arg);\n+\trte_trace_point_emit_u32(worker_id);\n+\trte_trace_point_emit_int(rc);\n+)\n+RTE_TRACE_POINT(\n+\trte_eal_trace_thread_lcore_ready,\n+\tRTE_TRACE_POINT_ARGS(unsigned int lcore_id, const char *cpuset),\n+\trte_trace_point_emit_u32(lcore_id);\n+\trte_trace_point_emit_string(cpuset);\n+)\n+\n+#ifdef __cplusplus\n+}\n+#endif\n+\n+#endif /* _EAL_TRACE_INTERNAL_H_ */\ndiff --git a/lib/eal/include/rte_eal_trace.h b/lib/eal/include/rte_eal_trace.h\nindex 6f5c022558..c3d15bbe5e 100644\n--- a/lib/eal/include/rte_eal_trace.h\n+++ b/lib/eal/include/rte_eal_trace.h\n@@ -15,32 +15,8 @@\n extern \"C\" {\n #endif\n \n-#include <rte_alarm.h>\n-#include <rte_interrupts.h>\n #include <rte_trace_point.h>\n \n-#include \"eal_interrupts.h\"\n-\n-/* Alarm */\n-RTE_TRACE_POINT(\n-\trte_eal_trace_alarm_set,\n-\tRTE_TRACE_POINT_ARGS(uint64_t us, rte_eal_alarm_callback cb_fn,\n-\t\tvoid *cb_arg, int rc),\n-\trte_trace_point_emit_u64(us);\n-\trte_trace_point_emit_ptr(cb_fn);\n-\trte_trace_point_emit_ptr(cb_arg);\n-\trte_trace_point_emit_int(rc);\n-)\n-\n-RTE_TRACE_POINT(\n-\trte_eal_trace_alarm_cancel,\n-\tRTE_TRACE_POINT_ARGS(rte_eal_alarm_callback cb_fn, void *cb_arg,\n-\t\tint count),\n-\trte_trace_point_emit_ptr(cb_fn);\n-\trte_trace_point_emit_ptr(cb_arg);\n-\trte_trace_point_emit_int(count);\n-)\n-\n /* Generic */\n RTE_TRACE_POINT(\n \trte_eal_trace_generic_void,\n@@ -151,140 +127,6 @@ RTE_TRACE_POINT(\n \n #define RTE_EAL_TRACE_GENERIC_FUNC rte_eal_trace_generic_func(__func__)\n \n-/* Interrupt */\n-RTE_TRACE_POINT(\n-\trte_eal_trace_intr_callback_register,\n-\tRTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle,\n-\t\trte_intr_callback_fn cb, void *cb_arg, int rc),\n-\trte_trace_point_emit_int(rc);\n-\trte_trace_point_emit_int(handle->dev_fd);\n-\trte_trace_point_emit_int(handle->fd);\n-\trte_trace_point_emit_int(handle->type);\n-\trte_trace_point_emit_u32(handle->max_intr);\n-\trte_trace_point_emit_u32(handle->nb_efd);\n-\trte_trace_point_emit_ptr(cb);\n-\trte_trace_point_emit_ptr(cb_arg);\n-)\n-RTE_TRACE_POINT(\n-\trte_eal_trace_intr_callback_unregister,\n-\tRTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle,\n-\t\trte_intr_callback_fn cb, void *cb_arg, int rc),\n-\trte_trace_point_emit_int(rc);\n-\trte_trace_point_emit_int(handle->dev_fd);\n-\trte_trace_point_emit_int(handle->fd);\n-\trte_trace_point_emit_int(handle->type);\n-\trte_trace_point_emit_u32(handle->max_intr);\n-\trte_trace_point_emit_u32(handle->nb_efd);\n-\trte_trace_point_emit_ptr(cb);\n-\trte_trace_point_emit_ptr(cb_arg);\n-)\n-RTE_TRACE_POINT(\n-\trte_eal_trace_intr_enable,\n-\tRTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, int rc),\n-\trte_trace_point_emit_int(rc);\n-\trte_trace_point_emit_int(handle->dev_fd);\n-\trte_trace_point_emit_int(handle->fd);\n-\trte_trace_point_emit_int(handle->type);\n-\trte_trace_point_emit_u32(handle->max_intr);\n-\trte_trace_point_emit_u32(handle->nb_efd);\n-)\n-RTE_TRACE_POINT(\n-\trte_eal_trace_intr_disable,\n-\tRTE_TRACE_POINT_ARGS(const struct rte_intr_handle *handle, int rc),\n-\trte_trace_point_emit_int(rc);\n-\trte_trace_point_emit_int(handle->dev_fd);\n-\trte_trace_point_emit_int(handle->fd);\n-\trte_trace_point_emit_int(handle->type);\n-\trte_trace_point_emit_u32(handle->max_intr);\n-\trte_trace_point_emit_u32(handle->nb_efd);\n-)\n-\n-/* Memory */\n-RTE_TRACE_POINT(\n-\trte_eal_trace_mem_zmalloc,\n-\tRTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align,\n-\t\tint socket, void *ptr),\n-\trte_trace_point_emit_string(type);\n-\trte_trace_point_emit_size_t(size);\n-\trte_trace_point_emit_u32(align);\n-\trte_trace_point_emit_int(socket);\n-\trte_trace_point_emit_ptr(ptr);\n-)\n-\n-RTE_TRACE_POINT(\n-\trte_eal_trace_mem_malloc,\n-\tRTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align,\n-\t\tint socket, void *ptr),\n-\trte_trace_point_emit_string(type);\n-\trte_trace_point_emit_size_t(size);\n-\trte_trace_point_emit_u32(align);\n-\trte_trace_point_emit_int(socket);\n-\trte_trace_point_emit_ptr(ptr);\n-)\n-\n-RTE_TRACE_POINT(\n-\trte_eal_trace_mem_realloc,\n-\tRTE_TRACE_POINT_ARGS(size_t size, unsigned int align, int socket,\n-\t\tvoid *ptr),\n-\trte_trace_point_emit_size_t(size);\n-\trte_trace_point_emit_u32(align);\n-\trte_trace_point_emit_int(socket);\n-\trte_trace_point_emit_ptr(ptr);\n-)\n-\n-RTE_TRACE_POINT(\n-\trte_eal_trace_mem_free,\n-\tRTE_TRACE_POINT_ARGS(void *ptr),\n-\trte_trace_point_emit_ptr(ptr);\n-)\n-\n-/* Memzone */\n-RTE_TRACE_POINT(\n-\trte_eal_trace_memzone_reserve,\n-\tRTE_TRACE_POINT_ARGS(const char *name, size_t len, int socket_id,\n-\t\tunsigned int flags, unsigned int align, unsigned int bound,\n-\t\tconst void *mz),\n-\trte_trace_point_emit_string(name);\n-\trte_trace_point_emit_size_t(len);\n-\trte_trace_point_emit_int(socket_id);\n-\trte_trace_point_emit_u32(flags);\n-\trte_trace_point_emit_u32(align);\n-\trte_trace_point_emit_u32(bound);\n-\trte_trace_point_emit_ptr(mz);\n-)\n-\n-RTE_TRACE_POINT(\n-\trte_eal_trace_memzone_lookup,\n-\tRTE_TRACE_POINT_ARGS(const char *name, const void *memzone),\n-\trte_trace_point_emit_string(name);\n-\trte_trace_point_emit_ptr(memzone);\n-)\n-\n-RTE_TRACE_POINT(\n-\trte_eal_trace_memzone_free,\n-\tRTE_TRACE_POINT_ARGS(const char *name, void *addr, int rc),\n-\trte_trace_point_emit_string(name);\n-\trte_trace_point_emit_ptr(addr);\n-\trte_trace_point_emit_int(rc);\n-)\n-\n-/* Thread */\n-RTE_TRACE_POINT(\n-\trte_eal_trace_thread_remote_launch,\n-\tRTE_TRACE_POINT_ARGS(int (*f)(void *), void *arg,\n-\t\tunsigned int worker_id, int rc),\n-\trte_trace_point_emit_ptr(f);\n-\trte_trace_point_emit_ptr(arg);\n-\trte_trace_point_emit_u32(worker_id);\n-\trte_trace_point_emit_int(rc);\n-)\n-RTE_TRACE_POINT(\n-\trte_eal_trace_thread_lcore_ready,\n-\tRTE_TRACE_POINT_ARGS(unsigned int lcore_id, const char *cpuset),\n-\trte_trace_point_emit_u32(lcore_id);\n-\trte_trace_point_emit_string(cpuset);\n-)\n-\n #ifdef __cplusplus\n }\n #endif\ndiff --git a/lib/eal/linux/eal_alarm.c b/lib/eal/linux/eal_alarm.c\nindex 9a68e4ce68..397f25d7d5 100644\n--- a/lib/eal/linux/eal_alarm.c\n+++ b/lib/eal/linux/eal_alarm.c\n@@ -9,12 +9,12 @@\n #include <sys/time.h>\n #include <sys/timerfd.h>\n \n+#include <eal_trace_internal.h>\n #include <rte_interrupts.h>\n #include <rte_alarm.h>\n #include <rte_common.h>\n #include <rte_errno.h>\n #include <rte_spinlock.h>\n-#include <rte_eal_trace.h>\n \n #include <eal_private.h>\n \ndiff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c\nindex d52ec8eb4c..c9881143be 100644\n--- a/lib/eal/linux/eal_interrupts.c\n+++ b/lib/eal/linux/eal_interrupts.c\n@@ -16,6 +16,7 @@\n #include <assert.h>\n #include <stdbool.h>\n \n+#include <eal_trace_internal.h>\n #include <rte_common.h>\n #include <rte_interrupts.h>\n #include <rte_per_lcore.h>\n@@ -27,7 +28,6 @@\n #include <rte_spinlock.h>\n #include <rte_pause.h>\n #include <rte_vfio.h>\n-#include <rte_eal_trace.h>\n \n #include \"eal_private.h\"\n \ndiff --git a/lib/eal/version.map b/lib/eal/version.map\nindex 2ae57ee78a..6d6978f108 100644\n--- a/lib/eal/version.map\n+++ b/lib/eal/version.map\n@@ -333,8 +333,6 @@ EXPERIMENTAL {\n \trte_dev_dma_unmap;\n \n \t# added in 20.05\n-\t__rte_eal_trace_alarm_cancel;\n-\t__rte_eal_trace_alarm_set;\n \t__rte_eal_trace_generic_double;\n \t__rte_eal_trace_generic_float;\n \t__rte_eal_trace_generic_func;\n@@ -351,19 +349,6 @@ EXPERIMENTAL {\n \t__rte_eal_trace_generic_u64;\n \t__rte_eal_trace_generic_u8;\n \t__rte_eal_trace_generic_void;\n-\t__rte_eal_trace_intr_callback_register;\n-\t__rte_eal_trace_intr_callback_unregister;\n-\t__rte_eal_trace_intr_enable;\n-\t__rte_eal_trace_intr_disable;\n-\t__rte_eal_trace_mem_free;\n-\t__rte_eal_trace_mem_malloc;\n-\t__rte_eal_trace_mem_realloc;\n-\t__rte_eal_trace_mem_zmalloc;\n-\t__rte_eal_trace_memzone_free;\n-\t__rte_eal_trace_memzone_lookup;\n-\t__rte_eal_trace_memzone_reserve;\n-\t__rte_eal_trace_thread_lcore_ready;\n-\t__rte_eal_trace_thread_remote_launch;\n \t__rte_trace_mem_per_thread_alloc;\n \t__rte_trace_point_emit_field;\n \t__rte_trace_point_register;\ndiff --git a/lib/eal/windows/eal_alarm.c b/lib/eal/windows/eal_alarm.c\nindex 51fe752c16..48203a2870 100644\n--- a/lib/eal/windows/eal_alarm.c\n+++ b/lib/eal/windows/eal_alarm.c\n@@ -9,8 +9,7 @@\n #include <rte_alarm.h>\n #include <rte_spinlock.h>\n \n-#include <rte_eal_trace.h>\n-\n+#include <eal_trace_internal.h>\n #include \"eal_windows.h\"\n \n enum alarm_state {\n", "prefixes": [ "v3", "3/5" ] }