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

Commit 0776eb59 authored by Jiri Olsa's avatar Jiri Olsa
Browse files

perf tools: Move sample data structures from perf.h 



Into util/event.h header where all sample data structures
are defined.

Acked-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Borislav Petkov <bp@suse.de>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1399293219-8732-7-git-send-email-jolsa@kernel.org


Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
parent 36446f4b

tools/perf/perf.h

+0 −24
Original line number Diff line number Diff line
@@ -214,30 +214,6 @@ sys_perf_event_open(struct perf_event_attr *attr, 


#define MAX_NR_CPUS			256



struct ip_callchain {

	u64 nr;

	u64 ips[0];

};



struct branch_flags {

	u64 mispred:1;

	u64 predicted:1;

	u64 in_tx:1;

	u64 abort:1;

	u64 reserved:60;

};



struct branch_entry {

	u64				from;

	u64				to;

	struct branch_flags flags;

};



struct branch_stack {

	u64				nr;

	struct branch_entry	entries[0];

};



extern const char *input_name;

extern bool perf_host, perf_guest;

extern const char perf_version_string[];

tools/perf/util/event.h

+24 −0
Original line number Diff line number Diff line
@@ -112,6 +112,30 @@ struct sample_read { 
	};

};



struct ip_callchain {

	u64 nr;

	u64 ips[0];

};



struct branch_flags {

	u64 mispred:1;

	u64 predicted:1;

	u64 in_tx:1;

	u64 abort:1;

	u64 reserved:60;

};



struct branch_entry {

	u64			from;

	u64			to;

	struct branch_flags	flags;

};



struct branch_stack {

	u64			nr;

	struct branch_entry	entries[0];

};



struct perf_sample {

	u64 ip;

	u32 pid, tid;

tools/perf/util/symbol.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <byteswap.h>

#include <libgen.h>

#include "build-id.h"

#include "event.h"



#ifdef HAVE_LIBELF_SUPPORT

#include <libelf.h>