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

NetworkConnection: Kill write thread when read dies and vice-versa.

Browse Source
This commit is contained in:
Peter Johnson
2015-07-31 23:40:16 -07:00
parent ecbf76e94b
commit 0a10778697
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/NetworkConnection.cpp
View File

@@ -103,6 +103,7 @@ void NetworkConnection::ReadThreadMain() {
DEBUG3("read thread died");
m_state = static_cast<int>(kDead);
m_active = false;
m_outgoing.push(Outgoing()); // also kill write thread
}
void NetworkConnection::WriteThreadMain() {
@@ -111,7 +112,7 @@ void NetworkConnection::WriteThreadMain() {
while (m_active) {
auto msgs = m_outgoing.pop();
DEBUG4("write thread woke up");
if (msgs.empty()) break;
if (msgs.empty()) continue;
encoder.set_proto_rev(m_proto_rev);
encoder.Reset();
DEBUG4("sending " << msgs.size() << " messages");
@@ -127,4 +128,5 @@ void NetworkConnection::WriteThreadMain() {
DEBUG3("write thread died");
m_state = static_cast<int>(kDead);
m_active = false;
if (m_stream) m_stream->close(); // also kill read thread
}