Skip to content

feat(kernel): Check interrupt-disabled context in RT_DEBUG_SCHEDULER_… #11315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wdfk-prog wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −1
Open

feat(kernel): Check interrupt-disabled context in RT_DEBUG_SCHEDULER_… #11315

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion include/rtthread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,17 +860,37 @@ do \
} \
while (0)

#if defined(RT_USING_SMP)
/**
* @brief Check whether disabled interrupts make scheduler unavailable.
*
* In SMP builds, some kernel-internal lockless wait paths may disable local
* interrupts while still using scheduler-related operations legally. Keep this
* IRQ-disabled context assertion for UP builds only.
*/
#define RT_DEBUG_SCHEDULER_IRQ_DISABLED() (RT_FALSE)
#else
/**
* @brief Check whether disabled interrupts make scheduler unavailable.
*
* In UP builds, globally disabled interrupts prevent normal scheduling and
* timeout progress, so blocking scheduler paths must reject this context.
*/
#define RT_DEBUG_SCHEDULER_IRQ_DISABLED() rt_hw_interrupt_is_disabled()
#endif /* defined(RT_USING_SMP) */

/* "scheduler available" means:
* 1) the scheduler has been started.
* 2) not in interrupt context.
* 3) scheduler is not locked.
* 4) interrupts are not disabled on UP.
*/
#define RT_DEBUG_SCHEDULER_AVAILABLE(need_check) \
do \
{ \
if (need_check) \
{ \
if (rt_critical_level() != 0) \
if ((rt_critical_level() != 0) || RT_DEBUG_SCHEDULER_IRQ_DISABLED()) \
{ \
rt_kprintf("Function[%s]: scheduler is not available\n", \
__FUNCTION__); \
Expand Down
Loading