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: Stephane 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: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 8a3dfac161e298bbab7f0912fd7429a52fbb1dd6..9c76add6a03a444d2a63174ea97d3e4b69246c14 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -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);

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 538598012139cad703b063e7dd75607358c8bb2c..2dd5edf161b731ae1be22b9530e25e59fd444f47 100644 (file)
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -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 @@ out:
        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_build_id                 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),

diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h
index 21a6be09c129dd63747bca64707a17d9eec13cb9..2d42b3e1826ff998534b3f949b48fc7c902bc0a1 100644 (file)
--- a/tools/perf/util/header.h
+++ b/tools/perf/util/header.h
@@ -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,