OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

sched/init: refine init state interface 

N/A, refine init state interface

Signed-off-by: chao an <anchao@lixiang.com>
This commit is contained in:
chao an 2024-03-22 13:41:20 +08:00 committed by Xiang Xiao
parent f7434c2bc4
commit b9a74f30c6
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/nuttx/init.h
View File

@ -38,13 +38,14 @@
* initialization. * initialization.
*/ */
#define nxsched_initstate() g_nx_initstate #define nxsched_set_initstate(s) g_nx_initstate = (s)
#define nxsched_get_initstate() g_nx_initstate
#define OSINIT_MM_READY() (nxsched_initstate() >= OSINIT_MEMORY) #define OSINIT_MM_READY() (nxsched_get_initstate() >= OSINIT_MEMORY)
#define OSINIT_HW_READY() (nxsched_initstate() >= OSINIT_HARDWARE) #define OSINIT_HW_READY() (nxsched_get_initstate() >= OSINIT_HARDWARE)
#define OSINIT_OS_READY() (nxsched_initstate() >= OSINIT_OSREADY) #define OSINIT_OS_READY() (nxsched_get_initstate() >= OSINIT_OSREADY)
#define OSINIT_IDLELOOP() (nxsched_initstate() >= OSINIT_IDLELOOP) #define OSINIT_IDLELOOP() (nxsched_get_initstate() >= OSINIT_IDLELOOP)
#define OSINIT_OS_INITIALIZING() (nxsched_initstate() < OSINIT_OSREADY) #define OSINIT_OS_INITIALIZING() (nxsched_get_initstate() < OSINIT_OSREADY)
/**************************************************************************** /****************************************************************************
* Public Types * Public Types

12
sched/init/nx_start.c
View File

@ -539,7 +539,7 @@ void nx_start(void)
/* Boot up is complete */ /* Boot up is complete */
nxsched_initstate() = OSINIT_BOOT; nxsched_set_initstate(OSINIT_BOOT);
/* Initialize RTOS Data ***************************************************/ /* Initialize RTOS Data ***************************************************/
@ -555,7 +555,7 @@ void nx_start(void)
/* Task lists are initialized */ /* Task lists are initialized */
nxsched_initstate() = OSINIT_TASKLISTS; nxsched_set_initstate(OSINIT_TASKLISTS);
/* Initialize RTOS facilities *********************************************/ /* Initialize RTOS facilities *********************************************/
@ -641,7 +641,7 @@ void nx_start(void)
/* The memory manager is available */ /* The memory manager is available */
nxsched_initstate() = OSINIT_MEMORY; nxsched_set_initstate(OSINIT_MEMORY);
/* Initialize tasking data structures */ /* Initialize tasking data structures */
@ -727,7 +727,7 @@ void nx_start(void)
/* Hardware resources are now available */ /* Hardware resources are now available */
nxsched_initstate() = OSINIT_HARDWARE; nxsched_set_initstate(OSINIT_HARDWARE);
/* Setup for Multi-Tasking ************************************************/ /* Setup for Multi-Tasking ************************************************/
@ -773,7 +773,7 @@ void nx_start(void)
/* The OS is fully initialized and we are beginning multi-tasking */ /* The OS is fully initialized and we are beginning multi-tasking */
nxsched_initstate() = OSINIT_OSREADY; nxsched_set_initstate(OSINIT_OSREADY);
/* Create initial tasks and bring-up the system */ /* Create initial tasks and bring-up the system */
@ -781,7 +781,7 @@ void nx_start(void)
/* Enter to idleloop */ /* Enter to idleloop */
nxsched_initstate() = OSINIT_IDLELOOP; nxsched_set_initstate(OSINIT_IDLELOOP);
/* Let other threads have access to the memory manager */ /* Let other threads have access to the memory manager */

10
sched/irq/irq_csection.c
View File

@ -192,7 +192,7 @@ try_again:
* lists are valid. * lists are valid.
*/ */
if (nxsched_initstate() >= OSINIT_TASKLISTS) if (nxsched_get_initstate() >= OSINIT_TASKLISTS)
{ {
/* If called from an interrupt handler, then just take the spinlock. /* If called from an interrupt handler, then just take the spinlock.
* If we are already in a critical section, this will lock the CPU * If we are already in a critical section, this will lock the CPU
@ -416,7 +416,7 @@ irqstate_t enter_critical_section(void)
* lists have been initialized. * lists have been initialized.
*/ */
if (!up_interrupt_context() && nxsched_initstate() >= OSINIT_TASKLISTS) if (!up_interrupt_context() && nxsched_get_initstate() >= OSINIT_TASKLISTS)
{ {
FAR struct tcb_s *rtcb = this_task(); FAR struct tcb_s *rtcb = this_task();
DEBUGASSERT(rtcb != NULL); DEBUGASSERT(rtcb != NULL);
@ -463,7 +463,7 @@ void leave_critical_section(irqstate_t flags)
* lists are valid. * lists are valid.
*/ */
if (nxsched_initstate() >= OSINIT_TASKLISTS) if (nxsched_get_initstate() >= OSINIT_TASKLISTS)
{ {
/* If called from an interrupt handler, then just release the /* If called from an interrupt handler, then just release the
* spinlock. The interrupt handling logic should already hold the * spinlock. The interrupt handling logic should already hold the
@ -608,7 +608,7 @@ void leave_critical_section(irqstate_t flags)
* lists have been initialized. * lists have been initialized.
*/ */
if (!up_interrupt_context() && nxsched_initstate() >= OSINIT_TASKLISTS) if (!up_interrupt_context() && nxsched_get_initstate() >= OSINIT_TASKLISTS)
{ {
FAR struct tcb_s *rtcb = this_task(); FAR struct tcb_s *rtcb = this_task();
DEBUGASSERT(rtcb != NULL); DEBUGASSERT(rtcb != NULL);
@ -667,7 +667,7 @@ bool irq_cpu_locked(int cpu)
/* g_cpu_irqset is not valid in early phases of initialization */ /* g_cpu_irqset is not valid in early phases of initialization */
if (nxsched_initstate() < OSINIT_OSREADY) if (nxsched_get_initstate() < OSINIT_OSREADY)
{ {
/* We are still single threaded. In either state of g_cpu_irqlock, /* We are still single threaded. In either state of g_cpu_irqlock,
* the correct return value should always be false. * the correct return value should always be false.

2
sched/sched/sched_idletask.c
View File

@ -62,7 +62,7 @@ bool sched_idletask(void)
* have been initialized and, in that case, rtcb may be NULL. * have been initialized and, in that case, rtcb may be NULL.
*/ */
DEBUGASSERT(rtcb != NULL || nxsched_initstate() < OSINIT_TASKLISTS); DEBUGASSERT(rtcb != NULL || nxsched_get_initstate() < OSINIT_TASKLISTS);
if (rtcb != NULL) if (rtcb != NULL)
{ {
/* The IDLE task TCB is distinguishable by a few things: /* The IDLE task TCB is distinguishable by a few things: