You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2023/08/11 05:52:20 UTC
[nuttx-apps] 02/02: trace: move trace_dump to noteram
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
commit bdc522bad7b306bdf36a4ab0101794c8da596ad8
Author: yinshengkai <yi...@xiaomi.com>
AuthorDate: Fri Aug 11 10:38:50 2023 +0800
trace: move trace_dump to noteram
Signed-off-by: yinshengkai <yi...@xiaomi.com>
---
system/trace/trace_dump.c | 630 +---------------------------------------------
1 file changed, 5 insertions(+), 625 deletions(-)
diff --git a/system/trace/trace_dump.c b/system/trace/trace_dump.c
index e5a98dbd2..b819b8cd3 100644
--- a/system/trace/trace_dump.c
+++ b/system/trace/trace_dump.c
@@ -23,103 +23,17 @@
****************************************************************************/
#include <nuttx/config.h>
+#include <nuttx/note/noteram_driver.h>
-#include <assert.h>
+#include <fcntl.h>
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
-#include <inttypes.h>
-#include <unistd.h>
-#include <fcntl.h>
#include <sys/ioctl.h>
-#include <nuttx/sched_note.h>
-#include <nuttx/note/noteram_driver.h>
+#include <unistd.h>
#include "trace.h"
-#ifdef CONFIG_SCHED_INSTRUMENTATION_SYSCALL
-# ifdef CONFIG_LIB_SYSCALL
-# include <syscall.h>
-# else
-# define CONFIG_LIB_SYSCALL
-# include <syscall.h>
-# undef CONFIG_LIB_SYSCALL
-# endif
-#endif
-
-#define NCPUS CONFIG_SMP_NCPUS
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* Renumber idle task PIDs
- * In NuttX, PID number less than NCPUS are idle tasks.
- * In Linux, there is only one idle task of PID 0.
- */
-
-#define get_pid(pid) ((pid) < NCPUS ? 0 : (pid))
-
-#define get_task_state(s) ((s) == 0 ? 'X' : \
- ((s) <= LAST_READY_TO_RUN_STATE ? 'R' : 'S'))
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/* The structure to hold the context data of trace dump */
-
-struct trace_dump_cpu_context_s
-{
- int intr_nest; /* Interrupt nest level */
- bool pendingswitch; /* sched_switch pending flag */
- int current_state; /* Task state of the current line */
- pid_t current_pid; /* Task PID of the current line */
- pid_t next_pid; /* Task PID of the next line */
- uint8_t current_priority; /* Task Priority of the current line */
- uint8_t next_priority; /* Task Priority of the next line */
-};
-
-struct trace_dump_task_context_s
-{
- FAR struct trace_dump_task_context_s *next;
- pid_t pid; /* Task PID */
- int syscall_nest; /* Syscall nest level */
- char name[CONFIG_TASK_NAME_SIZE + 1]; /* Task name (with NULL terminator) */
-};
-
-struct trace_dump_context_s
-{
- struct trace_dump_cpu_context_s cpu[NCPUS];
- FAR struct trace_dump_task_context_s *task;
- int notefd;
-};
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: trace_dump_unflatten
- ****************************************************************************/
-
-static void trace_dump_unflatten(FAR void *dst,
- FAR uint8_t *src, size_t len)
-{
-#ifdef CONFIG_ENDIAN_BIG
- FAR uint8_t *end = (FAR uint8_t *)dst + len - 1;
- while (len-- > 0)
- {
- *end-- = *src++;
- }
-#else
- memcpy(dst, src, len);
-#endif
-}
-
/****************************************************************************
* Name: note_ioctl
****************************************************************************/
@@ -139,526 +53,6 @@ static void note_ioctl(int cmd, unsigned long arg)
close(notefd);
}
-/****************************************************************************
- * Name: trace_dump_init_context
- ****************************************************************************/
-
-static void trace_dump_init_context(FAR struct trace_dump_context_s *ctx,
- int fd)
-{
- int cpu;
-
- /* Initialize the trace dump context */
-
- ctx->notefd = fd;
-
- for (cpu = 0; cpu < NCPUS; cpu++)
- {
- ctx->cpu[cpu].intr_nest = 0;
- ctx->cpu[cpu].pendingswitch = false;
- ctx->cpu[cpu].current_state = TSTATE_TASK_RUNNING;
- ctx->cpu[cpu].current_pid = -1;
- ctx->cpu[cpu].next_pid = -1;
- ctx->cpu[cpu].current_priority = -1;
- ctx->cpu[cpu].next_priority = -1;
- }
-
- ctx->task = NULL;
-}
-
-/****************************************************************************
- * Name: trace_dump_fini_context
- ****************************************************************************/
-
-static void trace_dump_fini_context(FAR struct trace_dump_context_s *ctx)
-{
- FAR struct trace_dump_task_context_s *tctx;
- FAR struct trace_dump_task_context_s *ntctx;
-
- /* Finalize the trace dump context */
-
- tctx = ctx->task;
- ctx->task = NULL;
- while (tctx != NULL)
- {
- ntctx = tctx->next;
- free(tctx);
- tctx = ntctx;
- }
-}
-
-/****************************************************************************
- * Name: copy_task_name
- ****************************************************************************/
-
-#if CONFIG_TASK_NAME_SIZE > 0
-static void copy_task_name(FAR char *dst, FAR const char *src)
-{
- char c;
- int i;
-
- /* Replace space to underline
- * Text trace data format cannot use a space as a task name.
- */
-
- for (i = 0; i < CONFIG_TASK_NAME_SIZE; i++)
- {
- c = *src++;
- if (c == '\0')
- {
- break;
- }
-
- *dst++ = (c == ' ') ? '_' : c;
- }
-
- *dst = '\0';
-}
-#endif
-
-/****************************************************************************
- * Name: get_task_context
- ****************************************************************************/
-
-FAR static struct trace_dump_task_context_s *get_task_context(pid_t pid,
- FAR struct trace_dump_context_s *ctx)
-{
- FAR struct trace_dump_task_context_s **tctxp;
- tctxp = &ctx->task;
- while (*tctxp != NULL)
- {
- if ((*tctxp)->pid == pid)
- {
- return *tctxp;
- }
-
- tctxp = &((*tctxp)->next);
- }
-
- /* Create new trace dump task context */
-
- *tctxp = (FAR struct trace_dump_task_context_s *)
- malloc(sizeof(struct trace_dump_task_context_s));
- if (*tctxp != NULL)
- {
- (*tctxp)->next = NULL;
- (*tctxp)->pid = pid;
- (*tctxp)->syscall_nest = 0;
- (*tctxp)->name[0] = '\0';
-
-#ifdef NOTERAM_GETTASKNAME
- {
- struct noteram_get_taskname_s tnm;
- int res;
-
- tnm.pid = pid;
- res = ioctl(ctx->notefd, NOTERAM_GETTASKNAME, (unsigned long)&tnm);
- if (res == 0)
- {
- copy_task_name((*tctxp)->name, tnm.taskname);
- }
- }
-#endif
- }
-
- return *tctxp;
-}
-
-/****************************************************************************
- * Name: get_task_name
- ****************************************************************************/
-
-static const char *get_task_name(pid_t pid,
- FAR struct trace_dump_context_s *ctx)
-{
- FAR struct trace_dump_task_context_s *tctx;
-
- tctx = get_task_context(pid, ctx);
- if (tctx != NULL && tctx->name[0] != '\0')
- {
- return tctx->name;
- }
-
- return "<noname>";
-}
-
-/****************************************************************************
- * Name: trace_dump_header
- ****************************************************************************/
-
-static void trace_dump_header(FAR FILE *out,
- FAR struct note_common_s *note,
- FAR struct trace_dump_context_s *ctx)
-{
- pid_t pid;
- uint32_t nsec;
- uint32_t sec;
-
- trace_dump_unflatten(&nsec, note->nc_systime_nsec, sizeof(nsec));
- trace_dump_unflatten(&sec, note->nc_systime_sec, sizeof(sec));
-#ifdef CONFIG_SMP
- int cpu = note->nc_cpu;
-#else
- int cpu = 0;
-#endif
-
- trace_dump_unflatten(&pid, note->nc_pid, sizeof(pid));
-
- fprintf(out, "%8s-%-3u [%d] %3" PRIu32 ".%09" PRIu32 ": ",
- get_task_name(pid, ctx), get_pid(pid), cpu,
- sec, nsec
- );
-}
-
-#if (defined CONFIG_SCHED_INSTRUMENTATION_SWITCH) || \
- (defined CONFIG_SCHED_INSTRUMENTATION_IRQHANDLER)
-/****************************************************************************
- * Name: trace_dump_sched_switch
- ****************************************************************************/
-
-static void trace_dump_sched_switch(FAR FILE *out,
- FAR struct note_common_s *note,
- FAR struct trace_dump_context_s *ctx)
-{
- FAR struct trace_dump_cpu_context_s *cctx;
- uint8_t current_priority;
- uint8_t next_priority;
- pid_t current_pid;
- pid_t next_pid;
-#ifdef CONFIG_SMP
- int cpu = note->nc_cpu;
-#else
- int cpu = 0;
-#endif
-
- cctx = &ctx->cpu[cpu];
- current_pid = cctx->current_pid;
- next_pid = cctx->next_pid;
-
- current_priority = cctx->current_priority;
- next_priority = cctx->next_priority;
-
- fprintf(out, "sched_switch: "
- "prev_comm=%s prev_pid=%u prev_prio=%u prev_state=%c ==> "
- "next_comm=%s next_pid=%u next_prio=%u\n",
- get_task_name(current_pid, ctx), get_pid(current_pid),
- current_priority, get_task_state(cctx->current_state),
- get_task_name(next_pid, ctx), get_pid(next_pid),
- next_priority);
-
- cctx->current_pid = cctx->next_pid;
- cctx->current_priority = cctx->next_priority;
- cctx->pendingswitch = false;
-}
-#endif
-
-/****************************************************************************
- * Name: trace_dump_one
- ****************************************************************************/
-
-static int trace_dump_one(FAR FILE *out, FAR uint8_t *p,
- FAR struct trace_dump_context_s *ctx)
-{
- FAR struct note_common_s *note = (FAR struct note_common_s *)p;
- FAR struct trace_dump_cpu_context_s *cctx;
- pid_t pid;
-#ifdef CONFIG_SMP
- int cpu = note->nc_cpu;
-#else
- int cpu = 0;
-#endif
-
- cctx = &ctx->cpu[cpu];
- trace_dump_unflatten(&pid, note->nc_pid, sizeof(pid));
-
- if (cctx->current_pid < 0)
- {
- cctx->current_pid = pid;
- }
-
- /* Output one note */
-
- switch (note->nc_type)
- {
- case NOTE_START:
- {
-#if CONFIG_TASK_NAME_SIZE > 0
- FAR struct note_start_s *nst = (FAR struct note_start_s *)p;
- FAR struct trace_dump_task_context_s *tctx;
-
- tctx = get_task_context(pid, ctx);
- if (tctx != NULL)
- {
- copy_task_name(tctx->name, nst->nst_name);
- }
-#endif
-
- trace_dump_header(out, note, ctx);
- fprintf(out, "sched_wakeup_new: comm=%s pid=%d target_cpu=%d\n",
- get_task_name(pid, ctx), get_pid(pid), cpu);
- }
- break;
-
- case NOTE_STOP:
- {
- /* This note informs the task to be stopped.
- * Change current task state for the succeeding NOTE_RESUME.
- */
-
- cctx->current_state = 0;
- }
- break;
-
-#ifdef CONFIG_SCHED_INSTRUMENTATION_SWITCH
- case NOTE_SUSPEND:
- {
- FAR struct note_suspend_s *nsu = (FAR struct note_suspend_s *)p;
-
- /* This note informs the task to be suspended.
- * Preserve the information for the succeeding NOTE_RESUME.
- */
-
- cctx->current_state = nsu->nsu_state;
- }
- break;
-
- case NOTE_RESUME:
- {
- /* This note informs the task to be resumed.
- * The task switch timing depends on the running context.
- */
-
- cctx->next_pid = pid;
- cctx->next_priority = note->nc_priority;
-
- if (cctx->intr_nest == 0)
- {
- /* If not in the interrupt context, the task switch is
- * executed immediately.
- */
-
- trace_dump_header(out, note, ctx);
- trace_dump_sched_switch(out, note, ctx);
- }
- else
- {
- /* If in the interrupt context, the task switch is postponed
- * until leaving the interrupt handler.
- */
-
- trace_dump_header(out, note, ctx);
- fprintf(out, "sched_waking: comm=%s pid=%d target_cpu=%d\n",
- get_task_name(cctx->next_pid, ctx),
- get_pid(cctx->next_pid), cpu);
- cctx->pendingswitch = true;
- }
- }
- break;
-#endif
-
-#ifdef CONFIG_SCHED_INSTRUMENTATION_SYSCALL
- case NOTE_SYSCALL_ENTER:
- {
- FAR struct note_syscall_enter_s *nsc;
- FAR struct trace_dump_task_context_s *tctx;
- int i;
- int j;
- uintptr_t arg;
-
- /* Exclude the case of syscall issued by an interrupt handler and
- * nested syscalls to correct tracecompass display.
- */
-
- if (cctx->intr_nest > 0)
- {
- break;
- }
-
- tctx = get_task_context(pid, ctx);
- if (tctx == NULL)
- {
- break;
- }
-
- tctx->syscall_nest++;
- if (tctx->syscall_nest > 1)
- {
- break;
- }
-
- nsc = (FAR struct note_syscall_enter_s *)p;
- if (nsc->nsc_nr < CONFIG_SYS_RESERVED ||
- nsc->nsc_nr >= SYS_maxsyscall)
- {
- break;
- }
-
- trace_dump_header(out, note, ctx);
- fprintf(out, "sys_%s(",
- g_funcnames[nsc->nsc_nr - CONFIG_SYS_RESERVED]);
-
- for (i = j = 0; i < nsc->nsc_argc; i++)
- {
- trace_dump_unflatten(&arg, nsc->nsc_args, sizeof(arg));
- if (i == 0)
- {
- fprintf(out, "arg%d: 0x%" PRIxPTR, i, arg);
- }
- else
- {
- fprintf(out, ", arg%d: 0x%" PRIxPTR, i, arg);
- }
- }
-
- fprintf(out, ")\n");
- }
- break;
-
- case NOTE_SYSCALL_LEAVE:
- {
- FAR struct note_syscall_leave_s *nsc;
- FAR struct trace_dump_task_context_s *tctx;
- uintptr_t result;
-
- /* Exclude the case of syscall issued by an interrupt handler and
- * nested syscalls to correct tracecompass display.
- */
-
- if (cctx->intr_nest > 0)
- {
- break;
- }
-
- tctx = get_task_context(pid, ctx);
- if (tctx == NULL)
- {
- break;
- }
-
- tctx->syscall_nest--;
- if (tctx->syscall_nest > 0)
- {
- break;
- }
-
- tctx->syscall_nest = 0;
-
- nsc = (FAR struct note_syscall_leave_s *)p;
- if (nsc->nsc_nr < CONFIG_SYS_RESERVED ||
- nsc->nsc_nr >= SYS_maxsyscall)
- {
- break;
- }
-
- trace_dump_header(out, note, ctx);
- trace_dump_unflatten(&result, nsc->nsc_result, sizeof(result));
- fprintf(out, "sys_%s -> 0x%" PRIxPTR "\n",
- g_funcnames[nsc->nsc_nr - CONFIG_SYS_RESERVED],
- result);
- }
- break;
-#endif
-
-#ifdef CONFIG_SCHED_INSTRUMENTATION_IRQHANDLER
- case NOTE_IRQ_ENTER:
- {
- FAR struct note_irqhandler_s *nih;
-
- nih = (FAR struct note_irqhandler_s *)p;
- trace_dump_header(out, note, ctx);
- fprintf(out, "irq_handler_entry: irq=%u name=%d\n",
- nih->nih_irq, nih->nih_irq);
- cctx->intr_nest++;
- }
- break;
-
- case NOTE_IRQ_LEAVE:
- {
- FAR struct note_irqhandler_s *nih;
-
- nih = (FAR struct note_irqhandler_s *)p;
- trace_dump_header(out, note, ctx);
- fprintf(out, "irq_handler_exit: irq=%u ret=handled\n",
- nih->nih_irq);
- cctx->intr_nest--;
-
- if (cctx->intr_nest <= 0)
- {
- cctx->intr_nest = 0;
- if (cctx->pendingswitch)
- {
- /* If the pending task switch exists, it is executed here */
-
- trace_dump_header(out, note, ctx);
- trace_dump_sched_switch(out, note, ctx);
- }
- }
- }
- break;
-#endif
-
-#ifdef CONFIG_SCHED_INSTRUMENTATION_DUMP
- case NOTE_DUMP_STRING:
- {
- FAR struct note_string_s *nst;
- uintptr_t ip;
-
- nst = (FAR struct note_string_s *)p;
- trace_dump_header(out, note, ctx);
- trace_dump_unflatten(&ip, nst->nst_ip, sizeof(ip));
-
- if (nst->nst_data[1] == '\0' &&
- (nst->nst_data[0] == 'B' ||
- nst->nst_data[0] == 'E'))
- {
- fprintf(out, "tracing_mark_write: %c|%d|%pS\n",
- nst->nst_data[0], pid, (FAR void *)ip);
- }
- else
- {
- fprintf(out, "tracing_mark_write: %s\n",
- nst->nst_data);
- }
- }
- break;
-
- case NOTE_DUMP_BINARY:
- {
- FAR struct note_binary_s *nbi;
- uint8_t count;
- uintptr_t ip;
- int i;
-
- nbi = (FAR struct note_binary_s *)p;
- trace_dump_header(out, note, ctx);
- count = note->nc_length - sizeof(struct note_binary_s) + 1;
-
- trace_dump_unflatten(&ip, nbi->nbi_ip, sizeof(ip));
-
- fprintf(out, "tracing_mark_write: 0x%" PRIdPTR
- ": event=%u count=%u",
- ip, nbi->nbi_event, count);
- for (i = 0; i < count; i++)
- {
- fprintf(out, " 0x%x", nbi->nbi_data[i]);
- }
-
- fprintf(out, "\n");
- }
- break;
-#endif
-
- default:
- break;
- }
-
- fflush(out);
-
- /* Return the length of the processed note */
-
- return note->nc_length;
-}
-
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -673,10 +67,7 @@ static int trace_dump_one(FAR FILE *out, FAR uint8_t *p,
int trace_dump(FAR FILE *out)
{
- struct trace_dump_context_s ctx;
uint8_t tracedata[UCHAR_MAX];
- FAR uint8_t *p;
- int size;
int ret;
int fd;
@@ -689,8 +80,6 @@ int trace_dump(FAR FILE *out)
return ERROR;
}
- trace_dump_init_context(&ctx, fd);
-
/* Read and output all notes */
while (1)
@@ -701,18 +90,9 @@ int trace_dump(FAR FILE *out)
break;
}
- p = tracedata;
- do
- {
- size = trace_dump_one(out, p, &ctx);
- p += size;
- ret -= size;
- }
- while (ret > 0);
+ fwrite(tracedata, 1, ret, out);
}
- trace_dump_fini_context(&ctx);
-
/* Close note */
close(fd);