Skip to content

Commit f12ad27

Browse files
captain5050acmel
authored andcommitted
perf util: Move input_name to util
'input_name' is the name of the input perf.data file, it is used by data convert and ui code. Move it to util to make it more consistent with other global state. Signed-off-by: Ian Rogers <irogers@google.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com> Cc: Chengdong Li <chengdongli@tencent.com> Cc: Denis Nikitin <denik@chromium.org> Cc: Florian Fischer <florian.fischer@muhq.space> Cc: Ingo Molnar <mingo@redhat.com> Cc: James Clark <james.clark@arm.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: John Garry <john.g.garry@oracle.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Martin Liška <mliska@suse.cz> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Raul Silvera <rsilvera@google.com> Cc: Ravi Bangoria <ravi.bangoria@amd.com> Cc: Rob Herring <robh@kernel.org> Cc: Sean Christopherson <seanjc@google.com> Cc: Suzuki Poulouse <suzuki.poulose@arm.com> Cc: Will Deacon <will@kernel.org> Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Link: https://lore.kernel.org/r/20230410162511.3055900-2-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 2176f9e commit f12ad27

File tree

16 files changed

+16
-14
lines changed

16 files changed

+16
-14
lines changed

tools/perf/builtin-annotate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <linux/zalloc.h>
1616
#include "util/symbol.h"
1717

18-
#include "perf.h"
1918
#include "util/debug.h"
2019

2120
#include "util/evlist.h"
@@ -36,6 +35,7 @@
3635
#include "util/block-range.h"
3736
#include "util/map_symbol.h"
3837
#include "util/branch.h"
38+
#include "util/util.h"
3939

4040
#include <dlfcn.h>
4141
#include <errno.h>

tools/perf/builtin-buildid-list.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
* Copyright (C) 2009, Arnaldo Carvalho de Melo <acme@redhat.com>
99
*/
1010
#include "builtin.h"
11-
#include "perf.h"
1211
#include "util/build-id.h"
1312
#include "util/debug.h"
1413
#include "util/dso.h"
@@ -18,6 +17,7 @@
1817
#include "util/session.h"
1918
#include "util/symbol.h"
2019
#include "util/data.h"
20+
#include "util/util.h"
2121
#include <errno.h>
2222
#include <inttypes.h>
2323
#include <linux/err.h>

tools/perf/builtin-c2c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
#include "symbol.h"
4242
#include "ui/ui.h"
4343
#include "ui/progress.h"
44-
#include "../perf.h"
4544
#include "pmu.h"
4645
#include "pmu-hybrid.h"
4746
#include "string2.h"
47+
#include "util/util.h"
4848

4949
struct c2c_hists {
5050
struct hists hists;

tools/perf/builtin-data.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
#include <stdio.h>
44
#include <string.h>
55
#include "builtin.h"
6-
#include "perf.h"
76
#include "debug.h"
87
#include <subcmd/parse-options.h>
98
#include "data-convert.h"
9+
#include "util/util.h"
1010

1111
typedef int (*data_cmd_fn_t)(int argc, const char **argv);
1212

tools/perf/builtin-evlist.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
#include <linux/list.h>
99

10-
#include "perf.h"
1110
#include "util/evlist.h"
1211
#include "util/evsel.h"
1312
#include "util/evsel_fprintf.h"
@@ -18,6 +17,7 @@
1817
#include "util/debug.h"
1918
#include <linux/err.h>
2019
#include "util/tool.h"
20+
#include "util/util.h"
2121

2222
static int process_header_feature(struct perf_session *session __maybe_unused,
2323
union perf_event *event __maybe_unused)

tools/perf/builtin-kmem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// SPDX-License-Identifier: GPL-2.0
22
#include "builtin.h"
3-
#include "perf.h"
43

54
#include "util/dso.h"
65
#include "util/evlist.h"
@@ -24,6 +23,7 @@
2423

2524
#include "util/debug.h"
2625
#include "util/string2.h"
26+
#include "util/util.h"
2727

2828
#include <linux/kernel.h>
2929
#include <linux/numa.h>

tools/perf/builtin-kwork.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77

88
#include "builtin.h"
9-
#include "perf.h"
109

1110
#include "util/data.h"
1211
#include "util/evlist.h"
@@ -20,6 +19,7 @@
2019
#include "util/string2.h"
2120
#include "util/callchain.h"
2221
#include "util/evsel_fprintf.h"
22+
#include "util/util.h"
2323

2424
#include <subcmd/pager.h>
2525
#include <subcmd/parse-options.h>

tools/perf/builtin-mem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include <sys/stat.h>
55
#include <unistd.h>
66
#include "builtin.h"
7-
#include "perf.h"
87

98
#include <subcmd/parse-options.h>
109
#include "util/auxtrace.h"
@@ -22,6 +21,7 @@
2221
#include "util/pmu-hybrid.h"
2322
#include "util/sample.h"
2423
#include "util/string2.h"
24+
#include "util/util.h"
2525
#include <linux/err.h>
2626

2727
#define MEM_OPERATION_LOAD 0x1

tools/perf/builtin-sched.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// SPDX-License-Identifier: GPL-2.0
22
#include "builtin.h"
3-
#include "perf.h"
43
#include "perf-sys.h"
54

65
#include "util/cpumap.h"
@@ -27,6 +26,7 @@
2726

2827
#include "util/debug.h"
2928
#include "util/event.h"
29+
#include "util/util.h"
3030

3131
#include <linux/kernel.h>
3232
#include <linux/log2.h>

tools/perf/builtin-stat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
*/
4242

4343
#include "builtin.h"
44-
#include "perf.h"
4544
#include "util/cgroup.h"
4645
#include <subcmd/parse-options.h>
4746
#include "util/parse-events.h"
@@ -71,6 +70,7 @@
7170
#include "util/bpf_counter.h"
7271
#include "util/iostat.h"
7372
#include "util/pmu-hybrid.h"
73+
#include "util/util.h"
7474
#include "asm/bug.h"
7575

7676
#include <linux/time64.h>

0 commit comments

Comments
 (0)