77 lines
2.8 KiB
Diff
77 lines
2.8 KiB
Diff
From 84897b16c0a93606817443f792da97b5923fbdf0 Mon Sep 17 00:00:00 2001
|
|
From: hankangkang <hankangkang5@huawei.com>
|
|
Date: Thu, 31 Oct 2024 16:06:21 +0800
|
|
Subject: [PATCH] remove: code about nobolck mode for mysql
|
|
|
|
---
|
|
src/lstack/api/lstack_rtw_api.c | 5 +----
|
|
src/lstack/core/lstack_cfg.c | 9 ---------
|
|
src/lstack/include/lstack_cfg.h | 1 -
|
|
3 files changed, 1 insertion(+), 14 deletions(-)
|
|
|
|
diff --git a/src/lstack/api/lstack_rtw_api.c b/src/lstack/api/lstack_rtw_api.c
|
|
index 8765463..eab379c 100644
|
|
--- a/src/lstack/api/lstack_rtw_api.c
|
|
+++ b/src/lstack/api/lstack_rtw_api.c
|
|
@@ -190,10 +190,7 @@ static int stack_broadcast_accept4(int fd, struct sockaddr *addr, socklen_t *add
|
|
|
|
static int stack_broadcast_accept(int fd, struct sockaddr *addr, socklen_t *addrlen)
|
|
{
|
|
- if (get_global_cfg_params()->nonblock_mode)
|
|
- return stack_broadcast_accept4(fd, addr, addrlen, O_NONBLOCK);
|
|
- else
|
|
- return stack_broadcast_accept4(fd, addr, addrlen, 0);
|
|
+ return stack_broadcast_accept4(fd, addr, addrlen, 0);
|
|
}
|
|
|
|
/* choice one stack listen */
|
|
diff --git a/src/lstack/core/lstack_cfg.c b/src/lstack/core/lstack_cfg.c
|
|
index f239b60..4c8f066 100644
|
|
--- a/src/lstack/core/lstack_cfg.c
|
|
+++ b/src/lstack/core/lstack_cfg.c
|
|
@@ -81,7 +81,6 @@ static int32_t parse_nic_rxqueue_size(void);
|
|
static int32_t parse_nic_txqueue_size(void);
|
|
static int32_t parse_stack_thread_mode(void);
|
|
static int32_t parse_nic_vlan_mode(void);
|
|
-static int32_t parse_defaule_nonblock_mode(void);
|
|
static int32_t parse_rpc_msg_max(void);
|
|
static int32_t parse_send_cache_mode(void);
|
|
static int32_t parse_flow_bifurcation(void);
|
|
@@ -149,7 +148,6 @@ static struct config_vector_t g_config_tbl[] = {
|
|
{ "nic_txqueue_size", parse_nic_txqueue_size},
|
|
{ "stack_thread_mode", parse_stack_thread_mode },
|
|
{ "nic_vlan_mode", parse_nic_vlan_mode },
|
|
- { "nonblock_mode", parse_defaule_nonblock_mode },
|
|
{ "rpc_msg_max", parse_rpc_msg_max },
|
|
{ "send_cache_mode", parse_send_cache_mode },
|
|
{ "flow_bifurcation", parse_flow_bifurcation},
|
|
@@ -1358,13 +1356,6 @@ static int32_t parse_nic_vlan_mode(void)
|
|
return ret;
|
|
}
|
|
|
|
-static int32_t parse_defaule_nonblock_mode(void)
|
|
-{
|
|
- int32_t ret;
|
|
- PARSE_ARG(g_config_params.nonblock_mode, "nonblock_mode", 1, 0, 1, ret);
|
|
- return ret;
|
|
-}
|
|
-
|
|
static int32_t parse_rpc_msg_max(void)
|
|
{
|
|
int32_t ret;
|
|
diff --git a/src/lstack/include/lstack_cfg.h b/src/lstack/include/lstack_cfg.h
|
|
index 071492d..876423d 100644
|
|
--- a/src/lstack/include/lstack_cfg.h
|
|
+++ b/src/lstack/include/lstack_cfg.h
|
|
@@ -136,7 +136,6 @@ struct cfg_params {
|
|
struct { // deprecated
|
|
char unix_socket_filename[NAME_MAX];
|
|
bool use_ltran; // false:lstack read from nic. true:lstack read form ltran process.
|
|
- bool nonblock_mode;
|
|
bool udp_enable;
|
|
bool kni_switch;
|
|
};
|
|
--
|
|
2.33.0
|
|
|