shinys000114/wiringPi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wiringPi: pthread: add mutex lock to avoid null pointer error.

Browse Source 
- In some case, ISR callback function pointer can be null pointer untill pthread
  is not killed. So add mutext to avoid this problem and exit it.

Signed-off-by: Luke Go <luke.go@hardkernel.com>
This commit is contained in:
Luke Go
2019-08-06 17:31:50 +09:00
committed by Joshua Yang
parent 6bb12bc532
commit 4786c27f19
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wiringPi/wiringPi.c
View File

@@ -630,8 +630,15 @@ static void *interruptHandler (UNU void *arg)
pinPass = -1 ; pinPass = -1 ;
for (;;) for (;;)
if (waitForInterrupt (myPin, -1) > 0) if (waitForInterrupt (myPin, -1) > 0) {
pthread_mutex_lock (&pinMutex) ;
if (libwiring.isrFunctions[PIN_NUM_CALC_SYSFD(myPin)] == 0) {
pthread_mutex_unlock (&pinMutex) ;
break;
}
libwiring.isrFunctions [PIN_NUM_CALC_SYSFD(myPin)] () ; libwiring.isrFunctions [PIN_NUM_CALC_SYSFD(myPin)] () ;
pthread_mutex_unlock (&pinMutex) ;
}
return NULL ; return NULL ;
} }
@@ -767,8 +774,10 @@ int wiringPiISR (int pin, int mode, void (*function)(void))
delay (1) ; delay (1) ;
pthread_mutex_unlock (&pinMutex) ; pthread_mutex_unlock (&pinMutex) ;
pthread_mutex_lock (&pinMutex) ;
libwiring.isrFunctions [PIN_NUM_CALC_SYSFD(GpioPin)] = function ; libwiring.isrFunctions [PIN_NUM_CALC_SYSFD(GpioPin)] = function ;
libwiring.isrThreadIds [PIN_NUM_CALC_SYSFD(GpioPin)] = threadId ; libwiring.isrThreadIds [PIN_NUM_CALC_SYSFD(GpioPin)] = threadId ;
pthread_mutex_unlock (&pinMutex) ;
return 0 ; return 0 ;
} }
@@ -799,8 +808,10 @@ int wiringPiISRCancel(int pin) {
"%s: wiringPiISRCancel: Unregister for the interrupt pin failed!\n", "%s: wiringPiISRCancel: Unregister for the interrupt pin failed!\n",
__func__); __func__);
else { else {
pthread_mutex_lock (&pinMutex) ;
libwiring.isrFunctions[PIN_NUM_CALC_SYSFD(GpioPin)] = NULL; libwiring.isrFunctions[PIN_NUM_CALC_SYSFD(GpioPin)] = NULL;
libwiring.isrThreadIds[PIN_NUM_CALC_SYSFD(GpioPin)] = 0; libwiring.isrThreadIds[PIN_NUM_CALC_SYSFD(GpioPin)] = 0;
pthread_mutex_unlock (&pinMutex) ;
} }
return 0; return 0;