lkml.org 
[lkml]   [2015]   [Nov]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v19 15/19] perf, tools: Handle header line in mapfile
    Date
    From: Andi Kleen <ak@linux.intel.com>

    To work with existing mapfiles, assume that the first line in
    'mapfile.csv' is a header line and skip over it.

    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
    Acked-by: Jiri Olsa <jolsa@redhat.com>
    ---

    Changelog[v2]
    All architectures may not use the "Family" to identify. So,
    assume first line is header.
    ---
    tools/perf/pmu-events/jevents.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
    index 8e6e813..b4e3f01 100644
    --- a/tools/perf/pmu-events/jevents.c
    +++ b/tools/perf/pmu-events/jevents.c
    @@ -463,7 +463,12 @@ static int process_mapfile(FILE *outfp, char *fpath)

    print_mapping_table_prefix(outfp);

    - line_num = 0;
    + /* Skip first line (header) */
    + p = fgets(line, n, mapfp);
    + if (!p)
    + goto out;
    +
    + line_num = 1;
    while (1) {
    char *cpuid, *version, *type, *fname;

    @@ -507,8 +512,8 @@ static int process_mapfile(FILE *outfp, char *fpath)
    fprintf(outfp, "},\n");
    }

    +out:
    print_mapping_table_suffix(outfp);
    -
    return 0;
    }

    --
    1.8.3.1


    \
     
     \ /
      Last update: 2015-12-01 04:21    [W:4.131 / U:0.768 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site