Implement independent instances.
Previously, most of the classes were implemented as singletons so only one
instance was possible.
This change adds an instance handle-based API. In Java, this API is located
in a different package than the old API (edu.wpi.first.networktables).
Backwards compatibility with ITable and the old NetworkTable API is largely
maintained, but a handful of classes have moved to the new package in Java
(ConnectionInfo and PersistentException), and the old JNI has been completed
replaced.
Also:
- Move SetTeam implementation to Dispatcher.
- Consistently pass time through Java and C++ Value API.
- Rename nt_Value.h to NetworkTableValue.h for consistency with Java.
- Improve documentation
- Make C++ and Java APIs more consistent
- Document RPC functions and support RPC in Java.
- Add polling features for entry and connection listeners and use them to
move callback threads to Java level.
- Remove thread start and stop hooks (as polling is available).
- Make Notifiers, RpcServer, Dispatcher, and Storage mockable.
- Set NOTIFY_NEW on immediate entry notifications.
- Make GetTable("/") and GetTable("") equivalent.
- Generate local notification for flags update when loading persistent file.
And many unit test updates/changes:
- Use InitGoogleMock instead of InitGoogleTest in test main.
- Move test printers to TestPrinter.h/cpp.
- Provide printers for StringRef, EntryNotifier, and Handle.
- StorageTest: Check notifications.
- Add entry notifier unit tests.
- Storage: Add test for incoming entry assignment.
- Update connection listener tests.
- Add entry listener unit tests.
Fixes #11, #140, #189, #190, #192, #193, #221
2017-04-23 10:26:17 -07:00
|
|
|
/*----------------------------------------------------------------------------*/
|
|
|
|
|
/* Copyright (c) FIRST 2015-2017. All Rights Reserved. */
|
|
|
|
|
/* Open Source Software - may be modified and shared by FRC teams. The code */
|
|
|
|
|
/* must be accompanied by the FIRST BSD license file in the root directory of */
|
|
|
|
|
/* the project. */
|
|
|
|
|
/*----------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
#include "InstanceImpl.h"
|
|
|
|
|
|
|
|
|
|
using namespace nt;
|
|
|
|
|
|
|
|
|
|
std::atomic<int> InstanceImpl::s_default{-1};
|
|
|
|
|
std::atomic<InstanceImpl*> InstanceImpl::s_fast_instances[10];
|
|
|
|
|
wpi::UidVector<std::unique_ptr<InstanceImpl>, 10> InstanceImpl::s_instances;
|
|
|
|
|
std::mutex InstanceImpl::s_mutex;
|
|
|
|
|
|
|
|
|
|
using namespace std::placeholders;
|
|
|
|
|
|
|
|
|
|
InstanceImpl::InstanceImpl(int inst)
|
|
|
|
|
: logger_impl(inst),
|
|
|
|
|
logger(std::bind(&LoggerImpl::Log, &logger_impl, _1, _2, _3, _4)),
|
|
|
|
|
connection_notifier(inst),
|
|
|
|
|
entry_notifier(inst, logger),
|
|
|
|
|
rpc_server(inst, logger),
|
|
|
|
|
storage(entry_notifier, rpc_server, logger),
|
|
|
|
|
dispatcher(storage, connection_notifier, logger),
|
2017-10-05 23:13:04 -07:00
|
|
|
ds_client(dispatcher, logger) {
|
|
|
|
|
logger.set_min_level(logger_impl.GetMinLevel());
|
|
|
|
|
}
|
Implement independent instances.
Previously, most of the classes were implemented as singletons so only one
instance was possible.
This change adds an instance handle-based API. In Java, this API is located
in a different package than the old API (edu.wpi.first.networktables).
Backwards compatibility with ITable and the old NetworkTable API is largely
maintained, but a handful of classes have moved to the new package in Java
(ConnectionInfo and PersistentException), and the old JNI has been completed
replaced.
Also:
- Move SetTeam implementation to Dispatcher.
- Consistently pass time through Java and C++ Value API.
- Rename nt_Value.h to NetworkTableValue.h for consistency with Java.
- Improve documentation
- Make C++ and Java APIs more consistent
- Document RPC functions and support RPC in Java.
- Add polling features for entry and connection listeners and use them to
move callback threads to Java level.
- Remove thread start and stop hooks (as polling is available).
- Make Notifiers, RpcServer, Dispatcher, and Storage mockable.
- Set NOTIFY_NEW on immediate entry notifications.
- Make GetTable("/") and GetTable("") equivalent.
- Generate local notification for flags update when loading persistent file.
And many unit test updates/changes:
- Use InitGoogleMock instead of InitGoogleTest in test main.
- Move test printers to TestPrinter.h/cpp.
- Provide printers for StringRef, EntryNotifier, and Handle.
- StorageTest: Check notifications.
- Add entry notifier unit tests.
- Storage: Add test for incoming entry assignment.
- Update connection listener tests.
- Add entry listener unit tests.
Fixes #11, #140, #189, #190, #192, #193, #221
2017-04-23 10:26:17 -07:00
|
|
|
|
|
|
|
|
InstanceImpl::~InstanceImpl() { logger.SetLogger(nullptr); }
|
|
|
|
|
|
|
|
|
|
InstanceImpl* InstanceImpl::GetDefault() { return Get(GetDefaultIndex()); }
|
|
|
|
|
|
|
|
|
|
InstanceImpl* InstanceImpl::Get(int inst) {
|
|
|
|
|
if (inst < 0) return nullptr;
|
|
|
|
|
|
|
|
|
|
// fast path, just an atomic read
|
|
|
|
|
if (static_cast<unsigned int>(inst) <
|
|
|
|
|
(sizeof(s_fast_instances) / sizeof(s_fast_instances[0]))) {
|
|
|
|
|
InstanceImpl* ptr = s_fast_instances[inst];
|
|
|
|
|
if (ptr) return ptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// slow path
|
|
|
|
|
std::lock_guard<std::mutex> lock(s_mutex);
|
|
|
|
|
|
|
|
|
|
// static fast-path block
|
|
|
|
|
if (static_cast<unsigned int>(inst) <
|
|
|
|
|
(sizeof(s_fast_instances) / sizeof(s_fast_instances[0]))) {
|
|
|
|
|
// double-check
|
|
|
|
|
return s_fast_instances[inst];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// vector
|
|
|
|
|
if (static_cast<unsigned int>(inst) < s_instances.size()) {
|
|
|
|
|
return s_instances[inst].get();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// doesn't exist
|
|
|
|
|
return nullptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int InstanceImpl::GetDefaultIndex() {
|
|
|
|
|
int inst = s_default;
|
|
|
|
|
if (inst >= 0) return inst;
|
|
|
|
|
|
|
|
|
|
// slow path
|
|
|
|
|
std::lock_guard<std::mutex> lock(s_mutex);
|
|
|
|
|
|
|
|
|
|
// double-check
|
|
|
|
|
inst = s_default;
|
|
|
|
|
if (inst >= 0) return inst;
|
|
|
|
|
|
|
|
|
|
// alloc and save
|
|
|
|
|
inst = AllocImpl();
|
|
|
|
|
s_default = inst;
|
|
|
|
|
return inst;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int InstanceImpl::Alloc() {
|
|
|
|
|
std::lock_guard<std::mutex> lock(s_mutex);
|
|
|
|
|
return AllocImpl();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int InstanceImpl::AllocImpl() {
|
|
|
|
|
unsigned int inst = s_instances.emplace_back();
|
|
|
|
|
InstanceImpl* ptr = new InstanceImpl(inst);
|
|
|
|
|
s_instances[inst].reset(ptr);
|
|
|
|
|
|
|
|
|
|
if (inst < (sizeof(s_fast_instances) / sizeof(s_fast_instances[0]))) {
|
|
|
|
|
s_fast_instances[inst] = ptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return static_cast<int>(inst);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void InstanceImpl::Destroy(int inst) {
|
|
|
|
|
std::lock_guard<std::mutex> lock(s_mutex);
|
|
|
|
|
if (inst < 0 || static_cast<unsigned int>(inst) >= s_instances.size()) return;
|
|
|
|
|
|
|
|
|
|
if (static_cast<unsigned int>(inst) <
|
|
|
|
|
(sizeof(s_fast_instances) / sizeof(s_fast_instances[0]))) {
|
|
|
|
|
s_fast_instances[inst] = nullptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s_instances.erase(inst);
|
|
|
|
|
}
|