diff options
| -rw-r--r-- | bsp/stm32/stm32f103-dofly-lyc8/rtconfig.py | 2 | ||||
| -rw-r--r-- | include/rtdebug.h | 9 | ||||
| -rw-r--r-- | include/rthw.h | 2 | ||||
| -rw-r--r-- | src/ipc.c | 6 | ||||
| -rw-r--r-- | src/irq.c | 5 |
5 files changed, 19 insertions, 5 deletions
diff --git a/bsp/stm32/stm32f103-dofly-lyc8/rtconfig.py b/bsp/stm32/stm32f103-dofly-lyc8/rtconfig.py index b90f7e65a9..ea0c3aee4a 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/rtconfig.py +++ b/bsp/stm32/stm32f103-dofly-lyc8/rtconfig.py @@ -52,7 +52,7 @@ if PLATFORM == 'gcc': LPATH = '' if BUILD == 'debug': - CFLAGS += ' -O0 -gdwarf-2 -g' + CFLAGS += ' -O2 -gdwarf-2 -g' AFLAGS += ' -gdwarf-2' else: CFLAGS += ' -O2' diff --git a/include/rtdebug.h b/include/rtdebug.h index ac5ba6c1c5..76a9779a57 100644 --- a/include/rtdebug.h +++ b/include/rtdebug.h @@ -119,13 +119,16 @@ while (0) * 1) the scheduler has been started. * 2) not in interrupt context. * 3) scheduler is not locked. + * 4) interrupt is not disabled. */ #define RT_DEBUG_SCHEDULER_AVAILABLE(need_check) \ do \ { \ if (need_check) \ { \ + rt_bool_t interrupt_disabled; \ rt_base_t level; \ + interrupt_disabled = rt_hw_interrupt_is_disabled(); \ level = rt_hw_interrupt_disable(); \ if (rt_critical_level() != 0) \ { \ @@ -133,6 +136,12 @@ do \ __FUNCTION__); \ RT_ASSERT(0) \ } \ + if (interrupt_disabled == RT_TRUE) \ + { \ + rt_kprintf("Function[%s]: interrupt is disabled\n", \ + __FUNCTION__); \ + RT_ASSERT(0) \ + } \ RT_DEBUG_IN_THREAD_CONTEXT; \ rt_hw_interrupt_enable(level); \ } \ diff --git a/include/rthw.h b/include/rthw.h index 21b28072ce..ed512ac14f 100644 --- a/include/rthw.h +++ b/include/rthw.h @@ -126,11 +126,11 @@ void rt_hw_local_irq_enable(rt_base_t level); #define rt_hw_interrupt_disable rt_cpus_lock #define rt_hw_interrupt_enable rt_cpus_unlock - #else rt_base_t rt_hw_interrupt_disable(void); void rt_hw_interrupt_enable(rt_base_t level); #endif /*RT_USING_SMP*/ +rt_bool_t rt_hw_interrupt_is_disabled(void); /* * Context interfaces @@ -507,6 +507,9 @@ static rt_err_t _rt_sem_take(rt_sem_t sem, rt_int32_t timeout, int suspend_flag) RT_OBJECT_HOOK_CALL(rt_object_trytake_hook, (&(sem->parent.parent))); + /* current context checking */ + RT_DEBUG_SCHEDULER_AVAILABLE(sem->value == 0 && timeout != 0); + /* disable interrupt */ level = rt_hw_interrupt_disable(); @@ -534,9 +537,6 @@ static rt_err_t _rt_sem_take(rt_sem_t sem, rt_int32_t timeout, int suspend_flag) } else { - /* current context checking */ - RT_DEBUG_SCHEDULER_AVAILABLE(RT_TRUE); - /* semaphore is unavailable, push to suspend list */ /* get current thread */ thread = rt_thread_self(); @@ -138,5 +138,10 @@ RTM_EXPORT(rt_interrupt_get_nest); RTM_EXPORT(rt_hw_interrupt_disable); RTM_EXPORT(rt_hw_interrupt_enable); +rt_weak rt_bool_t rt_hw_interrupt_is_disabled(void) +{ + return RT_FALSE; +} +RTM_EXPORT(rt_hw_interrupt_is_disabled); /**@}*/ |