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

Commit 2eeaaa09 authored by Stephane Eranian's avatar Stephane Eranian Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: rename HEADER_TRACE_INFO to HEADER_TRACING_DATA 



To match the PERF_RECORD_HEADER_TRACING_DATA record type.

This is the same info as the one used for pipe mode whereas the other
one is for regular file output. This will help in the later patch to add
meta-data infos in pipe mode.

Signed-off-by: default avatarStephane Eranian <eranian@google.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1337081295-10303-4-git-send-email-eranian@google.com


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

tools/perf/builtin-record.c

+2 −2
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static void perf_record__mmap_read_all(struct perf_record *rec) 
			perf_record__mmap_read(rec, &rec->evlist->mmap[i]);

	}



	if (perf_header__has_feat(&rec->session->header, HEADER_TRACE_INFO))

	if (perf_header__has_feat(&rec->session->header, HEADER_TRACING_DATA))

		write_output(rec, &finished_round_event, sizeof(finished_round_event));

}
@@ -478,7 +478,7 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv) 
		perf_header__clear_feat(&session->header, HEADER_BUILD_ID);



	if (!have_tracepoints(&evsel_list->entries))

		perf_header__clear_feat(&session->header, HEADER_TRACE_INFO);

		perf_header__clear_feat(&session->header, HEADER_TRACING_DATA);



	if (!rec->opts.branch_stack)

		perf_header__clear_feat(&session->header, HEADER_BRANCH_STACK);

tools/perf/util/header.c

+5 −5
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ static bool perf_session__read_build_ids(struct perf_session *session, bool with 
	return ret;

}



static int write_trace_info(int fd, struct perf_header *h __used,

static int write_tracing_data(int fd, struct perf_header *h __used,

			    struct perf_evlist *evlist)

{

	return read_tracing_data(fd, &evlist->entries);
@@ -1472,7 +1472,7 @@ static int perf_header__read_build_ids(struct perf_header *header, 
	return err;

}



static int process_trace_info(struct perf_file_section *section __unused,

static int process_tracing_data(struct perf_file_section *section __unused,

			      struct perf_header *ph __unused,

			      int feat __unused, int fd)

{
@@ -1508,11 +1508,11 @@ struct feature_ops { 
		.full_only = true }



/* feature_ops not implemented: */

#define print_trace_info		NULL

#define print_tracing_data	NULL

#define print_build_id		NULL



static const struct feature_ops feat_ops[HEADER_LAST_FEATURE] = {

	FEAT_OPP(HEADER_TRACE_INFO,	trace_info),

	FEAT_OPP(HEADER_TRACING_DATA,	tracing_data),

	FEAT_OPP(HEADER_BUILD_ID,	build_id),

	FEAT_OPA(HEADER_HOSTNAME,	hostname),

	FEAT_OPA(HEADER_OSRELEASE,	osrelease),

tools/perf/util/header.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
enum {

	HEADER_RESERVED		= 0,	/* always cleared */

	HEADER_FIRST_FEATURE	= 1,

	HEADER_TRACE_INFO	= 1,

	HEADER_TRACING_DATA	= 1,

	HEADER_BUILD_ID,



	HEADER_HOSTNAME,