YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-27 04:35:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] solve deadlock caused by destroy ice agent

Browse Source
This commit is contained in:
dijunkun
2024-09-02 16:31:33 +08:00
parent 0b11646619
commit 98bd477af5
8 changed files with 54 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ice/ice_agent.cpp
View File

@@ -47,7 +47,7 @@ int IceAgent::CreateIceAgent(nice_cb_state_changed_t on_state_changed,
exit_nice_thread_ = false;
nice_thread_.reset(new std::thread([this]() {
nice_thread_ = std::thread([this]() {
gloop_ = g_main_loop_new(nullptr, false);
agent_ = nice_agent_new_full(
@@ -97,10 +97,9 @@ int IceAgent::CreateIceAgent(nice_cb_state_changed_t on_state_changed,
user_ptr_);
nice_inited_ = true;
g_main_loop_run(gloop_);
exit_nice_thread_ = true;
}));
});
do {
g_usleep(1000);
@@ -130,8 +129,8 @@ int IceAgent::DestroyIceAgent() {
destroyed_ = true;
g_main_loop_quit(gloop_);
if (nice_thread_->joinable()) {
nice_thread_->join();
if (nice_thread_.joinable()) {
nice_thread_.join();
}
LOG_INFO("Destroy nice agent success");