gustavonihei commented on a change in pull request #5057:
URL: https://github.com/apache/incubator-nuttx/pull/5057#discussion_r773764438
##########
File path: arch/risc-v/src/rv64gc/riscv_assert.c
##########
@@ -132,63 +132,171 @@ static inline void riscv_registerdump(volatile uintptr_t
*regs)
}
/****************************************************************************
- * Name: up_taskdump
+ * Name: riscv_dump_stak
****************************************************************************/
-#if defined(CONFIG_STACK_COLORATION) || defined(CONFIG_SCHED_BACKTRACE)
-static void up_taskdump(struct tcb_s *tcb, void *arg)
+static void riscv_dump_stak(FAR struct tcb_s *tcb, FAR void *arg)
{
+#ifdef CONFIG_STACK_COLORATION
+ uint32_t stack_filled = 0;
+ uint32_t stack_used;
+#endif
+#ifdef CONFIG_SCHED_CPULOAD
+ struct cpuload_s cpuload;
+ uint32_t fracpart;
+ uint32_t intpart;
+ uint32_t tmp;
+
+ clock_cpuload(tcb->pid, &cpuload);
+
+ if (cpuload.total > 0)
+ {
+ tmp = (1000 * cpuload.active) / cpuload.total;
+ intpart = tmp / 10;
+ fracpart = tmp - 10 * intpart;
+ }
+ else
+ {
+ intpart = 0;
+ fracpart = 0;
+ }
+#endif
+
+#ifdef CONFIG_STACK_COLORATION
+ stack_used = up_check_tcbstack(tcb);
+ if (tcb->adj_stack_size > 0 && stack_used > 0)
+ {
+ /* Use fixed-point math with one decimal place */
+
+ stack_filled = 10 * 100 * stack_used / tcb->adj_stack_size;
+ }
+#endif
+
/* Dump interesting properties of this task */
- _alert(
-#if CONFIG_TASK_NAME_SIZE > 0
- "%s: "
+ _alert(" %4d %4d"
+#ifdef CONFIG_STACK_COLORATION
+ " %7lu"
#endif
- "PID=%d "
+ " %7lu"
#ifdef CONFIG_STACK_COLORATION
- "Stack Used=%lu of %lu\n",
-#else
- "Stack=%lu\n",
+ " %3" PRId32 ".%1" PRId32 "%%%c"
+#endif
+#ifdef CONFIG_SCHED_CPULOAD
+ " %3" PRId32 ".%01" PRId32 "%%"
#endif
#if CONFIG_TASK_NAME_SIZE > 0
- tcb->name,
+ " %s"
+#endif
+ "\n",
+ tcb->pid, tcb->sched_priority,
+#ifdef CONFIG_STACK_COLORATION
+ (unsigned long)up_check_tcbstack(tcb),
#endif
- tcb->pid,
+ (unsigned long)tcb->adj_stack_size
#ifdef CONFIG_STACK_COLORATION
- (unsigned long)up_check_tcbstack(tcb),
+ , stack_filled / 10, stack_filled % 10,
+ (stack_filled >= 10 * 80 ? '!' : ' ')
+#endif
+#ifdef CONFIG_SCHED_CPULOAD
+ , intpart, fracpart
+#endif
+#if CONFIG_TASK_NAME_SIZE > 0
+ , tcb->name
#endif
- (unsigned long)tcb->adj_stack_size);
+ );
+}
- /* Show back trace */
+/****************************************************************************
+ * Name: riscv_dump_backtrace
+ ****************************************************************************/
#ifdef CONFIG_SCHED_BACKTRACE
- sched_dumpstack(tcb->pid);
-#endif
-
- /* Dump the registers */
+static void riscv_dump_backtrace(FAR struct tcb_s *tcb, FAR void *arg)
+{
+ /* Show back trace */
- riscv_registerdump(tcb->xcp.regs);
+ sched_dumpstack(tcb->pid);
}
+#endif
/****************************************************************************
- * Name: up_showtasks
+ * Name: riscv_showtasks
****************************************************************************/
-static inline void up_showtasks(void)
+static inline void riscv_showtasks(void)
{
+#if CONFIG_ARCH_INTERRUPTSTACK > 7
Review comment:
```suggestion
#if CONFIG_ARCH_INTERRUPTSTACK > 15
```
RISC-V requires a 16-byte stack alignment.
##########
File path: arch/risc-v/src/rv64gc/riscv_assert.c
##########
@@ -132,63 +132,171 @@ static inline void riscv_registerdump(volatile uintptr_t
*regs)
}
/****************************************************************************
- * Name: up_taskdump
+ * Name: riscv_dump_stak
****************************************************************************/
-#if defined(CONFIG_STACK_COLORATION) || defined(CONFIG_SCHED_BACKTRACE)
-static void up_taskdump(struct tcb_s *tcb, void *arg)
+static void riscv_dump_stak(FAR struct tcb_s *tcb, FAR void *arg)
{
+#ifdef CONFIG_STACK_COLORATION
+ uint32_t stack_filled = 0;
+ uint32_t stack_used;
+#endif
+#ifdef CONFIG_SCHED_CPULOAD
+ struct cpuload_s cpuload;
+ uint32_t fracpart;
+ uint32_t intpart;
+ uint32_t tmp;
+
+ clock_cpuload(tcb->pid, &cpuload);
+
+ if (cpuload.total > 0)
+ {
+ tmp = (1000 * cpuload.active) / cpuload.total;
+ intpart = tmp / 10;
+ fracpart = tmp - 10 * intpart;
+ }
+ else
+ {
+ intpart = 0;
+ fracpart = 0;
+ }
+#endif
+
+#ifdef CONFIG_STACK_COLORATION
+ stack_used = up_check_tcbstack(tcb);
+ if (tcb->adj_stack_size > 0 && stack_used > 0)
+ {
+ /* Use fixed-point math with one decimal place */
+
+ stack_filled = 10 * 100 * stack_used / tcb->adj_stack_size;
+ }
+#endif
+
/* Dump interesting properties of this task */
- _alert(
-#if CONFIG_TASK_NAME_SIZE > 0
- "%s: "
+ _alert(" %4d %4d"
+#ifdef CONFIG_STACK_COLORATION
+ " %7lu"
#endif
- "PID=%d "
+ " %7lu"
#ifdef CONFIG_STACK_COLORATION
- "Stack Used=%lu of %lu\n",
-#else
- "Stack=%lu\n",
+ " %3" PRId32 ".%1" PRId32 "%%%c"
+#endif
+#ifdef CONFIG_SCHED_CPULOAD
+ " %3" PRId32 ".%01" PRId32 "%%"
#endif
#if CONFIG_TASK_NAME_SIZE > 0
- tcb->name,
+ " %s"
+#endif
+ "\n",
+ tcb->pid, tcb->sched_priority,
+#ifdef CONFIG_STACK_COLORATION
+ (unsigned long)up_check_tcbstack(tcb),
#endif
- tcb->pid,
+ (unsigned long)tcb->adj_stack_size
#ifdef CONFIG_STACK_COLORATION
- (unsigned long)up_check_tcbstack(tcb),
+ , stack_filled / 10, stack_filled % 10,
+ (stack_filled >= 10 * 80 ? '!' : ' ')
+#endif
+#ifdef CONFIG_SCHED_CPULOAD
+ , intpart, fracpart
+#endif
+#if CONFIG_TASK_NAME_SIZE > 0
+ , tcb->name
#endif
- (unsigned long)tcb->adj_stack_size);
+ );
+}
- /* Show back trace */
+/****************************************************************************
+ * Name: riscv_dump_backtrace
+ ****************************************************************************/
#ifdef CONFIG_SCHED_BACKTRACE
- sched_dumpstack(tcb->pid);
-#endif
-
- /* Dump the registers */
+static void riscv_dump_backtrace(FAR struct tcb_s *tcb, FAR void *arg)
+{
+ /* Show back trace */
- riscv_registerdump(tcb->xcp.regs);
+ sched_dumpstack(tcb->pid);
}
+#endif
/****************************************************************************
- * Name: up_showtasks
+ * Name: riscv_showtasks
****************************************************************************/
-static inline void up_showtasks(void)
+static inline void riscv_showtasks(void)
{
+#if CONFIG_ARCH_INTERRUPTSTACK > 7
+# ifdef CONFIG_STACK_COLORATION
+ uint32_t stack_used = up_check_intstack();
+ uint32_t stack_filled = 0;
+
+ if ((CONFIG_ARCH_INTERRUPTSTACK & ~7) > 0 && stack_used > 0)
Review comment:
```suggestion
if ((CONFIG_ARCH_INTERRUPTSTACK & ~15) > 0 && stack_used > 0)
```
##########
File path: arch/risc-v/src/rv64gc/riscv_assert.c
##########
@@ -132,63 +132,171 @@ static inline void riscv_registerdump(volatile uintptr_t
*regs)
}
/****************************************************************************
- * Name: up_taskdump
+ * Name: riscv_dump_stak
****************************************************************************/
-#if defined(CONFIG_STACK_COLORATION) || defined(CONFIG_SCHED_BACKTRACE)
-static void up_taskdump(struct tcb_s *tcb, void *arg)
+static void riscv_dump_stak(FAR struct tcb_s *tcb, FAR void *arg)
{
+#ifdef CONFIG_STACK_COLORATION
+ uint32_t stack_filled = 0;
+ uint32_t stack_used;
+#endif
+#ifdef CONFIG_SCHED_CPULOAD
+ struct cpuload_s cpuload;
+ uint32_t fracpart;
+ uint32_t intpart;
+ uint32_t tmp;
+
+ clock_cpuload(tcb->pid, &cpuload);
+
+ if (cpuload.total > 0)
+ {
+ tmp = (1000 * cpuload.active) / cpuload.total;
+ intpart = tmp / 10;
+ fracpart = tmp - 10 * intpart;
+ }
+ else
+ {
+ intpart = 0;
+ fracpart = 0;
+ }
+#endif
+
+#ifdef CONFIG_STACK_COLORATION
+ stack_used = up_check_tcbstack(tcb);
+ if (tcb->adj_stack_size > 0 && stack_used > 0)
+ {
+ /* Use fixed-point math with one decimal place */
+
+ stack_filled = 10 * 100 * stack_used / tcb->adj_stack_size;
+ }
+#endif
+
/* Dump interesting properties of this task */
- _alert(
-#if CONFIG_TASK_NAME_SIZE > 0
- "%s: "
+ _alert(" %4d %4d"
+#ifdef CONFIG_STACK_COLORATION
+ " %7lu"
#endif
- "PID=%d "
+ " %7lu"
#ifdef CONFIG_STACK_COLORATION
- "Stack Used=%lu of %lu\n",
-#else
- "Stack=%lu\n",
+ " %3" PRId32 ".%1" PRId32 "%%%c"
+#endif
+#ifdef CONFIG_SCHED_CPULOAD
+ " %3" PRId32 ".%01" PRId32 "%%"
#endif
#if CONFIG_TASK_NAME_SIZE > 0
- tcb->name,
+ " %s"
+#endif
+ "\n",
+ tcb->pid, tcb->sched_priority,
+#ifdef CONFIG_STACK_COLORATION
+ (unsigned long)up_check_tcbstack(tcb),
#endif
- tcb->pid,
+ (unsigned long)tcb->adj_stack_size
#ifdef CONFIG_STACK_COLORATION
- (unsigned long)up_check_tcbstack(tcb),
+ , stack_filled / 10, stack_filled % 10,
+ (stack_filled >= 10 * 80 ? '!' : ' ')
+#endif
+#ifdef CONFIG_SCHED_CPULOAD
+ , intpart, fracpart
+#endif
+#if CONFIG_TASK_NAME_SIZE > 0
+ , tcb->name
#endif
- (unsigned long)tcb->adj_stack_size);
+ );
+}
- /* Show back trace */
+/****************************************************************************
+ * Name: riscv_dump_backtrace
+ ****************************************************************************/
#ifdef CONFIG_SCHED_BACKTRACE
- sched_dumpstack(tcb->pid);
-#endif
-
- /* Dump the registers */
+static void riscv_dump_backtrace(FAR struct tcb_s *tcb, FAR void *arg)
+{
+ /* Show back trace */
- riscv_registerdump(tcb->xcp.regs);
+ sched_dumpstack(tcb->pid);
}
+#endif
/****************************************************************************
- * Name: up_showtasks
+ * Name: riscv_showtasks
****************************************************************************/
-static inline void up_showtasks(void)
+static inline void riscv_showtasks(void)
{
+#if CONFIG_ARCH_INTERRUPTSTACK > 7
+# ifdef CONFIG_STACK_COLORATION
+ uint32_t stack_used = up_check_intstack();
+ uint32_t stack_filled = 0;
+
+ if ((CONFIG_ARCH_INTERRUPTSTACK & ~7) > 0 && stack_used > 0)
+ {
+ /* Use fixed-point math with one decimal place */
+
+ stack_filled = 10 * 100 *
+ stack_used / (CONFIG_ARCH_INTERRUPTSTACK & ~7);
+ }
+# endif
+#endif
+
/* Dump interesting properties of each task in the crash environment */
- nxsched_foreach(up_taskdump, NULL);
-}
-#else
-# define up_showtasks()
+ _alert(" PID PRI"
+#ifdef CONFIG_STACK_COLORATION
+ " USED"
+#endif
+ " STACK"
+#ifdef CONFIG_STACK_COLORATION
+ " FILLED "
+#endif
+#ifdef CONFIG_SCHED_CPULOAD
+ " CPU"
+#endif
+#if CONFIG_TASK_NAME_SIZE > 0
+ " COMMAND"
+#endif
+ "\n");
+
+#if CONFIG_ARCH_INTERRUPTSTACK > 7
Review comment:
```suggestion
#if CONFIG_ARCH_INTERRUPTSTACK > 15
```
##########
File path: arch/risc-v/src/rv64gc/riscv_assert.c
##########
@@ -132,63 +132,171 @@ static inline void riscv_registerdump(volatile uintptr_t
*regs)
}
/****************************************************************************
- * Name: up_taskdump
+ * Name: riscv_dump_stak
****************************************************************************/
-#if defined(CONFIG_STACK_COLORATION) || defined(CONFIG_SCHED_BACKTRACE)
-static void up_taskdump(struct tcb_s *tcb, void *arg)
+static void riscv_dump_stak(FAR struct tcb_s *tcb, FAR void *arg)
{
+#ifdef CONFIG_STACK_COLORATION
+ uint32_t stack_filled = 0;
+ uint32_t stack_used;
+#endif
+#ifdef CONFIG_SCHED_CPULOAD
+ struct cpuload_s cpuload;
+ uint32_t fracpart;
+ uint32_t intpart;
+ uint32_t tmp;
+
+ clock_cpuload(tcb->pid, &cpuload);
+
+ if (cpuload.total > 0)
+ {
+ tmp = (1000 * cpuload.active) / cpuload.total;
+ intpart = tmp / 10;
+ fracpart = tmp - 10 * intpart;
+ }
+ else
+ {
+ intpart = 0;
+ fracpart = 0;
+ }
+#endif
+
+#ifdef CONFIG_STACK_COLORATION
+ stack_used = up_check_tcbstack(tcb);
+ if (tcb->adj_stack_size > 0 && stack_used > 0)
+ {
+ /* Use fixed-point math with one decimal place */
+
+ stack_filled = 10 * 100 * stack_used / tcb->adj_stack_size;
+ }
+#endif
+
/* Dump interesting properties of this task */
- _alert(
-#if CONFIG_TASK_NAME_SIZE > 0
- "%s: "
+ _alert(" %4d %4d"
+#ifdef CONFIG_STACK_COLORATION
+ " %7lu"
#endif
- "PID=%d "
+ " %7lu"
#ifdef CONFIG_STACK_COLORATION
- "Stack Used=%lu of %lu\n",
-#else
- "Stack=%lu\n",
+ " %3" PRId32 ".%1" PRId32 "%%%c"
+#endif
+#ifdef CONFIG_SCHED_CPULOAD
+ " %3" PRId32 ".%01" PRId32 "%%"
#endif
#if CONFIG_TASK_NAME_SIZE > 0
- tcb->name,
+ " %s"
+#endif
+ "\n",
+ tcb->pid, tcb->sched_priority,
+#ifdef CONFIG_STACK_COLORATION
+ (unsigned long)up_check_tcbstack(tcb),
#endif
- tcb->pid,
+ (unsigned long)tcb->adj_stack_size
#ifdef CONFIG_STACK_COLORATION
- (unsigned long)up_check_tcbstack(tcb),
+ , stack_filled / 10, stack_filled % 10,
+ (stack_filled >= 10 * 80 ? '!' : ' ')
+#endif
+#ifdef CONFIG_SCHED_CPULOAD
+ , intpart, fracpart
+#endif
+#if CONFIG_TASK_NAME_SIZE > 0
+ , tcb->name
#endif
- (unsigned long)tcb->adj_stack_size);
+ );
+}
- /* Show back trace */
+/****************************************************************************
+ * Name: riscv_dump_backtrace
+ ****************************************************************************/
#ifdef CONFIG_SCHED_BACKTRACE
- sched_dumpstack(tcb->pid);
-#endif
-
- /* Dump the registers */
+static void riscv_dump_backtrace(FAR struct tcb_s *tcb, FAR void *arg)
+{
+ /* Show back trace */
- riscv_registerdump(tcb->xcp.regs);
+ sched_dumpstack(tcb->pid);
}
+#endif
/****************************************************************************
- * Name: up_showtasks
+ * Name: riscv_showtasks
****************************************************************************/
-static inline void up_showtasks(void)
+static inline void riscv_showtasks(void)
{
+#if CONFIG_ARCH_INTERRUPTSTACK > 7
+# ifdef CONFIG_STACK_COLORATION
+ uint32_t stack_used = up_check_intstack();
+ uint32_t stack_filled = 0;
+
+ if ((CONFIG_ARCH_INTERRUPTSTACK & ~7) > 0 && stack_used > 0)
+ {
+ /* Use fixed-point math with one decimal place */
+
+ stack_filled = 10 * 100 *
+ stack_used / (CONFIG_ARCH_INTERRUPTSTACK & ~7);
+ }
+# endif
+#endif
+
/* Dump interesting properties of each task in the crash environment */
- nxsched_foreach(up_taskdump, NULL);
-}
-#else
-# define up_showtasks()
+ _alert(" PID PRI"
+#ifdef CONFIG_STACK_COLORATION
+ " USED"
+#endif
+ " STACK"
+#ifdef CONFIG_STACK_COLORATION
+ " FILLED "
+#endif
+#ifdef CONFIG_SCHED_CPULOAD
+ " CPU"
+#endif
+#if CONFIG_TASK_NAME_SIZE > 0
+ " COMMAND"
+#endif
+ "\n");
+
+#if CONFIG_ARCH_INTERRUPTSTACK > 7
+ _alert(" ---- ----"
+# ifdef CONFIG_STACK_COLORATION
+ " %7lu"
+# endif
+ " %7lu"
+# ifdef CONFIG_STACK_COLORATION
+ " %3" PRId32 ".%1" PRId32 "%%%c"
+# endif
+# ifdef CONFIG_SCHED_CPULOAD
+ " ----"
+# endif
+# if CONFIG_TASK_NAME_SIZE > 0
+ " irq"
+# endif
+ "\n"
+# ifdef CONFIG_STACK_COLORATION
+ , (unsigned long)stack_used
+# endif
+ , (unsigned long)(CONFIG_ARCH_INTERRUPTSTACK & ~7)
Review comment:
```suggestion
, (unsigned long)(CONFIG_ARCH_INTERRUPTSTACK & ~15)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
