Skip to content
Snippets Groups Projects
Commit b8b16ad1 authored by patacongo's avatar patacongo
Browse files

Suppress debug output if CONFIG_DEBUG_SCHED is not defined 

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@700 42af7a65-404d-4744-a932-0658087f49c3
parent c447d1ff
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
arch/z16/src/common/up_assert.c
+ 31
− 3
View file @ b8b16ad1
......@@ -108,7 +108,11 @@ static void _up_assert(int errorcode) /* __attribute__ ((noreturn)) */
* Name: up_assert
****************************************************************************/
#ifdef CONFIG_HAVE_FILENAME
void up_assert(const ubyte *filename, int lineno)
#else
void up_assert(void)
#endif
{
#if CONFIG_TASK_NAME_SIZE > 0
_TCB *rtcb = (_TCB*)g_readytorun.head;
......@@ -116,10 +120,20 @@ void up_assert(void)
up_ledon(LED_ASSERTION);
#ifdef CONFIG_HAVE_FILENAME
#if CONFIG_TASK_NAME_SIZE > 0
lldbg("Assertion failed in task: %s\n", rtcb->name);
lldbg("Assertion failed at file:%s line: %d task: %s\n",
filename, lineno, rtcb->name);
#else
lldbg("Assertion failed at file:%s line: %d\n",
filename, lineno);
#endif
#else
#if CONFIG_TASK_NAME_SIZE > 0
lldbg("Assertion failed: task: %s\n", rtcb->name);
#else
lldbg("Assertion failed\n");
#endif
#endif
up_stackdump();
......@@ -131,7 +145,11 @@ void up_assert(void)
* Name: up_assert_code
****************************************************************************/
#ifdef CONFIG_HAVE_FILENAME
void up_assert_code(const ubyte *filename, int lineno, int errorcode)
#else
void up_assert_code(int errorcode)
#endif
{
#if CONFIG_TASK_NAME_SIZE > 0
_TCB *rtcb = (_TCB*)g_readytorun.head;
......@@ -139,10 +157,20 @@ void up_assert_code(int errorcode)
up_ledon(LED_ASSERTION);
#ifdef CONFIG_HAVE_FILENAME
#if CONFIG_TASK_NAME_SIZE > 0
lldbg("Assertion failed in task: %s error code: %d\n", rtcb->name, errorcode);
lldbg("Assertion failed at file:%s line: %d task: %s error code: %d\n",
filename, lineno, rtcb->name, errorcode);
#else
lldbg("Assertion failed at file:%s line: %d error code: %d\n",
filename, lineno, errorcode);
#endif
#else
lldbg("Assertion failed: %d error code: %d\n", errorcode);
#if CONFIG_TASK_NAME_SIZE > 0
lldbg("Assertion failed: task: %s error code: %d\n", rtcb->name, errorcode);
#else
lldbg("Assertion failed: error code: %d\n", errorcode);
#endif
#endif
up_stackdump();
......
arch/z16/src/common/up_exit.c
+ 2
− 2
View file @ b8b16ad1
......@@ -152,7 +152,7 @@ void _exit(int status)
(void)irqsave();
lldbg("TCB=%p exitting\n", tcb);
slldbg("TCB=%p exitting\n", tcb);
#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
lldbg("Other tasks:\n");
......@@ -168,7 +168,7 @@ void _exit(int status)
*/
tcb = (FAR _TCB*)g_readytorun.head;
lldbg("New Active Task TCB=%p\n", tcb);
slldbg("New Active Task TCB=%p\n", tcb);
/* Then switch contexts */
......
arch/z16/src/common/up_releasepending.c
+ 3
− 3
View file @ b8b16ad1
......@@ -80,7 +80,7 @@ void up_release_pending(void)
{
FAR _TCB *rtcb = (FAR _TCB*)g_readytorun.head;
lldbg("From TCB=%p\n", rtcb);
slldbg("From TCB=%p\n", rtcb);
/* Merge the g_pendingtasks list into the g_readytorun task list */
......@@ -105,7 +105,7 @@ void up_release_pending(void)
*/
rtcb = (FAR _TCB*)g_readytorun.head;
lldbg("New Active Task TCB=%p\n", rtcb);
slldbg("New Active Task TCB=%p\n", rtcb);
/* Then setup so that the context will be performed on exit
* from the interrupt.
......@@ -127,7 +127,7 @@ void up_release_pending(void)
*/
rtcb = (FAR _TCB*)g_readytorun.head;
lldbg("New Active Task TCB=%p\n", rtcb);
slldbg("New Active Task TCB=%p\n", rtcb);
/* Then switch contexts */
......
arch/z16/src/common/up_reprioritizertr.c
+ 3
− 3
View file @ b8b16ad1
......@@ -101,7 +101,7 @@ void up_reprioritize_rtr(FAR _TCB *tcb, ubyte priority)
FAR _TCB *rtcb = (FAR _TCB*)g_readytorun.head;
boolean switch_needed;
lldbg("TCB=%p PRI=%d\n", tcb, priority);
slldbg("TCB=%p PRI=%d\n", tcb, priority);
/* Remove the tcb task from the ready-to-run list.
* sched_removereadytorun will return TRUE if we just
......@@ -153,7 +153,7 @@ void up_reprioritize_rtr(FAR _TCB *tcb, ubyte priority)
*/
rtcb = (FAR _TCB*)g_readytorun.head;
lldbg("New Active Task TCB=%p\n", rtcb);
slldbg("New Active Task TCB=%p\n", rtcb);
/* Then setup so that the context will be performed on exit
* from the interrupt.
......@@ -174,7 +174,7 @@ void up_reprioritize_rtr(FAR _TCB *tcb, ubyte priority)
*/
rtcb = (FAR _TCB*)g_readytorun.head;
lldbg("New Active Task TCB=%p\n", rtcb);
slldbg("New Active Task TCB=%p\n", rtcb);
/* Then switch contexts */
......
arch/z80/src/common/up_exit.c
+ 2
− 2
View file @ b8b16ad1
......@@ -152,7 +152,7 @@ void _exit(int status)
(void)irqsave();
lldbg("TCB=%p exitting\n", tcb);
slldbg("TCB=%p exitting\n", tcb);
#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
lldbg("Other tasks:\n");
......@@ -168,7 +168,7 @@ void _exit(int status)
*/
tcb = (FAR _TCB*)g_readytorun.head;
lldbg("New Active Task TCB=%p\n", tcb);
slldbg("New Active Task TCB=%p\n", tcb);
/* Then switch contexts */
......
arch/z80/src/common/up_releasepending.c
+ 3
− 3
View file @ b8b16ad1
......@@ -81,7 +81,7 @@ void up_release_pending(void)
{
FAR _TCB *rtcb = (FAR _TCB*)g_readytorun.head;
lldbg("From TCB=%p\n", rtcb);
slldbg("From TCB=%p\n", rtcb);
/* Merge the g_pendingtasks list into the g_readytorun task list */
......@@ -106,7 +106,7 @@ void up_release_pending(void)
*/
rtcb = (FAR _TCB*)g_readytorun.head;
lldbg("New Active Task TCB=%p\n", rtcb);
slldbg("New Active Task TCB=%p\n", rtcb);
/* Then setup so that the context will be performed on exit
* from the interrupt.
......@@ -128,7 +128,7 @@ void up_release_pending(void)
*/
rtcb = (FAR _TCB*)g_readytorun.head;
lldbg("New Active Task TCB=%p\n", rtcb);
slldbg("New Active Task TCB=%p\n", rtcb);
/* Then switch contexts */
......
arch/z80/src/common/up_reprioritizertr.c
+ 3
− 3
View file @ b8b16ad1
......@@ -102,7 +102,7 @@ void up_reprioritize_rtr(FAR _TCB *tcb, ubyte priority)
FAR _TCB *rtcb = (FAR _TCB*)g_readytorun.head;
boolean switch_needed;
lldbg("TCB=%p PRI=%d\n", tcb, priority);
slldbg("TCB=%p PRI=%d\n", tcb, priority);
/* Remove the tcb task from the ready-to-run list.
* sched_removereadytorun will return TRUE if we just
......@@ -154,7 +154,7 @@ void up_reprioritize_rtr(FAR _TCB *tcb, ubyte priority)
*/
rtcb = (FAR _TCB*)g_readytorun.head;
lldbg("New Active Task TCB=%p\n", rtcb);
slldbg("New Active Task TCB=%p\n", rtcb);
/* Then setup so that the context will be performed on exit
* from the interrupt.
......@@ -175,7 +175,7 @@ void up_reprioritize_rtr(FAR _TCB *tcb, ubyte priority)
*/
rtcb = (FAR _TCB*)g_readytorun.head;
lldbg("New Active Task TCB=%p\n", rtcb);
slldbg("New Active Task TCB=%p\n", rtcb);
/* Then switch contexts */
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment