From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 415F942CAB; Tue, 13 Jun 2023 16:12:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B251B427F2; Tue, 13 Jun 2023 16:12:01 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id F20B94161A for ; Tue, 13 Jun 2023 16:11:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686665520; x=1718201520; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QNUYn5vurRyH/69HTeB7fmupD/zb2Nh95ssYHx46jFI=; b=M+y0Hj2RQ+4r2V8Gt6aCCFfnzQi9tBxh65YbBGNMbxc86/yHWQEX8/cn 32OyoIGqhcNCu3RbTdJaSQt7C9qZlZTadhljEnNr5cFg3XFDKIXzOTe6i eJOSQHkbZO2BQmV7hxJPzI9Y+bnCpVTPR0xVJxUZpkDZRQdC/1ymS/0yc /vLmCivLB6fWfGerzc7j+bwBvzZlqtv/d5gk8KiVlf3p3FLp15RubMxgW QFOCwYVTOcqLFSZyY/J4UlFMXlJC2mAmvo9WHaq43mgsmBC211lcqQboL dCGx4QfcptXJ2eguKWC7iZ6n3Ib9iY64bLzoOrWHr3So3D/NRpA1Zp9Xc w==; X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="355839624" X-IronPort-AV: E=Sophos;i="6.00,239,1681196400"; d="scan'208";a="355839624" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2023 07:11:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="741439267" X-IronPort-AV: E=Sophos;i="6.00,239,1681196400"; d="scan'208";a="741439267" Received: from dpdk-zhirun-lmm.sh.intel.com ([10.67.119.94]) by orsmga008.jf.intel.com with ESMTP; 13 Jun 2023 07:11:56 -0700 From: Zhirun Yan To: dev@dpdk.org, jerinj@marvell.com, kirankumark@marvell.com, ndabilpuram@marvell.com, stephen@networkplumber.org, pbhagavatula@marvell.com, jerinjacobk@gmail.com, david.marchand@redhat.com Cc: cunming.liang@intel.com, haiyue.wang@intel.com, mattias.ronnblom@ericsson.com, Zhirun Yan Subject: [PATCH v14 01/16] graph: rename rte_graph_work as common Date: Tue, 13 Jun 2023 22:04:30 +0800 Message-Id: <20230613140445.2155542-2-zhirun.yan@intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230613140445.2155542-1-zhirun.yan@intel.com> References: <20230613101404.1787790-1-zhirun.yan@intel.com> <20230613140445.2155542-1-zhirun.yan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Rename rte_graph_work.h to rte_graph_work_common.h for supporting multiple graph worker model. Signed-off-by: Haiyue Wang Signed-off-by: Cunming Liang Signed-off-by: Zhirun Yan Acked-by: Jerin Jacob --- MAINTAINERS | 3 ++- app/test/test_graph.c | 2 +- app/test/test_graph_perf.c | 2 +- doc/api/doxy-api-index.md | 2 +- doc/guides/prog_guide/graph_lib.rst | 2 +- examples/l3fwd-graph/main.c | 2 +- lib/graph/graph_pcap.c | 2 +- lib/graph/graph_private.h | 2 +- lib/graph/meson.build | 2 +- .../{rte_graph_worker.h => rte_graph_worker_common.h} | 8 ++++---- lib/node/ethdev_rx.c | 2 +- lib/node/ethdev_tx.c | 2 +- lib/node/ip4_lookup.c | 2 +- lib/node/ip4_rewrite.c | 2 +- lib/node/ip6_lookup.c | 2 +- lib/node/ip6_rewrite.c | 2 +- lib/node/kernel_rx.c | 2 +- lib/node/kernel_tx.c | 2 +- lib/node/pkt_cls.c | 2 +- 19 files changed, 23 insertions(+), 22 deletions(-) rename lib/graph/{rte_graph_worker.h => rte_graph_worker_common.h} (98%) diff --git a/MAINTAINERS b/MAINTAINERS index 906b31f97c..fda0b55513 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1724,10 +1724,11 @@ F: doc/guides/prog_guide/bpf_lib.rst Graph - EXPERIMENTAL M: Jerin Jacob M: Kiran Kumar K +M: Nithin Dabilpuram +M: Zhirun Yan F: lib/graph/ F: doc/guides/prog_guide/graph_lib.rst F: app/test/test_graph* -M: Nithin Dabilpuram F: examples/l3fwd-graph/ F: doc/guides/sample_app_ug/l3_forward_graph.rst diff --git a/app/test/test_graph.c b/app/test/test_graph.c index 1a2d1e6fab..c2c855f776 100644 --- a/app/test/test_graph.c +++ b/app/test/test_graph.c @@ -24,7 +24,7 @@ test_node_list_dump(void) #else #include -#include +#include #include #include #include diff --git a/app/test/test_graph_perf.c b/app/test/test_graph_perf.c index c5b463f700..5c4e9c917b 100644 --- a/app/test/test_graph_perf.c +++ b/app/test/test_graph_perf.c @@ -23,7 +23,7 @@ test_graph_perf_func(void) #else #include -#include +#include #include #include #include diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md index 32bf7b72b2..cc1ad395f3 100644 --- a/doc/api/doxy-api-index.md +++ b/doc/api/doxy-api-index.md @@ -205,7 +205,7 @@ The public API headers are grouped by topics: [table_em](@ref rte_swx_table_em.h) [table_wm](@ref rte_swx_table_wm.h) * [graph](@ref rte_graph.h): - [graph_worker](@ref rte_graph_worker.h) + [graph_worker](@ref rte_graph_worker_common.h) * graph_nodes: [eth_node](@ref rte_node_eth_api.h), [ip4_node](@ref rte_node_ip4_api.h) diff --git a/doc/guides/prog_guide/graph_lib.rst b/doc/guides/prog_guide/graph_lib.rst index 07248f06c4..18d29e1422 100644 --- a/doc/guides/prog_guide/graph_lib.rst +++ b/doc/guides/prog_guide/graph_lib.rst @@ -26,7 +26,7 @@ Features of the Graph library are: - Low overhead statistics collection infrastructure. - Support to export the graph as a Graphviz dot file. See ``rte_graph_export()``. - Allow having another graph walk implementation in the future by segregating - the fast path(``rte_graph_worker.h``) and slow path code. + the fast path(``rte_graph_worker_common.h``) and slow path code. Advantages of Graph architecture -------------------------------- diff --git a/examples/l3fwd-graph/main.c b/examples/l3fwd-graph/main.c index 0c82e24513..cddbdf327b 100644 --- a/examples/l3fwd-graph/main.c +++ b/examples/l3fwd-graph/main.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/graph/graph_pcap.c b/lib/graph/graph_pcap.c index db722c375f..f7767fb8be 100644 --- a/lib/graph/graph_pcap.c +++ b/lib/graph/graph_pcap.c @@ -11,7 +11,7 @@ #include #include -#include "rte_graph_worker.h" +#include "rte_graph_worker_common.h" #include "graph_pcap_private.h" diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h index eacdef45f0..307e5f70bc 100644 --- a/lib/graph/graph_private.h +++ b/lib/graph/graph_private.h @@ -13,7 +13,7 @@ #include #include "rte_graph.h" -#include "rte_graph_worker.h" +#include "rte_graph_worker_common.h" extern int rte_graph_logtype; diff --git a/lib/graph/meson.build b/lib/graph/meson.build index 3526d1b5d4..4e2b612ad3 100644 --- a/lib/graph/meson.build +++ b/lib/graph/meson.build @@ -16,6 +16,6 @@ sources = files( 'graph_populate.c', 'graph_pcap.c', ) -headers = files('rte_graph.h', 'rte_graph_worker.h') +headers = files('rte_graph.h', 'rte_graph_worker_common.h') deps += ['eal', 'pcapng'] diff --git a/lib/graph/rte_graph_worker.h b/lib/graph/rte_graph_worker_common.h similarity index 98% rename from lib/graph/rte_graph_worker.h rename to lib/graph/rte_graph_worker_common.h index 438595b15c..5a4b54e490 100644 --- a/lib/graph/rte_graph_worker.h +++ b/lib/graph/rte_graph_worker_common.h @@ -2,11 +2,11 @@ * Copyright(C) 2020 Marvell International Ltd. */ -#ifndef _RTE_GRAPH_WORKER_H_ -#define _RTE_GRAPH_WORKER_H_ +#ifndef _RTE_GRAPH_WORKER_COMMON_H_ +#define _RTE_GRAPH_WORKER_COMMON_H_ /** - * @file rte_graph_worker.h + * @file rte_graph_worker_common.h * * @warning * @b EXPERIMENTAL: @@ -518,4 +518,4 @@ rte_node_next_stream_move(struct rte_graph *graph, struct rte_node *src, } #endif -#endif /* _RTE_GRAPH_WORKER_H_ */ +#endif /* _RTE_GRAPH_WORKER_COIMMON_H_ */ diff --git a/lib/node/ethdev_rx.c b/lib/node/ethdev_rx.c index d131034991..87cccbcc7b 100644 --- a/lib/node/ethdev_rx.c +++ b/lib/node/ethdev_rx.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include "ethdev_rx_priv.h" #include "node_private.h" diff --git a/lib/node/ethdev_tx.c b/lib/node/ethdev_tx.c index 7d2d72f823..17231d8b34 100644 --- a/lib/node/ethdev_tx.c +++ b/lib/node/ethdev_tx.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include "ethdev_tx_priv.h" diff --git a/lib/node/ip4_lookup.c b/lib/node/ip4_lookup.c index 8bce03d7db..b84c066fe3 100644 --- a/lib/node/ip4_lookup.c +++ b/lib/node/ip4_lookup.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/lib/node/ip4_rewrite.c b/lib/node/ip4_rewrite.c index 34a920df5e..72ca4b1370 100644 --- a/lib/node/ip4_rewrite.c +++ b/lib/node/ip4_rewrite.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/node/ip6_lookup.c b/lib/node/ip6_lookup.c index 2898b3f8f6..912e33688c 100644 --- a/lib/node/ip6_lookup.c +++ b/lib/node/ip6_lookup.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/lib/node/ip6_rewrite.c b/lib/node/ip6_rewrite.c index 198d8d8820..83f698a0c8 100644 --- a/lib/node/ip6_rewrite.c +++ b/lib/node/ip6_rewrite.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/node/kernel_rx.c b/lib/node/kernel_rx.c index 2dba7c8cc7..cdd2740170 100644 --- a/lib/node/kernel_rx.c +++ b/lib/node/kernel_rx.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/node/kernel_tx.c b/lib/node/kernel_tx.c index 27d1808c71..0db83a91a9 100644 --- a/lib/node/kernel_tx.c +++ b/lib/node/kernel_tx.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include "kernel_tx_priv.h" diff --git a/lib/node/pkt_cls.c b/lib/node/pkt_cls.c index a8302b8d28..2e5b339a60 100644 --- a/lib/node/pkt_cls.c +++ b/lib/node/pkt_cls.c @@ -3,7 +3,7 @@ */ #include -#include +#include #include "pkt_cls_priv.h" #include "node_private.h" -- 2.37.2