OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merged in masayuki2009/nuttx.nuttx/lc823450 (pull request #524) 

Fix DEBUGASSERT() issues with nxhello on lc823450-xgevk

* sched/task: Remove DEBUGASSERT in task_exitstatus() and task_groupexit()

* graphics: Change DEBUGASSERT condition in nx_runinstance()

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Masayuki Ishikawa 2017-10-31 16:53:00 +00:00 committed by Gregory Nutt
parent 6e9039bb08
commit 09d4874509
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/nxmu/nxmu_server.c
View File

@ -346,7 +346,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev)
/* Dispatch the message appropriately */ /* Dispatch the message appropriately */
DEBUGASSERT(nbytes >= sizeof(struct nxsvrmsg_s)); DEBUGASSERT(nbytes >= sizeof(struct nxsvrmsg_releasebkgd_s));
msg = (FAR struct nxsvrmsg_s *)buffer; msg = (FAR struct nxsvrmsg_s *)buffer;
ginfo("Received opcode=%d nbytes=%d\n", msg->msgid, nbytes); ginfo("Received opcode=%d nbytes=%d\n", msg->msgid, nbytes);

2
sched/task/task_exithook.c
View File

@ -215,7 +215,6 @@ static inline void task_exitstatus(FAR struct task_group_s *group, int status)
/* No.. Find the exit status entry for this task in the parent TCB */ /* No.. Find the exit status entry for this task in the parent TCB */
child = group_findchild(group, getpid()); child = group_findchild(group, getpid());
DEBUGASSERT(child);
if (child) if (child)
{ {
#ifndef HAVE_GROUP_MEMBERS #ifndef HAVE_GROUP_MEMBERS
@ -260,7 +259,6 @@ static inline void task_groupexit(FAR struct task_group_s *group)
/* No.. Find the exit status entry for this task in the parent TCB */ /* No.. Find the exit status entry for this task in the parent TCB */
child = group_findchild(group, getpid()); child = group_findchild(group, getpid());
DEBUGASSERT(child);
if (child) if (child)
{ {
/* Mark that all members of the child task group has exited */ /* Mark that all members of the child task group has exited */