Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

wpiutil: Use scoped connections to ensure cleanup (#1474)

Browse Source
This commit is contained in:
Peter Johnson
2018-12-09 01:36:36 -08:00
committed by GitHub
parent e0e15eafeb
commit 608d82423d
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wpiutil/src/main/native/cpp/HttpServerConnection.cpp
View File

@@ -31,7 +31,7 @@ HttpServerConnection::HttpServerConnection(std::shared_ptr<uv::Stream> stream)
});
// pass incoming data to HTTP parser
m_headerConn =
m_dataConn =
stream->data.connect_connection([this](uv::Buffer& buf, size_t size) {
m_request.Execute(StringRef{buf.base, size});
if (m_request.HasError()) {
@@ -41,7 +41,8 @@ HttpServerConnection::HttpServerConnection(std::shared_ptr<uv::Stream> stream)
});
// close when remote side closes
stream->end.connect([h = stream.get()] { h->Close(); });
m_endConn =
stream->end.connect_connection([h = stream.get()] { h->Close(); });
// start reading
stream->StartRead();

9
wpiutil/src/main/native/cpp/WebSocketServer.cpp
View File

@@ -86,7 +86,7 @@ WebSocketServer::WebSocketServer(uv::Stream& stream,
StringRef protocol = m_helper.MatchProtocol(protocols).second;
// Disconnect our header reader
m_headerConn.disconnect();
m_dataConn.disconnect();
// Accepting the stream may destroy this (as it replaces the stream user
// data), so grab a shared pointer first.
@@ -104,14 +104,15 @@ WebSocketServer::WebSocketServer(uv::Stream& stream,
// Set up stream
stream.StartRead();
m_headerConn =
m_dataConn =
stream.data.connect_connection([this](uv::Buffer& buf, size_t size) {
if (m_aborted) return;
m_req.Execute(StringRef{buf.base, size});
if (m_req.HasError()) Abort(400, "Bad Request");
});
stream.error.connect([this](uv::Error) { m_stream.Close(); });
stream.end.connect([this] { m_stream.Close(); });
m_errorConn =
stream.error.connect_connection([this](uv::Error) { m_stream.Close(); });
m_endConn = stream.end.connect_connection([this] { m_stream.Close(); });
}
std::shared_ptr<WebSocketServer> WebSocketServer::Create(

5
wpiutil/src/main/native/include/wpi/HttpServerConnection.h
View File

@@ -139,7 +139,10 @@ class HttpServerConnection {
uv::Stream& m_stream;
/** The header reader connection. */
sig::Connection m_headerConn;
sig::ScopedConnection m_dataConn;
/** The end stream connection. */
sig::ScopedConnection m_endConn;
/** The message complete connection. */
sig::Connection m_messageCompleteConn;

4
wpiutil/src/main/native/include/wpi/WebSocketServer.h
View File

@@ -137,7 +137,9 @@ class WebSocketServer : public std::enable_shared_from_this<WebSocketServer> {
SmallVector<std::string, 2> m_protocols;
ServerOptions m_options;
bool m_aborted = false;
sig::Connection m_headerConn;
sig::ScopedConnection m_dataConn;
sig::ScopedConnection m_errorConn;
sig::ScopedConnection m_endConn;
void Abort(uint16_t code, StringRef reason);
};