andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6048 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2013-07-30 14:23:37 +00:00
parent 9cd24294b8
commit 64403d8f18
12 changed files with 109 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
demos/ARMCM4-STM32F303-DISCOVERY/chconf.h
View File

@ -41,7 +41,7 @@
* setting also defines the system tick time unit.
*/
#if !defined(CH_CFG_FREQUENCY) || defined(__DOXYGEN__)
#define CH_CFG_FREQUENCY 10000
#define CH_CFG_FREQUENCY 1000
#endif
/**
@ -53,7 +53,7 @@
* this value.
*/
#if !defined(CH_CFG_TIMEDELTA) || defined(__DOXYGEN__)
#define CH_CFG_TIMEDELTA 2
#define CH_CFG_TIMEDELTA 0
#endif
/**
@ -359,7 +359,7 @@
* @note The default is @p FALSE.
*/
#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)
#define CH_DBG_SYSTEM_STATE_CHECK FALSE
#define CH_DBG_SYSTEM_STATE_CHECK TRUE
#endif
/**
@ -370,7 +370,7 @@
* @note The default is @p FALSE.
*/
#if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)
#define CH_DBG_ENABLE_CHECKS FALSE
#define CH_DBG_ENABLE_CHECKS TRUE
#endif
/**
@ -382,7 +382,7 @@
* @note The default is @p FALSE.
*/
#if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)
#define CH_DBG_ENABLE_ASSERTS FALSE
#define CH_DBG_ENABLE_ASSERTS TRUE
#endif
/**
@ -393,7 +393,7 @@
* @note The default is @p FALSE.
*/
#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)
#define CH_DBG_ENABLE_TRACE FALSE
#define CH_DBG_ENABLE_TRACE TRUE
#endif
/**
@ -407,7 +407,7 @@
* @p panic_msg variable set to @p NULL.
*/
#if !defined(CH_DBG_ENABLE_STACK_CHECK) || defined(__DOXYGEN__)
#define CH_DBG_ENABLE_STACK_CHECK FALSE
#define CH_DBG_ENABLE_STACK_CHECK TRUE
#endif
/**
@ -419,7 +419,7 @@
* @note The default is @p FALSE.
*/
#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)
#define CH_DBG_FILL_THREADS FALSE
#define CH_DBG_FILL_THREADS TRUE
#endif
/**

56
os/kernel/include/chstats.h
View File

@ -62,60 +62,12 @@ typedef struct {
critical zones duration. */
time_measurement_t m_crit_isr; /**< @brief Measurement of ISRs critical
zones duration. */
time_measurement_t m_isr; /**< @brief Measurement of ISRs total
duration. */
} kernel_stats_t;
/*===========================================================================*/
/* Module macros. */
/*===========================================================================*/
/**
* @brief Increases the IRQ counter.
*/
#define _stats_increase_irq() kernel_stats.n_irq++
/**
* @brief Increases the context switch counter.
*/
#define _stats_increase_ctxswc() kernel_stats.n_ctxswc++
/**
* @brief Starts the measurement of a thread critical zone.
*/
#define _stats_start_measure_crit_thd() \
chTMStartMeasurementX(&kernel_stats.m_crit_thd)
/**
* @brief Stops the measurement of a thread critical zone.
*/
#define _stats_stop_measure_crit_thd() \
chTMStopMeasurementX(&kernel_stats.m_crit_thd)
/**
* @brief Starts the measurement of an ISR critical zone.
*/
#define _stats_start_measure_crit_isr() \
chTMStartMeasurementX(&kernel_stats.m_crit_isr)
/**
* @brief Stops the measurement of an ISR critical zone.
*/
#define _stats_stop_measure_crit_isr() \
chTMStopMeasurementX(&kernel_stats.m_crit_isr)
/**
* @brief Starts the measurement of an ISR duration.
*/
#define _stats_start_measure_isr() \
chTMStartMeasurementX(&kernel_stats.m_crit_isr)
/**
* @brief Stops the measurement of an ISR duration.
*/
#define _stats_stop_measure_isr() \
chTMStopMeasurementX(&kernel_stats.m_crit_isr)
/*===========================================================================*/
/* External declarations. */
/*===========================================================================*/
@ -128,6 +80,12 @@ extern kernel_stats_t kernel_stats;
extern "C" {
#endif
void _stats_init(void);
void _stats_increase_irq(void);
void _stats_increase_ctxswc(void);
void _stats_start_measure_crit_thd(void);
void _stats_stop_measure_crit_thd(void);
void _stats_start_measure_crit_isr(void);
void _stats_stop_measure_crit_isr(void);
#ifdef __cplusplus
}
#endif
@ -145,8 +103,6 @@ extern "C" {
#define _stats_stop_measure_crit_thd()
#define _stats_start_measure_crit_isr()
#define _stats_stop_measure_crit_isr()
#define _stats_start_measure_isr()
#define _stats_stop_measure_isr()
#endif /* !CH_DBG_STATISTICS */

38
os/kernel/include/chsys.h
View File

@ -61,7 +61,6 @@
*/
#define CH_IRQ_PROLOGUE() \
PORT_IRQ_PROLOGUE(); \
_stats_start_measure_isr(); \
_stats_increase_irq(); \
dbg_check_enter_isr()
@ -75,7 +74,6 @@
*/
#define CH_IRQ_EPILOGUE() \
dbg_check_leave_isr(); \
_stats_stop_measure_isr(); \
PORT_IRQ_EPILOGUE()
/**
@ -196,6 +194,24 @@
#define chSysGetRealtimeCounterX() (rtcnt_t)port_rt_get_counter_value()
#endif
/**
* @brief Performs a context switch.
* @note Not a user function, it is meant to be invoked by the scheduler
* itself or from within the port layer.
*
* @param[in] ntp the thread to be switched in
* @param[in] otp the thread to be switched out
*
* @special
*/
#define chSysSwitch(ntp, otp) { \
\
dbg_trace(otp); \
_stats_increase_ctxswc(); \
CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp); \
port_switch(ntp, otp); \
}
/*===========================================================================*/
/* External declarations. */
/*===========================================================================*/
@ -220,24 +236,6 @@ extern "C" {
/* Module inline functions. */
/*===========================================================================*/
/**
* @brief Performs a context switch.
* @note Not a user function, it is meant to be invoked by the scheduler
* itself or from within the port layer.
*
* @param[in] ntp the thread to be switched in
* @param[in] otp the thread to be switched out
*
* @special
*/
static inline void chSysSwitch(thread_t *ntp, thread_t *otp) {
dbg_trace(otp);
_stats_increase_ctxswc();
CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp);
port_switch(ntp, otp);
}
/**
* @brief Raises the system interrupt priority mask to the maximum level.
* @details All the maskable interrupt sources are disabled regardless their

2
os/kernel/include/chtm.h
View File

@ -31,8 +31,6 @@
#if CH_CFG_USE_TM || defined(__DOXYGEN__)
#define port_rt_get_counter_value() 0
/*===========================================================================*/
/* Module constants. */
/*===========================================================================*/

2
os/kernel/src/chdebug.c
View File

@ -234,7 +234,7 @@ void _trace_init(void) {
*/
void dbg_trace(thread_t *otp) {
dbg_trace_buffer.tb_ptr->se_time = chTimeNow();
dbg_trace_buffer.tb_ptr->se_time = chVTGetSystemTimeX();
dbg_trace_buffer.tb_ptr->se_tp = currp;
dbg_trace_buffer.tb_ptr->se_wtobjp = otp->p_u.wtobjp;
dbg_trace_buffer.tb_ptr->se_state = (uint8_t)otp->p_state;

50
os/kernel/src/chstats.c
View File

@ -69,11 +69,59 @@ void _stats_init(void) {
kernel_stats.n_irq = 0;
kernel_stats.n_ctxswc = 0;
chTMObjectInit(&kernel_stats.m_isr);
chTMObjectInit(&kernel_stats.m_crit_thd);
chTMObjectInit(&kernel_stats.m_crit_isr);
}
/**
* @brief Increases the IRQ counter.
*/
void _stats_increase_irq(void) {
kernel_stats.n_irq++;
}
/**
* @brief Increases the context switch counter.
*/
void _stats_increase_ctxswc(void) {
kernel_stats.n_ctxswc++;
}
/**
* @brief Starts the measurement of a thread critical zone.
*/
void _stats_start_measure_crit_thd(void) {
chTMStartMeasurementX(&kernel_stats.m_crit_thd);
}
/**
* @brief Stops the measurement of a thread critical zone.
*/
void _stats_stop_measure_crit_thd(void) {
chTMStopMeasurementX(&kernel_stats.m_crit_thd);
}
/**
* @brief Starts the measurement of an ISR critical zone.
*/
void _stats_start_measure_crit_isr(void) {
chTMStartMeasurementX(&kernel_stats.m_crit_isr);
}
/**
* @brief Stops the measurement of an ISR critical zone.
*/
void _stats_stop_measure_crit_isr(void) {
chTMStopMeasurementX(&kernel_stats.m_crit_isr);
}
#endif /* CH_DBG_STATISTICS */
/** @} */

2
os/kernel/src/chsys.c
View File

@ -163,7 +163,7 @@ void chSysInit(void) {
*/
void chSysHalt(void) {
chSysDisable();
port_disable();
#if defined(CH_CFG_SYSTEM_HALT_HOOK) || defined(__DOXYGEN__)
CH_CFG_SYSTEM_HALT_HOOK();

6
os/ports/GCC/ARMCMx/chcore_v7m.c
View File

@ -62,9 +62,9 @@ CH_IRQ_HANDLER(SysTickVector) {
CH_IRQ_PROLOGUE();
chSysLockFromIsr();
chSysLockFromISR();
chSysTimerHandlerI();
chSysUnlockFromIsr();
chSysUnlockFromISR();
CH_IRQ_EPILOGUE();
}
@ -191,9 +191,11 @@ __attribute__((naked))
#endif
void _port_switch_from_isr(void) {
_stats_start_measure_crit_thd();
dbg_check_lock();
chSchDoReschedule();
dbg_check_unlock();
_stats_stop_measure_crit_thd();
asm volatile ("_port_exit_from_isr:" : : : "memory");
#if !CORTEX_SIMPLIFIED_PRIORITY || defined(__DOXYGEN__)
asm volatile ("svc #0");

10
os/ports/GCC/ARMCMx/chcore_v7m.h
View File

@ -421,6 +421,10 @@ static inline void port_init(void) {
SCB_VTOR = CORTEX_VTOR_INIT;
SCB_AIRCR = AIRCR_VECTKEY | AIRCR_PRIGROUP(CORTEX_PRIGROUP_INIT);
/* DWT cycle counter enable.*/
SCS_DEMCR |= SCS_DEMCR_TRCENA;
DWT_CTRL |= DWT_CTRL_CYCCNTENA;
/* Initialization of the system vectors used by the port.*/
nvicSetSystemHandlerPriority(HANDLER_SVCALL,
CORTEX_PRIORITY_MASK(CORTEX_PRIORITY_SVCALL));
@ -595,6 +599,12 @@ static inline void port_wait_for_interrupt(void) {
#endif
}
static inline rtcnt_t port_rt_get_counter_value(void) {
return DWT_CYCCNT;
}
#endif /* _FROM_ASM_ */
#endif /* _CHCORE_V7M_H_ */

3
test/testbmk.c
View File

@ -218,7 +218,8 @@ static void bmk4_execute(void) {
thread_t *tp;
uint32_t n;
tp = threads[0] = chThdCreateStatic(wa[0], WA_SIZE, chThdGetPriority()+1, thread4, NULL);
tp = threads[0] = chThdCreateStatic(wa[0], WA_SIZE, chThdGetPriority()+1,
thread4, NULL);
n = 0;
test_wait_tick();
test_start_timer(1000);

2
test/testmbox.c
View File

@ -80,7 +80,7 @@ static void mbox1_execute(void) {
/*
* Testing initial space.
*/
test_assert(1, chMBGetFreeCountI(&mb1) == MB_SIZE, "wrong size");
test_assert_lock(1, chMBGetFreeCountI(&mb1) == MB_SIZE, "wrong size");
/*
* Testing enqueuing and backward circularity.

18
test/testsem.c
View File

@ -104,7 +104,7 @@ static void sem1_execute(void) {
chSemAddCounterI(&sem1, 2);
chSysUnlock();
test_wait_threads();
test_assert(2, chSemGetCounterI(&sem1) == 1, "invalid counter");
test_assert_lock(2, chSemGetCounterI(&sem1) == 1, "invalid counter");
}
ROMCONST struct testcase testsem1 = {
@ -252,7 +252,7 @@ static void sem4_execute(void) {
/* Creates a taken binary semaphore.*/
chBSemObjectInit(&bsem, TRUE);
chBSemReset(&bsem, TRUE);
test_assert(1, chBSemGetStateI(&bsem) == TRUE, "not taken");
test_assert_lock(1, chBSemGetStateI(&bsem) == TRUE, "not taken");
/* Starts a signaler thread at a lower priority.*/
threads[0] = chThdCreateStatic(wa[0], WA_SIZE,
@ -262,18 +262,18 @@ static void sem4_execute(void) {
chBSemWait(&bsem);
/* The binary semaphore is expected to be taken.*/
test_assert(2, chBSemGetStateI(&bsem) == TRUE, "not taken");
test_assert_lock(2, chBSemGetStateI(&bsem) == TRUE, "not taken");
/* Releasing it, check both the binary semaphore state and the underlying
counter semaphore state..*/
chBSemSignal(&bsem);
test_assert(3, chBSemGetStateI(&bsem) == FALSE, "still taken");
test_assert(4, chSemGetCounterI(&bsem.bs_sem) == 1, "unexpected counter");
test_assert_lock(3, chBSemGetStateI(&bsem) == FALSE, "still taken");
test_assert_lock(4, chSemGetCounterI(&bsem.bs_sem) == 1, "unexpected counter");
/* Checking signaling overflow, the counter must not go beyond 1.*/
chBSemSignal(&bsem);
test_assert(3, chBSemGetStateI(&bsem) == FALSE, "taken");
test_assert(5, chSemGetCounterI(&bsem.bs_sem) == 1, "unexpected counter");
test_assert_lock(3, chBSemGetStateI(&bsem) == FALSE, "taken");
test_assert_lock(5, chSemGetCounterI(&bsem.bs_sem) == 1, "unexpected counter");
}
ROMCONST struct testcase testsem4 = {