From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754009AbcJDIO3 (ORCPT ); Tue, 4 Oct 2016 04:14:29 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37538 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753437AbcJDIO1 (ORCPT ); Tue, 4 Oct 2016 04:14:27 -0400 Date: Tue, 4 Oct 2016 01:13:55 -0700 From: tip-bot for Andi Kleen Message-ID: Cc: ak@linux.intel.com, mingo@kernel.org, acme@redhat.com, sukadev@linux.vnet.ibm.com, maddy@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, peterz@infradead.org, jolsa@redhat.com, hpa@zytor.com Reply-To: jolsa@redhat.com, peterz@infradead.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, maddy@linux.vnet.ibm.com, hpa@zytor.com, ak@linux.intel.com, mingo@kernel.org, sukadev@linux.vnet.ibm.com, acme@redhat.com In-Reply-To: <1473978296-20712-15-git-send-email-sukadev@linux.vnet.ibm.com> References: <1473978296-20712-15-git-send-email-sukadev@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf jevents: Handle header line in mapfile Git-Commit-ID: dc720ffc9863b618a192f5949234c54aad00ed24 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: dc720ffc9863b618a192f5949234c54aad00ed24 Gitweb: http://git.kernel.org/tip/dc720ffc9863b618a192f5949234c54aad00ed24 Author: Andi Kleen AuthorDate: Thu, 15 Sep 2016 15:24:51 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 3 Oct 2016 21:33:54 -0300 perf jevents: Handle header line in mapfile To work with existing mapfiles, assume that the first line in 'mapfile.csv' is a header line and skip over it. Signed-off-by: Sukadev Bhattiprolu Acked-by: Ingo Molnar Acked-by: Jiri Olsa Cc: Madhavan Srinivasan Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1473978296-20712-15-git-send-email-sukadev@linux.vnet.ibm.com Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Andi Kleen Signed-off-by: Arnaldo Carvalho de Melo --- 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 c4c074a..c9bf9a7 100644 --- a/tools/perf/pmu-events/jevents.c +++ b/tools/perf/pmu-events/jevents.c @@ -477,7 +477,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; @@ -521,8 +526,8 @@ static int process_mapfile(FILE *outfp, char *fpath) fprintf(outfp, "},\n"); } +out: print_mapping_table_suffix(outfp); - return 0; }