michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples/task_profiler: fix crash when starting profiler

Browse source 
When profiler is started from shell, platform information is
transmitted over uart by calling uart_poll_out(uart_dev)
directly in the shell fiber context which is executed when
the command is entered ('prof start')

Problem is that 'uart_dev' global variable is set to the UART
console device when prof_flush() first call is done.

Depending on when this call happens (application dependent,
especially in nano-apps which have to call prof_flush in
their main loop), 'prof start' may happen before 'uart_dev'
variable is actually set, which drives to shell fiber crash.

This patches moves sending platform information from shell
fiber to prof_flush function to avoid using non initialized
'uart_dev' variable.

Change-Id: Ie64f4418a745affa3fbd731db6bf9bb998b7c2f9
Signed-off-by: Fabrice Olivero <fabrice.olivero@intel.com>
This commit is contained in:
Fabrice Olivero 2016-06-01 16:00:06 +02:00 • committed by Inaky Perez-Gonzalez
commit b551a447b0
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
samples/task_profiler/profiler/src/profiler.c
View file

@ -105,7 +105,10 @@ int cfg2;
#endif
/*TODO: could configure flush period as well ? */
int prof_started;
#define PROF_STOPPED 0
#define PROF_STARTING 1
#define PROF_STARTED 2
int prof_state;
int shell_cmd_prof(int argc, char *argv[])
{
@ -128,8 +131,7 @@ int shell_cmd_prof(int argc, char *argv[])
|| (sys_k_event_logger_get_monitor_mask() != 0)
#endif
) {
prof_started = 1;
prof_send_platform_info();
prof_state = PROF_STARTING;
}
} else if (!strncmp(argv[1], "stop", len)) {
PRINT("Stop\n");
@ -270,7 +272,7 @@ void prof_flush(void)
* of profiler state
* Have to consider improving this (task suspend/resume in microkernel mode)
*/
if (!prof_started) {
if (prof_state == PROF_STOPPED) {
return;
}
#endif
@ -278,7 +280,12 @@ void prof_flush(void)
/*TODO: should consider removing this... */
PRINT("Dump\n");
#ifndef PROFILER_SHELL
#ifdef PROFILER_SHELL
if (prof_state == PROF_STARTING) {
prof_send_platform_info();
prof_state = PROF_STARTED;
}
#else
prof_send_platform_info();
#endif
@ -310,8 +317,9 @@ void prof_flush(void)
#ifdef CONFIG_TASK_MONITOR
&& (sys_k_event_logger_get_monitor_mask() == 0)
#endif
)
prof_started = 0;
) {
prof_state = PROF_STOPPED;
}
irq_unlock(key);
#endif