pdxx
/
libserverframe
mirror of https://github.com/happyfish100/libserverframe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use macro FC_SET_CLOEXEC from libfastcommon

replication_quorum
YuQing 2022-06-25 11:24:59 +08:00
parent dfc58be3ec
commit c6300318c8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/sf_func.c
View File

@ -45,6 +45,7 @@ int sf_connect_to_server(const char *ip_addr, const int port, int *sock)
*sock = -1; *sock = -1;
return result; return result;
} }
FC_SET_CLOEXEC(*sock);
if ((result=connectserverbyip_nb(*sock, ip_addr, port, if ((result=connectserverbyip_nb(*sock, ip_addr, port,
g_sf_global_vars.connect_timeout)) != 0) g_sf_global_vars.connect_timeout)) != 0)

8
src/sf_service.c
View File

@ -231,11 +231,12 @@ int sf_service_init_ex2(SFContext *sf_context, const char *name,
break; break;
} }
if ((result=fd_add_flags(FC_NOTIFY_READ_FD(thread_data), if ((result=fd_add_flags(FC_NOTIFY_READ_FD(thread_data),
O_NONBLOCK | FD_CLOEXEC)) != 0) O_NONBLOCK)) != 0)
{ {
break; break;
} }
fd_set_cloexec(FC_NOTIFY_WRITE_FD(thread_data)); FC_SET_CLOEXEC(FC_NOTIFY_READ_FD(thread_data));
FC_SET_CLOEXEC(FC_NOTIFY_WRITE_FD(thread_data));
#endif #endif
thread_ctx->sf_context = sf_context; thread_ctx->sf_context = sf_context;
@ -340,7 +341,7 @@ static int _socket_server(const char *bind_addr, int port, int *sock)
return result; return result;
} }
return fd_set_cloexec(*sock); return 0;
} }
int sf_socket_server_ex(SFContext *sf_context) int sf_socket_server_ex(SFContext *sf_context)
@ -409,6 +410,7 @@ static void accept_run(struct accept_thread_context *accept_context)
close(incomesock); close(incomesock);
continue; continue;
} }
FC_SET_CLOEXEC(incomesock);
if ((task=sf_alloc_init_task(accept_context-> if ((task=sf_alloc_init_task(accept_context->
sf_context, incomesock)) == NULL) sf_context, incomesock)) == NULL)