From patchwork Tue Feb 6 17:44:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 127035 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3094189ljc; Tue, 6 Feb 2018 08:57:25 -0800 (PST) X-Google-Smtp-Source: AH8x2255Vfc8tXB1D4LlbS5GO5s8SMiljGHZlmpbH1GaIOsXuVQBIPlumoBP2KbEBYDcnzzfmh+j X-Received: by 10.98.68.91 with SMTP id r88mr3088996pfa.52.1517936245300; Tue, 06 Feb 2018 08:57:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517936245; cv=none; d=google.com; s=arc-20160816; b=WT6lHi9IRXtMHC8EgnVJFX5zVuwhspcBtJNSbBF9ASqLV4OifnpFo2Tivp1ZsKprsp u9/JBV0tZlLSK1OFgMYw/je7IxgVw2YcV8OSSkOkD6GF1BUN/U/tMHFzvPkwTPZDa5JI tUQb1OLgtOpcXJHj+2hxU4vMhxYFDkgXGjzJTl9/bBsN6bdasrhqUIG5GtiC6Z/YROmh nEyToqJeuWIqoE7QaUs0xXiDDVg4pHWZJ7UOLy3rpDHPA20HyEOsBOHhF7Fz2AWv6Uuf zc7RK0U1UEKKS86rDVlJ7ljCljh6DnVIXxgJ1EnD++ba29VASgRWPx7JZLlOUrSITR5v vs7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=rgi/1bWaBGY/7IhKminZ5Ivbocu3kgMaYGGO38k3C1E=; b=xyG3+duq6jkQMmHSTaWFFjcXVfVC98jbwL0f5XeOMdSgT0dMHUtdCBfQpGt05N8Nek 3lhcQaFb/hgSoAdKs3BoUq56eMXK4lU8CmmwJsi3Yoc8q5VvAdgu3BGQwEdZaRMIRk47 y49WRcH9HNy3i2E962FmbPKhzlbAtI1VRNe6jcRsAP0JKDCNp4JOO/il1L8LZRNDwiE4 3ufNA8ZeBCuFeaO2nUNr5tOriiCp5lnthaWOf72JGfhvD07TBjqQF2De0miECLzM8JDD o22VxNF2InPyy85llmyseF1zlHqU9chc9le6nJYPSP+VtTZwusk/0yz9WU/jWfgO52mD /Ekg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k29si4929543pgn.739.2018.02.06.08.57.24; Tue, 06 Feb 2018 08:57:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752621AbeBFQ5W (ORCPT + 21 others); Tue, 6 Feb 2018 11:57:22 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:51532 "EHLO huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753136AbeBFQ4C (ORCPT ); Tue, 6 Feb 2018 11:56:02 -0500 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 3D3C6B78CEEF2; Wed, 7 Feb 2018 00:55:58 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.361.1; Wed, 7 Feb 2018 00:55:50 +0800 From: John Garry To: , , , , , , , , , CC: , , , , "John Garry" Subject: [PATCH 1/9] perf vendor events: drop incomplete multiple mapfile support Date: Wed, 7 Feb 2018 01:44:56 +0800 Message-ID: <1517939104-230881-2-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1517939104-230881-1-git-send-email-john.garry@huawei.com> References: <1517939104-230881-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently jevents supports multiple mapfiles, but this is only in the form where mapfile basename starts with 'mapfile.csv' At the moment, no architectures actually use multiple mapfiles, so drop the support for now. This patch also solves a nuisance where, when the mapfile is edited and the text editor may create a backup, jevents may use the backup, as shown: jevents: Many mapfiles? Using pmu-events/arch/arm64/mapfile.csv~, ignoring pmu-events/arch/arm64/mapfile.csv Signed-off-by: John Garry --- tools/perf/pmu-events/README | 5 ++--- tools/perf/pmu-events/jevents.c | 10 ++-------- 2 files changed, 4 insertions(+), 11 deletions(-) -- 1.9.1 Acked-by: Jiri Olsa diff --git a/tools/perf/pmu-events/README b/tools/perf/pmu-events/README index c2ee3e4..2407abc 100644 --- a/tools/perf/pmu-events/README +++ b/tools/perf/pmu-events/README @@ -11,9 +11,8 @@ tree tools/perf/pmu-events/arch/foo. - Regular files with '.json' extension in the name are assumed to be JSON files, each of which describes a set of PMU events. - - Regular files with basename starting with 'mapfile.csv' are assumed - to be a CSV file that maps a specific CPU to its set of PMU events. - (see below for mapfile format) + - The CSV file that maps a specific CPU to its set of PMU events is to + be named 'mapfile.csv' (see below for mapfile format). - Directories are traversed, but all other files are ignored. diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c index b578aa2..9e0a21e 100644 --- a/tools/perf/pmu-events/jevents.c +++ b/tools/perf/pmu-events/jevents.c @@ -798,16 +798,10 @@ static int process_one_file(const char *fpath, const struct stat *sb, * after processing all JSON files (so we can write out the * mapping table after all PMU events tables). * - * TODO: Allow for multiple mapfiles? Punt for now. */ if (level == 1 && is_file) { - if (!strncmp(bname, "mapfile.csv", 11)) { - if (mapfile) { - pr_info("%s: Many mapfiles? Using %s, ignoring %s\n", - prog, mapfile, fpath); - } else { - mapfile = strdup(fpath); - } + if (!strcmp(bname, "mapfile.csv")) { + mapfile = strdup(fpath); return 0; }