[ntcore] Refactor local topic

PeterJohnson · Nov 2, 2024 · bc37c6c · bc37c6c
1 parent c76ad73
commit bc37c6c
Show file tree

Hide file tree

Showing 9 changed files with 308 additions and 213 deletions.
diff --git a/ntcore/src/main/native/cpp/LocalStorage.h b/ntcore/src/main/native/cpp/LocalStorage.h
@@ -134,7 +134,7 @@ class LocalStorage final : public net::ILocalStorage {
   bool GetTopicPersistent(NT_Topic topicHandle) {
     std::scoped_lock lock{m_mutex};
     if (auto topic = m_impl.GetTopicByHandle(topicHandle)) {
-      return (topic->flags & NT_PERSISTENT) != 0;
+      return (topic->GetFlags() & NT_PERSISTENT) != 0;
     } else {
       return false;
     }
@@ -150,7 +150,7 @@ class LocalStorage final : public net::ILocalStorage {
   bool GetTopicRetained(NT_Topic topicHandle) {
     std::scoped_lock lock{m_mutex};
     if (auto topic = m_impl.GetTopicByHandle(topicHandle)) {
-      return (topic->flags & NT_RETAINED) != 0;
+      return (topic->GetFlags() & NT_RETAINED) != 0;
     } else {
       return false;
     }
@@ -166,7 +166,7 @@ class LocalStorage final : public net::ILocalStorage {
   bool GetTopicCached(NT_Topic topicHandle) {
     std::scoped_lock lock{m_mutex};
     if (auto topic = m_impl.GetTopicByHandle(topicHandle)) {
-      return (topic->flags & NT_UNCACHED) == 0;
+      return (topic->GetFlags() & NT_UNCACHED) == 0;
     } else {
       return false;
     }
@@ -392,7 +392,7 @@ class LocalStorage final : public net::ILocalStorage {
   unsigned int GetEntryFlags(NT_Entry entryHandle) {
     std::scoped_lock lock{m_mutex};
     if (auto entry = m_impl.GetEntryByHandle(entryHandle)) {
-      return entry->subscriber->topic->flags;
+      return entry->subscriber->topic->GetFlags();
     } else {
       return 0;
     }

diff --git a/ntcore/src/main/native/cpp/local/LocalDataLogger.cpp b/ntcore/src/main/native/cpp/local/LocalDataLogger.cpp
@@ -8,22 +8,17 @@
 #include <wpi/DataLog.h>
 #include <wpi/StringExtras.h>
 
-#include "local/LocalDataLoggerEntry.h"
-#include "local/LocalTopic.h"
-
 using namespace nt::local;
 
-int LocalDataLogger::Start(LocalTopic* topic, int64_t time) {
-  std::string_view typeStr = topic->typeStr;
+int LocalDataLogger::Start(std::string_view name, std::string_view typeStr,
+                           std::string_view metadata, int64_t time) {
   // NT and DataLog use different standard representations for int and int[]
   if (typeStr == "int") {
     typeStr = "int64";
   } else if (typeStr == "int[]") {
     typeStr = "int64[]";
   }
-  return log.Start(
-      fmt::format(
-          "{}{}", logPrefix,
-          wpi::remove_prefix(topic->name, prefix).value_or(topic->name)),
-      typeStr, LocalDataLoggerEntry::MakeMetadata(topic->propertiesStr), time);
+  return log.Start(fmt::format("{}{}", logPrefix,
+                               wpi::remove_prefix(name, prefix).value_or(name)),
+                   typeStr, metadata, time);
 }
diff --git a/ntcore/src/main/native/cpp/local/LocalDataLogger.h b/ntcore/src/main/native/cpp/local/LocalDataLogger.h
@@ -27,7 +27,8 @@ struct LocalDataLogger {
                   std::string_view prefix, std::string_view logPrefix)
       : handle{handle}, log{log}, prefix{prefix}, logPrefix{logPrefix} {}
 
-  int Start(LocalTopic* topic, int64_t time);
+  int Start(std::string_view name, std::string_view typeStr,
+            std::string_view metadata, int64_t time);
 
   NT_DataLogger handle;
   wpi::log::DataLog& log;

diff --git a/ntcore/src/main/native/cpp/local/LocalDataLoggerEntry.cpp b/ntcore/src/main/native/cpp/local/LocalDataLoggerEntry.cpp
@@ -8,7 +8,6 @@
 #include <string_view>
 
 #include <fmt/format.h>
-#include <wpi/DataLog.h>
 #include <wpi/StringExtras.h>
 
 #include "networktables/NetworkTableValue.h"

diff --git a/ntcore/src/main/native/cpp/local/LocalDataLoggerEntry.h b/ntcore/src/main/native/cpp/local/LocalDataLoggerEntry.h
@@ -4,9 +4,13 @@
 
 #pragma once
 
+#include <stdint.h>
+
 #include <string>
 #include <string_view>
 
+#include <wpi/DataLog.h>
+
 #include "ntcore_c.h"
 
 namespace wpi::log {
@@ -28,6 +32,10 @@ struct LocalDataLoggerEntry {
   static std::string MakeMetadata(std::string_view properties);
 
   void Append(const Value& v);
+  void Finish(int64_t timestamp) { log->Finish(entry, timestamp); }
+  void SetMetadata(std::string_view metadata, int64_t timestamp) {
+    log->SetMetadata(entry, metadata, timestamp);
+  }
 
   wpi::log::DataLog* log;
   int entry;