summaryrefslogtreecommitdiff
path: root/src/ipc.c
diff options
context:
space:
mode:
author蒙蒙plus <[email protected]>2026-07-15 11:02:13 +0800
committerRbb666 <[email protected]>2026-07-22 09:45:59 +0800
commit7e451489778af014081f5ca3bf356fd0f62083a9 (patch)
treeef4129c5e2937b64664b1be871afe65f48857222 /src/ipc.c
parentc49320d57d324d789703d428b5fd78ca5413af4d (diff)
[mutex] 跨线程 rt_thread_delete 被删线程持有的mutex也一并释放
- 增加单元测试 Clarified mutex release conditions and added exception handling for closed owner threads.
Diffstat (limited to 'src/ipc.c')
-rw-r--r--src/ipc.c30
1 files changed, 25 insertions, 5 deletions
diff --git a/src/ipc.c b/src/ipc.c
index 7c52956b1c..a8fde2a8cf 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -1613,13 +1613,30 @@ rt_err_t rt_mutex_release(rt_mutex_t mutex)
RT_OBJECT_HOOK_CALL(rt_object_put_hook, (&(mutex->parent.parent)));
- /* mutex only can be released by owner */
+ /*
+ * Mutex can only be released by its owner.
+ * Exception: if the owner thread is already closed, allow other threads
+ * to release so the orphaned mutex can be cleaned up (e.g. cross-thread
+ * rt_thread_delete path in _thread_detach_from_mutex).
+ */
if (thread != mutex->owner)
{
- thread->error = -RT_ERROR;
- rt_spin_unlock(&(mutex->spinlock));
+ rt_bool_t owner_closed = RT_FALSE;
- return -RT_ERROR;
+ if (mutex->owner != RT_NULL)
+ {
+ rt_sched_lock(&slvl);
+ owner_closed =
+ (rt_sched_thread_get_stat(mutex->owner) == RT_THREAD_CLOSE);
+ rt_sched_unlock(slvl);
+ }
+
+ if (!owner_closed)
+ {
+ thread->error = -RT_ERROR;
+ rt_spin_unlock(&(mutex->spinlock));
+ return -RT_ERROR;
+ }
}
/* decrease hold */
@@ -1627,13 +1644,16 @@ rt_err_t rt_mutex_release(rt_mutex_t mutex)
/* if no hold */
if (mutex->hold == 0)
{
+ /* always restore priority of the owner, not the caller */
+ struct rt_thread *owner = mutex->owner;
+
rt_sched_lock(&slvl);
/* remove mutex from thread's taken list */
rt_list_remove(&mutex->taken_list);
/* whether change the thread priority */
- need_schedule = _check_and_update_prio(thread, mutex);
+ need_schedule = _check_and_update_prio(owner, mutex);
/* wakeup suspended thread */
if (!rt_list_isempty(&mutex->parent.suspend_thread))