libs/rt-thread-official
libs/rt-thread-official
4
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-01-27 17:20:47 +08:00
Code Issues Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
Meco Man 2021-06-08 10:49:20 +08:00
parent 076941612a
commit bb848db2a4
1 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/ipc.c
View File

@ -194,31 +194,6 @@ rt_inline rt_err_t _rt_ipc_list_resume_all(rt_list_t *list)
return RT_EOK; return RT_EOK;
} }
/**
* This function will get the highest priority from the specified
* list of threads
*
* @param list of the threads
*
* @return the highest priority
*/
rt_uint8_t _rt_ipc_get_highest_priority(rt_list_t *list)
{
struct rt_list_node *n;
struct rt_thread *sthread;
rt_uint8_t priority = RT_THREAD_PRIORITY_MAX - 1;
for (n = list->next; n != list; n = n->next)
{
sthread = rt_list_entry(n, struct rt_thread, tlist);
priority = priority < sthread->current_priority ?
priority :
sthread->current_priority;
}
return priority;
}
#ifdef RT_USING_SEMAPHORE #ifdef RT_USING_SEMAPHORE
/** /**
* This function will initialize a semaphore and put it under control of * This function will initialize a semaphore and put it under control of
@ -870,7 +845,6 @@ rt_err_t rt_mutex_release(rt_mutex_t mutex)
register rt_base_t temp; register rt_base_t temp;
struct rt_thread *thread; struct rt_thread *thread;
rt_bool_t need_schedule; rt_bool_t need_schedule;
rt_uint8_t max_priority_in_queue = RT_THREAD_PRIORITY_MAX - 1;
/* parameter check */ /* parameter check */
RT_ASSERT(mutex != RT_NULL); RT_ASSERT(mutex != RT_NULL);
@ -932,21 +906,6 @@ rt_err_t rt_mutex_release(rt_mutex_t mutex)
mutex->owner = thread; mutex->owner = thread;
mutex->original_priority = thread->current_priority; mutex->original_priority = thread->current_priority;
/* Priority adjustment occurs only when the following conditions
* are met simultaneously:
* 1.The type of mutex is RT_IPC_FLAG_FIFO;
* 2.The priority of the thread to be resumed is not equal to the
* highest priority in the queue;
*/
max_priority_in_queue = _rt_ipc_get_highest_priority(&mutex->parent.suspend_thread);
if (mutex->parent.parent.flag == RT_IPC_FLAG_FIFO &&
thread->current_priority != max_priority_in_queue)
{
rt_thread_control(thread,
RT_THREAD_CTRL_CHANGE_PRIORITY,
&(max_priority_in_queue));
}
if(mutex->hold < RT_MUTEX_HOLD_MAX) if(mutex->hold < RT_MUTEX_HOLD_MAX)
{ {
mutex->hold ++; mutex->hold ++;