breeze/workflow
1
0
Fork 0
mirror of https://github.com/sogou/workflow.git synced 2026-02-08 01:33:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make sure the communicator can be deinitialized in session's 'handle()'. (#1574)

Browse Source
This commit is contained in:
xiehan
2024-06-14 19:08:11 +08:00
committed by GitHub
parent 5988d6e84e
commit f6d46a9ed9
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/kernel/Communicator.cc
View File

@@ -1279,6 +1279,12 @@ void Communicator::handler_thread_routine(void *context)
free(res);
}
if (!comm->thrdpool)
{
mpoller_destroy(comm->mpoller);
msgqueue_destroy(comm->msgqueue);
}
}
int Communicator::append_request(const void *buf, size_t *size,
@@ -1636,14 +1642,15 @@ int Communicator::init(size_t poller_threads, size_t handler_threads)
void Communicator::deinit()
{
int in_handler = this->is_handler_thread();
this->stop_flag = 1;
mpoller_stop(this->mpoller);
msgqueue_set_nonblock(this->msgqueue);
thrdpool_destroy(NULL, this->thrdpool);
this->thrdpool = NULL;
Communicator::handler_thread_routine(this);
mpoller_destroy(this->mpoller);
msgqueue_destroy(this->msgqueue);
if (!in_handler)
Communicator::handler_thread_routine(this);
}
int Communicator::nonblock_connect(CommTarget *target)