alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/sysview_trace_taskid' into 'master'

Browse Source 
freertos: fix task ID sent to the trace

See merge request idf/esp-idf!3807
This commit is contained in:
Ivan Grokhotkov 2018-11-29 01:45:36 +08:00
commit 98884b4f6c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/freertos/tasks.c
View File

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