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

[cscore] Fix Java direct callback notifications (#3631)

Browse Source 
These relied on the OnStart and OnExit callbacks which were not present
in the wpiutil common CallbackManager code.  Add support for these and
fix up other use cases.

Also fixes notifications to correctly filter on event kind.

This fixes a breakage caused by #3133.
This commit is contained in:
Peter Johnson
2021-10-13 08:46:07 -07:00
committed by GitHub
parent 6d3dd99eb2
commit 61996c2bbf
7 changed files with 60 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ntcore/src/main/native/cpp/ConnectionNotifier.h
View File

@@ -5,6 +5,8 @@
#ifndef NTCORE_CONNECTIONNOTIFIER_H_
#define NTCORE_CONNECTIONNOTIFIER_H_
#include <utility>
#include <wpi/CallbackManager.h>
#include "Handle.h"
@@ -19,7 +21,9 @@ class ConnectionNotifierThread
: public wpi::CallbackThread<ConnectionNotifierThread,
ConnectionNotification> {
public:
explicit ConnectionNotifierThread(int inst) : m_inst(inst) {}
ConnectionNotifierThread(std::function<void()> on_start,
std::function<void()> on_exit, int inst)
: CallbackThread(std::move(on_start), std::move(on_exit)), m_inst(inst) {}
bool Matches(const ListenerData& /*listener*/,
const ConnectionNotification& /*data*/) {

5
ntcore/src/main/native/cpp/EntryNotifier.h
View File

@@ -9,6 +9,7 @@
#include <memory>
#include <string>
#include <string_view>
#include <utility>
#include <wpi/CallbackManager.h>
@@ -52,7 +53,9 @@ class EntryNotifierThread
: public wpi::CallbackThread<EntryNotifierThread, EntryNotification,
EntryListenerData> {
public:
explicit EntryNotifierThread(int inst) : m_inst(inst) {}
EntryNotifierThread(std::function<void()> on_start,
std::function<void()> on_exit, int inst)
: CallbackThread(std::move(on_start), std::move(on_exit)), m_inst(inst) {}
bool Matches(const EntryListenerData& listener,
const EntryNotification& data);

6
ntcore/src/main/native/cpp/LoggerImpl.h
View File

@@ -5,6 +5,8 @@
#ifndef NTCORE_LOGGERIMPL_H_
#define NTCORE_LOGGERIMPL_H_
#include <utility>
#include <wpi/CallbackManager.h>
#include "Handle.h"
@@ -35,7 +37,9 @@ struct LoggerListenerData : public wpi::CallbackListenerData<
class LoggerThread
: public wpi::CallbackThread<LoggerThread, LogMessage, LoggerListenerData> {
public:
explicit LoggerThread(int inst) : m_inst(inst) {}
LoggerThread(std::function<void()> on_start, std::function<void()> on_exit,
int inst)
: CallbackThread(std::move(on_start), std::move(on_exit)), m_inst(inst) {}
bool Matches(const LoggerListenerData& listener, const LogMessage& data) {
return data.level >= listener.min_level && data.level <= listener.max_level;

7
ntcore/src/main/native/cpp/RpcServer.h
View File

@@ -38,8 +38,11 @@ class RpcServerThread
: public wpi::CallbackThread<RpcServerThread, RpcAnswer, RpcListenerData,
RpcNotifierData> {
public:
RpcServerThread(int inst, wpi::Logger& logger)
: m_inst(inst), m_logger(logger) {}
RpcServerThread(std::function<void()> on_start, std::function<void()> on_exit,
int inst, wpi::Logger& logger)
: CallbackThread(std::move(on_start), std::move(on_exit)),
m_inst(inst),
m_logger(logger) {}
bool Matches(const RpcListenerData& /*listener*/,
const RpcNotifierData& data) {