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

[ntcore] LocalStorage: Move template functions inside class definition

Browse Source
This commit is contained in:
Peter Johnson
2024-10-15 16:39:18 -07:00
parent 8b8b634f65
commit de318fab91
1 changed files with 26 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
ntcore/src/main/native/cpp/LocalStorage.h
View File

@@ -246,13 +246,29 @@ class LocalStorage final : public net::ILocalStorage {
template <ValidType T>
Timestamped<typename TypeInfo<T>::Value> GetAtomic(
NT_Handle subentry, typename TypeInfo<T>::View defaultValue);
NT_Handle subentry, typename TypeInfo<T>::View defaultValue) {
std::scoped_lock lock{m_mutex};
Value* value = m_impl.GetSubEntryValue(subentry);
if (value && (IsNumericConvertibleTo<T>(*value) || IsType<T>(*value))) {
return GetTimestamped<T, true>(*value);
} else {
return {0, 0, CopyValue<T>(defaultValue)};
}
}
template <SmallArrayType T>
Timestamped<typename TypeInfo<T>::SmallRet> GetAtomic(
NT_Handle subentry,
wpi::SmallVectorImpl<typename TypeInfo<T>::SmallElem>& buf,
typename TypeInfo<T>::View defaultValue);
typename TypeInfo<T>::View defaultValue) {
std::scoped_lock lock{m_mutex};
Value* value = m_impl.GetSubEntryValue(subentry);
if (value && (IsNumericConvertibleTo<T>(*value) || IsType<T>(*value))) {
return GetTimestamped<T, true>(*value, buf);
} else {
return {0, 0, CopyValue<T>(defaultValue, buf)};
}
}
std::vector<Value> ReadQueueValue(NT_Handle subentry, unsigned int types) {
std::scoped_lock lock{m_mutex};
@@ -265,7 +281,14 @@ class LocalStorage final : public net::ILocalStorage {
template <ValidType T>
std::vector<Timestamped<typename TypeInfo<T>::Value>> ReadQueue(
NT_Handle subentry);
NT_Handle subentry) {
std::scoped_lock lock{m_mutex};
auto subscriber = m_impl.GetSubEntry(subentry);
if (!subscriber) {
return {};
}
return subscriber->pollStorage.Read<T>();
}
//
// Backwards compatible user functions
@@ -665,41 +688,4 @@ class LocalStorage final : public net::ILocalStorage {
Impl m_impl;
};
template <ValidType T>
Timestamped<typename TypeInfo<T>::Value> LocalStorage::GetAtomic(
NT_Handle subentry, typename TypeInfo<T>::View defaultValue) {
std::scoped_lock lock{m_mutex};
Value* value = m_impl.GetSubEntryValue(subentry);
if (value && (IsNumericConvertibleTo<T>(*value) || IsType<T>(*value))) {
return GetTimestamped<T, true>(*value);
} else {
return {0, 0, CopyValue<T>(defaultValue)};
}
}
template <SmallArrayType T>
Timestamped<typename TypeInfo<T>::SmallRet> LocalStorage::GetAtomic(
NT_Handle subentry,
wpi::SmallVectorImpl<typename TypeInfo<T>::SmallElem>& buf,
typename TypeInfo<T>::View defaultValue) {
std::scoped_lock lock{m_mutex};
Value* value = m_impl.GetSubEntryValue(subentry);
if (value && (IsNumericConvertibleTo<T>(*value) || IsType<T>(*value))) {
return GetTimestamped<T, true>(*value, buf);
} else {
return {0, 0, CopyValue<T>(defaultValue, buf)};
}
}
template <ValidType T>
std::vector<Timestamped<typename TypeInfo<T>::Value>> LocalStorage::ReadQueue(
NT_Handle subentry) {
std::scoped_lock lock{m_mutex};
auto subscriber = m_impl.GetSubEntry(subentry);
if (!subscriber) {
return {};
}
return subscriber->pollStorage.Read<T>();
}
} // namespace nt