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

[ntcore] Handle topicsonly followed by value subscribe (#4991)

Browse Source 
Previously this wouldn't send the last value on the value subscribe if a
topics only subscription already existed.

Also start adding server implementation unit tests.
This commit is contained in:
Peter Johnson
2023-01-24 21:50:38 -08:00
committed by GitHub
parent 917906530a
commit 9e5b7b8040
4 changed files with 287 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ntcore/src/main/native/cpp/LocalStorage.cpp
View File

@@ -909,6 +909,7 @@ std::unique_ptr<EntryData> LSImpl::RemoveEntry(NT_Entry entryHandle) {
MultiSubscriberData* LSImpl::AddMultiSubscriber(
std::span<const std::string_view> prefixes, const PubSubOptions& options) {
DEBUG4("AddMultiSubscriber({})", fmt::join(prefixes, ","));
auto subscriber = m_multiSubscribers.Add(m_inst, prefixes, options);
// subscribe to any already existing topics
for (auto&& topic : m_topics) {
@@ -920,6 +921,7 @@ MultiSubscriberData* LSImpl::AddMultiSubscriber(
}
}
if (m_network) {
DEBUG4("-> NetworkSubscribe");
m_network->Subscribe(subscriber->handle, subscriber->prefixes,
subscriber->options);
}

20
ntcore/src/main/native/cpp/net/ServerImpl.cpp
View File

@@ -656,10 +656,13 @@ void ClientData4Base::ClientSubscribe(int64_t subuid,
// is client already subscribed?
bool wasSubscribed = false;
bool wasSubscribedValue = false;
for (auto subscriber : topic->subscribers) {
if (subscriber->client == this) {
wasSubscribed = true;
break;
if (!subscriber->options.topicsOnly) {
wasSubscribedValue = true;
}
}
}
@@ -673,16 +676,17 @@ void ClientData4Base::ClientSubscribe(int64_t subuid,
m_server.UpdateMetaTopicSub(topic.get());
}
if (!wasSubscribed && added && !removed) {
// announce topic to client
// announce topic to client if not previously announced
if (added && !removed && !wasSubscribed) {
DEBUG4("client {}: announce {}", m_id, topic->name);
SendAnnounce(topic.get(), std::nullopt);
}
// send last value
if (!sub->options.topicsOnly && topic->lastValue) {
DEBUG4("send last value for {} to client {}", topic->name, m_id);
SendValue(topic.get(), topic->lastValue, kSendAll);
}
// send last value
if (added && !sub->options.topicsOnly && !wasSubscribedValue &&
topic->lastValue) {
DEBUG4("send last value for {} to client {}", topic->name, m_id);
SendValue(topic.get(), topic->lastValue, kSendAll);
}
}