[ntcore] NetworkTables 4 (#3217)

ntcore/src/main/native/cpp/InstanceImpl.cpp

@@ -16,19 +16,12 @@ InstanceImpl::InstanceImpl(int inst)
     : logger_impl(inst),
       logger(
           std::bind(&LoggerImpl::Log, &logger_impl, _1, _2, _3, _4)),  // NOLINT
-      connection_notifier(inst),
-      entry_notifier(inst, logger),
-      rpc_server(inst, logger),
-      storage(entry_notifier, rpc_server, logger),
-      dispatcher(storage, connection_notifier, logger),
-      ds_client(dispatcher, logger) {
+      connectionList(inst),
+      localStorage(inst, logger),
+      m_inst{inst} {
   logger.set_min_level(logger_impl.GetMinLevel());
 }
 
-InstanceImpl::~InstanceImpl() {
-  logger.SetLogger(nullptr);
-}
-
 InstanceImpl* InstanceImpl::GetDefault() {
   return Get(GetDefaultIndex());
 }
@@ -83,7 +76,90 @@ void InstanceImpl::Destroy(int inst) {
     return;
   }
 
-  InstanceImpl* ptr = nullptr;
-  s_instances[inst].exchange(ptr);
-  delete ptr;
+  delete s_instances[inst].exchange(nullptr);
+}
+
+void InstanceImpl::StartLocal() {
+  std::scoped_lock lock{m_mutex};
+  if (networkMode != NT_NET_MODE_NONE) {
+    return;
+  }
+  networkMode = NT_NET_MODE_LOCAL;
+}
+
+void InstanceImpl::StopLocal() {
+  std::scoped_lock lock{m_mutex};
+  if ((networkMode & NT_NET_MODE_LOCAL) == 0) {
+    return;
+  }
+  networkMode = NT_NET_MODE_NONE;
+}
+
+void InstanceImpl::StartServer(std::string_view persistFilename,
+                               std::string_view listenAddress,
+                               unsigned int port3, unsigned int port4) {
+  std::scoped_lock lock{m_mutex};
+  if (networkMode != NT_NET_MODE_NONE) {
+    return;
+  }
+  m_networkServer = std::make_shared<NetworkServer>(
+      persistFilename, listenAddress, port3, port4, localStorage,
+      connectionList, logger, [this] {
+        std::scoped_lock lock{m_mutex};
+        networkMode &= ~NT_NET_MODE_STARTING;
+      });
+  networkMode = NT_NET_MODE_SERVER | NT_NET_MODE_STARTING;
+}
+
+void InstanceImpl::StopServer() {
+  std::scoped_lock lock{m_mutex};
+  if ((networkMode & NT_NET_MODE_SERVER) == 0) {
+    return;
+  }
+  m_networkServer.reset();
+  networkMode = NT_NET_MODE_NONE;
+}
+
+void InstanceImpl::StartClient3() {
+  std::scoped_lock lock{m_mutex};
+  if (networkMode != NT_NET_MODE_NONE) {
+    return;
+  }
+  m_networkClient = std::make_shared<NetworkClient3>(
+      m_inst, m_identity, localStorage, connectionList, logger);
+  networkMode = NT_NET_MODE_CLIENT3;
+}
+
+void InstanceImpl::StartClient4() {
+  std::scoped_lock lock{m_mutex};
+  if (networkMode != NT_NET_MODE_NONE) {
+    return;
+  }
+  m_networkClient = std::make_shared<NetworkClient>(
+      m_inst, m_identity, localStorage, connectionList, logger);
+  networkMode = NT_NET_MODE_CLIENT4;
+}
+
+void InstanceImpl::StopClient() {
+  std::scoped_lock lock{m_mutex};
+  if ((networkMode & (NT_NET_MODE_CLIENT3 | NT_NET_MODE_CLIENT4)) == 0) {
+    return;
+  }
+  m_networkClient.reset();
+  networkMode = NT_NET_MODE_NONE;
+}
+
+void InstanceImpl::SetIdentity(std::string_view identity) {
+  std::scoped_lock lock{m_mutex};
+  m_identity = identity;
+}
+
+std::shared_ptr<NetworkServer> InstanceImpl::GetServer() {
+  std::scoped_lock lock{m_mutex};
+  return m_networkServer;
+}
+
+std::shared_ptr<INetworkClient> InstanceImpl::GetClient() {
+  std::scoped_lock lock{m_mutex};
+  return m_networkClient;
 }