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/esp_pm_dump_critical_v3.3' into 'release/v3.3'

Browse Source 
esp_pm: esp_pm_dump_locks: don't print from a critical section, and fix formatting (backport v3.3)

See merge request espressif/esp-idf!12017
This commit is contained in:
Jiang Jiang Jian 2021-04-22 05:47:12 +00:00
commit bc625858ae
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/esp32/pm_locks.c
View File

@ -173,26 +173,35 @@ esp_err_t esp_pm_dump_locks(FILE* stream)
fprintf(stream, "Lock stats:\n");
esp_pm_lock_t* it;
char line[80];
SLIST_FOREACH(it, &s_list, next) {
char *buf = line;
size_t len = sizeof(line);
size_t cb;
portENTER_CRITICAL(&it->spinlock);
if (it->name == NULL) {
fprintf(stream, "lock@%p ", it);
cb = snprintf(buf, len, "lock@%p ", it);
} else {
fprintf(stream, "%-15s ", it->name);
cb = snprintf(buf, len, "%-15.15s ", it->name);
}
assert(cb <= len); // above formats should fit into sizeof(line)
buf += cb;
len -= cb;
#ifdef WITH_PROFILING
pm_time_t time_held = it->time_held;
if (it->count > 0) {
time_held += cur_time - it->last_taken;
}
fprintf(stream, "%10s %3d %3d %9d %9lld %3lld%%\n",
snprintf(buf, len, "%14s %3d %3d %9d %12lld %3lld%%\n",
s_lock_type_names[it->type], it->arg,
it->count, it->times_taken, time_held,
(time_held + cur_time_d100 - 1) / cur_time_d100);
#else
fprintf(stream, "%10s %3d %3d\n", s_lock_type_names[it->type], it->arg, it->count);
snprintf(buf, len, "%14s %3d %3d\n", s_lock_type_names[it->type], it->arg, it->count);
#endif // WITH_PROFILING
portEXIT_CRITICAL(&it->spinlock);
fputs(line, stream);
}
_lock_release(&s_list_lock);
#ifdef WITH_PROFILING