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

[ntcore] Fix client unpublish outgoing queue (#7051)

Browse Source 
The unpublish message must be sent on the outgoing queue before the handle
indicating which queue to use is erased.
This commit is contained in:
Peter Johnson
2024-09-08 10:35:41 -07:00
committed by GitHub
parent 7bdecab729
commit 306e190f78
3 changed files with 67 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ntcore/src/main/native/cpp/net/ClientImpl.cpp
View File

@@ -118,9 +118,7 @@ void ClientImpl::HandleLocal(std::vector<ClientMessage>&& msgs) {
msg->properties, msg->options);
m_outgoing.SendMessage(msg->pubHandle, std::move(elem));
} else if (auto msg = std::get_if<UnpublishMsg>(&elem.contents)) {
if (Unpublish(msg->pubHandle, msg->topicHandle)) {
m_outgoing.SendMessage(msg->pubHandle, std::move(elem));
}
Unpublish(msg->pubHandle, msg->topicHandle, std::move(elem));
} else {
m_outgoing.SendMessage(0, std::move(elem));
}
@@ -199,12 +197,12 @@ void ClientImpl::Publish(NT_Publisher pubHandle, NT_Topic topicHandle,
UpdatePeriodic();
}
bool ClientImpl::Unpublish(NT_Publisher pubHandle, NT_Topic topicHandle) {
void ClientImpl::Unpublish(NT_Publisher pubHandle, NT_Topic topicHandle,
ClientMessage&& msg) {
unsigned int index = Handle{pubHandle}.GetIndex();
if (index >= m_publishers.size()) {
return false;
return;
}
bool doSend = true;
m_publishers[index].reset();
// loop over all publishers to update period
@@ -216,10 +214,10 @@ bool ClientImpl::Unpublish(NT_Publisher pubHandle, NT_Topic topicHandle) {
}
UpdatePeriodic();
m_outgoing.SendMessage(pubHandle, std::move(msg));
// remove from outgoing handle map
m_outgoing.EraseHandle(pubHandle);
return doSend;
}
void ClientImpl::SetValue(NT_Publisher pubHandle, const Value& value) {

3
ntcore/src/main/native/cpp/net/ClientImpl.h
View File

@@ -75,7 +75,8 @@ class ClientImpl final : private ServerMessageHandler {
void Publish(NT_Publisher pubHandle, NT_Topic topicHandle,
std::string_view name, std::string_view typeStr,
const wpi::json& properties, const PubSubOptionsImpl& options);
bool Unpublish(NT_Publisher pubHandle, NT_Topic topicHandle);
void Unpublish(NT_Publisher pubHandle, NT_Topic topicHandle,
ClientMessage&& msg);
void SetValue(NT_Publisher pubHandle, const Value& value);
int m_inst;