sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dump_task: also dump thread param when dump thread name

Browse Source 
Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd 2022-05-12 12:36:24 +08:00 committed by Petro Karashchenko
parent 9d4c708913
commit 118fd3902c
3 changed files with 81 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arch/arm/src/common/arm_assert.c
View File

@ -24,6 +24,7 @@
#include <nuttx/config.h>
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include <assert.h>
@ -137,6 +138,7 @@ static void arm_registerdump(volatile uint32_t *regs)
static void arm_dump_task(struct tcb_s *tcb, void *arg)
{
char args[64] = "";
#ifdef CONFIG_STACK_COLORATION
uint32_t stack_filled = 0;
uint32_t stack_used;
@ -172,6 +174,26 @@ static void arm_dump_task(struct tcb_s *tcb, void *arg)
}
#endif
#ifndef CONFIG_DISABLE_PTHREAD
if ((tcb->flags & TCB_FLAG_TTYPE_MASK) == TCB_FLAG_TTYPE_PTHREAD)
{
FAR struct pthread_tcb_s *ptcb = (FAR struct pthread_tcb_s *)tcb;
snprintf(args, sizeof(args), "%p ", ptcb->arg);
}
else
#endif
{
FAR char **argv;
size_t npos = 0;
for (argv = tcb->group->tg_info->argv + 1; *argv; argv++)
{
npos += strlcpy(args + npos, *argv, sizeof(args) - npos);
npos += strlcpy(args + npos, " ", sizeof(args) - npos);
}
}
/* Dump interesting properties of this task */
_alert(" %4d %4d"
@ -189,9 +211,10 @@ static void arm_dump_task(struct tcb_s *tcb, void *arg)
" %3" PRId32 ".%01" PRId32 "%%"
#endif
#if CONFIG_TASK_NAME_SIZE > 0
" %s"
" %s %s\n",
#else
" %s\n",
#endif
"\n",
tcb->pid, tcb->sched_priority,
#ifdef CONFIG_SMP
tcb->cpu,
@ -210,6 +233,7 @@ static void arm_dump_task(struct tcb_s *tcb, void *arg)
#if CONFIG_TASK_NAME_SIZE > 0
, tcb->name
#endif
, args
);
}
@ -263,10 +287,7 @@ static void arm_showtasks(void)
#ifdef CONFIG_SCHED_CPULOAD
" CPU"
#endif
#if CONFIG_TASK_NAME_SIZE > 0
" COMMAND"
#endif
"\n");
" COMMAND\n");
#if CONFIG_ARCH_INTERRUPTSTACK > 7
_alert(" ---- ----"

33
arch/risc-v/src/common/riscv_assert.c
View File

@ -24,6 +24,7 @@
#include <nuttx/config.h>
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include <assert.h>
@ -137,6 +138,7 @@ static inline void riscv_registerdump(volatile uintptr_t *regs)
static void riscv_dump_task(struct tcb_s *tcb, void *arg)
{
char args[64] = "";
#ifdef CONFIG_STACK_COLORATION
uint32_t stack_filled = 0;
uint32_t stack_used;
@ -172,6 +174,26 @@ static void riscv_dump_task(struct tcb_s *tcb, void *arg)
}
#endif
#ifndef CONFIG_DISABLE_PTHREAD
if ((tcb->flags & TCB_FLAG_TTYPE_MASK) == TCB_FLAG_TTYPE_PTHREAD)
{
FAR struct pthread_tcb_s *ptcb = (FAR struct pthread_tcb_s *)tcb;
snprintf(args, sizeof(args), "%p ", ptcb->arg);
}
else
#endif
{
FAR char **argv;
size_t npos = 0;
for (argv = tcb->group->tg_info->argv + 1; *argv; argv++)
{
npos += strlcpy(args + npos, *argv, sizeof(args) - npos);
npos += strlcpy(args + npos, " ", sizeof(args) - npos);
}
}
/* Dump interesting properties of this task */
_alert(" %4d %4d"
@ -189,9 +211,10 @@ static void riscv_dump_task(struct tcb_s *tcb, void *arg)
" %3" PRId32 ".%01" PRId32 "%%"
#endif
#if CONFIG_TASK_NAME_SIZE > 0
" %s"
" %s %s\n",
#else
" %s\n",
#endif
"\n",
tcb->pid, tcb->sched_priority,
#ifdef CONFIG_SMP
tcb->cpu,
@ -210,6 +233,7 @@ static void riscv_dump_task(struct tcb_s *tcb, void *arg)
#if CONFIG_TASK_NAME_SIZE > 0
, tcb->name
#endif
, args
);
}
@ -263,10 +287,7 @@ static inline void riscv_showtasks(void)
#ifdef CONFIG_SCHED_CPULOAD
" CPU"
#endif
#if CONFIG_TASK_NAME_SIZE > 0
" COMMAND"
#endif
"\n");
" COMMAND\n");
#if CONFIG_ARCH_INTERRUPTSTACK > 15
_alert(" ---- ----"

33
arch/xtensa/src/common/xtensa_dumpstate.c
View File

@ -24,6 +24,7 @@
#include <nuttx/config.h>
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include <assert.h>
@ -52,6 +53,7 @@
static void xtensa_dump_task(struct tcb_s *tcb, void *arg)
{
char args[64] = "";
#ifdef CONFIG_STACK_COLORATION
uint32_t stack_filled = 0;
uint32_t stack_used;
@ -87,6 +89,26 @@ static void xtensa_dump_task(struct tcb_s *tcb, void *arg)
}
#endif
#ifndef CONFIG_DISABLE_PTHREAD
if ((tcb->flags & TCB_FLAG_TTYPE_MASK) == TCB_FLAG_TTYPE_PTHREAD)
{
FAR struct pthread_tcb_s *ptcb = (FAR struct pthread_tcb_s *)tcb;
snprintf(args, sizeof(args), "%p ", ptcb->arg);
}
else
#endif
{
FAR char **argv;
size_t npos = 0;
for (argv = tcb->group->tg_info->argv + 1; *argv; argv++)
{
npos += strlcpy(args + npos, *argv, sizeof(args) - npos);
npos += strlcpy(args + npos, " ", sizeof(args) - npos);
}
}
/* Dump interesting properties of this task */
_alert(" %4d %4d"
@ -104,9 +126,10 @@ static void xtensa_dump_task(struct tcb_s *tcb, void *arg)
" %3" PRId32 ".%01" PRId32 "%%"
#endif
#if CONFIG_TASK_NAME_SIZE > 0
" %s"
" %s %s\n",
#else
" %s\n",
#endif
"\n",
tcb->pid, tcb->sched_priority,
#ifdef CONFIG_SMP
tcb->cpu,
@ -125,6 +148,7 @@ static void xtensa_dump_task(struct tcb_s *tcb, void *arg)
#if CONFIG_TASK_NAME_SIZE > 0
, tcb->name
#endif
, args
);
}
@ -178,10 +202,7 @@ static inline void xtensa_showtasks(void)
#ifdef CONFIG_SCHED_CPULOAD
" CPU"
#endif
#if CONFIG_TASK_NAME_SIZE > 0
" COMMAND"
#endif
"\n");
" COMMAND\n");
#if CONFIG_ARCH_INTERRUPTSTACK > 15
_alert(" ---- ----"