From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71F70C433F5 for ; Wed, 5 Sep 2018 22:06:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 22EEF20857 for ; Wed, 5 Sep 2018 22:06:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="Y7Y4F3dB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 22EEF20857 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728609AbeIFCim (ORCPT ); Wed, 5 Sep 2018 22:38:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:53262 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727626AbeIFCim (ORCPT ); Wed, 5 Sep 2018 22:38:42 -0400 Received: from jouet.infradead.org (unknown [179.97.41.186]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 85BAF20869; Wed, 5 Sep 2018 22:06:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1536185189; bh=nVQbwaijgupcxQFeaceVuXHUsBxqyPb3P8sSmv+rj7A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y7Y4F3dBSQ40XVyJ5RjFEglRUsSuvdtRIGdGm8d/2jFz/dFB8UPeBOFxL3pmXtz07 K2IwzbI+L269MwZoNgxZpmpHO7jhUYYMnB9zPew1k1s4PjhNteZzHqLN3Y1Oe/Zn5V Qoc850/bOIdRF85cWD6qGTQl8Yi98ZjT1YL/G/Vw= From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Jiri Olsa , Alexander Shishkin , Andi Kleen , David Ahern , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo Subject: [PATCH 36/77] perf stat: Add 'struct perf_tool' argument to perf_stat_synthesize_config() Date: Wed, 5 Sep 2018 19:03:59 -0300 Message-Id: <20180905220440.20256-37-acme@kernel.org> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180905220440.20256-1-acme@kernel.org> References: <20180905220440.20256-1-acme@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiri Olsa So that we can use the function outside the 'perf stat' command with standard synthesize functions, that take 'struct perf_tool *' argument. Signed-off-by: Jiri Olsa Cc: Alexander Shishkin Cc: Andi Kleen Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20180830063252.23729-12-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-stat.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index d0d19a5ffa85..ae5029875e87 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -403,12 +403,13 @@ static void workload_exec_failed_signal(int signo __maybe_unused, siginfo_t *inf } static int perf_stat_synthesize_config(struct perf_stat_config *config, + struct perf_tool *tool, bool attrs) { int err; if (attrs) { - err = perf_event__synthesize_attrs(NULL, evsel_list, + err = perf_event__synthesize_attrs(tool, evsel_list, process_synthesized_event); if (err < 0) { pr_err("Couldn't synthesize attrs.\n"); @@ -416,12 +417,12 @@ static int perf_stat_synthesize_config(struct perf_stat_config *config, } } - err = perf_event__synthesize_extra_attr(NULL, + err = perf_event__synthesize_extra_attr(tool, evsel_list, process_synthesized_event, attrs); - err = perf_event__synthesize_thread_map2(NULL, evsel_list->threads, + err = perf_event__synthesize_thread_map2(tool, evsel_list->threads, process_synthesized_event, NULL); if (err < 0) { @@ -429,14 +430,14 @@ static int perf_stat_synthesize_config(struct perf_stat_config *config, return err; } - err = perf_event__synthesize_cpu_map(NULL, evsel_list->cpus, + err = perf_event__synthesize_cpu_map(tool, evsel_list->cpus, process_synthesized_event, NULL); if (err < 0) { pr_err("Couldn't synthesize thread map.\n"); return err; } - err = perf_event__synthesize_stat_config(NULL, config, + err = perf_event__synthesize_stat_config(tool, config, process_synthesized_event, NULL); if (err < 0) { pr_err("Couldn't synthesize config.\n"); @@ -607,7 +608,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) if (err < 0) return err; - err = perf_stat_synthesize_config(&stat_config, is_pipe); + err = perf_stat_synthesize_config(&stat_config, NULL, is_pipe); if (err < 0) return err; } -- 2.14.4