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/trunk@3144 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2011-07-10 08:45:36 +00:00
parent 8f03a39047
commit fbdd64538e
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/kernel/include/chdebug.h
View File

@ -145,12 +145,12 @@ typedef struct {
extern "C" { extern "C" {
#endif #endif
#if CH_DBG_ENABLE_TRACE || defined(__DOXYGEN__) #if CH_DBG_ENABLE_TRACE || defined(__DOXYGEN__)
extern ch_trace_buffer_t ch_dbg_trace_buffer; extern ch_trace_buffer_t dbg_trace_buffer;
void _trace_init(void); void _trace_init(void);
void chDbgTrace(Thread *otp); void chDbgTrace(Thread *otp);
#endif #endif
#if CH_DBG_ENABLE_ASSERTS || CH_DBG_ENABLE_CHECKS || CH_DBG_ENABLE_STACK_CHECK #if CH_DBG_ENABLE_ASSERTS || CH_DBG_ENABLE_CHECKS || CH_DBG_ENABLE_STACK_CHECK
extern char *ch_dbg_panic_msg; extern char *dbg_panic_msg;
void chDbgPanic(char *msg); void chDbgPanic(char *msg);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

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

@ -40,7 +40,7 @@
/** /**
* @brief Public trace buffer. * @brief Public trace buffer.
*/ */
ch_trace_buffer_t ch_dbg_trace_buffer; ch_trace_buffer_t dbg_trace_buffer;
/** /**
* @brief Trace circular buffer subsystem initialization. * @brief Trace circular buffer subsystem initialization.
@ -48,8 +48,8 @@ ch_trace_buffer_t ch_dbg_trace_buffer;
*/ */
void _trace_init(void) { void _trace_init(void) {
ch_dbg_trace_buffer.tb_size = CH_TRACE_BUFFER_SIZE; dbg_trace_buffer.tb_size = CH_TRACE_BUFFER_SIZE;
ch_dbg_trace_buffer.tb_ptr = &ch_dbg_trace_buffer.tb_buffer[0]; dbg_trace_buffer.tb_ptr = &dbg_trace_buffer.tb_buffer[0];
} }
/** /**
@ -61,13 +61,13 @@ void _trace_init(void) {
*/ */
void chDbgTrace(Thread *otp) { void chDbgTrace(Thread *otp) {
ch_dbg_trace_buffer.tb_ptr->se_time = chTimeNow(); dbg_trace_buffer.tb_ptr->se_time = chTimeNow();
ch_dbg_trace_buffer.tb_ptr->se_tp = currp; dbg_trace_buffer.tb_ptr->se_tp = currp;
ch_dbg_trace_buffer.tb_ptr->se_wtobjp = otp->p_u.wtobjp; dbg_trace_buffer.tb_ptr->se_wtobjp = otp->p_u.wtobjp;
ch_dbg_trace_buffer.tb_ptr->se_state = (uint8_t)otp->p_state; dbg_trace_buffer.tb_ptr->se_state = (uint8_t)otp->p_state;
if (++ch_dbg_trace_buffer.tb_ptr >= if (++dbg_trace_buffer.tb_ptr >=
&ch_dbg_trace_buffer.tb_buffer[CH_TRACE_BUFFER_SIZE]) &dbg_trace_buffer.tb_buffer[CH_TRACE_BUFFER_SIZE])
ch_dbg_trace_buffer.tb_ptr = &ch_dbg_trace_buffer.tb_buffer[0]; dbg_trace_buffer.tb_ptr = &dbg_trace_buffer.tb_buffer[0];
} }
#endif /* CH_DBG_ENABLE_TRACE */ #endif /* CH_DBG_ENABLE_TRACE */
@ -79,7 +79,7 @@ void chDbgTrace(Thread *otp) {
* written once and then the system is halted. This variable can be * written once and then the system is halted. This variable can be
* set to @p NULL if the halt is caused by a stack overflow. * set to @p NULL if the halt is caused by a stack overflow.
*/ */
char *ch_dbg_panic_msg; char *dbg_panic_msg;
/** /**
* @brief Prints a panic message on the console and then halts the system. * @brief Prints a panic message on the console and then halts the system.
@ -88,7 +88,7 @@ char *ch_dbg_panic_msg;
*/ */
void chDbgPanic(char *msg) { void chDbgPanic(char *msg) {
ch_dbg_panic_msg = msg; dbg_panic_msg = msg;
chSysHalt(); chSysHalt();
} }
#endif /* CH_DBG_ENABLE_ASSERTS || CH_DBG_ENABLE_CHECKS || CH_DBG_ENABLE_STACK_CHECK */ #endif /* CH_DBG_ENABLE_ASSERTS || CH_DBG_ENABLE_CHECKS || CH_DBG_ENABLE_STACK_CHECK */

2
readme.txt
View File

@ -85,7 +85,7 @@
- FIX: Fixed timeout problem in the lwIP interface layer (bug 3302420) - FIX: Fixed timeout problem in the lwIP interface layer (bug 3302420)
(backported to 2.2.4). (backported to 2.2.4).
- NEW: Improvements to the trace buffer, now it stores a full thread pointer - NEW: Improvements to the trace buffer, now it stores a full thread pointer
and event time, changed names of debug variables by addin the "ch_dbg_" and event time, changed names to debug variables by adding the "dbg_"
prefix. prefix.
- NEW: Added a new functionality to the registry subsystem, now it is possible - NEW: Added a new functionality to the registry subsystem, now it is possible
to associate a name to the threads using chRegSetThreadName. The main and to associate a name to the threads using chRegSetThreadName. The main and