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

Merged in antmerlino/apps/i8sak-daemon-fixea (pull request #165)

Browse Source 
wireless/ieee802154/i8sak: Fixes issues related to re-running daemon. Releases lock when releasing daemon. Re-sets daemon_shutdown so that a subsequent daemon launch does not immediately return.

Approved-by: GregoryN <gnutt@nuttx.org>
This commit is contained in:
Anthony Merlino 2019-01-13 14:19:43 +00:00 committed by GregoryN
parent e08d100919
commit c895593fc1
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wireless/ieee802154/i8sak/i8sak.h
View File

@ -115,7 +115,6 @@ struct i8sak_s
enum i8sak_mode_e mode; enum i8sak_mode_e mode;
bool initialized : 1; bool initialized : 1;
bool daemon_started : 1;
bool daemon_shutdown : 1; bool daemon_shutdown : 1;
bool verbose : 1; bool verbose : 1;
bool acceptall : 1; bool acceptall : 1;

8
wireless/ieee802154/i8sak/i8sak_main.c
View File

@ -179,7 +179,7 @@ int i8sak_requestdaemon(FAR struct i8sak_s *i8sak)
} }
#endif #endif
i8sak->daemon_started = true; i8sak->daemon_shutdown = false;
i8sak->daemon_pid = task_create(daemonname, CONFIG_IEEE802154_I8SAK_PRIORITY, i8sak->daemon_pid = task_create(daemonname, CONFIG_IEEE802154_I8SAK_PRIORITY,
CONFIG_IEEE802154_I8SAK_STACKSIZE, i8sak_daemon, CONFIG_IEEE802154_I8SAK_STACKSIZE, i8sak_daemon,
NULL); NULL);
@ -231,6 +231,7 @@ int i8sak_releasedaemon(FAR struct i8sak_s *i8sak)
sem_post(&i8sak->updatesem); sem_post(&i8sak->updatesem);
} }
sem_post(&i8sak->daemonlock);
return 0; return 0;
} }
@ -701,8 +702,6 @@ static int i8sak_setup(FAR struct i8sak_s *i8sak, FAR const char *ifname)
sem_init(&i8sak->daemonlock, 0, 1); sem_init(&i8sak->daemonlock, 0, 1);
i8sak->daemon_started = false;
i8sak->daemon_shutdown = false;
i8sak->daemonusers = 0; i8sak->daemonusers = 0;
i8sak->eventlistener_run = false; i8sak->eventlistener_run = false;
@ -739,7 +738,6 @@ static int i8sak_daemon(int argc, FAR char *argv[])
if (i8sak->fd < 0) if (i8sak->fd < 0)
{ {
fprintf(stderr, "ERROR: cannot open %s, errno=%d\n", i8sak->ifname, errno); fprintf(stderr, "ERROR: cannot open %s, errno=%d\n", i8sak->ifname, errno);
i8sak->daemon_started = false;
ret = errno; ret = errno;
return ret; return ret;
} }
@ -751,7 +749,6 @@ static int i8sak_daemon(int argc, FAR char *argv[])
if (i8sak->fd < 0) if (i8sak->fd < 0)
{ {
fprintf(stderr, "ERROR: failed to open socket, errno=%d\n", errno); fprintf(stderr, "ERROR: failed to open socket, errno=%d\n", errno);
i8sak->daemon_started = false;
ret = errno; ret = errno;
return ret; return ret;
} }
@ -802,7 +799,6 @@ static int i8sak_daemon(int argc, FAR char *argv[])
} }
i8sak_eventlistener_stop(i8sak); i8sak_eventlistener_stop(i8sak);
i8sak->daemon_started = false;
close(i8sak->fd); close(i8sak->fd);
printf("i8sak: daemon closing\n"); printf("i8sak: daemon closing\n");
return OK; return OK;