Rename rte_graph_work.h to rte_graph_work_common.h for supporting
multiple graph worker model.
Signed-off-by: Haiyue Wang <haiyue.w...@intel.com>
Signed-off-by: Cunming Liang <cunming.li...@intel.com>
Signed-off-by: Zhirun Yan <zhirun....@intel.com>
Acked-by: Jerin Jacob <jer...@marvell.com>
---
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/pkt_cls.c | 2 +-
15 files changed, 19 insertions(+), 18 deletions(-)
rename lib/graph/{rte_graph_worker.h => rte_graph_worker_common.h} (98%)
diff --git a/MAINTAINERS b/MAINTAINERS
index ac22093dd4..3b11305bc0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1721,10 +1721,11 @@ F: doc/guides/prog_guide/bpf_lib.rst
Graph - EXPERIMENTAL
M: Jerin Jacob <jer...@marvell.com>
M: Kiran Kumar K <kirankum...@marvell.com>
+M: Nithin Dabilpuram <ndabilpu...@marvell.com>
+M: Zhirun Yan <zhirun....@intel.com>
F: lib/graph/
F: doc/guides/prog_guide/graph_lib.rst
F: app/test/test_graph*
-M: Nithin Dabilpuram <ndabilpu...@marvell.com>
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 <rte_graph.h>
-#include <rte_graph_worker.h>
+#include <rte_graph_worker_common.h>
#include <rte_mbuf.h>
#include <rte_mbuf_dyn.h>
#include <rte_random.h>
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 <rte_graph.h>
-#include <rte_graph_worker.h>
+#include <rte_graph_worker_common.h>
#include <rte_lcore.h>
#include <rte_malloc.h>
#include <rte_mbuf.h>
diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index c709fd48ad..6804d02c3c 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -201,7 +201,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 1cfdc86433..3eaa4b7f92 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 5feeab4f0f..48825da0ce 100644
--- a/examples/l3fwd-graph/main.c
+++ b/examples/l3fwd-graph/main.c
@@ -23,7 +23,7 @@
#include <rte_cycles.h>
#include <rte_eal.h>
#include <rte_ethdev.h>
-#include <rte_graph_worker.h>
+#include <rte_graph_worker_common.h>
#include <rte_launch.h>
#include <rte_lcore.h>
#include <rte_log.h>
diff --git a/lib/graph/graph_pcap.c b/lib/graph/graph_pcap.c
index 6c43330029..8a220370fa 100644
--- a/lib/graph/graph_pcap.c
+++ b/lib/graph/graph_pcap.c
@@ -10,7 +10,7 @@
#include <rte_mbuf.h>
#include <rte_pcapng.h>
-#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 <rte_spinlock.h>
#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 a19237b42f..e681f9f6ec 100644
--- a/lib/node/ethdev_rx.c
+++ b/lib/node/ethdev_rx.c
@@ -6,7 +6,7 @@
#include <rte_ethdev.h>
#include <rte_ether.h>
#include <rte_graph.h>
-#include <rte_graph_worker.h>
+#include <rte_graph_worker_common.h>
#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 <rte_debug.h>
#include <rte_ethdev.h>
#include <rte_graph.h>
-#include <rte_graph_worker.h>
+#include <rte_graph_worker_common.h>
#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 <rte_ethdev.h>
#include <rte_ether.h>
#include <rte_graph.h>
-#include <rte_graph_worker.h>
+#include <rte_graph_worker_common.h>
#include <rte_ip.h>
#include <rte_lpm.h>
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 <rte_ethdev.h>
#include <rte_ether.h>
#include <rte_graph.h>
-#include <rte_graph_worker.h>
+#include <rte_graph_worker_common.h>
#include <rte_ip.h>
#include <rte_malloc.h>
#include <rte_vect.h>
diff --git a/lib/node/pkt_cls.c b/lib/node/pkt_cls.c
index 3e75f2cf78..03f8b03f6c 100644
--- a/lib/node/pkt_cls.c
+++ b/lib/node/pkt_cls.c
@@ -3,7 +3,7 @@
*/
#include <rte_graph.h>
-#include <rte_graph_worker.h>
+#include <rte_graph_worker_common.h>
#include "pkt_cls_priv.h"
#include "node_private.h"
--
2.37.2
