1From 39f06e9ef0929da16282b23ec606c3893f394b1e Mon Sep 17 00:00:00 2001 2From: jiangheng <jiangheng14@huawei.com> 3Date: Mon, 25 Sep 2023 15:23:51 +0800 4Subject: [PATCH] lstack_lwip: external api start with do_lwip_ prefix 5 6--- 7 src/api/api_msg.c | 8 ++++---- 8 src/api/sockets.c | 8 ++++---- 9 src/core/pbuf.c | 4 ++-- 10 src/core/tcp_out.c | 4 ++-- 11 src/core/udp.c | 4 ++-- 12 src/include/lwip/pbuf.h | 3 ++- 13 src/include/lwipsock.h | 19 +++++++++++-------- 14 7 files changed, 27 insertions(+), 23 deletions(-) 15 16diff --git a/src/api/api_msg.c b/src/api/api_msg.c 17index 869d6bc..3e982ab 100644 18--- a/src/api/api_msg.c 19+++ b/src/api/api_msg.c 20@@ -292,7 +292,7 @@ recv_udp(void *arg, struct udp_pcb *pcb, struct pbuf *p, 21 SYS_ARCH_INC(conn->recv_avail, len); 22 #endif /* LWIP_SO_RCVBUF */ 23 #if GAZELLE_UDP_ENABLE 24- add_recv_list(conn->socket); 25+ do_lwip_add_recvlist(conn->socket); 26 LWIP_UNUSED_ARG(len); 27 #else /* GAZELLE_UDP_ENABLE */ 28 /* Register event with callback */ 29@@ -356,7 +356,7 @@ recv_tcp(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err) 30 SYS_ARCH_INC(conn->recv_avail, len); 31 #endif /* LWIP_SO_RCVBUF */ 32 #if GAZELLE_ENABLE 33- add_recv_list(conn->socket); 34+ do_lwip_add_recvlist(conn->socket); 35 LWIP_UNUSED_ARG(len); 36 #else 37 /* Register event with callback */ 38@@ -492,7 +492,7 @@ err_tcp(void *arg, err_t err) 39 /* use trypost to prevent deadlock */ 40 sys_mbox_trypost(&conn->recvmbox, mbox_msg); 41 #if GAZELLE_ENABLE 42- add_recv_list(conn->socket); 43+ do_lwip_add_recvlist(conn->socket); 44 #endif 45 } 46 /* pass error message to acceptmbox to wake up pending accept */ 47@@ -1348,7 +1348,7 @@ lwip_netconn_do_connected(void *arg, struct tcp_pcb *pcb, err_t err) 48 } 49 50 #if GAZELLE_ENABLE 51- gazelle_connected_callback(conn); 52+ do_lwip_connected_callback(conn); 53 #endif 54 55 LWIP_ASSERT("conn->state == NETCONN_CONNECT", conn->state == NETCONN_CONNECT); 56diff --git a/src/api/sockets.c b/src/api/sockets.c 57index f9b7a8f..8d573aa 100644 58--- a/src/api/sockets.c 59+++ b/src/api/sockets.c 60@@ -613,7 +613,7 @@ alloc_socket(struct netconn *newconn, int accepted, int flags) 61 return i + LWIP_SOCKET_OFFSET; 62 } else { 63 lwip_close(i); 64- gazelle_clean_sock(i); 65+ do_lwip_clean_sock(i); 66 } 67 68 err: 69@@ -785,7 +785,7 @@ lwip_accept4(int s, struct sockaddr *addr, socklen_t *addrlen, int flags) 70 } 71 #if GAZELLE_ENABLE 72 LWIP_ASSERT("invalid socket index", (newsock >= LWIP_SOCKET_OFFSET) && (newsock < sockets_num + LWIP_SOCKET_OFFSET)); 73- gazelle_init_sock(newsock); 74+ do_lwip_init_sock(newsock); 75 #else 76 LWIP_ASSERT("invalid socket index", (newsock >= LWIP_SOCKET_OFFSET) && (newsock < NUM_SOCKETS + LWIP_SOCKET_OFFSET)); 77 #endif /* GAZELLE_ENABLE */ 78@@ -1170,7 +1170,7 @@ lwip_recv_tcp(struct lwip_sock *sock, void *mem, size_t len, int flags) 79 lwip_recv_tcp_done: 80 #else /* GAZELLE_ENABLE */ 81 LWIP_UNUSED_ARG(recv_left); 82- recvd = read_lwip_data(sock, flags, apiflags); 83+ recvd = do_lwip_read_from_lwip(sock, flags, apiflags); 84 if (recvd <= 0) { 85 return recvd; 86 } 87@@ -1369,7 +1369,7 @@ lwip_recvfrom_udp_raw(struct lwip_sock *sock, int flags, struct msghdr *msg, u16 88 LWIP_UNUSED_ARG(err); 89 LWIP_UNUSED_ARG(copied); 90 LWIP_UNUSED_ARG(i); 91- buflen = read_lwip_data(sock, flags, apiflags); 92+ buflen = do_lwip_read_from_lwip(sock, flags, apiflags); 93 if (buflen <= 0) { 94 return ERR_BUF; 95 } 96diff --git a/src/core/pbuf.c b/src/core/pbuf.c 97index 8a55463..975e240 100644 98--- a/src/core/pbuf.c 99+++ b/src/core/pbuf.c 100@@ -288,7 +288,7 @@ pbuf_alloc(pbuf_layer layer, u16_t length, pbuf_type type) 101 /* If pbuf is to be allocated in RAM, allocate memory for it. */ 102 #if GAZELLE_ENABLE 103 /* alloc mbuf avoid send copy */ 104- p = lwip_alloc_pbuf(layer, length, type); 105+ p = do_lwip_alloc_pbuf(layer, length, type); 106 #else 107 p = (struct pbuf *)mem_malloc(alloc_len); 108 if (p == NULL) { 109@@ -780,7 +780,7 @@ pbuf_free(struct pbuf *p) 110 /* is this a custom pbuf? */ 111 if ((p->flags & PBUF_FLAG_IS_CUSTOM) != 0) { 112 #if GAZELLE_ENABLE 113- gazelle_free_pbuf(p); 114+ do_lwip_free_pbuf(p); 115 #else 116 struct pbuf_custom *pc = (struct pbuf_custom *)p; 117 LWIP_ASSERT("pc->custom_free_function != NULL", pc->custom_free_function != NULL); 118diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c 119index 6250e6b..547d01e 100644 120--- a/src/core/tcp_out.c 121+++ b/src/core/tcp_out.c 122@@ -699,7 +699,7 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags) 123 pbuf_cat(p/*header*/, p2/*data*/); 124 } 125 #else /* GAZELLE_ENABLE */ 126- p = write_lwip_data((struct lwip_sock *)arg, len - pos, &apiflags); 127+ p = do_lwip_get_from_sendring((struct lwip_sock *)arg, len - pos, &apiflags); 128 if (p == NULL) { 129 break; 130 } 131@@ -764,7 +764,7 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags) 132 133 pos += seglen; 134 #if GAZELLE_ENABLE 135- write_lwip_over((struct lwip_sock*)arg); 136+ do_lwip_get_from_sendring_over((struct lwip_sock*)arg); 137 #endif 138 } 139 140diff --git a/src/core/udp.c b/src/core/udp.c 141index d9db535..5c6dadb 100644 142--- a/src/core/udp.c 143+++ b/src/core/udp.c 144@@ -677,8 +677,8 @@ udp_sendto_chksum(struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *dst_ip, 145 #if GAZELLE_UDP_ENABLE 146 uint8_t apiflags = 0; 147 148- struct pbuf *udp_pbuf = write_lwip_data((struct lwip_sock *)(p->payload), p->tot_len, &apiflags); 149- write_lwip_over((struct lwip_sock *)(p->payload)); 150+ struct pbuf *udp_pbuf = do_lwip_get_from_sendring((struct lwip_sock *)(p->payload), p->tot_len, &apiflags); 151+ do_lwip_get_from_sendring_over((struct lwip_sock *)(p->payload)); 152 153 pbuf_free(p); 154 p = udp_pbuf; 155diff --git a/src/include/lwip/pbuf.h b/src/include/lwip/pbuf.h 156index 2639b37..e1f2e50 100644 157--- a/src/include/lwip/pbuf.h 158+++ b/src/include/lwip/pbuf.h 159@@ -300,7 +300,8 @@ void pbuf_free_ooseq(void); 160 /* Initializes the pbuf module. This call is empty for now, but may not be in future. */ 161 #define pbuf_init() 162 #if GAZELLE_ENABLE 163-struct pbuf *lwip_alloc_pbuf(pbuf_layer layer, uint16_t length, pbuf_type type); 164+extern struct pbuf *do_lwip_alloc_pbuf(pbuf_layer layer, uint16_t length, pbuf_type type); 165+extern void do_lwip_free_pbuf(struct pbuf *pbuf); 166 #endif 167 struct pbuf *pbuf_alloc(pbuf_layer l, u16_t length, pbuf_type type); 168 struct pbuf *pbuf_alloc_reference(void *payload, u16_t length, pbuf_type type); 169diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h 170index f8480c5..ccc8c43 100644 171--- a/src/include/lwipsock.h 172+++ b/src/include/lwipsock.h 173@@ -164,13 +164,17 @@ static inline unsigned same_node_ring_count(struct lwip_sock *sock) 174 #if GAZELLE_ENABLE 175 extern uint32_t sockets_num; 176 extern struct lwip_sock *sockets; 177-extern void gazelle_connected_callback(struct netconn *conn); 178-extern void add_recv_list(int32_t fd); 179-extern ssize_t read_lwip_data(struct lwip_sock *sock, int32_t flags, u8_t apiflags); 180-extern struct pbuf *write_lwip_data(struct lwip_sock *sock, uint16_t remain_size, uint8_t *apiflags); 181-extern void gazelle_init_sock(int32_t fd); 182-extern void gazelle_clean_sock(int32_t fd); 183-extern void write_lwip_over(struct lwip_sock *sock); 184+ 185+extern void do_lwip_init_sock(int32_t fd); 186+extern void do_lwip_clean_sock(int32_t fd); 187+extern void do_lwip_connected_callback(struct netconn *conn); 188+ 189+extern struct pbuf *do_lwip_get_from_sendring(struct lwip_sock *sock, uint16_t remain_size, uint8_t *apiflags); 190+extern void do_lwip_get_from_sendring_over(struct lwip_sock *sock); 191+extern ssize_t do_lwip_read_from_lwip(struct lwip_sock *sock, int32_t flags, u8_t apiflags); 192+ 193+extern void do_lwip_add_recvlist(int32_t fd); 194+ 195 extern void netif_poll(struct netif *netif); 196 extern err_t netif_loop_output(struct netif *netif, struct pbuf *p); 197 extern err_t find_same_node_memzone(struct tcp_pcb *pcb, struct lwip_sock *nsock); 198@@ -178,7 +182,6 @@ extern err_t same_node_memzone_create(const struct rte_memzone **zone, int size, 199 extern err_t same_node_ring_create(struct rte_ring **ring, int size, int port, char *name, char *rx); 200 extern err_t create_same_node_ring(struct tcp_pcb *pcb); 201 extern err_t find_same_node_ring(struct tcp_pcb *pcb); 202-extern void gazelle_free_pbuf(struct pbuf *pbuf); 203 extern void lstack_calculate_aggregate(int type, uint32_t len); 204 #endif /* GAZELLE_ENABLE */ 205 206-- 2072.27.0 208 209