packages/gazelle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
gazelle/0242-cleancode-rename-gazelle-files-in-lwip.patch
jiangheng12 50b48909f3 sync drop netbuf in read_lwip_data to fix mem overflow 
(cherry picked from commit 1aabf9e9472126c472a28577057044b4649bbe11)
2023-05-29 21:59:17 +08:00

325 lines
9.7 KiB
Diff
Raw Blame History

From 8a32751b05845921e3bf7fdc74592a084d67c8cc Mon Sep 17 00:00:00 2001
From: Lemmy Huang <huangliming5@huawei.com>
Date: Tue, 23 May 2023 16:32:26 +0800
Subject: [PATCH] cleancode: rename gazelle files in lwip
Signed-off-by: Lemmy Huang <huangliming5@huawei.com>
---
src/lstack/api/lstack_epoll.c | 4 ++--
src/lstack/api/lstack_fork.c | 2 +-
src/lstack/api/lstack_signal.c | 2 +-
src/lstack/api/lstack_wrap.c | 2 +-
src/lstack/core/lstack_cfg.c | 2 +-
src/lstack/core/lstack_control_plane.c | 4 ++--
src/lstack/core/lstack_dpdk.c | 4 ++--
src/lstack/core/lstack_init.c | 2 +-
src/lstack/core/lstack_lwip.c | 2 +-
src/lstack/core/lstack_protocol_stack.c | 2 +-
src/lstack/core/lstack_stack_stat.c | 2 +-
src/lstack/include/lstack_protocol_stack.h | 2 +-
src/lstack/include/posix/lstack_epoll.h | 2 +-
src/lstack/netif/lstack_ethdev.c | 2 +-
src/lstack/netif/lstack_vdev.c | 2 +-
src/ltran/ltran_instance.h | 2 +-
src/ltran/ltran_stack.h | 2 +-
src/ltran/ltran_tcp_conn.h | 4 ++--
src/ltran/ltran_tcp_sock.c | 2 +-
src/ltran/ltran_tcp_sock.h | 2 +-
src/ltran/ltran_timer.c | 2 +-
21 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/lstack/api/lstack_epoll.c b/src/lstack/api/lstack_epoll.c
index 888552c..a25b0de 100644
--- a/src/lstack/api/lstack_epoll.c
+++ b/src/lstack/api/lstack_epoll.c
@@ -20,11 +20,11 @@
#include <lwip/lwipsock.h>
#include <lwip/sockets.h>
-#include <lwip/eventpoll.h>
+#include <lwip/gazelle_event.h>
#include <lwip/api.h>
#include <lwip/tcp.h>
#include <lwip/timeouts.h>
-#include <lwip/posix_api.h>
+#include <lwip/gazelle_posix_api.h>
#include "lstack_ethdev.h"
#include "lstack_stack_stat.h"
diff --git a/src/lstack/api/lstack_fork.c b/src/lstack/api/lstack_fork.c
index 43c212b..4cdfff3 100644
--- a/src/lstack/api/lstack_fork.c
+++ b/src/lstack/api/lstack_fork.c
@@ -13,7 +13,7 @@
#include <sys/socket.h>
#include <unistd.h>
-#include <lwip/posix_api.h>
+#include <lwip/gazelle_posix_api.h>
pid_t lstack_fork(void)
{
diff --git a/src/lstack/api/lstack_signal.c b/src/lstack/api/lstack_signal.c
index 0c0ed1f..f6ac876 100644
--- a/src/lstack/api/lstack_signal.c
+++ b/src/lstack/api/lstack_signal.c
@@ -16,7 +16,7 @@
#include <execinfo.h>
#include <unistd.h>
#include <lwip/lwipsock.h>
-#include <lwip/posix_api.h>
+#include <lwip/gazelle_posix_api.h>
#include "lstack_cfg.h"
#include "common/dpdk_common.h"
diff --git a/src/lstack/api/lstack_wrap.c b/src/lstack/api/lstack_wrap.c
index b3afa73..4e83501 100644
--- a/src/lstack/api/lstack_wrap.c
+++ b/src/lstack/api/lstack_wrap.c
@@ -25,7 +25,7 @@
#include <net/if.h>
#include <securec.h>
-#include <lwip/posix_api.h>
+#include <lwip/gazelle_posix_api.h>
#include <lwip/lwipsock.h>
#include <lwip/tcp.h>
diff --git a/src/lstack/core/lstack_cfg.c b/src/lstack/core/lstack_cfg.c
index 66399db..fa014e8 100644
--- a/src/lstack/core/lstack_cfg.c
+++ b/src/lstack/core/lstack_cfg.c
@@ -24,7 +24,7 @@
#include <sched.h>
#include <lwip/lwipsock.h>
-#include <lwip/posix_api.h>
+#include <lwip/gazelle_posix_api.h>
#include <lwip/inet.h>
#include "common/gazelle_reg_msg.h"
diff --git a/src/lstack/core/lstack_control_plane.c b/src/lstack/core/lstack_control_plane.c
index 3dfe622..30cf4c8 100644
--- a/src/lstack/core/lstack_control_plane.c
+++ b/src/lstack/core/lstack_control_plane.c
@@ -21,8 +21,8 @@
#include <lwip/tcp.h>
#include <rte_eal.h>
#include <rte_errno.h>
-#include <lwip/posix_api.h>
-#include <lwip/reg_sock.h>
+#include <lwip/gazelle_posix_api.h>
+#include <lwip/gazelle_tcp_reg.h>
#include "lstack_cfg.h"
#include "lstack_dpdk.h"
diff --git a/src/lstack/core/lstack_dpdk.c b/src/lstack/core/lstack_dpdk.c
index fa33ff8..d927b60 100644
--- a/src/lstack/core/lstack_dpdk.c
+++ b/src/lstack/core/lstack_dpdk.c
@@ -29,10 +29,10 @@
#include <rte_kni.h>
#include <rte_pdump.h>
#include <rte_thash.h>
-#include <lwip/posix_api.h>
+#include <lwip/gazelle_posix_api.h>
#include <lwipopts.h>
#include <lwip/pbuf.h>
-#include <lwip/reg_sock.h>
+#include <lwip/gazelle_tcp_reg.h>
#include <lwip/priv/tcp_priv.h>
#include <rte_eth_bond_8023ad.h>
#include <rte_eth_bond.h>
diff --git a/src/lstack/core/lstack_init.c b/src/lstack/core/lstack_init.c
index 7d4edd4..7bb1a66 100644
--- a/src/lstack/core/lstack_init.c
+++ b/src/lstack/core/lstack_init.c
@@ -32,7 +32,7 @@
#include <lwip/tcpip.h>
#include <lwip/memp_def.h>
#include <lwip/lwipopts.h>
-#include <lwip/posix_api.h>
+#include <lwip/gazelle_posix_api.h>
#include "lstack_cfg.h"
#include "lstack_control_plane.h"
diff --git a/src/lstack/core/lstack_lwip.c b/src/lstack/core/lstack_lwip.c
index 09c5261..1a82a2e 100644
--- a/src/lstack/core/lstack_lwip.c
+++ b/src/lstack/core/lstack_lwip.c
@@ -19,7 +19,7 @@
#include <arch/sys_arch.h>
#include <lwip/pbuf.h>
#include <lwip/priv/tcp_priv.h>
-#include <lwip/posix_api.h>
+#include <lwip/gazelle_posix_api.h>
#include <lwip/api.h>
#include <lwip/tcp.h>
#include <securec.h>
diff --git a/src/lstack/core/lstack_protocol_stack.c b/src/lstack/core/lstack_protocol_stack.c
index 2f71f97..f04f736 100644
--- a/src/lstack/core/lstack_protocol_stack.c
+++ b/src/lstack/core/lstack_protocol_stack.c
@@ -20,7 +20,7 @@
#include <lwip/tcp.h>
#include <lwip/memp_def.h>
#include <lwipsock.h>
-#include <lwip/posix_api.h>
+#include <lwip/gazelle_posix_api.h>
#include <securec.h>
#include <numa.h>
diff --git a/src/lstack/core/lstack_stack_stat.c b/src/lstack/core/lstack_stack_stat.c
index 8c4f298..a66445b 100644
--- a/src/lstack/core/lstack_stack_stat.c
+++ b/src/lstack/core/lstack_stack_stat.c
@@ -15,10 +15,10 @@
#include <sys/un.h>
#include <sys/socket.h>
#include <lwip/api.h>
+#include <lwip/gazelle_posix_api.h>
#include "lstack_cfg.h"
#include "lstack_ethdev.h"
-#include "posix_api.h"
#include "lstack_control_plane.h"
#include "lstack_log.h"
#include "common/dpdk_common.h"
diff --git a/src/lstack/include/lstack_protocol_stack.h b/src/lstack/include/lstack_protocol_stack.h
index 5e2b8e6..76ecf67 100644
--- a/src/lstack/include/lstack_protocol_stack.h
+++ b/src/lstack/include/lstack_protocol_stack.h
@@ -17,7 +17,7 @@
#include <sys/epoll.h>
#include <stdbool.h>
-#include <lwip/list.h>
+#include <lwip/gazelle_list.h>
#include <lwip/netif.h>
#include "common/gazelle_dfx_msg.h"
diff --git a/src/lstack/include/posix/lstack_epoll.h b/src/lstack/include/posix/lstack_epoll.h
index 08cd092..205bae0 100644
--- a/src/lstack/include/posix/lstack_epoll.h
+++ b/src/lstack/include/posix/lstack_epoll.h
@@ -18,7 +18,7 @@
#include <semaphore.h>
#include <pthread.h>
-#include <lwip/list.h>
+#include <lwip/gazelle_list.h>
#include "common/gazelle_dfx_msg.h"
#include "common/gazelle_opt.h"
diff --git a/src/lstack/netif/lstack_ethdev.c b/src/lstack/netif/lstack_ethdev.c
index 3d609eb..3923b77 100644
--- a/src/lstack/netif/lstack_ethdev.c
+++ b/src/lstack/netif/lstack_ethdev.c
@@ -19,7 +19,7 @@
#include <lwip/debug.h>
#include <lwip/etharp.h>
-#include <lwip/posix_api.h>
+#include <lwip/gazelle_posix_api.h>
#include <netif/ethernet.h>
#include <lwip/tcp.h>
#include <lwip/prot/tcp.h>
diff --git a/src/lstack/netif/lstack_vdev.c b/src/lstack/netif/lstack_vdev.c
index 87df325..82127fc 100644
--- a/src/lstack/netif/lstack_vdev.c
+++ b/src/lstack/netif/lstack_vdev.c
@@ -14,7 +14,7 @@
#include <lwip/memp.h>
#include <lwip/lwipopts.h>
#include <lwip/sys.h>
-#include <lwip/reg_sock.h>
+#include <lwip/gazelle_tcp_reg.h>
#include <rte_ring.h>
#include <rte_malloc.h>
#include <rte_ethdev.h>
diff --git a/src/ltran/ltran_instance.h b/src/ltran/ltran_instance.h
index f0fe580..b32885a 100644
--- a/src/ltran/ltran_instance.h
+++ b/src/ltran/ltran_instance.h
@@ -13,7 +13,7 @@
#ifndef __GAZELLE_INSTANCE_H__
#define __GAZELLE_INSTANCE_H__
-#include <lwip/hlist.h>
+#include <lwip/gazelle_hlist.h>
#include <netinet/in.h>
#include <limits.h>
diff --git a/src/ltran/ltran_stack.h b/src/ltran/ltran_stack.h
index 693bb33..ca3bc5b 100644
--- a/src/ltran/ltran_stack.h
+++ b/src/ltran/ltran_stack.h
@@ -13,7 +13,7 @@
#ifndef __GAZELLE_STACK_H__
#define __GAZELLE_STACK_H__
-#include <lwip/hlist.h>
+#include <lwip/gazelle_hlist.h>
#include "ltran_stat.h"
diff --git a/src/ltran/ltran_tcp_conn.h b/src/ltran/ltran_tcp_conn.h
index 82c5faf..80e9f80 100644
--- a/src/ltran/ltran_tcp_conn.h
+++ b/src/ltran/ltran_tcp_conn.h
@@ -13,10 +13,10 @@
#ifndef __GAZELLE_TCP_CONN_H__
#define __GAZELLE_TCP_CONN_H__
-#include <lwip/hlist.h>
+#include <lwip/gazelle_hlist.h>
#include <stdint.h>
#include <stdbool.h>
-#include <lwip/reg_sock.h>
+#include <lwip/gazelle_tcp_reg.h>
#include "common/gazelle_opt.h"
diff --git a/src/ltran/ltran_tcp_sock.c b/src/ltran/ltran_tcp_sock.c
index 9bc2c45..9206675 100644
--- a/src/ltran/ltran_tcp_sock.c
+++ b/src/ltran/ltran_tcp_sock.c
@@ -12,7 +12,7 @@
#include <stdlib.h>
-#include <lwip/hlist.h>
+#include <lwip/gazelle_hlist.h>
#include "ltran_tcp_conn.h"
#include "ltran_instance.h"
diff --git a/src/ltran/ltran_tcp_sock.h b/src/ltran/ltran_tcp_sock.h
index e40891d..d724613 100644
--- a/src/ltran/ltran_tcp_sock.h
+++ b/src/ltran/ltran_tcp_sock.h
@@ -13,7 +13,7 @@
#ifndef __GAZELLE_TCP_SOCK_H__
#define __GAZELLE_TCP_SOCK_H__
-#include <lwip/hlist.h>
+#include <lwip/gazelle_hlist.h>
#include <pthread.h>
#include <stdint.h>
diff --git a/src/ltran/ltran_timer.c b/src/ltran/ltran_timer.c
index 85ea324..690eca5 100644
--- a/src/ltran/ltran_timer.c
+++ b/src/ltran/ltran_timer.c
@@ -16,7 +16,7 @@
#include <rte_malloc.h>
#include <rte_errno.h>
#include <rte_cycles.h>
-#include <lwip/hlist.h>
+#include <lwip/gazelle_hlist.h>
#include "ltran_param.h"
#include "ltran_log.h"
--
2.23.0
Reference in New Issue View Git Blame Copy Permalink