sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged in antmerlino/apps/i8sak-event-fix (pull request #157)

Browse Source 
i8sak: Properly shuts down event thread.

Approved-by: GregoryN <gnutt@nuttx.org>
This commit is contained in:
Anthony Merlino 2018-10-06 20:12:26 +00:00 committed by GregoryN
parent b5e032e050
commit 0989023de7
1 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
wireless/ieee802154/i8sak/i8sak_events.c
View File

@ -80,7 +80,7 @@ static pthread_addr_t i8sak_eventthread(pthread_addr_t arg)
#endif #endif
FAR struct i8sak_eventreceiver_s *receiver; FAR struct i8sak_eventreceiver_s *receiver;
FAR struct ieee802154_primitive_s *primitive = NULL; FAR struct ieee802154_primitive_s *primitive = NULL;
int ret; int ret = OK;
if (i8sak->mode == I8SAK_MODE_CHAR) if (i8sak->mode == I8SAK_MODE_CHAR)
{ {
@ -117,13 +117,15 @@ static pthread_addr_t i8sak_eventthread(pthread_addr_t arg)
if (ret != OK) if (ret != OK)
{ {
return NULL; i8sak->eventlistener_run = false;
continue;
} }
ret = sem_wait(&i8sak->eventsem); ret = sem_wait(&i8sak->eventsem);
if (ret != OK) if (ret != OK)
{ {
return NULL; i8sak->eventlistener_run = false;
continue;
} }
/* Loop through event receivers and call callbacks for those receivers /* Loop through event receivers and call callbacks for those receivers
@ -188,6 +190,22 @@ static pthread_addr_t i8sak_eventthread(pthread_addr_t arg)
sem_post(&i8sak->eventsem); sem_post(&i8sak->eventsem);
} }
if (i8sak->mode == I8SAK_MODE_CHAR)
{
macarg.enable = false;
ioctl(i8sak->fd, MAC802154IOC_ENABLE_EVENTS,
(unsigned long)((uintptr_t)&macarg));
}
#ifdef CONFIG_NET_6LOWPAN
else if (i8sak->mode == I8SAK_MODE_NETIF)
{
netarg.u.enable = false;
strncpy(netarg.ifr_name, i8sak->ifname, IFNAMSIZ);
ioctl(i8sak->fd, MAC802154IOC_ENABLE_EVENTS,
(unsigned long)((uintptr_t)&netarg));
}
#endif
return NULL; return NULL;
} }
@ -246,7 +264,18 @@ int i8sak_eventlistener_start(FAR struct i8sak_s *i8sak)
int i8sak_eventlistener_stop(FAR struct i8sak_s *i8sak) int i8sak_eventlistener_stop(FAR struct i8sak_s *i8sak)
{ {
return -ENOTTY; int ret;
FAR void *value;
i8sak->eventlistener_run = false;
pthread_kill(i8sak->eventlistener_threadid, 2);
ret = pthread_join(i8sak->eventlistener_threadid, &value);
if (ret != OK)
{
fprintf(stderr, "ERROR: pthread_join() failed: %d\n", ret);
}
return ret;
} }
/**************************************************************************** /****************************************************************************