|
@@ -1,5 +1,5 @@
|
|
/*
|
|
/*
|
|
- * Copyright (c) 2006-2022, RT-Thread Development Team
|
|
|
|
|
|
+ * Copyright (c) 2006-2023, RT-Thread Development Team
|
|
*
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*
|
|
*
|
|
@@ -28,15 +28,12 @@
|
|
* in smp version, rt_hw_context_switch_interrupt maybe switch to
|
|
* in smp version, rt_hw_context_switch_interrupt maybe switch to
|
|
* new task directly
|
|
* new task directly
|
|
* 2022-01-07 Gabriel Moving __on_rt_xxxxx_hook to scheduler.c
|
|
* 2022-01-07 Gabriel Moving __on_rt_xxxxx_hook to scheduler.c
|
|
|
|
+ * 2023-03-27 rose_man Split into scheduler upc and scheduler_mp.c
|
|
*/
|
|
*/
|
|
|
|
|
|
#include <rtthread.h>
|
|
#include <rtthread.h>
|
|
#include <rthw.h>
|
|
#include <rthw.h>
|
|
|
|
|
|
-#ifdef RT_USING_SMART
|
|
|
|
-#include <lwp.h>
|
|
|
|
-#endif /* RT_USING_SMART */
|
|
|
|
-
|
|
|
|
rt_list_t rt_thread_priority_table[RT_THREAD_PRIORITY_MAX];
|
|
rt_list_t rt_thread_priority_table[RT_THREAD_PRIORITY_MAX];
|
|
rt_uint32_t rt_thread_ready_priority_group;
|
|
rt_uint32_t rt_thread_ready_priority_group;
|
|
#if RT_THREAD_PRIORITY_MAX > 32
|
|
#if RT_THREAD_PRIORITY_MAX > 32
|
|
@@ -44,13 +41,6 @@ rt_uint32_t rt_thread_ready_priority_group;
|
|
rt_uint8_t rt_thread_ready_table[32];
|
|
rt_uint8_t rt_thread_ready_table[32];
|
|
#endif /* RT_THREAD_PRIORITY_MAX > 32 */
|
|
#endif /* RT_THREAD_PRIORITY_MAX > 32 */
|
|
|
|
|
|
-#ifndef RT_USING_SMP
|
|
|
|
-extern volatile rt_uint8_t rt_interrupt_nest;
|
|
|
|
-static rt_int16_t rt_scheduler_lock_nest;
|
|
|
|
-struct rt_thread *rt_current_thread = RT_NULL;
|
|
|
|
-rt_uint8_t rt_current_priority;
|
|
|
|
-#endif /* RT_USING_SMP */
|
|
|
|
-
|
|
|
|
#ifndef __on_rt_scheduler_hook
|
|
#ifndef __on_rt_scheduler_hook
|
|
#define __on_rt_scheduler_hook(from, to) __ON_HOOK_ARGS(rt_scheduler_hook, (from, to))
|
|
#define __on_rt_scheduler_hook(from, to) __ON_HOOK_ARGS(rt_scheduler_hook, (from, to))
|
|
#endif
|
|
#endif
|
|
@@ -146,7 +136,6 @@ static void _scheduler_stack_check(struct rt_thread *thread)
|
|
/*
|
|
/*
|
|
* get the highest priority thread in ready queue
|
|
* get the highest priority thread in ready queue
|
|
*/
|
|
*/
|
|
-#ifdef RT_USING_SMP
|
|
|
|
static struct rt_thread* _scheduler_get_highest_priority_thread(rt_ubase_t *highest_prio)
|
|
static struct rt_thread* _scheduler_get_highest_priority_thread(rt_ubase_t *highest_prio)
|
|
{
|
|
{
|
|
struct rt_thread *highest_priority_thread;
|
|
struct rt_thread *highest_priority_thread;
|
|
@@ -182,46 +171,15 @@ static struct rt_thread* _scheduler_get_highest_priority_thread(rt_ubase_t *high
|
|
|
|
|
|
return highest_priority_thread;
|
|
return highest_priority_thread;
|
|
}
|
|
}
|
|
-#else
|
|
|
|
-static struct rt_thread* _scheduler_get_highest_priority_thread(rt_ubase_t *highest_prio)
|
|
|
|
-{
|
|
|
|
- struct rt_thread *highest_priority_thread;
|
|
|
|
- rt_ubase_t highest_ready_priority;
|
|
|
|
-
|
|
|
|
-#if RT_THREAD_PRIORITY_MAX > 32
|
|
|
|
- rt_ubase_t number;
|
|
|
|
-
|
|
|
|
- number = __rt_ffs(rt_thread_ready_priority_group) - 1;
|
|
|
|
- highest_ready_priority = (number << 3) + __rt_ffs(rt_thread_ready_table[number]) - 1;
|
|
|
|
-#else
|
|
|
|
- highest_ready_priority = __rt_ffs(rt_thread_ready_priority_group) - 1;
|
|
|
|
-#endif /* RT_THREAD_PRIORITY_MAX > 32 */
|
|
|
|
-
|
|
|
|
- /* get highest ready priority thread */
|
|
|
|
- highest_priority_thread = rt_list_entry(rt_thread_priority_table[highest_ready_priority].next,
|
|
|
|
- struct rt_thread,
|
|
|
|
- tlist);
|
|
|
|
-
|
|
|
|
- *highest_prio = highest_ready_priority;
|
|
|
|
-
|
|
|
|
- return highest_priority_thread;
|
|
|
|
-}
|
|
|
|
-#endif /* RT_USING_SMP */
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* @brief This function will initialize the system scheduler.
|
|
* @brief This function will initialize the system scheduler.
|
|
*/
|
|
*/
|
|
void rt_system_scheduler_init(void)
|
|
void rt_system_scheduler_init(void)
|
|
{
|
|
{
|
|
-#ifdef RT_USING_SMP
|
|
|
|
int cpu;
|
|
int cpu;
|
|
-#endif /* RT_USING_SMP */
|
|
|
|
rt_base_t offset;
|
|
rt_base_t offset;
|
|
|
|
|
|
-#ifndef RT_USING_SMP
|
|
|
|
- rt_scheduler_lock_nest = 0;
|
|
|
|
-#endif /* RT_USING_SMP */
|
|
|
|
-
|
|
|
|
RT_DEBUG_LOG(RT_DEBUG_SCHEDULER, ("start scheduler: max priority 0x%02x\n",
|
|
RT_DEBUG_LOG(RT_DEBUG_SCHEDULER, ("start scheduler: max priority 0x%02x\n",
|
|
RT_THREAD_PRIORITY_MAX));
|
|
RT_THREAD_PRIORITY_MAX));
|
|
|
|
|
|
@@ -229,7 +187,7 @@ void rt_system_scheduler_init(void)
|
|
{
|
|
{
|
|
rt_list_init(&rt_thread_priority_table[offset]);
|
|
rt_list_init(&rt_thread_priority_table[offset]);
|
|
}
|
|
}
|
|
-#ifdef RT_USING_SMP
|
|
|
|
|
|
+
|
|
for (cpu = 0; cpu < RT_CPUS_NR; cpu++)
|
|
for (cpu = 0; cpu < RT_CPUS_NR; cpu++)
|
|
{
|
|
{
|
|
struct rt_cpu *pcpu = rt_cpu_index(cpu);
|
|
struct rt_cpu *pcpu = rt_cpu_index(cpu);
|
|
@@ -247,7 +205,6 @@ void rt_system_scheduler_init(void)
|
|
rt_memset(pcpu->ready_table, 0, sizeof(pcpu->ready_table));
|
|
rt_memset(pcpu->ready_table, 0, sizeof(pcpu->ready_table));
|
|
#endif /* RT_THREAD_PRIORITY_MAX > 32 */
|
|
#endif /* RT_THREAD_PRIORITY_MAX > 32 */
|
|
}
|
|
}
|
|
-#endif /* RT_USING_SMP */
|
|
|
|
|
|
|
|
/* initialize ready priority group */
|
|
/* initialize ready priority group */
|
|
rt_thread_ready_priority_group = 0;
|
|
rt_thread_ready_priority_group = 0;
|
|
@@ -269,21 +226,13 @@ void rt_system_scheduler_start(void)
|
|
|
|
|
|
to_thread = _scheduler_get_highest_priority_thread(&highest_ready_priority);
|
|
to_thread = _scheduler_get_highest_priority_thread(&highest_ready_priority);
|
|
|
|
|
|
-#ifdef RT_USING_SMP
|
|
|
|
to_thread->oncpu = rt_hw_cpu_id();
|
|
to_thread->oncpu = rt_hw_cpu_id();
|
|
-#else
|
|
|
|
- rt_current_thread = to_thread;
|
|
|
|
-#endif /* RT_USING_SMP */
|
|
|
|
|
|
|
|
rt_schedule_remove_thread(to_thread);
|
|
rt_schedule_remove_thread(to_thread);
|
|
to_thread->stat = RT_THREAD_RUNNING;
|
|
to_thread->stat = RT_THREAD_RUNNING;
|
|
|
|
|
|
/* switch to new thread */
|
|
/* switch to new thread */
|
|
-#ifdef RT_USING_SMP
|
|
|
|
rt_hw_context_switch_to((rt_ubase_t)&to_thread->sp, to_thread);
|
|
rt_hw_context_switch_to((rt_ubase_t)&to_thread->sp, to_thread);
|
|
-#else
|
|
|
|
- rt_hw_context_switch_to((rt_ubase_t)&to_thread->sp);
|
|
|
|
-#endif /* RT_USING_SMP */
|
|
|
|
|
|
|
|
/* never come back */
|
|
/* never come back */
|
|
}
|
|
}
|
|
@@ -294,8 +243,6 @@ void rt_system_scheduler_start(void)
|
|
|
|
|
|
/**@{*/
|
|
/**@{*/
|
|
|
|
|
|
-
|
|
|
|
-#ifdef RT_USING_SMP
|
|
|
|
/**
|
|
/**
|
|
* @brief This function will handle IPI interrupt and do a scheduling in system.
|
|
* @brief This function will handle IPI interrupt and do a scheduling in system.
|
|
*
|
|
*
|
|
@@ -443,142 +390,12 @@ void rt_schedule(void)
|
|
__exit:
|
|
__exit:
|
|
return ;
|
|
return ;
|
|
}
|
|
}
|
|
-#else
|
|
|
|
-/**
|
|
|
|
- * @brief This function will perform scheduling once. It will select one thread
|
|
|
|
- * with the highest priority, and switch to it immediately.
|
|
|
|
- */
|
|
|
|
-void rt_schedule(void)
|
|
|
|
-{
|
|
|
|
- rt_base_t level;
|
|
|
|
- struct rt_thread *to_thread;
|
|
|
|
- struct rt_thread *from_thread;
|
|
|
|
-
|
|
|
|
- /* disable interrupt */
|
|
|
|
- level = rt_hw_interrupt_disable();
|
|
|
|
-
|
|
|
|
- /* check the scheduler is enabled or not */
|
|
|
|
- if (rt_scheduler_lock_nest == 0)
|
|
|
|
- {
|
|
|
|
- rt_ubase_t highest_ready_priority;
|
|
|
|
-
|
|
|
|
- if (rt_thread_ready_priority_group != 0)
|
|
|
|
- {
|
|
|
|
- /* need_insert_from_thread: need to insert from_thread to ready queue */
|
|
|
|
- int need_insert_from_thread = 0;
|
|
|
|
-
|
|
|
|
- to_thread = _scheduler_get_highest_priority_thread(&highest_ready_priority);
|
|
|
|
-
|
|
|
|
- if ((rt_current_thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_RUNNING)
|
|
|
|
- {
|
|
|
|
- if (rt_current_thread->current_priority < highest_ready_priority)
|
|
|
|
- {
|
|
|
|
- to_thread = rt_current_thread;
|
|
|
|
- }
|
|
|
|
- else if (rt_current_thread->current_priority == highest_ready_priority && (rt_current_thread->stat & RT_THREAD_STAT_YIELD_MASK) == 0)
|
|
|
|
- {
|
|
|
|
- to_thread = rt_current_thread;
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- need_insert_from_thread = 1;
|
|
|
|
- }
|
|
|
|
- rt_current_thread->stat &= ~RT_THREAD_STAT_YIELD_MASK;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (to_thread != rt_current_thread)
|
|
|
|
- {
|
|
|
|
- /* if the destination thread is not the same as current thread */
|
|
|
|
- rt_current_priority = (rt_uint8_t)highest_ready_priority;
|
|
|
|
- from_thread = rt_current_thread;
|
|
|
|
- rt_current_thread = to_thread;
|
|
|
|
-
|
|
|
|
- RT_OBJECT_HOOK_CALL(rt_scheduler_hook, (from_thread, to_thread));
|
|
|
|
-
|
|
|
|
- if (need_insert_from_thread)
|
|
|
|
- {
|
|
|
|
- rt_schedule_insert_thread(from_thread);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- rt_schedule_remove_thread(to_thread);
|
|
|
|
- to_thread->stat = RT_THREAD_RUNNING | (to_thread->stat & ~RT_THREAD_STAT_MASK);
|
|
|
|
-
|
|
|
|
- /* switch to new thread */
|
|
|
|
- RT_DEBUG_LOG(RT_DEBUG_SCHEDULER,
|
|
|
|
- ("[%d]switch to priority#%d "
|
|
|
|
- "thread:%.*s(sp:0x%08x), "
|
|
|
|
- "from thread:%.*s(sp: 0x%08x)\n",
|
|
|
|
- rt_interrupt_nest, highest_ready_priority,
|
|
|
|
- RT_NAME_MAX, to_thread->name, to_thread->sp,
|
|
|
|
- RT_NAME_MAX, from_thread->name, from_thread->sp));
|
|
|
|
-
|
|
|
|
-#ifdef RT_USING_OVERFLOW_CHECK
|
|
|
|
- _scheduler_stack_check(to_thread);
|
|
|
|
-#endif /* RT_USING_OVERFLOW_CHECK */
|
|
|
|
-
|
|
|
|
- if (rt_interrupt_nest == 0)
|
|
|
|
- {
|
|
|
|
- extern void rt_thread_handle_sig(rt_bool_t clean_state);
|
|
|
|
-
|
|
|
|
- RT_OBJECT_HOOK_CALL(rt_scheduler_switch_hook, (from_thread));
|
|
|
|
-
|
|
|
|
- rt_hw_context_switch((rt_ubase_t)&from_thread->sp,
|
|
|
|
- (rt_ubase_t)&to_thread->sp);
|
|
|
|
-
|
|
|
|
- /* enable interrupt */
|
|
|
|
- rt_hw_interrupt_enable(level);
|
|
|
|
-
|
|
|
|
-#ifdef RT_USING_SIGNALS
|
|
|
|
- /* check stat of thread for signal */
|
|
|
|
- level = rt_hw_interrupt_disable();
|
|
|
|
- if (rt_current_thread->stat & RT_THREAD_STAT_SIGNAL_PENDING)
|
|
|
|
- {
|
|
|
|
- extern void rt_thread_handle_sig(rt_bool_t clean_state);
|
|
|
|
-
|
|
|
|
- rt_current_thread->stat &= ~RT_THREAD_STAT_SIGNAL_PENDING;
|
|
|
|
-
|
|
|
|
- rt_hw_interrupt_enable(level);
|
|
|
|
-
|
|
|
|
- /* check signal status */
|
|
|
|
- rt_thread_handle_sig(RT_TRUE);
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- rt_hw_interrupt_enable(level);
|
|
|
|
- }
|
|
|
|
-#endif /* RT_USING_SIGNALS */
|
|
|
|
- goto __exit;
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- RT_DEBUG_LOG(RT_DEBUG_SCHEDULER, ("switch in interrupt\n"));
|
|
|
|
-
|
|
|
|
- rt_hw_context_switch_interrupt((rt_ubase_t)&from_thread->sp,
|
|
|
|
- (rt_ubase_t)&to_thread->sp, from_thread, to_thread);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- rt_schedule_remove_thread(rt_current_thread);
|
|
|
|
- rt_current_thread->stat = RT_THREAD_RUNNING | (rt_current_thread->stat & ~RT_THREAD_STAT_MASK);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- /* enable interrupt */
|
|
|
|
- rt_hw_interrupt_enable(level);
|
|
|
|
-
|
|
|
|
-__exit:
|
|
|
|
- return;
|
|
|
|
-}
|
|
|
|
-#endif /* RT_USING_SMP */
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* @brief This function checks whether a scheduling is needed after an IRQ context switching. If yes,
|
|
* @brief This function checks whether a scheduling is needed after an IRQ context switching. If yes,
|
|
* it will select one thread with the highest priority level, and then switch
|
|
* it will select one thread with the highest priority level, and then switch
|
|
* to it.
|
|
* to it.
|
|
*/
|
|
*/
|
|
-#ifdef RT_USING_SMP
|
|
|
|
void rt_scheduler_do_irq_switch(void *context)
|
|
void rt_scheduler_do_irq_switch(void *context)
|
|
{
|
|
{
|
|
int cpu_id;
|
|
int cpu_id;
|
|
@@ -679,7 +496,6 @@ void rt_scheduler_do_irq_switch(void *context)
|
|
}
|
|
}
|
|
rt_hw_interrupt_enable(level);
|
|
rt_hw_interrupt_enable(level);
|
|
}
|
|
}
|
|
-#endif /* RT_USING_SMP */
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* @brief This function will insert a thread to the system ready queue. The state of
|
|
* @brief This function will insert a thread to the system ready queue. The state of
|
|
@@ -689,7 +505,6 @@ void rt_scheduler_do_irq_switch(void *context)
|
|
*
|
|
*
|
|
* @note Please do not invoke this function in user application.
|
|
* @note Please do not invoke this function in user application.
|
|
*/
|
|
*/
|
|
-#ifdef RT_USING_SMP
|
|
|
|
void rt_schedule_insert_thread(struct rt_thread *thread)
|
|
void rt_schedule_insert_thread(struct rt_thread *thread)
|
|
{
|
|
{
|
|
int cpu_id;
|
|
int cpu_id;
|
|
@@ -775,52 +590,6 @@ __exit:
|
|
/* enable interrupt */
|
|
/* enable interrupt */
|
|
rt_hw_interrupt_enable(level);
|
|
rt_hw_interrupt_enable(level);
|
|
}
|
|
}
|
|
-#else
|
|
|
|
-void rt_schedule_insert_thread(struct rt_thread *thread)
|
|
|
|
-{
|
|
|
|
- rt_base_t level;
|
|
|
|
-
|
|
|
|
- RT_ASSERT(thread != RT_NULL);
|
|
|
|
-
|
|
|
|
- /* disable interrupt */
|
|
|
|
- level = rt_hw_interrupt_disable();
|
|
|
|
-
|
|
|
|
- /* it's current thread, it should be RUNNING thread */
|
|
|
|
- if (thread == rt_current_thread)
|
|
|
|
- {
|
|
|
|
- thread->stat = RT_THREAD_RUNNING | (thread->stat & ~RT_THREAD_STAT_MASK);
|
|
|
|
- goto __exit;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- /* READY thread, insert to ready queue */
|
|
|
|
- thread->stat = RT_THREAD_READY | (thread->stat & ~RT_THREAD_STAT_MASK);
|
|
|
|
- /* there is no time slices left(YIELD), inserting thread before ready list*/
|
|
|
|
- if((thread->stat & RT_THREAD_STAT_YIELD_MASK) != 0)
|
|
|
|
- {
|
|
|
|
- rt_list_insert_before(&(rt_thread_priority_table[thread->current_priority]),
|
|
|
|
- &(thread->tlist));
|
|
|
|
- }
|
|
|
|
- /* there are some time slices left, inserting thread after ready list to schedule it firstly at next time*/
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- rt_list_insert_after(&(rt_thread_priority_table[thread->current_priority]),
|
|
|
|
- &(thread->tlist));
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- RT_DEBUG_LOG(RT_DEBUG_SCHEDULER, ("insert thread[%.*s], the priority: %d\n",
|
|
|
|
- RT_NAME_MAX, thread->name, thread->current_priority));
|
|
|
|
-
|
|
|
|
- /* set priority mask */
|
|
|
|
-#if RT_THREAD_PRIORITY_MAX > 32
|
|
|
|
- rt_thread_ready_table[thread->number] |= thread->high_mask;
|
|
|
|
-#endif /* RT_THREAD_PRIORITY_MAX > 32 */
|
|
|
|
- rt_thread_ready_priority_group |= thread->number_mask;
|
|
|
|
-
|
|
|
|
-__exit:
|
|
|
|
- /* enable interrupt */
|
|
|
|
- rt_hw_interrupt_enable(level);
|
|
|
|
-}
|
|
|
|
-#endif /* RT_USING_SMP */
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* @brief This function will remove a thread from system ready queue.
|
|
* @brief This function will remove a thread from system ready queue.
|
|
@@ -829,7 +598,6 @@ __exit:
|
|
*
|
|
*
|
|
* @note Please do not invoke this function in user application.
|
|
* @note Please do not invoke this function in user application.
|
|
*/
|
|
*/
|
|
-#ifdef RT_USING_SMP
|
|
|
|
void rt_schedule_remove_thread(struct rt_thread *thread)
|
|
void rt_schedule_remove_thread(struct rt_thread *thread)
|
|
{
|
|
{
|
|
rt_base_t level;
|
|
rt_base_t level;
|
|
@@ -881,44 +649,10 @@ void rt_schedule_remove_thread(struct rt_thread *thread)
|
|
/* enable interrupt */
|
|
/* enable interrupt */
|
|
rt_hw_interrupt_enable(level);
|
|
rt_hw_interrupt_enable(level);
|
|
}
|
|
}
|
|
-#else
|
|
|
|
-void rt_schedule_remove_thread(struct rt_thread *thread)
|
|
|
|
-{
|
|
|
|
- rt_base_t level;
|
|
|
|
-
|
|
|
|
- RT_ASSERT(thread != RT_NULL);
|
|
|
|
-
|
|
|
|
- /* disable interrupt */
|
|
|
|
- level = rt_hw_interrupt_disable();
|
|
|
|
-
|
|
|
|
- RT_DEBUG_LOG(RT_DEBUG_SCHEDULER, ("remove thread[%.*s], the priority: %d\n",
|
|
|
|
- RT_NAME_MAX, thread->name,
|
|
|
|
- thread->current_priority));
|
|
|
|
-
|
|
|
|
- /* remove thread from ready list */
|
|
|
|
- rt_list_remove(&(thread->tlist));
|
|
|
|
- if (rt_list_isempty(&(rt_thread_priority_table[thread->current_priority])))
|
|
|
|
- {
|
|
|
|
-#if RT_THREAD_PRIORITY_MAX > 32
|
|
|
|
- rt_thread_ready_table[thread->number] &= ~thread->high_mask;
|
|
|
|
- if (rt_thread_ready_table[thread->number] == 0)
|
|
|
|
- {
|
|
|
|
- rt_thread_ready_priority_group &= ~thread->number_mask;
|
|
|
|
- }
|
|
|
|
-#else
|
|
|
|
- rt_thread_ready_priority_group &= ~thread->number_mask;
|
|
|
|
-#endif /* RT_THREAD_PRIORITY_MAX > 32 */
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- /* enable interrupt */
|
|
|
|
- rt_hw_interrupt_enable(level);
|
|
|
|
-}
|
|
|
|
-#endif /* RT_USING_SMP */
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* @brief This function will lock the thread scheduler.
|
|
* @brief This function will lock the thread scheduler.
|
|
*/
|
|
*/
|
|
-#ifdef RT_USING_SMP
|
|
|
|
void rt_enter_critical(void)
|
|
void rt_enter_critical(void)
|
|
{
|
|
{
|
|
rt_base_t level;
|
|
rt_base_t level;
|
|
@@ -958,30 +692,11 @@ void rt_enter_critical(void)
|
|
/* enable interrupt */
|
|
/* enable interrupt */
|
|
rt_hw_local_irq_enable(level);
|
|
rt_hw_local_irq_enable(level);
|
|
}
|
|
}
|
|
-#else
|
|
|
|
-void rt_enter_critical(void)
|
|
|
|
-{
|
|
|
|
- rt_base_t level;
|
|
|
|
-
|
|
|
|
- /* disable interrupt */
|
|
|
|
- level = rt_hw_interrupt_disable();
|
|
|
|
-
|
|
|
|
- /*
|
|
|
|
- * the maximal number of nest is RT_UINT16_MAX, which is big
|
|
|
|
- * enough and does not check here
|
|
|
|
- */
|
|
|
|
- rt_scheduler_lock_nest ++;
|
|
|
|
-
|
|
|
|
- /* enable interrupt */
|
|
|
|
- rt_hw_interrupt_enable(level);
|
|
|
|
-}
|
|
|
|
-#endif /* RT_USING_SMP */
|
|
|
|
RTM_EXPORT(rt_enter_critical);
|
|
RTM_EXPORT(rt_enter_critical);
|
|
|
|
|
|
/**
|
|
/**
|
|
* @brief This function will unlock the thread scheduler.
|
|
* @brief This function will unlock the thread scheduler.
|
|
*/
|
|
*/
|
|
-#ifdef RT_USING_SMP
|
|
|
|
void rt_exit_critical(void)
|
|
void rt_exit_critical(void)
|
|
{
|
|
{
|
|
rt_base_t level;
|
|
rt_base_t level;
|
|
@@ -1023,34 +738,6 @@ void rt_exit_critical(void)
|
|
rt_hw_local_irq_enable(level);
|
|
rt_hw_local_irq_enable(level);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-#else
|
|
|
|
-void rt_exit_critical(void)
|
|
|
|
-{
|
|
|
|
- rt_base_t level;
|
|
|
|
-
|
|
|
|
- /* disable interrupt */
|
|
|
|
- level = rt_hw_interrupt_disable();
|
|
|
|
-
|
|
|
|
- rt_scheduler_lock_nest --;
|
|
|
|
- if (rt_scheduler_lock_nest <= 0)
|
|
|
|
- {
|
|
|
|
- rt_scheduler_lock_nest = 0;
|
|
|
|
- /* enable interrupt */
|
|
|
|
- rt_hw_interrupt_enable(level);
|
|
|
|
-
|
|
|
|
- if (rt_current_thread)
|
|
|
|
- {
|
|
|
|
- /* if scheduler is started, do a schedule */
|
|
|
|
- rt_schedule();
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- /* enable interrupt */
|
|
|
|
- rt_hw_interrupt_enable(level);
|
|
|
|
- }
|
|
|
|
-}
|
|
|
|
-#endif /* RT_USING_SMP */
|
|
|
|
RTM_EXPORT(rt_exit_critical);
|
|
RTM_EXPORT(rt_exit_critical);
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -1060,13 +747,9 @@ RTM_EXPORT(rt_exit_critical);
|
|
*/
|
|
*/
|
|
rt_uint16_t rt_critical_level(void)
|
|
rt_uint16_t rt_critical_level(void)
|
|
{
|
|
{
|
|
-#ifdef RT_USING_SMP
|
|
|
|
struct rt_thread *current_thread = rt_cpu_self()->current_thread;
|
|
struct rt_thread *current_thread = rt_cpu_self()->current_thread;
|
|
|
|
|
|
return current_thread->critical_lock_nest;
|
|
return current_thread->critical_lock_nest;
|
|
-#else
|
|
|
|
- return rt_scheduler_lock_nest;
|
|
|
|
-#endif /* RT_USING_SMP */
|
|
|
|
}
|
|
}
|
|
RTM_EXPORT(rt_critical_level);
|
|
RTM_EXPORT(rt_critical_level);
|
|
|
|
|