Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ntcore] Don't deadlock server on early destroy (#4863)

Browse Source 
It was possible to deadlock on instance destroy if the server had started
but had not yet fully initialized its handles.
This commit is contained in:
Peter Johnson
2022-12-27 10:25:48 -08:00
committed by GitHub
parent 2ac41f3edc
commit 6cfe5de00d
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ntcore/src/main/native/cpp/InstanceImpl.cpp
View File

@@ -113,12 +113,15 @@ void InstanceImpl::StartServer(std::string_view persistFilename,
}
void InstanceImpl::StopServer() {
std::scoped_lock lock{m_mutex};
if ((networkMode & NT_NET_MODE_SERVER) == 0) {
return;
std::shared_ptr<NetworkServer> server;
{
std::scoped_lock lock{m_mutex};
if ((networkMode & NT_NET_MODE_SERVER) == 0) {
return;
}
server = std::move(m_networkServer);
networkMode = NT_NET_MODE_NONE;
}
m_networkServer.reset();
networkMode = NT_NET_MODE_NONE;
}
void InstanceImpl::StartClient3(std::string_view identity) {