mirror of
https://gitee.com/acl-dev/acl.git
synced 2024-11-29 18:37:41 +08:00
optimize for making valgrind happy
This commit is contained in:
parent
29e43b1d6f
commit
14fce1cc1a
@ -50,8 +50,6 @@ master_service::master_service(void)
|
||||
|
||||
master_service::~master_service(void)
|
||||
{
|
||||
delete conf_;
|
||||
delete service_;
|
||||
}
|
||||
|
||||
http_service& master_service::get_service(void) const
|
||||
@ -185,6 +183,9 @@ void master_service::proc_on_init(void)
|
||||
void master_service::proc_on_exit(void)
|
||||
{
|
||||
logger(">>>proc_on_exit<<<");
|
||||
|
||||
delete conf_;
|
||||
delete service_;
|
||||
}
|
||||
|
||||
bool master_service::proc_on_sighup(acl::string&)
|
||||
|
@ -275,6 +275,8 @@ static void main_server_exit(ACL_FIBER *fiber, int status)
|
||||
|
||||
/* stop the main thread fiber schedule proccess */
|
||||
acl_fiber_schedule_stop();
|
||||
acl_app_conf_unload();
|
||||
acl_debug_end();
|
||||
__exit_status = status;
|
||||
}
|
||||
|
||||
@ -639,9 +641,10 @@ static void main_thread_loop(void)
|
||||
acl_close_on_exec(ACL_MASTER_STATUS_FD, ACL_CLOSE_ON_EXEC);
|
||||
acl_close_on_exec(ACL_MASTER_FLOW_READ, ACL_CLOSE_ON_EXEC);
|
||||
acl_close_on_exec(ACL_MASTER_FLOW_WRITE, ACL_CLOSE_ON_EXEC);
|
||||
if (acl_var_fiber_dispatch_addr && *acl_var_fiber_dispatch_addr)
|
||||
if (acl_var_fiber_dispatch_addr && *acl_var_fiber_dispatch_addr) {
|
||||
acl_fiber_create(main_fiber_dispatch, NULL, STACK_SIZE);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
__sighup_fiber = acl_fiber_create(main_fiber_sighup, NULL,
|
||||
|
@ -91,6 +91,15 @@ void master_fiber::service_exit(void* ctx)
|
||||
master_fiber* mf = (master_fiber *) ctx;
|
||||
acl_assert(mf != NULL);
|
||||
mf->proc_on_exit();
|
||||
|
||||
for (std::vector<server_socket*>::iterator it = mf->servers_.begin();
|
||||
it != mf->servers_.end(); ++it) {
|
||||
(*it)->unbind();
|
||||
delete *it;
|
||||
}
|
||||
|
||||
mf->conf_.reset();
|
||||
acl::log::close();
|
||||
}
|
||||
|
||||
void master_fiber::service_on_listen(void* ctx, ACL_VSTREAM* sstream)
|
||||
|
Loading…
Reference in New Issue
Block a user