UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf stat: Use scnprintf() in prepare_interval() 

It should not use sprintf() anymore.  Let's pass the buffer size and use the
safer scnprintf() instead.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Link: https://lore.kernel.org/r/20221123180208.2068936-5-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim 2022-11-23 10:01:57 -08:00 committed by Arnaldo Carvalho de Melo
parent 8e55ae24c0
commit a7ec1dd2d7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/perf/util/stat-display.c
View File

@ -1073,23 +1073,23 @@ static void print_metric_headers(struct perf_stat_config *config,
}
static void prepare_interval(struct perf_stat_config *config,
char *prefix, struct timespec *ts)
char *prefix, size_t len, struct timespec *ts)
{
if (config->iostat_run)
return;
if (config->csv_output)
sprintf(prefix, "%lu.%09lu%s", (unsigned long) ts->tv_sec,
ts->tv_nsec, config->csv_sep);
scnprintf(prefix, len, "%lu.%09lu%s",
(unsigned long) ts->tv_sec, ts->tv_nsec, config->csv_sep);
else if (!config->json_output)
sprintf(prefix, "%6lu.%09lu ", (unsigned long) ts->tv_sec,
ts->tv_nsec);
scnprintf(prefix, len, "%6lu.%09lu ",
(unsigned long) ts->tv_sec, ts->tv_nsec);
else if (!config->metric_only)
sprintf(prefix, "{\"interval\" : %lu.%09lu, ", (unsigned long)
ts->tv_sec, ts->tv_nsec);
scnprintf(prefix, len, "{\"interval\" : %lu.%09lu, ",
(unsigned long) ts->tv_sec, ts->tv_nsec);
else
sprintf(prefix, "{\"interval\" : %lu.%09lu}", (unsigned long)
ts->tv_sec, ts->tv_nsec);
scnprintf(prefix, len, "{\"interval\" : %lu.%09lu}",
(unsigned long) ts->tv_sec, ts->tv_nsec);
}
static void print_header_interval_std(struct perf_stat_config *config,
@ -1390,7 +1390,7 @@ void evlist__print_counters(struct evlist *evlist, struct perf_stat_config *conf
if (interval) {
prefix = buf;
prepare_interval(config, prefix, ts);
prepare_interval(config, buf, sizeof(buf), ts);
}
print_header(config, _target, evlist, argc, argv);