Merge branch 'bugfix/increase_pm_dump_time_field_length_v4.4' into 'release/v4.4'

Power Management: increase pm_dump time field width (backport v4.4)

See merge request espressif/esp-idf!24448
This commit is contained in:
Jiang Jiang Jian 2023-07-11 06:19:09 +08:00
commit 6209a2c5e2

View File

@ -1,16 +1,8 @@
// Copyright 2016-2017 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2016-2023 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -173,13 +165,13 @@ esp_err_t esp_pm_dump_locks(FILE* stream)
fprintf(stream, "Lock stats:\n"); fprintf(stream, "Lock stats:\n");
#ifdef WITH_PROFILING #ifdef WITH_PROFILING
fprintf(stream, "%-15s %-14s %-5s %-8s %-13s %-8s %-8s\n", fprintf(stream, "%-15s %-14s %-5s %-8s %-13s %-14s %-8s\n",
"Name", "Type", "Arg", "Active", "Total_count", "Time(us)", "Time(%)"); "Name", "Type", "Arg", "Active", "Total_count", "Time(us)", "Time(%)");
#else #else
fprintf(stream, "%-15s %-14s %-5s %-8s\n", "Name", "Type", "Arg", "Active"); fprintf(stream, "%-15s %-14s %-5s %-8s\n", "Name", "Type", "Arg", "Active");
#endif #endif
esp_pm_lock_t* it; esp_pm_lock_t* it;
char line[80]; char line[128];
SLIST_FOREACH(it, &s_list, next) { SLIST_FOREACH(it, &s_list, next) {
char *buf = line; char *buf = line;
size_t len = sizeof(line); size_t len = sizeof(line);
@ -199,7 +191,7 @@ esp_err_t esp_pm_dump_locks(FILE* stream)
if (it->count > 0) { if (it->count > 0) {
time_held += cur_time - it->last_taken; time_held += cur_time - it->last_taken;
} }
snprintf(buf, len, "%-14s %-5d %-8d %-13d %-8lld %-3lld%%\n", snprintf(buf, len, "%-14s %-5d %-8d %-13d %-14lld %-3lld%%\n",
s_lock_type_names[it->type], it->arg, s_lock_type_names[it->type], it->arg,
it->count, it->times_taken, time_held, it->count, it->times_taken, time_held,
(time_held + cur_time_d100 - 1) / cur_time_d100); (time_held + cur_time_d100 - 1) / cur_time_d100);