test/acl
1
0
Fork 0
mirror of https://gitee.com/acl-dev/acl.git synced 2024-11-30 10:57:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fiber_server.c can support reuseport when running alonely.

Browse Source
This commit is contained in:
zhengshuxin 2017-08-21 17:39:48 +08:00
parent 1758f39c30
commit 2016e3b46a
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib_acl/src/net/acl_vstream_net.c
View File

@ -106,7 +106,7 @@ ACL_VSTREAM *acl_vstream_listen_ex(const char *addr, int qlen,
ACL_VSTREAM *acl_vstream_listen(const char *addr, int qlen)
{
return acl_vstream_listen_ex(addr, qlen, ACL_BLOCKING, 0, 0);
return acl_vstream_listen_ex(addr, qlen, ACL_INET_FLAG_NONE, 0, 0);
}
ACL_VSTREAM *acl_vstream_accept_ex(ACL_VSTREAM *listen_stream,

14
lib_fiber/c/src/master/fiber_server.c
View File

@ -44,6 +44,7 @@ static char *acl_var_fiber_access_allow;
static char *acl_var_fiber_owner;
static char *acl_var_fiber_dispatch_addr;
static char *acl_var_fiber_dispatch_type;
static char *acl_var_fiber_reuseport; /* just for stand alone */
static ACL_CONFIG_STR_TABLE __conf_str_tab[] = {
{ "fiber_queue_dir", "", &acl_var_fiber_queue_dir },
{ "fiber_log_debug", "all:1", &acl_var_fiber_log_debug },
@ -52,6 +53,7 @@ static ACL_CONFIG_STR_TABLE __conf_str_tab[] = {
{ "fiber_owner", "", &acl_var_fiber_owner },
{ "fiber_dispatch_addr", "", &acl_var_fiber_dispatch_addr },
{ "fiber_dispatch_type", "default", &acl_var_fiber_dispatch_type },
{ "master_reuseport", "", &acl_var_fiber_reuseport },
{ 0, 0, 0 },
};
@ -439,11 +441,21 @@ static void server_alone_open(FIBER_SERVER *server, ACL_ARGV *addrs)
{
const char *myname = "server_alone_open";
ACL_ITER iter;
unsigned flag = ACL_INET_FLAG_NONE;
int i = 0;
#define EQ !strcasecmp
if (EQ(acl_var_fiber_reuseport, "yes") ||
EQ(acl_var_fiber_reuseport, "true") ||
EQ(acl_var_fiber_reuseport, "on")) {
flag |= ACL_INET_FLAG_REUSEPORT;
}
acl_foreach(iter, addrs) {
const char* addr = (const char*) iter.data;
ACL_VSTREAM* sstream = acl_vstream_listen(addr, 128);
ACL_VSTREAM* sstream = acl_vstream_listen_ex(
addr, 128, flag, 0, 0);
if (sstream == NULL) {
acl_msg_error("%s(%d): listen %s error(%s)",
myname, __LINE__, addr, acl_last_serror());

4
lib_fiber/changes.txt
View File

@ -1,4 +1,8 @@
57) 2017.8.21
57.1) feature: fiber_server.c 当在独立运行时也可以通过配置文件指定 master_reuseport
选项
56) 2017.7.27
56.1) compile: master_fiber.hpp 中去掉了对 master_base.hpp 的包含，要求应用
需要首先包含该头文件