test/acl
1
0
Fork 0
mirror of https://gitee.com/acl-dev/acl.git synced 2024-12-02 03:47:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed compiling error on Windows by vc

Browse Source
This commit is contained in:
郑树新 2017-09-11 08:49:07 +08:00
parent 5101ef3cc6
commit 4ac182fdce
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib_acl/src/master/template/acl_threads_server.c
View File

@ -1233,7 +1233,9 @@ void acl_threads_server_main(int argc, char * argv[],
ACL_MASTER_SERVER_THREAD_INIT_FN thread_init_fn = NULL; ACL_MASTER_SERVER_THREAD_INIT_FN thread_init_fn = NULL;
ACL_MASTER_SERVER_THREAD_EXIT_FN thread_exit_fn = NULL; ACL_MASTER_SERVER_THREAD_EXIT_FN thread_exit_fn = NULL;
ACL_VSTRING *buf = acl_vstring_alloc(128); ACL_VSTRING *buf = acl_vstring_alloc(128);
#ifdef ACL_UNIX
const char *generation; const char *generation;
#endif
va_list ap; va_list ap;
/*******************************************************************/ /*******************************************************************/
@ -1408,12 +1410,14 @@ void acl_threads_server_main(int argc, char * argv[],
else else
event_mode = ACL_EVENT_SELECT; event_mode = ACL_EVENT_SELECT;
#ifdef ACL_UNIX
/* Retrieve process generation from environment. */ /* Retrieve process generation from environment. */
if ((generation = getenv(ACL_MASTER_GEN_NAME)) != 0) { if ((generation = getenv(ACL_MASTER_GEN_NAME)) != 0) {
if (!acl_alldig(generation)) if (!acl_alldig(generation))
acl_msg_fatal("bad generation: %s", generation); acl_msg_fatal("bad generation: %s", generation);
sscanf(generation, "%o", &__threads_server_generation); sscanf(generation, "%o", &__threads_server_generation);
} }
#endif
/*******************************************************************/ /*******************************************************************/
@ -1488,7 +1492,7 @@ void acl_threads_server_main(int argc, char * argv[],
while (1) { while (1) {
acl_event_loop(__event); acl_event_loop(__event);
#ifdef ACL_UNIX
if (acl_var_server_gotsighup && __sighup_handler) { if (acl_var_server_gotsighup && __sighup_handler) {
acl_var_server_gotsighup = 0; acl_var_server_gotsighup = 0;
if (__sighup_handler(__service_ctx, buf) < 0) if (__sighup_handler(__service_ctx, buf) < 0)
@ -1500,6 +1504,7 @@ void acl_threads_server_main(int argc, char * argv[],
__threads_server_generation, __threads_server_generation,
ACL_MASTER_STAT_SIGHUP_OK); ACL_MASTER_STAT_SIGHUP_OK);
} }
#endif
} }
acl_vstring_free(buf); acl_vstring_free(buf);

6
lib_acl/src/master/template/acl_udp_server.c
View File

@ -621,6 +621,7 @@ static void main_thread_loop(void)
while (1) { while (1) {
acl_event_loop(__main_event); acl_event_loop(__main_event);
#ifdef ACL_UNIX
if (acl_var_server_gotsighup && __sighup_handler) { if (acl_var_server_gotsighup && __sighup_handler) {
acl_var_server_gotsighup = 0; acl_var_server_gotsighup = 0;
if (__sighup_handler(__service_ctx, buf) < 0) if (__sighup_handler(__service_ctx, buf) < 0)
@ -632,6 +633,7 @@ static void main_thread_loop(void)
__udp_server_generation, __udp_server_generation,
ACL_MASTER_STAT_SIGHUP_OK); ACL_MASTER_STAT_SIGHUP_OK);
} }
#endif
} }
acl_vstring_free(buf); acl_vstring_free(buf);
@ -699,7 +701,9 @@ void acl_udp_server_main(int argc, char **argv, ACL_UDP_SERVER_FN service, ...)
ACL_MASTER_SERVER_INIT_FN post_init = 0; ACL_MASTER_SERVER_INIT_FN post_init = 0;
char *root_dir = 0, *user_name = 0; char *root_dir = 0, *user_name = 0;
UDP_SERVER *server; UDP_SERVER *server;
#ifdef ACL_UNIX
const char *generation; const char *generation;
#endif
int c, key; int c, key;
va_list ap; va_list ap;
@ -829,12 +833,14 @@ void acl_udp_server_main(int argc, char **argv, ACL_UDP_SERVER_FN service, ...)
__service_name = service_name; __service_name = service_name;
__service_argv = argv + optind; __service_argv = argv + optind;
#ifdef ACL_UNIX
/* Retrieve process generation from environment. */ /* Retrieve process generation from environment. */
if ((generation = getenv(ACL_MASTER_GEN_NAME)) != 0) { if ((generation = getenv(ACL_MASTER_GEN_NAME)) != 0) {
if (!acl_alldig(generation)) if (!acl_alldig(generation))
acl_msg_fatal("bad generation: %s", generation); acl_msg_fatal("bad generation: %s", generation);
sscanf(generation, "%o", &__udp_server_generation); sscanf(generation, "%o", &__udp_server_generation);
} }
#endif
/*******************************************************************/ /*******************************************************************/