diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-01-20 20:45:56 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-01-20 20:45:56 +0000 |
| commit | 85016e2a2622a64719e8baa58dd493b6b99aa793 (patch) | |
| tree | dd916ca036a20b1d5137f324f536ecb3eae8ab2d /os/kernel/src/chmtx.c | |
| parent | 14005a2ffefe28adb2ce2cfdad24be782090c089 (diff) | |
| download | ChibiOS-85016e2a2622a64719e8baa58dd493b6b99aa793.tar.gz ChibiOS-85016e2a2622a64719e8baa58dd493b6b99aa793.tar.bz2 ChibiOS-85016e2a2622a64719e8baa58dd493b6b99aa793.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1534 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/kernel/src/chmtx.c')
| -rw-r--r-- | os/kernel/src/chmtx.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/os/kernel/src/chmtx.c b/os/kernel/src/chmtx.c index d319b9316..c14db4ad0 100644 --- a/os/kernel/src/chmtx.c +++ b/os/kernel/src/chmtx.c @@ -77,37 +77,30 @@ void chMtxLockS(Mutex *mp) { * of the running thread requesting the mutex. */ Thread *tp = mp->m_owner; - /* {tp is the thread currently owning the mutex} */ - /* Has the running thread higher priority than tp? */ + /* Does the running thread have higher priority than the mutex + * ownning thread? */ while (tp->p_prio < currp->p_prio) { /* Make priority of thread tp match the running thread's priority.*/ tp->p_prio = currp->p_prio; - /* - * The following states need priority queues reordering. - */ + /* The following states need priority queues reordering.*/ switch (tp->p_state) { case THD_STATE_WTMTX: - /* Re-enqueues tp with its new priority on the mutex wait queue.*/ + /* Re-enqueues the mutex owner with its new priority.*/ prio_insert(dequeue(tp), (ThreadsQueue *)tp->p_u.wtobjp); - /* Boost the owner of this mutex if needed.*/ tp = ((Mutex *)tp->p_u.wtobjp)->m_owner; continue; +#if CH_USE_CONDVARS | CH_USE_SEMAPHORES_PRIORITY | CH_USE_MESSAGES_PRIORITY #if CH_USE_CONDVARS case THD_STATE_WTCOND: - /* Re-enqueues tp with its new priority on the condvar queue.*/ - prio_insert(dequeue(tp), (ThreadsQueue *)tp->p_u.wtobjp); - break; #endif #if CH_USE_SEMAPHORES_PRIORITY case THD_STATE_WTSEM: - /* Re-enqueues tp with its new priority on the semaphore queue.*/ - prio_insert(dequeue(tp), (ThreadsQueue *)tp->p_u.wtobjp); - break; #endif #if CH_USE_MESSAGES_PRIORITY case THD_STATE_SNDMSG: - /* Re-enqueues tp with its new priority on the server thread queue.*/ - prio_insert(dequeue(tp), &((Thread *)tp->p_u.wtobjp)->p_msgqueue); +#endif + /* Re-enqueues tp with its new priority on the queue.*/ + prio_insert(dequeue(tp), (ThreadsQueue *)tp->p_u.wtobjp); break; #endif case THD_STATE_READY: |