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

perf record: Fix debug message placement for test consumption 

[ Upstream commit 792bc998baf9ae17297b1f93b1edc3ca34a0b7e2 ]

evlist__config() might mess up the debug output consumed by test
"Test per-thread recording" in "Miscellaneous Intel PT testing".

Move it out from between the debug prints:

  "perf record opening and mmapping events" and
  "perf record done opening and mmapping events"

Fixes: da4062021e ("perf tools: Add debug messages and comments for testing")
Closes: https://lore.kernel.org/linux-perf-users/ZhVfc5jYLarnGzKa@x1/
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240411075447.17306-1-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Adrian Hunter 2024-04-11 10:54:47 +03:00 committed by Greg Kroah-Hartman
parent aa4158e316
commit 829afc132f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/perf/builtin-record.c
View File

@ -1317,8 +1317,6 @@ static int record__open(struct record *rec)
struct record_opts *opts = &rec->opts; struct record_opts *opts = &rec->opts;
int rc = 0; int rc = 0;
evlist__config(evlist, opts, &callchain_param);
evlist__for_each_entry(evlist, pos) { evlist__for_each_entry(evlist, pos) {
try_again: try_again:
if (evsel__open(pos, pos->core.cpus, pos->core.threads) < 0) { if (evsel__open(pos, pos->core.cpus, pos->core.threads) < 0) {
@ -2428,6 +2426,8 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
evlist__uniquify_name(rec->evlist); evlist__uniquify_name(rec->evlist);
evlist__config(rec->evlist, opts, &callchain_param);
/* Debug message used by test scripts */ /* Debug message used by test scripts */
pr_debug3("perf record opening and mmapping events\n"); pr_debug3("perf record opening and mmapping events\n");
if (record__open(rec) != 0) { if (record__open(rec) != 0) {