sync wrap: dont hijack select temporarily

(cherry picked from commit 40356a69c0055459764a33f09980625d991a95e2)
This commit is contained in:
yinbin 2023-11-18 19:21:50 +08:00 committed by openeuler-sync-bot
parent ce2d57aa72
commit b4fd922423
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,29 @@
From 801aafea1889a5c54ca884f62b0a24c5d6b6d8ce Mon Sep 17 00:00:00 2001
From: yinbin <yinbin8@huawei.com>
Date: Sat, 18 Nov 2023 19:09:34 +0800
Subject: [PATCH] wrap: dont hijack select temporarily
---
src/lstack/api/lstack_wrap.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/lstack/api/lstack_wrap.c b/src/lstack/api/lstack_wrap.c
index 9468003..1e67b76 100644
--- a/src/lstack/api/lstack_wrap.c
+++ b/src/lstack/api/lstack_wrap.c
@@ -582,11 +582,7 @@ static int32_t do_sigaction(int32_t signum, const struct sigaction *act, struct
static int32_t do_select(int32_t nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout)
{
- if (select_posix_path() == PATH_KERNEL) {
- return posix_api->select_fn(nfds, readfds, writefds, exceptfds, timeout);
- }
-
- return g_wrap_api->select_fn(nfds, readfds, writefds, exceptfds, timeout);
+ return posix_api->select_fn(nfds, readfds, writefds, exceptfds, timeout);
}
#define WRAP_VA_PARAM(_fd, _cmd, _lwip_fcntl, _fcntl_fn) \
--
2.27.0

View File

@ -2,7 +2,7 @@
Name: gazelle
Version: 1.0.2
Release: 14
Release: 15
Summary: gazelle is a high performance user-mode stack
License: MulanPSL-2.0
URL: https://gitee.com/openeuler/gazelle
@ -66,6 +66,7 @@ Patch9047: 0047-cfg-fix-lstack-mempool-lookup-failed-in-ltran-mode.patch
Patch9048: 0048-add-tx-package-timeout.patch
Patch9049: 0049-modif-mem.patch
Patch9050: 0050-enable-ipv6.patch
Patch9051: 0051-wrap-dont-hijack-select-temporarily.patch
%description
%{name} is a high performance user-mode stack.
@ -107,6 +108,9 @@ install -Dpm 0640 %{_builddir}/%{name}-%{version}/src/ltran/ltran.conf %{b
%config(noreplace) %{conf_path}/ltran.conf
%changelog
* Sat Nov 18 2023 yinbin6 <yinbin8@huawei.com> - 1.0.2-15
- wrap: dont hijack select temporarily
* Sat Nov 18 2023 yinbin6 <yinbin8@huawei.com> - 1.0.2-14
- enable ipv6