Merge branch 'bugfix/sysview_trace_taskid' into 'master'

freertos: fix task ID sent to the trace

See merge request idf/esp-idf!3807
pull/2770/head
Ivan Grokhotkov 2018-11-29 01:45:36 +08:00
commit 98884b4f6c
1 zmienionych plików z 3 dodań i 3 usunięć

Wyświetl plik

@ -2951,7 +2951,7 @@ TickType_t xTimeToWake;
/* Add the task to the suspended task list instead of a delayed task
list to ensure the task is not woken by a timing event. It will
block indefinitely. */
traceMOVED_TASK_TO_SUSPENDED_LIST(pxCurrentTCB);
traceMOVED_TASK_TO_SUSPENDED_LIST(pxCurrentTCB[ xPortGetCoreID() ]);
vListInsertEnd( &xSuspendedTaskList, &( pxCurrentTCB[ xPortGetCoreID() ]->xGenericListItem ) );
}
else
@ -4651,7 +4651,7 @@ TickType_t uxReturn;
of a delayed task list to ensure the task is not
woken by a timing event. It will block
indefinitely. */
traceMOVED_TASK_TO_SUSPENDED_LIST(pxCurrentTCB);
traceMOVED_TASK_TO_SUSPENDED_LIST(pxCurrentTCB[ xPortGetCoreID() ]);
vListInsertEnd( &xSuspendedTaskList, &( pxCurrentTCB[ xPortGetCoreID() ]->xGenericListItem ) );
}
else
@ -4767,7 +4767,7 @@ TickType_t uxReturn;
of a delayed task list to ensure the task is not
woken by a timing event. It will block
indefinitely. */
traceMOVED_TASK_TO_SUSPENDED_LIST(pxCurrentTCB);
traceMOVED_TASK_TO_SUSPENDED_LIST(pxCurrentTCB[ xPortGetCoreID() ]);
vListInsertEnd( &xSuspendedTaskList, &( pxCurrentTCB[ xPortGetCoreID() ]->xGenericListItem ) );
}
else