sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

When Priority Inheritance is enabled, the format of /proc/<PID>/status changes to show both the current priority and the thread’s base priority. This messes up the format of cmd_ps.

Browse Source 
The attached patch fixes cmd_ps to ignore the base priority.
This commit is contained in:
David Alessio 2016-07-15 07:01:02 -06:00 committed by Gregory Nutt
parent 47c90c6b6f
commit f48b3c73b0
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nshlib/nsh_proccmds.c
View File

@ -235,7 +235,17 @@ static void nsh_parse_statusline(FAR char *line,
} }
else if (strncmp(line, g_priority, strlen(g_priority)) == 0) else if (strncmp(line, g_priority, strlen(g_priority)) == 0)
{ {
status->td_priority = nsh_trimspaces(&line[12]); FAR char *ptr =
status->td_priority = nsh_trimspaces(&line[12]);
/* If priority inheritance is enabled, use current pri, ignore base */
while (isdigit(*ptr))
{
++ptr;
}
*ptr = '\0';
} }
else if (strncmp(line, g_scheduler, strlen(g_scheduler)) == 0) else if (strncmp(line, g_scheduler, strlen(g_scheduler)) == 0)
{ {
@ -474,11 +484,11 @@ static int ps_callback(FAR struct nsh_vtbl_s *vtbl, FAR const char *dirpath,
stack_filled = 10 * 100 * stack_used / stack_size; stack_filled = 10 * 100 * stack_used / stack_size;
} }
/* Additionally print a "!" if the stack is filled more than 80% */ /* Additionally print a '!' if the stack is filled more than 80% */
nsh_output(vtbl, "%3d.%1d%%%s ", nsh_output(vtbl, "%3d.%1d%%%c ",
stack_filled / 10, stack_filled % 10, stack_filled / 10, stack_filled % 10,
(stack_filled >= 10 * 80 ? "!" : " ")); (stack_filled >= 10 * 80 ? '!' : ' '));
#endif #endif
#endif #endif