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

compiling: fixed compiling error on vc

Browse Source
This commit is contained in:
zhengshuxin 2017-10-27 16:33:56 +08:00
parent b7c6384b1e
commit 46cc12739f
6 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib_acl/src/master/template/acl_aio_server.c
View File

@ -1491,9 +1491,11 @@ static void server_main(int argc, char **argv, va_list ap)
if (post_init)
post_init(__service_ctx);
#ifdef ACL_LINUX
/* notify master that child started ok */
acl_master_notify(acl_var_aio_pid, __aio_server_generation,
ACL_MASTER_STAT_START_OK);
#endif
if (acl_var_aio_dispatch_addr && *acl_var_aio_dispatch_addr)
dispatch_open(acl_aio_server_event(), __h_aio);

2
lib_acl/src/master/template/acl_single_server.c
View File

@ -685,9 +685,11 @@ void acl_single_server_main(int argc, char **argv, ACL_SINGLE_SERVER_FN service,
if (post_init)
post_init(__service_ctx);
#ifdef ACL_LINUX
/* notify master that child started ok */
acl_master_notify(acl_var_single_pid, single_server_generation,
ACL_MASTER_STAT_START_OK);
#endif
acl_server_sighup_setup();
acl_server_sigterm_setup();

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

@ -1478,11 +1478,11 @@ void acl_threads_server_main(int argc, char * argv[],
if (post_init)
post_init(__service_ctx);
#ifdef ACL_LINUX
/* notify master that child started ok */
acl_master_notify(acl_var_threads_pid, __threads_server_generation,
ACL_MASTER_STAT_START_OK);
#ifdef ACL_UNIX
/* connect the dispatch server */
if (acl_var_threads_dispatch_addr && *acl_var_threads_dispatch_addr)
dispatch_open(__event, __threads);

2
lib_acl/src/master/template/acl_trigger_server.c
View File

@ -650,9 +650,11 @@ void acl_trigger_server_main(int argc, char **argv, ACL_TRIGGER_SERVER_FN servic
if (post_init)
post_init(__service_ctx);
#ifdef ACL_LINUX
/* notify master that child started ok */
acl_master_notify(acl_var_trigger_pid, trigger_server_generation,
ACL_MASTER_STAT_START_OK);
#endif
/*
* Running as a semi-resident server. Service connection requests.

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

@ -885,9 +885,11 @@ void acl_udp_server_main(int argc, char **argv, ACL_UDP_SERVER_FN service, ...)
if (post_init)
post_init(__service_ctx);
#ifdef ACL_LINUX
/* notify master that child started ok */
acl_master_notify(acl_var_udp_pid, __udp_server_generation,
ACL_MASTER_STAT_START_OK);
#endif
/* 设置 SIGHUP 信号 */
acl_server_sighup_setup();

2
lib_acl_cpp/include/acl_cpp/stdlib/mbox.hpp
View File

@ -1,5 +1,6 @@
#pragma once
#include "../acl_cpp_define.hpp"
#include <assert.h>
#include "noncopyable.hpp"
namespace acl
@ -54,6 +55,7 @@ public:
mbox(void)
{
mbox_ = mbox_create();
assert(mbox_);
}
~mbox(void)