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

Provide more extensive listener features.

Browse Source 
This enables listeners to be notified of not only value updates, but also flag
changes and deletions by using a bitmask to specify what notifications are
desired.  The old API (which only provided a new/not new) flag is still
supported.  This also subsumes the feature to listen to local changes (that's
one of the bitmask options).
This commit is contained in:
Peter Johnson
2015-09-25 11:54:17 -07:00
parent 51064f5e75
commit 90959defd9
17 changed files with 246 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/lib/NetworkTablesJNI.cpp
View File

@@ -887,8 +887,7 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_networktables_NetworkTablesJNI
* Signature: (Ljava/lang/String;Ledu/wpi/first/wpilibj/networktables/NetworkTablesJNI/EntryListenerFunction;Z)I
*/
JNIEXPORT jint JNICALL Java_edu_wpi_first_wpilibj_networktables_NetworkTablesJNI_addEntryListener
(JNIEnv *envouter, jclass, jstring prefix, jobject listener,
jboolean immediateNotify, jboolean localNotify)
(JNIEnv *envouter, jclass, jstring prefix, jobject listener, jint flags)
{
// the shared pointer to the weak global will keep it around until the
// entry listener is destroyed
@@ -901,13 +900,13 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_wpilibj_networktables_NetworkTablesJNI
// method ids, on the other hand, are safe to retain
jmethodID mid = envouter->GetMethodID(
cls, "apply", "(ILjava/lang/String;Ljava/lang/Object;Z)V");
cls, "apply", "(ILjava/lang/String;Ljava/lang/Object;I)V");
if (!mid) return 0;
return nt::AddEntryListener(
JavaStringRef(envouter, prefix),
[=](unsigned int uid, nt::StringRef name,
std::shared_ptr<nt::Value> value, bool is_new) {
std::shared_ptr<nt::Value> value, unsigned int flags_) {
// need to attach as we're coming from a separate thread here
if (!jvm) return;
JNIEnv *env;
@@ -929,14 +928,13 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_wpilibj_networktables_NetworkTablesJNI
goto done;
}
env->CallVoidMethod(handler, mid, (jint)uid, ToJavaString(env, name),
jobj, (jboolean)(is_new ? 1 : 0));
jobj, (jint)(flags_));
if (env->ExceptionCheck()) env->ExceptionDescribe();
}
done:
jvm->DetachCurrentThread();
},
immediateNotify != JNI_FALSE,
localNotify != JNI_FALSE);
flags);
}
/*