From 4353d0faf3e86022f4c7a2bb4e58e527a1db90ca Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Fri, 18 Jun 2021 12:00:23 -0700 Subject: [PATCH] print_load:Support NuttX Dynamic FDs --- platforms/nuttx/src/px4/common/print_load.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/platforms/nuttx/src/px4/common/print_load.cpp b/platforms/nuttx/src/px4/common/print_load.cpp index 70a17dfd0a..3770f4ba8a 100644 --- a/platforms/nuttx/src/px4/common/print_load.cpp +++ b/platforms/nuttx/src/px4/common/print_load.cpp @@ -222,19 +222,16 @@ void print_load_buffer(char *buffer, int buffer_length, print_load_callback_f cb uint8_t tcb_sched_priority = system_load.tasks[i].tcb->sched_priority; unsigned int tcb_num_used_fds = 0; // number of used file descriptors -#if CONFIG_NFILE_DESCRIPTORS > 0 - FAR struct task_group_s *group = system_load.tasks[i].tcb->group; + struct filelist *filelist = &system_load.tasks[i].tcb->group->tg_filelist; - if (group) { - for (int fd_index = 0; fd_index < CONFIG_NFILE_DESCRIPTORS; ++fd_index) { - if (group->tg_filelist.fl_files[fd_index].f_inode) { + for (int fdr = 0; fdr < filelist->fl_rows; fdr++) { + for (int fdc = 0; fdc < CONFIG_NFILE_DESCRIPTORS_PER_BLOCK; fdc++) { + if (filelist->fl_files[fdr][fdc].f_inode) { ++tcb_num_used_fds; } } } -#endif - sched_unlock(); switch (tcb_task_state) {