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

perf util: Move perf_guest/host declarations

The definitions are in util.c so move the declarations to match.
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 f12ad272
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* DSOs and symbol information, sort them and produce a diff. * DSOs and symbol information, sort them and produce a diff.
*/ */
#include "builtin.h" #include "builtin.h"
#include "perf.h"
#include "util/debug.h" #include "util/debug.h"
#include "util/event.h" #include "util/event.h"
...@@ -26,6 +25,7 @@ ...@@ -26,6 +25,7 @@
#include "util/spark.h" #include "util/spark.h"
#include "util/block-info.h" #include "util/block-info.h"
#include "util/stream.h" #include "util/stream.h"
#include "util/util.h"
#include <linux/err.h> #include <linux/err.h>
#include <linux/zalloc.h> #include <linux/zalloc.h>
#include <subcmd/pager.h> #include <subcmd/pager.h>
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "util/data.h" #include "util/data.h"
#include "util/ordered-events.h" #include "util/ordered-events.h"
#include "util/kvm-stat.h" #include "util/kvm-stat.h"
#include "util/util.h"
#include "ui/browsers/hists.h" #include "ui/browsers/hists.h"
#include "ui/progress.h" #include "ui/progress.h"
#include "ui/ui.h" #include "ui/ui.h"
......
...@@ -2,14 +2,10 @@ ...@@ -2,14 +2,10 @@
#ifndef _PERF_PERF_H #ifndef _PERF_PERF_H
#define _PERF_PERF_H #define _PERF_PERF_H
#include <stdbool.h>
#ifndef MAX_NR_CPUS #ifndef MAX_NR_CPUS
#define MAX_NR_CPUS 2048 #define MAX_NR_CPUS 2048
#endif #endif
extern bool perf_host, perf_guest;
enum perf_affinity { enum perf_affinity {
PERF_AFFINITY_SYS = 0, PERF_AFFINITY_SYS = 0,
PERF_AFFINITY_NODE, PERF_AFFINITY_NODE,
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "../util/sort.h" #include "../util/sort.h"
#include "../util/evsel.h" #include "../util/evsel.h"
#include "../util/evlist.h" #include "../util/evlist.h"
#include "../perf.h" #include "../util/util.h"
/* hist period print (hpp) functions */ /* hist period print (hpp) functions */
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include "tsc.h" #include "tsc.h"
#include <tools/libc_compat.h> #include <tools/libc_compat.h>
#include "util/synthetic-events.h" #include "util/synthetic-events.h"
#include "util/util.h"
struct cs_etm_auxtrace { struct cs_etm_auxtrace {
struct auxtrace auxtrace; struct auxtrace auxtrace;
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "bpf-event.h" #include "bpf-event.h"
#include "print_binary.h" #include "print_binary.h"
#include "tool.h" #include "tool.h"
#include "../perf.h" #include "util.h"
static const char *perf_event__names[] = { static const char *perf_event__names[] = {
[0] = "TOTAL", [0] = "TOTAL",
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "util/pmu.h" #include "util/pmu.h"
#include "util/sample.h" #include "util/sample.h"
#include "util/bpf-filter.h" #include "util/bpf-filter.h"
#include "util/util.h"
#include <signal.h> #include <signal.h>
#include <unistd.h> #include <unistd.h>
#include <sched.h> #include <sched.h>
......
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
#include "util/parse-branch-options.h" #include "util/parse-branch-options.h"
#include "util/evsel_config.h" #include "util/evsel_config.h"
#include "util/event.h" #include "util/event.h"
#include "perf.h"
#include "util/parse-events-hybrid.h" #include "util/parse-events-hybrid.h"
#include "util/pmu-hybrid.h" #include "util/pmu-hybrid.h"
#include "util/bpf-filter.h" #include "util/bpf-filter.h"
#include "util/util.h"
#include "tracepoint.h" #include "tracepoint.h"
#include "thread_map.h" #include "thread_map.h"
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "stat.h" #include "stat.h"
#include "tsc.h" #include "tsc.h"
#include "ui/progress.h" #include "ui/progress.h"
#include "../perf.h" #include "util.h"
#include "arch/common.h" #include "arch/common.h"
#include "units.h" #include "units.h"
#include <internal/lib.h> #include <internal/lib.h>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "parse-events.h" #include "parse-events.h"
#include "symbol.h" #include "symbol.h"
#include "top.h" #include "top.h"
#include "../perf.h" #include "util.h"
#include <inttypes.h> #include <inttypes.h>
#define SNPRINTF(buf, size, fmt, args...) \ #define SNPRINTF(buf, size, fmt, args...) \
......
...@@ -20,6 +20,9 @@ extern const char perf_more_info_string[]; ...@@ -20,6 +20,9 @@ extern const char perf_more_info_string[];
extern const char *input_name; extern const char *input_name;
extern bool perf_host;
extern bool perf_guest;
/* 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