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

sched: pthread: Fix potential bugs in pthread_condclockwait.c

Browse Source 
Summary:
- I found potential bugs in pthread_condclockwait.c
- Actually, sched_unlock() and wd_cancel() were misplaced.
- This commit fixes this issue

Impact:
- pthread_cond_clockwait() only

Testing:
- Tested with ostest with the following configs
- sabre-6quad:nsh, sabre-6quad:smp, sim:ostest

Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>
This commit is contained in:
Masayuki Ishikawa 2020-12-15 10:39:23 +09:00 committed by Xiang Xiao
parent 3ec7cd186a
commit 8ba67b7ec9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sched/pthread/pthread_condclockwait.c
View File

@ -275,6 +275,10 @@ int pthread_cond_clockwait(FAR pthread_cond_t *cond,
status = nxsem_wait((FAR sem_t *)&cond->sem);
/* We no longer need the watchdog */
wd_cancel(&rtcb->waitdog);
/* Did we get the condition semaphore. */
if (status < 0)
@ -326,17 +330,13 @@ int pthread_cond_clockwait(FAR pthread_cond_t *cond,
ret = status;
}
}
/* Re-enable pre-emption (It is expected that interrupts
* have already been re-enabled in the above logic)
*/
sched_unlock();
}
/* We no longer need the watchdog */
/* Re-enable pre-emption (It is expected that interrupts
* have already been re-enabled in the above logic)
*/
wd_cancel(&rtcb->waitdog);
sched_unlock();
}
leave_cancellation_point();