Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d25ed5d9 authored by Soramichi AKIYAMA's avatar Soramichi AKIYAMA Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Move two variables usied in libperf from perf.c 



The use_browser and perf_version_string variables are both declared in
perf.c but they are also referenced by other functions of libperf.a.

Therefore a user linking an own main() with libperf.a must declare those
two variables in their files even if the files never use the browser or
the version information.

This patch fixes this issue by moving use_browser and
perf_version_string out of perf.c to some other files.

Signed-off-by: default avatarSoramichi Akiyama <akiyama@m.soramichi.jp>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20170117002237.c1aec0ce3b4d675dca018deb@m.soramichi.jp


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 587782c5

tools/perf/Build

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ CFLAGS_builtin-help.o += $(paths) 
CFLAGS_builtin-timechart.o += $(paths)

CFLAGS_perf.o              += -DPERF_HTML_PATH="BUILD_STR($(htmldir_SQ))"	\

			      -DPERF_EXEC_PATH="BUILD_STR($(perfexecdir_SQ))"	\

			      -DPREFIX="BUILD_STR($(prefix_SQ))"		\

			      -include $(OUTPUT)PERF-VERSION-FILE

			      -DPREFIX="BUILD_STR($(prefix_SQ))"

CFLAGS_builtin-trace.o	   += -DSTRACE_GROUPS_DIR="BUILD_STR($(STRACE_GROUPS_DIR_SQ))"

CFLAGS_builtin-report.o	   += -DTIPDIR="BUILD_STR($(tipdir_SQ))"

CFLAGS_builtin-report.o	   += -DDOCDIR="BUILD_STR($(srcdir_SQ)/Documentation)"

tools/perf/perf.c

+0 −3
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ const char perf_usage_string[] = 
const char perf_more_info_string[] =

	"See 'perf help COMMAND' for more information on a specific command.";



int use_browser = -1;

static int use_pager = -1;

const char *input_name;
@@ -330,8 +329,6 @@ static int handle_alias(int *argcp, const char ***argv) 
	return ret;

}



const char perf_version_string[] = PERF_VERSION;



#define RUN_SETUP	(1<<0)

#define USE_PAGER	(1<<1)

tools/perf/ui/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


pthread_mutex_t ui__lock = PTHREAD_MUTEX_INITIALIZER;

void *perf_gtk_handle;

int use_browser = -1;



#ifdef HAVE_GTK2_SUPPORT

static int setup_gtk_browser(void)

tools/perf/util/Build

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ CFLAGS_rbtree.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ET 
CFLAGS_libstring.o     += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"

CFLAGS_hweight.o       += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"

CFLAGS_parse-events.o  += -Wno-redundant-decls

CFLAGS_header.o        += -include $(OUTPUT)PERF-VERSION-FILE



$(OUTPUT)util/kallsyms.o: ../lib/symbol/kallsyms.c FORCE

	$(call rule_mkdir)

tools/perf/util/header.c

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ static const u64 __perf_magic2_sw = 0x50455246494c4532ULL; 


#define PERF_MAGIC	__perf_magic2



const char perf_version_string[] = PERF_VERSION;



struct perf_file_attr {

	struct perf_event_attr	attr;

	struct perf_file_section	ids;