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

sem_holder:Clean up from Review 

Spelling and backward DEBUGASSERT along with one gem

  if (sem->holder[0].htcb != NULL || sem->holder[**1**].htcb != NULL)
This commit is contained in:
David Sidrane 2017-03-21 08:03:06 -10:00
parent b9e29d1083
commit d76157db7b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sched/semaphore/sem_holder.c
View File

@ -156,7 +156,7 @@ static FAR struct semholder_s *sem_findholder(sem_t *sem,
int i; int i;
pholder = NULL; pholder = NULL;
/* We have two hard-allocated holder structuse in sem_t */ /* We have two hard-allocated holder structures in sem_t */
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
@ -338,7 +338,7 @@ static int sem_boostholderprio(FAR struct semholder_s *pholder,
if (!sched_verifytcb(htcb)) if (!sched_verifytcb(htcb))
{ {
serr("ERROR: TCB 0x%08x is a stale handle, counts lost\n", htcb); serr("ERROR: TCB 0x%08x is a stale handle, counts lost\n", htcb);
DEBUGASSERT(!sched_verifytcb(htcb)); DEBUGASSERT(sched_verifytcb(htcb));
sem_freeholder(sem, pholder); sem_freeholder(sem, pholder);
} }
@ -498,7 +498,7 @@ static int sem_restoreholderprio(FAR struct tcb_s *htcb,
if (!sched_verifytcb(htcb)) if (!sched_verifytcb(htcb))
{ {
serr("ERROR: TCB 0x%08x is a stale handle, counts lost\n", htcb); serr("ERROR: TCB 0x%08x is a stale handle, counts lost\n", htcb);
DEBUGASSERT(!sched_verifytcb(htcb)); DEBUGASSERT(sched_verifytcb(htcb));
pholder = sem_findholder(sem, htcb); pholder = sem_findholder(sem, htcb);
if (pholder != NULL) if (pholder != NULL)
{ {
@ -905,13 +905,13 @@ void sem_destroyholder(FAR sem_t *sem)
if (sem->hhead != NULL) if (sem->hhead != NULL)
{ {
serr("ERROR: Semaphore destroyed with holders\n"); serr("ERROR: Semaphore destroyed with holders\n");
DEBUGASSERT(sem->hhead != NULL); DEBUGASSERT(sem->hhead == NULL);
(void)sem_foreachholder(sem, sem_recoverholders, NULL); (void)sem_foreachholder(sem, sem_recoverholders, NULL);
} }
#else #else
if (sem->holder[0].htcb != NULL || sem->holder[0].htcb != NULL) if (sem->holder[0].htcb != NULL || sem->holder[1].htcb != NULL)
{ {
DEBUGASSERT(sem->holder[0].htcb != NULL || sem->holder[0].htcb != NULL); DEBUGASSERT(sem->holder[0].htcb == NULL || sem->holder[1].htcb == NULL);
serr("ERROR: Semaphore destroyed with holder\n"); serr("ERROR: Semaphore destroyed with holder\n");
} }