From 54e54163e49e4afa2c27e92de1b1a5b3c5628f1a Mon Sep 17 00:00:00 2001 From: wu-changsheng Date: Tue, 20 Dec 2022 14:54:04 +0800 Subject: [PATCH] add-variable-in-struct-sock (cherry picked from commit eb5787602eb5ba059567052e7e395ffd847d54be) --- 0045-add-variable-in-struct-sock.patch | 26 ++++++++++++++++++++++++++ lwip.spec | 7 ++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0045-add-variable-in-struct-sock.patch diff --git a/0045-add-variable-in-struct-sock.patch b/0045-add-variable-in-struct-sock.patch new file mode 100644 index 0000000..8fcb6da --- /dev/null +++ b/0045-add-variable-in-struct-sock.patch @@ -0,0 +1,26 @@ +From 1ede4a00c1eca575314af02374846cb086798c08 Mon Sep 17 00:00:00 2001 +From: wu-changsheng +Date: Tue, 20 Dec 2022 14:37:21 +0800 +Subject: [PATCH] add variable in struct sock + +--- + src/include/lwipsock.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/include/lwipsock.h b/src/include/lwipsock.h +index ec4d78c..8924728 100644 +--- a/src/include/lwipsock.h ++++ b/src/include/lwipsock.h +@@ -105,8 +105,7 @@ struct lwip_sock { + char pad1 __rte_cache_aligned; + /* app and stack thread all use */ + uint32_t in_send; /* avoid sock too much send rpc msg*/ +- pthread_spinlock_t sock_lock; +- ++ bool read_wait; + char pad2 __rte_cache_aligned; + /* stack thread all use */ + struct list_node recv_list; +-- +2.23.0 + diff --git a/lwip.spec b/lwip.spec index 9067aab..d8448d9 100644 --- a/lwip.spec +++ b/lwip.spec @@ -4,7 +4,7 @@ Summary: lwip is a small independent implementation of the TCP/IP protocol suite Name: lwip Version: 2.1.3 -Release: 32 +Release: 33 License: BSD URL: http://savannah.nongnu.org/projects/lwip/ Source0: http://download.savannah.nongnu.org/releases/lwip/%{name}-%{version}.zip @@ -56,6 +56,7 @@ Patch9040: 0041-optimite-pcb-list-limit-send-size-and-ack-now.patch Patch9041: 0042-expand-recv-win.patch Patch9042: 0043-add-prefetch.patch Patch9043: 0044-skip-unnecessary-tcp_route.patch +Patch9044: 0045-add-variable-in-struct-sock.patch BuildRequires: gcc-c++ dos2unix dpdk-devel @@ -116,6 +117,7 @@ find %{_builddir}/%{name}-%{version} -type f -exec dos2unix -q {} \; %patch9041 -p1 %patch9042 -p1 %patch9043 -p1 +%patch9044 -p1 %build cd %{_builddir}/%{name}-%{version}/src @@ -131,6 +133,9 @@ cd %{_builddir}/%{name}-%{version}/src %{_libdir}/liblwip.a %changelog +* Tue Dec 20 2022 wuchangsheng - 2.1.3-33 +- add variable in struct sock + * Mon Dec 19 2022 kircher - 2.1.3-32 - skip unnecessary tcp_route -- Gitee