fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-28 08:03:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

priority_restoration_fix:Review feedback

Browse Source 
Additional backport of c2c226be1db53dd0c1315e13bbd76ace6538eedf
  sem_holder:Clean up from Review
This commit is contained in:
David Sidrane
2017-03-22 09:02:15 +01:00
committed by Lorenz Meier
parent a6dcbc3a22
commit eb054a0ea1
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nuttx-patches/priority_restoration_fix.patch
+7 -7
View File
@@ -60,7 +60,7 @@ index f4037d3..ec7de27 100644
#endif #endif
return OK; return OK;
diff --git NuttX/nuttx/sched/semaphore/sem_holder.c NuttX/nuttx/sched/semaphore/sem_holder.c diff --git NuttX/nuttx/sched/semaphore/sem_holder.c NuttX/nuttx/sched/semaphore/sem_holder.c
index 6b9f05a..bc5c186 100644 index 6b9f05a..7b4e3e3 100644
--- NuttX/nuttx/sched/semaphore/sem_holder.c --- NuttX/nuttx/sched/semaphore/sem_holder.c
+++ NuttX/nuttx/sched/semaphore/sem_holder.c +++ NuttX/nuttx/sched/semaphore/sem_holder.c
@@ -93,7 +93,7 @@ static inline FAR struct semholder_s *sem_allocholder(sem_t *sem) @@ -93,7 +93,7 @@ static inline FAR struct semholder_s *sem_allocholder(sem_t *sem)
@@ -126,7 +126,7 @@ index 6b9f05a..bc5c186 100644
+ 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++)
{ {
@@ -243,7 +243,7 @@ index 6b9f05a..bc5c186 100644
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);
} }
@@ -297,7 +297,7 @@ index 6b9f05a..bc5c186 100644
{ {
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);
- sem_freeholder(sem, pholder); - sem_freeholder(sem, pholder);
+ DEBUGASSERT(!sched_verifytcb(htcb)); + DEBUGASSERT(sched_verifytcb(htcb));
+ pholder = sem_findholder(sem, htcb); + pholder = sem_findholder(sem, htcb);
+ if (pholder != NULL) + if (pholder != NULL)
+ { + {
@@ -411,14 +411,14 @@ index 6b9f05a..bc5c186 100644
+ 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.htcb) - if (sem->holder.htcb)
+ 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");
} }