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
The following commit(s) were added to refs/heads/master by this push:
new 1b4805528 system: simplify system/note code
1b4805528 is described below
commit 1b48055286aa5503e302fde0b6f8ead734024b2b
Author: yinshengkai <[email protected]>
AuthorDate: Tue Nov 14 21:40:18 2023 +0800
system: simplify system/note code
delete the note format. This part has been implemented inside the driver.
Signed-off-by: yinshengkai <[email protected]>
---
system/sched_note/note_main.c | 728 +-----------------------------------------
1 file changed, 1 insertion(+), 727 deletions(-)
diff --git a/system/sched_note/note_main.c b/system/sched_note/note_main.c
index 661af30ba..2f0691796 100644
--- a/system/sched_note/note_main.c
+++ b/system/sched_note/note_main.c
@@ -36,15 +36,6 @@
#include <nuttx/sched_note.h>
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-# define syslog_time(priority, fmt, ...) \
- syslog(priority, "%08lx: " fmt, \
- (unsigned long)systime, \
- __VA_ARGS__)
-
/****************************************************************************
* Private Data
****************************************************************************/
@@ -52,723 +43,6 @@
static bool g_note_daemon_started;
static uint8_t g_note_buffer[CONFIG_SYSTEM_NOTE_BUFFERSIZE];
-/* Names of task/thread states */
-
-#ifdef CONFIG_SCHED_INSTRUMENTATION_SWITCH
-static FAR const char *g_statenames[] =
-{
- "Invalid",
- "Waiting for Unlock",
- "Ready",
- "Running",
- "Inactive",
- "Waiting for Semaphore",
- "Waiting for Signal",
-#ifndef CONFIG_DISABLE_MQUEUE
- "Waiting for MQ empty",
- "Waiting for MQ full"
-#endif
-};
-
-#define NSTATES (sizeof(g_statenames)/sizeof(FAR const char *))
-#endif
-
-/****************************************************************************
- * 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: dump_notes
- ****************************************************************************/
-
-static void dump_notes(size_t nread)
-{
- FAR struct note_common_s *note;
- uint32_t systime_sec;
- uint32_t systime_nsec;
- pid_t pid;
- off_t offset;
-
- offset = 0;
- while (offset < nread)
- {
- note = (FAR struct note_common_s *)&g_note_buffer[offset];
- trace_dump_unflatten(&pid, note->nc_pid, sizeof(pid));
- trace_dump_unflatten(&systime_nsec,
- note->nc_systime_nsec, sizeof(systime_nsec));
- trace_dump_unflatten(&systime_sec,
- note->nc_systime_sec, sizeof(systime_sec));
-
- switch (note->nc_type)
- {
- case NOTE_START:
- {
- FAR struct note_start_s *note_start =
- (FAR struct note_start_s *)note;
-
- if (note->nc_length < sizeof(struct note_start_s))
- {
- syslog(LOG_ERR,
- "Note too small for \"Start\" note: %d\n",
- note->nc_length);
- return;
- }
-
-#ifdef CONFIG_SMP
-#if CONFIG_TASK_NAME_SIZE > 0
- syslog_time(LOG_INFO,
- "Task %u \"%s\" started, CPU%u, priority %u\n",
- (unsigned int)pid,
- note_start->nst_name, (unsigned int)note->nc_cpu,
- (unsigned int)note->nc_priority);
-#else
- syslog_time(LOG_INFO,
- "Task %u started, CPU%u, priority %u\n",
- (unsigned int)pid,
- (unsigned int)note->nc_cpu,
- (unsigned int)note->nc_priority);
-#endif
-#else
-#if CONFIG_TASK_NAME_SIZE > 0
- syslog_time(LOG_INFO,
- "Task %u \"%s\" started, priority %u\n",
- (unsigned int)pid,
- note_start->nst_name, (unsigned int)note->nc_priority);
-#else
- syslog_time(LOG_INFO,
- "Task %u started, priority %u\n",
- (unsigned int)pid,
- (unsigned int)note->nc_priority);
-#endif
-#endif
- }
- break;
-
- case NOTE_STOP:
- {
- if (note->nc_length != sizeof(struct note_stop_s))
- {
- syslog(LOG_ERR,
- "Size incorrect for \"Stop\" note: %d\n",
- note->nc_length);
- return;
- }
-
-#ifdef CONFIG_SMP
- syslog_time(LOG_INFO,
- "Task %u stopped, CPU%u, priority %u\n",
- (unsigned int)pid, (unsigned int)note->nc_cpu,
- (unsigned int)note->nc_priority);
-#else
- syslog_time(LOG_INFO,
- "Task %u stopped, priority %u\n",
- (unsigned int)pid,
- (unsigned int)note->nc_priority);
-#endif
- }
- break;
-
-#ifdef CONFIG_SCHED_INSTRUMENTATION_SWITCH
- case NOTE_SUSPEND:
- {
- FAR struct note_suspend_s *note_suspend =
- (FAR struct note_suspend_s *)note;
- FAR const char *statename;
-
- if (note->nc_length != sizeof(struct note_suspend_s))
- {
- syslog(LOG_ERR,
- "Size incorrect for \"Suspend\" note: %d\n",
- note->nc_length);
- return;
- }
-
- if (note_suspend->nsu_state < NSTATES)
- {
- statename = g_statenames[note_suspend->nsu_state];
- }
- else
- {
- statename = "ERROR";
- }
-
-#ifdef CONFIG_SMP
- syslog_time(LOG_INFO,
- "Task %u suspended, CPU%u, priority %u, state \"%s\"\n",
- (unsigned int)pid,
- (unsigned int)note->nc_cpu,
- (unsigned int)note->nc_priority, statename);
-#else
- syslog_time(LOG_INFO,
- "Task %u suspended, priority %u, state \"%s\"\n",
- (unsigned int)pid,
- (unsigned int)note->nc_priority, statename);
-#endif
- }
- break;
-
- case NOTE_RESUME:
- {
- if (note->nc_length != sizeof(struct note_resume_s))
- {
- syslog(LOG_ERR,
- "Size incorrect for \"Resume\" note: %d\n",
- note->nc_length);
- return;
- }
-
-#ifdef CONFIG_SMP
- syslog_time(LOG_INFO,
- "Task %u resumed, CPU%u, priority %u\n",
- (unsigned int)pid,
- (unsigned int)note->nc_cpu,
- (unsigned int)note->nc_priority);
-#else
- syslog_time(LOG_INFO,
- "Task %u resumed, priority %u\n",
- (unsigned int)pid,
- (unsigned int)note->nc_priority);
-#endif
- }
- break;
-#endif
-
-#ifdef CONFIG_SMP
- case NOTE_CPU_START:
- {
- FAR struct note_cpu_start_s *note_start =
- (FAR struct note_cpu_start_s *)note;
-
- if (note->nc_length != sizeof(struct note_cpu_start_s))
- {
- syslog(LOG_ERR,
- "Size incorrect for \"CPU Start\" note: %d\n",
- note->nc_length);
- return;
- }
-
- syslog_time(LOG_INFO,
- "Task %u CPU%u requests CPU%u to start, priority %u\n",
- (unsigned int)pid,
- (unsigned int)note->nc_cpu,
- (unsigned int)note_start->ncs_target,
- (unsigned int)note->nc_priority);
- }
- break;
-
- case NOTE_CPU_STARTED:
- {
- if (note->nc_length != sizeof(struct note_cpu_started_s))
- {
- syslog(LOG_ERR,
- "Size incorrect for \"CPU started\" note: %d\n",
- note->nc_length);
- return;
- }
-
- syslog_time(LOG_INFO,
- "Task %u CPU%u has started, priority %u\n",
- (unsigned int)pid,
- (unsigned int)note->nc_cpu,
- (unsigned int)note->nc_priority);
- }
- break;
-
-#ifdef CONFIG_SCHED_INSTRUMENTATION_SWITCH
- case NOTE_CPU_PAUSE:
- {
- FAR struct note_cpu_pause_s *note_pause =
- (FAR struct note_cpu_pause_s *)note;
-
- if (note->nc_length != sizeof(struct note_cpu_pause_s))
- {
- syslog(LOG_ERR,
- "Size incorrect for \"CPU pause\" note: %d\n",
- note->nc_length);
- return;
- }
-
- syslog_time(LOG_INFO,
- "Task %u CPU%u requests CPU%u to pause, priority %u\n",
- (unsigned int)pid,
- (unsigned int)note->nc_cpu,
- (unsigned int)note_pause->ncp_target,
- (unsigned int)note->nc_priority);
- }
- break;
-
- case NOTE_CPU_PAUSED:
- {
- if (note->nc_length != sizeof(struct note_cpu_paused_s))
- {
- syslog(LOG_ERR,
- "Size incorrect for \"CPU paused\" note: %d\n",
- note->nc_length);
- return;
- }
-
- syslog_time(LOG_INFO,
- "Task %u CPU%u has paused, priority %u\n",
- (unsigned int)pid,
- (unsigned int)note->nc_cpu,
- (unsigned int)note->nc_priority);
- }
- break;
-
- case NOTE_CPU_RESUME:
- {
- FAR struct note_cpu_resume_s *note_resume =
- (FAR struct note_cpu_resume_s *)note;
-
- if (note->nc_length != sizeof(struct note_cpu_resume_s))
- {
- syslog(LOG_ERR,
- "Size incorrect for \"CPU resume\" note: %d\n",
- note->nc_length);
- return;
- }
-
- syslog_time(LOG_INFO,
- "Task %u CPU%u requests CPU%u to resume, priority %u\n",
- (unsigned int)pid,
- (unsigned int)note->nc_cpu,
- (unsigned int)note_resume->ncr_target,
- (unsigned int)note->nc_priority);
- }
- break;
-
- case NOTE_CPU_RESUMED:
- {
- if (note->nc_length != sizeof(struct note_cpu_resumed_s))
- {
- syslog(LOG_ERR,
- "Size incorrect for \"CPU resumed\" note: %d\n",
- note->nc_length);
- return;
- }
-
- syslog_time(LOG_INFO,
- "Task %u CPU%u has resumed, priority %u\n",
- (unsigned int)pid,
- (unsigned int)note->nc_cpu,
- (unsigned int)note->nc_priority);
- }
- break;
-#endif
-#endif
-
-#ifdef CONFIG_SCHED_INSTRUMENTATION_PREEMPTION
- case NOTE_PREEMPT_LOCK:
- case NOTE_PREEMPT_UNLOCK:
- {
- FAR struct note_preempt_s *note_preempt =
- (FAR struct note_preempt_s *)note;
- uint16_t count;
-
- if (note->nc_length != sizeof(struct note_preempt_s))
- {
- syslog(LOG_ERR,
- "Size incorrect for \"Preemption\" note: %d\n",
- note->nc_length);
- return;
- }
-
- trace_dump_unflatten(&count, note_preempt->npr_count,
- sizeof(count));
-
- if (note->nc_type == NOTE_PREEMPT_LOCK)
- {
-#ifdef CONFIG_SMP
- syslog_time(LOG_INFO,
- "Task %u locked, CPU%u, priority %u, count=%u\n",
- (unsigned int)pid, (unsigned int)note->nc_cpu,
- (unsigned int)note->nc_priority,
- (unsigned int)count);
-#else
- syslog_time(LOG_INFO,
- "Task %u locked, priority %u, count=%u\n",
- (unsigned int)pid,
- (unsigned int)note->nc_priority,
- (unsigned int)count);
-#endif
- }
- else
- {
-#ifdef CONFIG_SMP
- syslog_time(LOG_INFO,
- "Task %u unlocked, CPU%u, priority %u, count=%u\n",
- (unsigned int)pid, (unsigned int)note->nc_cpu,
- (unsigned int)note->nc_priority,
- (unsigned int)count);
-#else
- syslog_time(LOG_INFO,
- "Task %u unlocked, priority %u, count=%u\n",
- (unsigned int)pid,
- (unsigned int)note->nc_priority,
- (unsigned int)count);
-#endif
- }
- }
- break;
-
-#endif
-
-#ifdef CONFIG_SCHED_INSTRUMENTATION_CSECTION
- case NOTE_CSECTION_ENTER:
- case NOTE_CSECTION_LEAVE:
- {
-#ifdef CONFIG_SMP
- FAR struct note_csection_s *note_csection =
- (FAR struct note_csection_s *)note;
- uint16_t count;
-#endif
-
- if (note->nc_length != sizeof(struct note_csection_s))
- {
- syslog(LOG_ERR,
- "Size incorrect for \"csection\" note: %d\n",
- note->nc_length);
- return;
- }
-
-#ifdef CONFIG_SMP
- trace_dump_unflatten(&count, note_csection->ncs_count,
- sizeof(count));
-
- if (note->nc_type == NOTE_CSECTION_ENTER)
- {
- syslog_time(LOG_INFO,
- "Task %u enter csection, CPU%u, priority %u, "
- "count=%u\n",
- (unsigned int)pid, (unsigned int)note->nc_cpu,
- (unsigned int)note->nc_priority,
- (unsigned int)count);
- }
- else
- {
- syslog_time(LOG_INFO,
- "Task %u leave csection, CPU%u, priority %u, "
- "count=%u\n",
- (unsigned int)pid, (unsigned int)note->nc_cpu,
- (unsigned int)note->nc_priority,
- (unsigned int)count);
- }
-#else
- if (note->nc_type == NOTE_CSECTION_ENTER)
- {
- syslog_time(LOG_INFO,
- "Task %u enter csection, priority %u\n",
- (unsigned int)pid,
- (unsigned int)note->nc_priority);
- }
- else
- {
- syslog_time(LOG_INFO,
- "Task %u leave csection, priority %u\n",
- (unsigned int)pid,
- (unsigned int)note->nc_priority);
- }
-#endif
- }
- break;
-#endif
-
-#ifdef CONFIG_SCHED_INSTRUMENTATION_SPINLOCKS
- case NOTE_SPINLOCK_LOCK:
- case NOTE_SPINLOCK_LOCKED:
- case NOTE_SPINLOCK_UNLOCK:
- case NOTE_SPINLOCK_ABORT:
- {
- FAR struct note_spinlock_s *note_spinlock =
- (FAR struct note_spinlock_s *)note;
- FAR void *spinlock;
-
- if (note->nc_length != sizeof(struct note_spinlock_s))
- {
- syslog(LOG_ERR,
- "Size incorrect for \"Spinlock\" note: %d\n",
- note->nc_length);
- return;
- }
-
- trace_dump_unflatten(&spinlock,
- note_spinlock->nsp_spinlock,
- sizeof(spinlock));
-
- switch (note->nc_type)
- {
-#ifdef CONFIG_SMP
- case NOTE_SPINLOCK_LOCK:
- {
- syslog_time(LOG_INFO,
- "Task %u CPU%u wait for spinlock=%p value=%u "
- "priority %u\n",
- (unsigned int)pid,
- (unsigned int)note->nc_cpu,
- spinlock,
- (unsigned int)note_spinlock->nsp_value,
- (unsigned int)note->nc_priority);
- }
- break;
-
- case NOTE_SPINLOCK_LOCKED:
- {
- syslog_time(LOG_INFO,
- "Task %u CPU%u has spinlock=%p value=%u "
- "priority %u\n",
- (unsigned int)pid,
- (unsigned int)note->nc_cpu,
- spinlock,
- (unsigned int)note_spinlock->nsp_value,
- (unsigned int)note->nc_priority);
- }
- break;
-
- case NOTE_SPINLOCK_UNLOCK:
- {
- syslog_time(LOG_INFO,
- "Task %u CPU%u unlocking spinlock=%p value=%u "
- "priority %u\n",
- (unsigned int)pid,
- (unsigned int)note->nc_cpu,
- spinlock,
- (unsigned int)note_spinlock->nsp_value,
- (unsigned int)note->nc_priority);
- }
- break;
-
- case NOTE_SPINLOCK_ABORT:
- {
- syslog_time(LOG_INFO,
- "Task %u CPU%u abort wait on spinlock=%p "
- "value=%u priority %u\n",
- (unsigned int)pid,
- (unsigned int)note->nc_cpu,
- spinlock,
- (unsigned int)note_spinlock->nsp_value,
- (unsigned int)note->nc_priority);
- }
- break;
-#else
- case NOTE_SPINLOCK_LOCK:
- {
- syslog_time(LOG_INFO,
- "Task %u wait for spinlock=%p value=%u "
- "priority %u\n",
- (unsigned int)pid,
- spinlock,
- (unsigned int)note_spinlock->nsp_value,
- (unsigned int)note->nc_priority);
- }
- break;
-
- case NOTE_SPINLOCK_LOCKED:
- {
- syslog_time(LOG_INFO,
- "Task %u has spinlock=%p value=%u priority %u\n",
- (unsigned int)pid,
- spinlock,
- (unsigned int)note_spinlock->nsp_value,
- (unsigned int)note->nc_priority);
- }
- break;
-
- case NOTE_SPINLOCK_UNLOCK:
- {
- syslog_time(LOG_INFO,
- "Task %u unlocking spinlock=%p value=%u "
- "priority %u\n",
- (unsigned int)pid,
- spinlock,
- (unsigned int)note_spinlock->nsp_value,
- (unsigned int)note->nc_priority);
- }
- break;
-
- case NOTE_SPINLOCK_ABORT:
- {
- syslog_time(LOG_INFO,
- "Task %u abort wait on spinlock=%p value=%u "
- "priority %u\n",
- (unsigned int)pid,
- spinlock,
- (unsigned int)note_spinlock->nsp_value,
- (unsigned int)note->nc_priority);
- }
- break;
-#endif
- }
- break;
- }
-#endif
-
-#ifdef CONFIG_SCHED_INSTRUMENTATION_SYSCALL
- case NOTE_SYSCALL_ENTER:
- {
- FAR struct note_syscall_enter_s *note_sysenter =
- (FAR struct note_syscall_enter_s *)note;
-
- if (note->nc_length < SIZEOF_NOTE_SYSCALL_ENTER(0))
- {
- syslog(LOG_ERR,
- "Size incorrect for \"SYSCALL enter\" note: "
- "%d\n",
- note->nc_length);
- return;
- }
-
- syslog_time(LOG_INFO,
- "Task %u Enter SYSCALL %d\n",
- (unsigned int)pid,
- note_sysenter->nsc_nr);
- }
- break;
-
- case NOTE_SYSCALL_LEAVE:
- {
- FAR struct note_syscall_leave_s *note_sysleave =
- (FAR struct note_syscall_leave_s *)note;
- uintptr_t result;
-
- if (note->nc_length !=
- sizeof(struct note_syscall_leave_s))
- {
- syslog(LOG_ERR,
- "Size incorrect for \"SYSCALL leave\" note: "
- "%d\n",
- note->nc_length);
- return;
- }
-
- trace_dump_unflatten(&result,
- note_sysleave->nsc_result,
- sizeof(result));
-
- syslog_time(LOG_INFO,
- "Task %u Leave SYSCALL %d: %" PRIdPTR "\n",
- (unsigned int)pid,
- note_sysleave->nsc_nr, result);
- }
- break;
-#endif
-
-#ifdef CONFIG_SCHED_INSTRUMENTATION_IRQHANDLER
- case NOTE_IRQ_ENTER:
- case NOTE_IRQ_LEAVE:
- {
- FAR struct note_irqhandler_s *note_irq =
- (FAR struct note_irqhandler_s *)note;
-
- if (note->nc_length != sizeof(struct note_irqhandler_s))
- {
- syslog(LOG_ERR,
- "Size incorrect for \"IRQ\" note: %d\n",
- note->nc_length);
- return;
- }
-
- syslog_time(LOG_INFO,
- "Task %u %s IRQ %d\n",
- (unsigned int)pid,
- note->nc_type == NOTE_IRQ_ENTER ? "Enter" : "Leave",
- note_irq->nih_irq);
- }
- break;
-#endif
-
-#ifdef CONFIG_SCHED_INSTRUMENTATION_DUMP
- case NOTE_DUMP_STRING:
- {
- FAR struct note_string_s *note_string =
- (FAR struct note_string_s *)note;
-
- if (note->nc_length < sizeof(struct note_string_s))
- {
- syslog(LOG_INFO,
- "ERROR: note too small for string note: %d\n",
- note->nc_length);
- return;
- }
-
- syslog_time(LOG_INFO,
- "Task %u priority %u, string:%s\n",
- (unsigned int)pid,
- (unsigned int)note->nc_priority,
- note_string->nst_data);
- }
- break;
-
- case NOTE_DUMP_BINARY:
- {
- FAR struct note_binary_s *note_binary =
- (FAR struct note_binary_s *)note;
- uintptr_t ip;
- char out[1280];
- int count;
- int ret = 0;
- int i;
-
- count =
- note->nc_length - sizeof(struct note_binary_s) + 1;
-
- if (count < 0)
- {
- syslog(LOG_INFO,
- "ERROR: note too small for binary note: %d\n",
- note->nc_length);
- return;
- }
-
- for (i = 0; i < count; i++)
- {
- snprintf(&out[ret], sizeof(out) - ret,
- " 0x%x", note_binary->nbi_data[i]);
- ret += strlen(&out[ret]);
- }
-
- trace_dump_unflatten(&ip, note_binary->nbi_ip,
- sizeof(ip));
-
- syslog_time(LOG_INFO,
- "Task %u priority %u, ip=0x%" PRIdPTR
- " event=%u count=%u%s\n",
- (unsigned int)pid,
- (unsigned int)note->nc_priority,
- note_binary->nbi_ip,
- note_binary->nbi_event,
- count,
- out);
- }
- break;
-#endif
-
- default:
- syslog(LOG_INFO, "Unrecognized note type: %d\n", note->nc_type);
- return;
- }
-
- offset += note->nc_length;
- }
-}
-
/****************************************************************************
* Name: note_daemon
****************************************************************************/
@@ -803,7 +77,7 @@ static int note_daemon(int argc, char *argv[])
nread = read(fd, g_note_buffer, CONFIG_SYSTEM_NOTE_BUFFERSIZE);
if (nread > 0)
{
- dump_notes(nread);
+ syslog(LOG_INFO, "%.*s", (int)nread, g_note_buffer);
}
usleep(CONFIG_SYSTEM_NOTE_DELAY * 1000L);
