From 70791af8e21c03211712538a60b806957d9e88b2 Mon Sep 17 00:00:00 2001 From: anjiahao Date: Thu, 10 Nov 2022 20:32:34 +0800 Subject: [PATCH] procmeminfo:support memdump can show specific task Signed-off-by: anjiahao --- fs/procfs/fs_procfsmeminfo.c | 31 +++++++++++++++++++++++++++++++ include/nuttx/sched.h | 3 ++- mm/mm_heap/mm.h | 5 ++++- 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/fs/procfs/fs_procfsmeminfo.c b/fs/procfs/fs_procfsmeminfo.c index fa847657cb..fbdca5d294 100644 --- a/fs/procfs/fs_procfsmeminfo.c +++ b/fs/procfs/fs_procfsmeminfo.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -452,6 +453,10 @@ static ssize_t memdump_write(FAR struct file *filep, FAR const char *buffer, FAR struct procfs_meminfo_entry_s *entry; FAR struct meminfo_file_s *procfile; pid_t pid = INVALID_PROCESS_ID; +#if CONFIG_MM_BACKTRACE > 0 + FAR struct tcb_s *tcb; + FAR char *p; +#endif DEBUGASSERT(filep != NULL && buffer != NULL && buflen > 0); @@ -479,6 +484,32 @@ static ssize_t memdump_write(FAR struct file *filep, FAR const char *buffer, return buflen; } + else if ((p = strstr(buffer, "on")) != NULL) + { + *p = '\0'; + pid = atoi(buffer); + tcb = nxsched_get_tcb(pid); + if (tcb == NULL) + { + return -EINVAL; + } + + tcb->flags |= TCB_FLAG_HEAP_DUMP; + return buflen; + } + else if ((p = strstr(buffer, "off")) != NULL) + { + *p = '\0'; + pid = atoi(buffer); + tcb = nxsched_get_tcb(pid); + if (tcb == NULL) + { + return -EINVAL; + } + + tcb->flags &= ~TCB_FLAG_HEAP_DUMP; + return buflen; + } #endif switch (buffer[0]) diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h index c9f2455451..e84c15a773 100644 --- a/include/nuttx/sched.h +++ b/include/nuttx/sched.h @@ -102,7 +102,8 @@ #define TCB_FLAG_EXIT_PROCESSING (1 << 11) /* Bit 10: Exitting */ #define TCB_FLAG_FREE_STACK (1 << 12) /* Bit 12: Free stack after exit */ #define TCB_FLAG_HEAP_CHECK (1 << 13) /* Bit 13: Heap check */ - /* Bits 14-15: Available */ +#define TCB_FLAG_HEAP_DUMP (1 << 14) /* Bit 14: Heap dump */ + /* Bits 15: Available */ /* Values for struct task_group tg_flags */ diff --git a/mm/mm_heap/mm.h b/mm/mm_heap/mm.h index dc444d94be..a8afdea8f3 100644 --- a/mm/mm_heap/mm.h +++ b/mm/mm_heap/mm.h @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -82,8 +83,10 @@ { \ FAR struct mm_allocnode_s *tmp = (FAR struct mm_allocnode_s *)(ptr); \ kasan_unpoison(tmp, SIZEOF_MM_ALLOCNODE); \ + FAR strcut tcb_s *tcb; \ tmp->pid = gettid(); \ - if ((heap)->mm_procfs.backtrace) \ + tcb = nxsched_get_tcb(tmp->pid); \ + if ((heap)->mm_procfs.backtrace || (tcb && tcb->flags & TCB_FLAG_HEAP_DUMP)) \ { \ memset(tmp->backtrace, 0, sizeof(tmp->backtrace)); \ backtrace(tmp->backtrace, CONFIG_MM_BACKTRACE); \