Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754475AbbFCKdD (ORCPT ); Wed, 3 Jun 2015 06:33:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45916 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754419AbbFCKcr (ORCPT ); Wed, 3 Jun 2015 06:32:47 -0400 Date: Wed, 3 Jun 2015 12:32:41 +0200 From: Jiri Olsa To: Sukadev Bhattiprolu Cc: mingo@redhat.com, ak@linux.intel.com, Michael Ellerman , Arnaldo Carvalho de Melo , namhyung@kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v13 13/14] perf, tools: Handle header line in mapfile Message-ID: <20150603103241.GL1828@krava.redhat.com> References: <1433265135-20426-1-git-send-email-sukadev@linux.vnet.ibm.com> <1433265135-20426-14-git-send-email-sukadev@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1433265135-20426-14-git-send-email-sukadev@linux.vnet.ibm.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1536 Lines: 57 On Tue, Jun 02, 2015 at 10:12:13AM -0700, Sukadev Bhattiprolu wrote: > From: Andi Kleen > > Support a header line in the mapfile.csv, to match the existing > mapfiles 'Suport' means 'skip' in here jirka > > Signed-off-by: Andi Kleen > Signed-off-by: Sukadev Bhattiprolu > > 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 14707fb..8d365f2 100644 > --- a/tools/perf/pmu-events/jevents.c > +++ b/tools/perf/pmu-events/jevents.c > @@ -461,7 +461,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; > > @@ -505,8 +510,8 @@ static int process_mapfile(FILE *outfp, char *fpath) > fprintf(outfp, "},\n"); > } > > +out: > print_mapping_table_suffix(outfp); > - > return 0; > } > > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/