perf tools: Rename perf_session_env to perf_env
As it is not necessarily tied to a perf.data file and needs using in places where a perf_session is not required. Suggested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Kan Liang <kan.liang@intel.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1440755289-30939-4-git-send-email-kan.liang@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
9f30fffc78
commit
ce80d3bef9
10 changed files with 21 additions and 21 deletions
|
@ -128,7 +128,7 @@ static const char *normalize_arch(char *arch)
|
|||
return arch;
|
||||
}
|
||||
|
||||
static int perf_session_env__lookup_binutils_path(struct perf_session_env *env,
|
||||
static int perf_session_env__lookup_binutils_path(struct perf_env *env,
|
||||
const char *name,
|
||||
const char **path)
|
||||
{
|
||||
|
@ -206,7 +206,7 @@ static int perf_session_env__lookup_binutils_path(struct perf_session_env *env,
|
|||
return -1;
|
||||
}
|
||||
|
||||
int perf_session_env__lookup_objdump(struct perf_session_env *env)
|
||||
int perf_session_env__lookup_objdump(struct perf_env *env)
|
||||
{
|
||||
/*
|
||||
* For live mode, env->arch will be NULL and we can use
|
||||
|
|
|
@ -5,6 +5,6 @@
|
|||
|
||||
extern const char *objdump_path;
|
||||
|
||||
int perf_session_env__lookup_objdump(struct perf_session_env *env);
|
||||
int perf_session_env__lookup_objdump(struct perf_env *env);
|
||||
|
||||
#endif /* ARCH_PERF_COMMON_H */
|
||||
|
|
|
@ -61,8 +61,8 @@ int ui_browser__help_window(struct ui_browser *browser, const char *text);
|
|||
bool ui_browser__dialog_yesno(struct ui_browser *browser, const char *text);
|
||||
int ui_browser__input_window(const char *title, const char *text, char *input,
|
||||
const char *exit_msg, int delay_sec);
|
||||
struct perf_session_env;
|
||||
int tui__header_window(struct perf_session_env *env);
|
||||
struct perf_env;
|
||||
int tui__header_window(struct perf_env *env);
|
||||
|
||||
void ui_browser__argv_seek(struct ui_browser *browser, off_t offset, int whence);
|
||||
unsigned int ui_browser__argv_refresh(struct ui_browser *browser);
|
||||
|
|
|
@ -91,7 +91,7 @@ static int ui__list_menu(int argc, char * const argv[])
|
|||
return list_menu__run(&menu);
|
||||
}
|
||||
|
||||
int tui__header_window(struct perf_session_env *env)
|
||||
int tui__header_window(struct perf_env *env)
|
||||
{
|
||||
int i, argc = 0;
|
||||
char **argv;
|
||||
|
|
|
@ -26,7 +26,7 @@ struct hist_browser {
|
|||
struct map_symbol *selection;
|
||||
struct hist_browser_timer *hbt;
|
||||
struct pstack *pstack;
|
||||
struct perf_session_env *env;
|
||||
struct perf_env *env;
|
||||
int print_seq;
|
||||
bool show_dso;
|
||||
bool show_headers;
|
||||
|
@ -1214,7 +1214,7 @@ static int hist_browser__dump(struct hist_browser *browser)
|
|||
|
||||
static struct hist_browser *hist_browser__new(struct hists *hists,
|
||||
struct hist_browser_timer *hbt,
|
||||
struct perf_session_env *env)
|
||||
struct perf_env *env)
|
||||
{
|
||||
struct hist_browser *browser = zalloc(sizeof(*browser));
|
||||
|
||||
|
@ -1695,7 +1695,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
|
|||
bool left_exits,
|
||||
struct hist_browser_timer *hbt,
|
||||
float min_pcnt,
|
||||
struct perf_session_env *env)
|
||||
struct perf_env *env)
|
||||
{
|
||||
struct hists *hists = evsel__hists(evsel);
|
||||
struct hist_browser *browser = hist_browser__new(hists, hbt, env);
|
||||
|
@ -2016,7 +2016,7 @@ struct perf_evsel_menu {
|
|||
struct perf_evsel *selection;
|
||||
bool lost_events, lost_events_warned;
|
||||
float min_pcnt;
|
||||
struct perf_session_env *env;
|
||||
struct perf_env *env;
|
||||
};
|
||||
|
||||
static void perf_evsel_menu__write(struct ui_browser *browser,
|
||||
|
@ -2169,7 +2169,7 @@ static int __perf_evlist__tui_browse_hists(struct perf_evlist *evlist,
|
|||
int nr_entries, const char *help,
|
||||
struct hist_browser_timer *hbt,
|
||||
float min_pcnt,
|
||||
struct perf_session_env *env)
|
||||
struct perf_env *env)
|
||||
{
|
||||
struct perf_evsel *pos;
|
||||
struct perf_evsel_menu menu = {
|
||||
|
@ -2202,7 +2202,7 @@ static int __perf_evlist__tui_browse_hists(struct perf_evlist *evlist,
|
|||
int perf_evlist__tui_browse_hists(struct perf_evlist *evlist, const char *help,
|
||||
struct hist_browser_timer *hbt,
|
||||
float min_pcnt,
|
||||
struct perf_session_env *env)
|
||||
struct perf_env *env)
|
||||
{
|
||||
int nr_entries = evlist->nr_entries;
|
||||
|
||||
|
|
|
@ -66,7 +66,7 @@ struct perf_header;
|
|||
int perf_file_header__read(struct perf_file_header *header,
|
||||
struct perf_header *ph, int fd);
|
||||
|
||||
struct perf_session_env {
|
||||
struct perf_env {
|
||||
char *hostname;
|
||||
char *os_release;
|
||||
char *version;
|
||||
|
@ -98,7 +98,7 @@ struct perf_header {
|
|||
u64 data_size;
|
||||
u64 feat_offset;
|
||||
DECLARE_BITMAP(adds_features, HEADER_FEAT_BITS);
|
||||
struct perf_session_env env;
|
||||
struct perf_env env;
|
||||
};
|
||||
|
||||
struct perf_evlist;
|
||||
|
|
|
@ -313,7 +313,7 @@ int hist_entry__tui_annotate(struct hist_entry *he, struct perf_evsel *evsel,
|
|||
int perf_evlist__tui_browse_hists(struct perf_evlist *evlist, const char *help,
|
||||
struct hist_browser_timer *hbt,
|
||||
float min_pcnt,
|
||||
struct perf_session_env *env);
|
||||
struct perf_env *env);
|
||||
int script_browse(const char *script_opt);
|
||||
#else
|
||||
static inline
|
||||
|
@ -321,7 +321,7 @@ int perf_evlist__tui_browse_hists(struct perf_evlist *evlist __maybe_unused,
|
|||
const char *help __maybe_unused,
|
||||
struct hist_browser_timer *hbt __maybe_unused,
|
||||
float min_pcnt __maybe_unused,
|
||||
struct perf_session_env *env __maybe_unused)
|
||||
struct perf_env *env __maybe_unused)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -170,7 +170,7 @@ static void perf_session__delete_threads(struct perf_session *session)
|
|||
machine__delete_threads(&session->machines.host);
|
||||
}
|
||||
|
||||
static void perf_session_env__exit(struct perf_session_env *env)
|
||||
static void perf_session_env__exit(struct perf_env *env)
|
||||
{
|
||||
zfree(&env->hostname);
|
||||
zfree(&env->os_release);
|
||||
|
|
|
@ -1853,7 +1853,7 @@ static void vmlinux_path__exit(void)
|
|||
zfree(&vmlinux_path);
|
||||
}
|
||||
|
||||
static int vmlinux_path__init(struct perf_session_env *env)
|
||||
static int vmlinux_path__init(struct perf_env *env)
|
||||
{
|
||||
struct utsname uts;
|
||||
char bf[PATH_MAX];
|
||||
|
@ -1964,7 +1964,7 @@ static bool symbol__read_kptr_restrict(void)
|
|||
return value;
|
||||
}
|
||||
|
||||
int symbol__init(struct perf_session_env *env)
|
||||
int symbol__init(struct perf_env *env)
|
||||
{
|
||||
const char *symfs;
|
||||
|
||||
|
|
|
@ -252,8 +252,8 @@ int modules__parse(const char *filename, void *arg,
|
|||
int filename__read_debuglink(const char *filename, char *debuglink,
|
||||
size_t size);
|
||||
|
||||
struct perf_session_env;
|
||||
int symbol__init(struct perf_session_env *env);
|
||||
struct perf_env;
|
||||
int symbol__init(struct perf_env *env);
|
||||
void symbol__exit(void);
|
||||
void symbol__elf_init(void);
|
||||
struct symbol *symbol__new(u64 start, u64 len, u8 binding, const char *name);
|
||||
|
|
Loading…
Reference in a new issue