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

apps/system/critmon: Make output more compact and usable.

Browse Source
This commit is contained in:
Gregory Nutt 2018-11-25 07:42:47 -06:00
parent 92d8243153
commit 411a047f9c
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
system/critmon/critmon.c
View File

@ -134,6 +134,7 @@ static int critmon_process_directory(FAR struct dirent *entryp)
FAR char *filepath; FAR char *filepath;
FAR char *maxpreemp; FAR char *maxpreemp;
FAR char *maxcrit; FAR char *maxcrit;
FAR char *endptr;
FILE *stream; FILE *stream;
int errcode; int errcode;
int len; int len;
@ -228,7 +229,9 @@ static int critmon_process_directory(FAR struct dirent *entryp)
goto errout_with_filepath; goto errout_with_filepath;
} }
/* Format: X.XXXXXXXXX,X.XXXXXXXXX */ /* Input Format: X.XXXXXXXXX,X.XXXXXXXXX
* Output Format: X.XXXXXXXXX X.XXXXXXXXX <name> (ID nn)
*/
maxpreemp = g_critmon.line; maxpreemp = g_critmon.line;
maxcrit = strchr(g_critmon.line, ','); maxcrit = strchr(g_critmon.line, ',');
@ -236,6 +239,11 @@ static int critmon_process_directory(FAR struct dirent *entryp)
if (maxcrit != NULL) if (maxcrit != NULL)
{ {
*maxcrit++ = '\0'; *maxcrit++ = '\0';
endptr = strchr(maxcrit, '\n');
if (endptr != NULL)
{
*endptr = '\0';
}
} }
else else
{ {
@ -245,12 +253,12 @@ static int critmon_process_directory(FAR struct dirent *entryp)
/* Finally, output the stack info that we gleaned from the procfs */ /* Finally, output the stack info that we gleaned from the procfs */
#if CONFIG_TASK_NAME_SIZE > 0 #if CONFIG_TASK_NAME_SIZE > 0
printf("Thread %s (ID %s):\n", name, entryp->d_name); printf("%11s %11s Thread %s (ID %s)\n",
maxpreemp, maxcrit, name, entryp->d_name);
#else #else
printf("Thread ID %s:\n", entryp->d_name); printf("%11s %11s Thread ID %s\n",
maxpreemp, maxcrit, entryp->d_name);
#endif #endif
printf(" Max Pre-emption Disable: %s\n", maxpreemp);
printf(" Max Critical Section: %s\n", maxcrit);
ret = OK; ret = OK;
@ -304,6 +312,7 @@ static void critmon_global_crit(void)
FAR char *cpu; FAR char *cpu;
FAR char *maxpreemp; FAR char *maxpreemp;
FAR char *maxcrit; FAR char *maxcrit;
FAR char *endptr;
FILE *stream; FILE *stream;
int errcode; int errcode;
int ret; int ret;
@ -336,7 +345,9 @@ static void critmon_global_crit(void)
while (fgets(g_critmon.line, 80, stream) != NULL) while (fgets(g_critmon.line, 80, stream) != NULL)
{ {
/* Format: X,X.XXXXXXXXX,X.XXXXXXXXX */ /* Input Format: X,X.XXXXXXXXX,X.XXXXXXXXX
* Output Format: X.XXXXXXXXX X.XXXXXXXXX CPU X
*/
cpu = g_critmon.line; cpu = g_critmon.line;
maxpreemp = strchr(g_critmon.line, ','); maxpreemp = strchr(g_critmon.line, ',');
@ -348,6 +359,11 @@ static void critmon_global_crit(void)
if (maxcrit != NULL) if (maxcrit != NULL)
{ {
*maxcrit++ = '\0'; *maxcrit++ = '\0';
endptr = strchr(maxcrit, '\n');
if (endptr != NULL)
{
*endptr = '\0';
}
} }
else else
{ {
@ -362,9 +378,7 @@ static void critmon_global_crit(void)
/* Finally, output the stack info that we gleaned from the procfs */ /* Finally, output the stack info that we gleaned from the procfs */
printf("CPU %s:\n", cpu); printf("%11s %11s CPU %s\n", maxpreemp, maxcrit, cpu);
printf(" Max Pre-emption Disable: %s\n", maxpreemp);
printf(" Max Critical Section: %s\n", maxcrit);
} }
fclose(stream); fclose(stream);
@ -394,6 +408,11 @@ static int critmon_daemon(int argc, char **argv)
sleep(CONFIG_SYSTEM_CRITMONITOR_INTERVAL); sleep(CONFIG_SYSTEM_CRITMONITOR_INTERVAL);
/* Output a Header */
printf("PRE-EMPTION CSECTION DESCRIPTION\n");
printf("MAX DISABLE MAX TIME\n");
/* Should global usage first */ /* Should global usage first */
critmon_global_crit(); critmon_global_crit();
@ -457,6 +476,7 @@ static int critmon_daemon(int argc, char **argv)
} }
closedir(dirp); closedir(dirp);
fputc('\n', stdout);
} }
/* Stopped */ /* Stopped */