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

[wpiutil] WebSocket: move std::function (#3700)

Browse Source
This commit is contained in:
Peter Johnson
2021-11-01 07:46:15 -07:00
committed by GitHub
parent 93799fbe9d
commit d7b1e3576f
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wpiutil/src/main/native/cpp/WebSocket.cpp
View File

@@ -22,16 +22,18 @@ namespace {
class WebSocketWriteReq : public uv::WriteReq {
public:
explicit WebSocketWriteReq(
std::function<void(span<uv::Buffer>, uv::Error)> callback) {
finish.connect([=](uv::Error err) {
std::function<void(span<uv::Buffer>, uv::Error)> callback)
: m_callback{std::move(callback)} {
finish.connect([this](uv::Error err) {
span<uv::Buffer> bufs{m_bufs};
for (auto&& buf : bufs.subspan(0, m_startUser)) {
buf.Deallocate();
}
callback(bufs.subspan(m_startUser), err);
m_callback(bufs.subspan(m_startUser), err);
});
}
std::function<void(span<uv::Buffer>, uv::Error)> m_callback;
SmallVector<uv::Buffer, 4> m_bufs;
size_t m_startUser;
};
@@ -589,7 +591,7 @@ void WebSocket::Send(
return;
}
auto req = std::make_shared<WebSocketWriteReq>(callback);
auto req = std::make_shared<WebSocketWriteReq>(std::move(callback));
raw_uv_ostream os{req->m_bufs, 4096};
// opcode (includes FIN bit)

40
wpiutil/src/main/native/include/wpi/WebSocket.h
View File

@@ -183,7 +183,7 @@ class WebSocket : public std::enable_shared_from_this<WebSocket> {
*/
void SendText(span<const uv::Buffer> data,
std::function<void(span<uv::Buffer>, uv::Error)> callback) {
Send(kFlagFin | kOpText, data, callback);
Send(kFlagFin | kOpText, data, std::move(callback));
}
/**
@@ -193,7 +193,7 @@ class WebSocket : public std::enable_shared_from_this<WebSocket> {
*/
void SendText(std::initializer_list<uv::Buffer> data,
std::function<void(span<uv::Buffer>, uv::Error)> callback) {
SendText({data.begin(), data.end()}, callback);
SendText({data.begin(), data.end()}, std::move(callback));
}
/**
@@ -203,7 +203,7 @@ class WebSocket : public std::enable_shared_from_this<WebSocket> {
*/
void SendBinary(span<const uv::Buffer> data,
std::function<void(span<uv::Buffer>, uv::Error)> callback) {
Send(kFlagFin | kOpBinary, data, callback);
Send(kFlagFin | kOpBinary, data, std::move(callback));
}
/**
@@ -213,7 +213,7 @@ class WebSocket : public std::enable_shared_from_this<WebSocket> {
*/
void SendBinary(std::initializer_list<uv::Buffer> data,
std::function<void(span<uv::Buffer>, uv::Error)> callback) {
SendBinary({data.begin(), data.end()}, callback);
SendBinary({data.begin(), data.end()}, std::move(callback));
}
/**
@@ -226,7 +226,7 @@ class WebSocket : public std::enable_shared_from_this<WebSocket> {
void SendTextFragment(
span<const uv::Buffer> data,
std::function<void(span<uv::Buffer>, uv::Error)> callback) {
Send(kOpText, data, callback);
Send(kOpText, data, std::move(callback));
}
/**
@@ -239,7 +239,7 @@ class WebSocket : public std::enable_shared_from_this<WebSocket> {
void SendTextFragment(
std::initializer_list<uv::Buffer> data,
std::function<void(span<uv::Buffer>, uv::Error)> callback) {
SendTextFragment({data.begin(), data.end()}, callback);
SendTextFragment({data.begin(), data.end()}, std::move(callback));
}
/**
@@ -252,7 +252,7 @@ class WebSocket : public std::enable_shared_from_this<WebSocket> {
void SendBinaryFragment(
span<const uv::Buffer> data,
std::function<void(span<uv::Buffer>, uv::Error)> callback) {
Send(kOpBinary, data, callback);
Send(kOpBinary, data, std::move(callback));
}
/**
@@ -265,7 +265,7 @@ class WebSocket : public std::enable_shared_from_this<WebSocket> {
void SendBinaryFragment(
std::initializer_list<uv::Buffer> data,
std::function<void(span<uv::Buffer>, uv::Error)> callback) {
SendBinaryFragment({data.begin(), data.end()}, callback);
SendBinaryFragment({data.begin(), data.end()}, std::move(callback));
}
/**
@@ -277,7 +277,7 @@ class WebSocket : public std::enable_shared_from_this<WebSocket> {
*/
void SendFragment(span<const uv::Buffer> data, bool fin,
std::function<void(span<uv::Buffer>, uv::Error)> callback) {
Send(kOpCont | (fin ? kFlagFin : 0), data, callback);
Send(kOpCont | (fin ? kFlagFin : 0), data, std::move(callback));
}
/**
@@ -289,7 +289,7 @@ class WebSocket : public std::enable_shared_from_this<WebSocket> {
*/
void SendFragment(std::initializer_list<uv::Buffer> data, bool fin,
std::function<void(span<uv::Buffer>, uv::Error)> callback) {
SendFragment({data.begin(), data.end()}, fin, callback);
SendFragment({data.begin(), data.end()}, fin, std::move(callback));
}
/**
@@ -298,9 +298,9 @@ class WebSocket : public std::enable_shared_from_this<WebSocket> {
* write completes.
*/
void SendPing(std::function<void(uv::Error)> callback = nullptr) {
SendPing({}, [callback](auto bufs, uv::Error err) {
if (callback) {
callback(err);
SendPing({}, [f = std::move(callback)](auto bufs, uv::Error err) {
if (f) {
f(err);
}
});
}
@@ -313,7 +313,7 @@ class WebSocket : public std::enable_shared_from_this<WebSocket> {
*/
void SendPing(span<const uv::Buffer> data,
std::function<void(span<uv::Buffer>, uv::Error)> callback) {
Send(kFlagFin | kOpPing, data, callback);
Send(kFlagFin | kOpPing, data, std::move(callback));
}
/**
@@ -324,7 +324,7 @@ class WebSocket : public std::enable_shared_from_this<WebSocket> {
*/
void SendPing(std::initializer_list<uv::Buffer> data,
std::function<void(span<uv::Buffer>, uv::Error)> callback) {
SendPing({data.begin(), data.end()}, callback);
SendPing({data.begin(), data.end()}, std::move(callback));
}
/**
@@ -333,9 +333,9 @@ class WebSocket : public std::enable_shared_from_this<WebSocket> {
* write completes.
*/
void SendPong(std::function<void(uv::Error)> callback = nullptr) {
SendPong({}, [callback](auto bufs, uv::Error err) {
if (callback) {
callback(err);
SendPong({}, [f = std::move(callback)](auto bufs, uv::Error err) {
if (f) {
f(err);
}
});
}
@@ -348,7 +348,7 @@ class WebSocket : public std::enable_shared_from_this<WebSocket> {
*/
void SendPong(span<const uv::Buffer> data,
std::function<void(span<uv::Buffer>, uv::Error)> callback) {
Send(kFlagFin | kOpPong, data, callback);
Send(kFlagFin | kOpPong, data, std::move(callback));
}
/**
@@ -359,7 +359,7 @@ class WebSocket : public std::enable_shared_from_this<WebSocket> {
*/
void SendPong(std::initializer_list<uv::Buffer> data,
std::function<void(span<uv::Buffer>, uv::Error)> callback) {
SendPong({data.begin(), data.end()}, callback);
SendPong({data.begin(), data.end()}, std::move(callback));
}
/**