Skip to content

Commit

Permalink
Merge pull request #901 from llange/mainstream-espidf-no-uxmutexesheld
Browse files Browse the repository at this point in the history
ESP-IDF v4+: we do not have uxMutexesHeld any more
  • Loading branch information
llange committed May 18, 2023
2 parents f37c8c6 + b1c8c2e commit d87102e
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions vehicle/OVMS.V3/main/ovms_module.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -780,13 +780,23 @@ static void module_tasks(int verbosity, OvmsWriter* writer, OvmsCommand* cmd, in
uint32_t used = total - ((uint32_t)taskstatus[i].pxStackBase & 0xFFFF);
int core = xTaskGetAffinity(taskstatus[i].xHandle);
uint32_t runtime = taskstatus[i].ulRunTimeCounter - last_runtime[taskstatus[i].xTaskNumber];
#if ESP_IDF_VERSION_MAJOR >= 4
writer->printf("%08" PRIX32 " %4u %s %-15s %5" PRIu32 " %5" PRIu32 " %5" PRIu32 " %7u%7u%7u %c %3d %3.0f%% %3d\n",
(uint32_t)taskstatus[i].xHandle,
taskstatus[i].xTaskNumber, states[taskstatus[i].eCurrentState], taskstatus[i].pcTaskName,
used, total - taskstatus[i].usStackHighWaterMark, total, heaptotal, heap32bit, heapspi,
(core == tskNO_AFFINITY) ? '*' : '0'+core, taskstatus[i].uxCurrentPriority,
diff_totalruntime ? ((float) runtime / diff_totalruntime * 100) : 0.0f,
taskstatus[i].uxBasePriority);
#else
writer->printf("%08" PRIX32 " %4u %s %-15s %5" PRIu32 " %5" PRIu32 " %5" PRIu32 " %7u%7u%7u %c %3d %3.0f%% %3d/%2d\n",
(uint32_t)taskstatus[i].xHandle,
taskstatus[i].xTaskNumber, states[taskstatus[i].eCurrentState], taskstatus[i].pcTaskName,
used, total - taskstatus[i].usStackHighWaterMark, total, heaptotal, heap32bit, heapspi,
(core == tskNO_AFFINITY) ? '*' : '0'+core, taskstatus[i].uxCurrentPriority,
diff_totalruntime ? ((float) runtime / diff_totalruntime * 100) : 0.0f,
taskstatus[i].uxBasePriority, taskstatus[i].uxMutexesHeld);
#endif
if (showStack)
{
uint32_t* stack = (uint32_t*)(pxTaskGetStackStart(taskstatus[i].xHandle) + total);
Expand Down

0 comments on commit d87102e

Please sign in to comment.