Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

iio: guard pthread_setcancelstate with HAVE_PTHREAD_CANCEL

Browse Source 
Signed-off-by: Constantin Musca <constantin.musca@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Constantin Musca
2016-01-15 18:13:41 +02:00
committed by Brendan Le Foll
parent ab14b9de43
commit caebb8b1fb
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/iio/iio.c
View File

@@ -318,15 +318,21 @@ mraa_iio_trigger_handler(void* arg)
for (;;) { for (;;) {
if (mraa_iio_wait_event(dev->fp, &data[0], &read_size) == MRAA_SUCCESS) { if (mraa_iio_wait_event(dev->fp, &data[0], &read_size) == MRAA_SUCCESS) {
#ifdef HAVE_PTHREAD_CANCEL
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
#endif
// only can process if readsize >= enabled channel's datasize // only can process if readsize >= enabled channel's datasize
for (i = 0; i < (read_size / dev->datasize); i++) { for (i = 0; i < (read_size / dev->datasize); i++) {
dev->isr((void*)&data); dev->isr((void*)&data);
} }
#ifdef HAVE_PTHREAD_CANCEL
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
#endif
} else { } else {
// we must have got an error code so die nicely // we must have got an error code so die nicely
#ifdef HAVE_PTHREAD_CANCEL
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
#endif
return NULL; return NULL;
} }
} }
@@ -467,12 +473,18 @@ mraa_iio_event_handler(void* arg)
for (;;) { for (;;) {
if (mraa_iio_event_poll_nonblock(dev->fp_event, &data) == MRAA_SUCCESS) { if (mraa_iio_event_poll_nonblock(dev->fp_event, &data) == MRAA_SUCCESS) {
#ifdef HAVE_PTHREAD_CANCEL
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
#endif
dev->isr_event(&data, dev->isr_args); dev->isr_event(&data, dev->isr_args);
#ifdef HAVE_PTHREAD_CANCEL
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
#endif
} else { } else {
// we must have got an error code so die nicely // we must have got an error code so die nicely
#ifdef HAVE_PTHREAD_CANCEL
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
#endif
return NULL; return NULL;
} }
} }