Commit f12ad272 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo

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: default avatarIan 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.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2176f9e2
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include <linux/zalloc.h> #include <linux/zalloc.h>
#include "util/symbol.h" #include "util/symbol.h"
#include "perf.h"
#include "util/debug.h" #include "util/debug.h"
#include "util/evlist.h" #include "util/evlist.h"
...@@ -36,6 +35,7 @@ ...@@ -36,6 +35,7 @@
#include "util/block-range.h" #include "util/block-range.h"
#include "util/map_symbol.h" #include "util/map_symbol.h"
#include "util/branch.h" #include "util/branch.h"
#include "util/util.h"
#include <dlfcn.h> #include <dlfcn.h>
#include <errno.h> #include <errno.h>
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
* Copyright (C) 2009, Arnaldo Carvalho de Melo <acme@redhat.com> * Copyright (C) 2009, Arnaldo Carvalho de Melo <acme@redhat.com>
*/ */
#include "builtin.h" #include "builtin.h"
#include "perf.h"
#include "util/build-id.h" #include "util/build-id.h"
#include "util/debug.h" #include "util/debug.h"
#include "util/dso.h" #include "util/dso.h"
...@@ -18,6 +17,7 @@ ...@@ -18,6 +17,7 @@
#include "util/session.h" #include "util/session.h"
#include "util/symbol.h" #include "util/symbol.h"
#include "util/data.h" #include "util/data.h"
#include "util/util.h"
#include <errno.h> #include <errno.h>
#include <inttypes.h> #include <inttypes.h>
#include <linux/err.h> #include <linux/err.h>
......
...@@ -41,10 +41,10 @@ ...@@ -41,10 +41,10 @@
#include "symbol.h" #include "symbol.h"
#include "ui/ui.h" #include "ui/ui.h"
#include "ui/progress.h" #include "ui/progress.h"
#include "../perf.h"
#include "pmu.h" #include "pmu.h"
#include "pmu-hybrid.h" #include "pmu-hybrid.h"
#include "string2.h" #include "string2.h"
#include "util/util.h"
struct c2c_hists { struct c2c_hists {
struct hists hists; struct hists hists;
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "builtin.h" #include "builtin.h"
#include "perf.h"
#include "debug.h" #include "debug.h"
#include <subcmd/parse-options.h> #include <subcmd/parse-options.h>
#include "data-convert.h" #include "data-convert.h"
#include "util/util.h"
typedef int (*data_cmd_fn_t)(int argc, const char **argv); typedef int (*data_cmd_fn_t)(int argc, const char **argv);
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include <linux/list.h> #include <linux/list.h>
#include "perf.h"
#include "util/evlist.h" #include "util/evlist.h"
#include "util/evsel.h" #include "util/evsel.h"
#include "util/evsel_fprintf.h" #include "util/evsel_fprintf.h"
...@@ -18,6 +17,7 @@ ...@@ -18,6 +17,7 @@
#include "util/debug.h" #include "util/debug.h"
#include <linux/err.h> #include <linux/err.h>
#include "util/tool.h" #include "util/tool.h"
#include "util/util.h"
static int process_header_feature(struct perf_session *session __maybe_unused, static int process_header_feature(struct perf_session *session __maybe_unused,
union perf_event *event __maybe_unused) union perf_event *event __maybe_unused)
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "builtin.h" #include "builtin.h"
#include "perf.h"
#include "util/dso.h" #include "util/dso.h"
#include "util/evlist.h" #include "util/evlist.h"
...@@ -24,6 +23,7 @@ ...@@ -24,6 +23,7 @@
#include "util/debug.h" #include "util/debug.h"
#include "util/string2.h" #include "util/string2.h"
#include "util/util.h"
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/numa.h> #include <linux/numa.h>
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
*/ */
#include "builtin.h" #include "builtin.h"
#include "perf.h"
#include "util/data.h" #include "util/data.h"
#include "util/evlist.h" #include "util/evlist.h"
...@@ -20,6 +19,7 @@ ...@@ -20,6 +19,7 @@
#include "util/string2.h" #include "util/string2.h"
#include "util/callchain.h" #include "util/callchain.h"
#include "util/evsel_fprintf.h" #include "util/evsel_fprintf.h"
#include "util/util.h"
#include <subcmd/pager.h> #include <subcmd/pager.h>
#include <subcmd/parse-options.h> #include <subcmd/parse-options.h>
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include "builtin.h" #include "builtin.h"
#include "perf.h"
#include <subcmd/parse-options.h> #include <subcmd/parse-options.h>
#include "util/auxtrace.h" #include "util/auxtrace.h"
...@@ -22,6 +21,7 @@ ...@@ -22,6 +21,7 @@
#include "util/pmu-hybrid.h" #include "util/pmu-hybrid.h"
#include "util/sample.h" #include "util/sample.h"
#include "util/string2.h" #include "util/string2.h"
#include "util/util.h"
#include <linux/err.h> #include <linux/err.h>
#define MEM_OPERATION_LOAD 0x1 #define MEM_OPERATION_LOAD 0x1
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "builtin.h" #include "builtin.h"
#include "perf.h"
#include "perf-sys.h" #include "perf-sys.h"
#include "util/cpumap.h" #include "util/cpumap.h"
...@@ -27,6 +26,7 @@ ...@@ -27,6 +26,7 @@
#include "util/debug.h" #include "util/debug.h"
#include "util/event.h" #include "util/event.h"
#include "util/util.h"
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/log2.h> #include <linux/log2.h>
......
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
*/ */
#include "builtin.h" #include "builtin.h"
#include "perf.h"
#include "util/cgroup.h" #include "util/cgroup.h"
#include <subcmd/parse-options.h> #include <subcmd/parse-options.h>
#include "util/parse-events.h" #include "util/parse-events.h"
...@@ -71,6 +70,7 @@ ...@@ -71,6 +70,7 @@
#include "util/bpf_counter.h" #include "util/bpf_counter.h"
#include "util/iostat.h" #include "util/iostat.h"
#include "util/pmu-hybrid.h" #include "util/pmu-hybrid.h"
#include "util/util.h"
#include "asm/bug.h" #include "asm/bug.h"
#include <linux/time64.h> #include <linux/time64.h>
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include "util/thread.h" #include "util/thread.h"
#include "util/callchain.h" #include "util/callchain.h"
#include "perf.h"
#include "util/header.h" #include "util/header.h"
#include <subcmd/pager.h> #include <subcmd/pager.h>
#include <subcmd/parse-options.h> #include <subcmd/parse-options.h>
...@@ -37,6 +36,7 @@ ...@@ -37,6 +36,7 @@
#include "util/debug.h" #include "util/debug.h"
#include "util/string2.h" #include "util/string2.h"
#include "util/tracepoint.h" #include "util/tracepoint.h"
#include "util/util.h"
#include <linux/err.h> #include <linux/err.h>
#include <traceevent/event-parse.h> #include <traceevent/event-parse.h>
......
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
#include <linux/zalloc.h> #include <linux/zalloc.h>
static int use_pager = -1; static int use_pager = -1;
const char *input_name;
struct cmd_struct { struct cmd_struct {
const char *cmd; const char *cmd;
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#define MAX_NR_CPUS 2048 #define MAX_NR_CPUS 2048
#endif #endif
extern const char *input_name;
extern bool perf_host, perf_guest; extern bool perf_host, perf_guest;
enum perf_affinity { enum perf_affinity {
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
#include "../../util/top.h" #include "../../util/top.h"
#include "../../util/thread.h" #include "../../util/thread.h"
#include "../../util/block-info.h" #include "../../util/block-info.h"
#include "../../util/util.h"
#include "../../arch/common.h" #include "../../arch/common.h"
#include "../../perf.h"
#include "../browsers/hists.h" #include "../browsers/hists.h"
#include "../helpline.h" #include "../helpline.h"
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
* XXX We need to find a better place for these things... * XXX We need to find a better place for these things...
*/ */
const char *input_name;
bool perf_singlethreaded = true; bool perf_singlethreaded = true;
void perf_set_singlethreaded(void) void perf_set_singlethreaded(void)
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
extern const char perf_usage_string[]; extern const char perf_usage_string[];
extern const char perf_more_info_string[]; extern const char perf_more_info_string[];
extern const char *input_name;
/* General helper functions */ /* General helper functions */
void usage(const char *err) __noreturn; void usage(const char *err) __noreturn;
void die(const char *err, ...) __noreturn __printf(1, 2); void die(const char *err, ...) __noreturn __printf(1, 2);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment