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

Always initialize status to 0 when calling HAL from JNI.

Browse Source 
The HAL functions often call NI functions that may expect status to be
initialized on entry.  Java does not guarantee direct pointer allocation
memory to be initialized, although that may have been occurring by accident.

Change-Id: I5e3a553f3a7be8de3716ccfc13e6ca1cb4f2a552
This commit is contained in:
Peter Johnson
2015-09-29 23:45:55 -07:00
parent c0c91c414a
commit 049be6870c
18 changed files with 181 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wpilibj/wpilibJavaJNI/lib/DIOJNI.cpp
View File

@@ -27,6 +27,7 @@ JNIEXPORT jobject JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_initializeDigita
jint * statusPtr = (jint*)env->GetDirectBufferAddress(status);
DIOJNI_LOG(logDEBUG) << "Status Ptr = " << statusPtr;
void** dioPtr = (void**)new unsigned char[4];
*statusPtr = 0;
*dioPtr = initializeDigitalPort(*javaId, statusPtr);
DIOJNI_LOG(logDEBUG) << "Status = " << *statusPtr;
DIOJNI_LOG(logDEBUG) << "DIO Ptr = " << *dioPtr;
@@ -46,6 +47,7 @@ JNIEXPORT jbyte JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_allocateDIO
DIOJNI_LOG(logDEBUG) << "Port Ptr = " << *javaId;
jint * statusPtr = (jint*)env->GetDirectBufferAddress(status);
DIOJNI_LOG(logDEBUG) << "Status Ptr = " << statusPtr;
*statusPtr = 0;
jbyte returnValue = allocateDIO(*javaId, value, statusPtr);
DIOJNI_LOG(logDEBUG) << "Status = " << *statusPtr;
DIOJNI_LOG(logDEBUG) << "allocateDIOResult = " << (jint)returnValue;
@@ -65,6 +67,7 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_freeDIO
DIOJNI_LOG(logDEBUG) << "Port Ptr = " << *javaId;
jint * statusPtr = (jint*)env->GetDirectBufferAddress(status);
DIOJNI_LOG(logDEBUG) << "Status Ptr = " << statusPtr;
*statusPtr = 0;
freeDIO(*javaId, statusPtr);
DIOJNI_LOG(logDEBUG) << "Status = " << *statusPtr;
}
@@ -83,6 +86,7 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_setDIO
//DIOJNI_LOG(logDEBUG) << "Value = " << value;
jint * statusPtr = (jint*)env->GetDirectBufferAddress(status);
//DIOJNI_LOG(logDEBUG) << "Status Ptr = " << statusPtr;
*statusPtr = 0;
setDIO(*javaId, value, statusPtr);
//DIOJNI_LOG(logDEBUG) << "Status = " << *statusPtr;
}
@@ -100,6 +104,7 @@ JNIEXPORT jbyte JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_getDIO
//DIOJNI_LOG(logDEBUG) << "Port Ptr = " << *javaId;
jint * statusPtr = (jint*)env->GetDirectBufferAddress(status);
//DIOJNI_LOG(logDEBUG) << "Status Ptr = " << statusPtr;
*statusPtr = 0;
jbyte returnValue = getDIO(*javaId, statusPtr);
//DIOJNI_LOG(logDEBUG) << "Status = " << *statusPtr;
//DIOJNI_LOG(logDEBUG) << "getDIOResult = " << (jint)returnValue;
@@ -120,6 +125,7 @@ JNIEXPORT jbyte JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_getDIODirection
//DIOJNI_LOG(logDEBUG) << "Port Ptr = " << *javaId;
jint * statusPtr = (jint*)env->GetDirectBufferAddress(status);
//DIOJNI_LOG(logDEBUG) << "Status Ptr = " << statusPtr;
*statusPtr = 0;
jbyte returnValue = getDIODirection(*javaId, statusPtr);
//DIOJNI_LOG(logDEBUG) << "Status = " << *statusPtr;
DIOJNI_LOG(logDEBUG) << "getDIODirectionResult = " << (jbyte)returnValue;
@@ -140,6 +146,7 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_pulse
//DIOJNI_LOG(logDEBUG) << "Value = " << value;
jint * statusPtr = (jint*)env->GetDirectBufferAddress(status);
//DIOJNI_LOG(logDEBUG) << "Status Ptr = " << statusPtr;
*statusPtr = 0;
pulse(*javaId, value, statusPtr);
DIOJNI_LOG(logDEBUG) << "Did it work? Status = " << *statusPtr;
}
@@ -157,6 +164,7 @@ JNIEXPORT jbyte JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_isPulsing
//DIOJNI_LOG(logDEBUG) << "Port Ptr = " << *javaId;
jint * statusPtr = (jint*)env->GetDirectBufferAddress(status);
//DIOJNI_LOG(logDEBUG) << "Status Ptr = " << statusPtr;
*statusPtr = 0;
jbyte returnValue = isPulsing(*javaId, statusPtr);
//DIOJNI_LOG(logDEBUG) << "Status = " << *statusPtr;
DIOJNI_LOG(logDEBUG) << "isPulsingResult = " << (jbyte)returnValue;
@@ -175,6 +183,7 @@ JNIEXPORT jbyte JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_isAnyPulsing
{
DIOJNI_LOG(logDEBUG) << "Calling DIOJNI isAnyPulsing (RR upd)";
jint * statusPtr = (jint*)env->GetDirectBufferAddress(status);
*statusPtr = 0;
jbyte returnValue = isAnyPulsing( statusPtr );
//DIOJNI_LOG(logDEBUG) << "Status = " << *statusPtr;
DIOJNI_LOG(logDEBUG) << "isAnyPulsingResult = " << (jbyte)returnValue;
@@ -191,6 +200,7 @@ JNIEXPORT jshort JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_getLoopTiming
{
DIOJNI_LOG(logDEBUG) << "Calling DIOJNI getLoopTimeing";
jint * statusPtr = (jint*)env->GetDirectBufferAddress(status);
*statusPtr = 0;
jshort returnValue = getLoopTiming( statusPtr );
DIOJNI_LOG(logDEBUG) << "Status = " << *statusPtr;
DIOJNI_LOG(logDEBUG) << "LoopTiming = " << returnValue;