Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix abort in some cases with DDS #13627

Merged
merged 1 commit into from
Dec 31, 2024
Merged

fix abort in some cases with DDS #13627

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions third-party/realdds/src/dds-network-adapter-watcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ class network_adapter_watcher_singleton
if( new_ips.size() || old_ips.size() )
callbacks.raise( new_ips, old_ips );
}
_th.detach(); // so it's not joinable
LOG_DEBUG( "done waiting for IP changes" );
} );
}
Expand All @@ -72,8 +71,15 @@ class network_adapter_watcher_singleton
~network_adapter_watcher_singleton()
{
_adapter_watcher.reset(); // signal the thread to finish
if( _th.joinable() )
_th.join();
try
{
if (_th.joinable())
_th.join();
}
catch (std::exception& e)
{
LOG_DEBUG("Network adapter watcher termination failed: " << e.what());
}
}

void update_ips( ip_set * p_new_ips = nullptr, ip_set * p_old_ips = nullptr )
Expand Down
Loading