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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A908C433EF for ; Tue, 4 Jan 2022 14:20:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234097AbiADOUI (ORCPT ); Tue, 4 Jan 2022 09:20:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:55492 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234096AbiADOUH (ORCPT ); Tue, 4 Jan 2022 09:20:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641306006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tdBXcdlUZgH91vSV8gBFMtFgTf/fDf2VkDsQMplYoag=; b=W2syZLrtg98LPwkFetWikVPH1TWKDNIghIwTwM2jgmg65df4nrzlPeMVMzlz0ANH82WWZl wnOwstiWuBhLiSNEoT4nassAPQ0sSruTas1VCjdtZDdOqb3HdRVbcpfnLEqc1uf2MEcFP+ dqIuoelHsYlIWL0iZQqaQj3QQazBqxo= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-62-n1iAn0RgMQeFHGQPKVCCVQ-1; Tue, 04 Jan 2022 09:20:05 -0500 X-MC-Unique: n1iAn0RgMQeFHGQPKVCCVQ-1 Received: by mail-ed1-f69.google.com with SMTP id dz8-20020a0564021d4800b003f897935eb3so25425956edb.12 for ; Tue, 04 Jan 2022 06:20:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=tdBXcdlUZgH91vSV8gBFMtFgTf/fDf2VkDsQMplYoag=; b=LfurKwZcm74voUJKo67ZHQSzdgwOr0egnbqb6h9IxQ8Sgp62WsKoSlNKpxdmBReSGj ROLN/Ur+BrTYLdyPpnT5EXD3FNWDtUXBCaJKYrjdSYgSR6zrDH9Rv+vfl/9yocGkOyk8 CgvVtgjeW6qS3saUiqW1M19DHfNcWPK32WuCuhwjAiRC6w0A4Hmpi3hES7qByUKkxDks XsUrIafx+huX6SI086BlllcB3HInPfyYnZxvJ9rgVFbJ+q/mBeKmpjV/XfCwmROoT1Nm yCOQ+4F9gTq/XQwM0AA69qGVOzYHj8vk0gIFA5MDKEDBJW4mpf7NRNKnnBwmccfYKlrp yOVw== X-Gm-Message-State: AOAM530l7FFPBpkhyR6vbLqoiNsOjL8a9Kgqt+FfFf1RVCFixGlMo0Lo oflRfnovxCHDb+/NUoG3j2/Ysn5TvM3KPL0mKkcuwkQnMd1lFFjj9fd6chPTbhcYHnlFBe6KUlE unK+Axn5bh/ZS7ZP0NPwI6maz X-Received: by 2002:a17:907:3f83:: with SMTP id hr3mr41248730ejc.604.1641306004249; Tue, 04 Jan 2022 06:20:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJxDMB0s8rjFyQSN39kRHQDqc01meMLfO5JYh1JLbN/Rupu47T0fL4hC9U8RPK01PTE4BlD7MQ== X-Received: by 2002:a17:907:3f83:: with SMTP id hr3mr41248713ejc.604.1641306004067; Tue, 04 Jan 2022 06:20:04 -0800 (PST) Received: from krava (nat-pool-brq-u.redhat.com. [213.175.37.12]) by smtp.gmail.com with ESMTPSA id f14sm14766323eds.20.2022.01.04.06.20.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:20:03 -0800 (PST) Date: Tue, 4 Jan 2022 15:20:01 +0100 From: Jiri Olsa To: Ian Rogers Cc: Andi Kleen , Namhyung Kim , John Garry , Kajol Jain , "Paul A . Clarke" , Arnaldo Carvalho de Melo , Riccardo Mancini , Kan Liang , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Vineet Singh , James Clark , Mathieu Poirier , Suzuki K Poulose , Mike Leach , Leo Yan , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, zhengjun.xing@intel.com, eranian@google.com Subject: Re: [PATCH v3 18/48] perf cpumap: Refactor cpu_map__build_map Message-ID: References: <20211230072030.302559-1-irogers@google.com> <20211230072030.302559-20-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211230072030.302559-20-irogers@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Dec 29, 2021 at 11:20:00PM -0800, Ian Rogers wrote: SNIP > + return 0; > + > + stat_config.aggr_map = cpu_aggr_map__new(evsel_list->core.cpus, get_id, env); > + if (!stat_config.aggr_map) { > + pr_err("cannot build %s map", aggr_mode__string[stat_config.aggr_mode]); > + return -1; > + } > + stat_config.aggr_get_id = aggr_mode__get_id_file(stat_config.aggr_mode); > return 0; > } > > diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c > index 32f9fc2dd389..ba4468f691c8 100644 > --- a/tools/perf/util/cpumap.c > +++ b/tools/perf/util/cpumap.c > @@ -140,7 +140,7 @@ struct aggr_cpu_id cpu_map__get_socket_aggr_by_cpu(int cpu, void *data __maybe_u > return id; > } > > -static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer) > +static int aggr_cpu_id__cmp(const void *a_pointer, const void *b_pointer) > { > struct aggr_cpu_id *a = (struct aggr_cpu_id *)a_pointer; > struct aggr_cpu_id *b = (struct aggr_cpu_id *)b_pointer; > @@ -157,37 +157,40 @@ static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer) > return a->thread - b->thread; > } > > -int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res, > - struct aggr_cpu_id (*f)(int cpu, void *data), > - void *data) > +struct cpu_aggr_map *cpu_aggr_map__new(const struct perf_cpu_map *cpus, > + aggr_cpu_id_get_t f, s/f/get_id/ ? jirka > + void *data) > { > - int nr = cpus->nr; > - struct cpu_aggr_map *c = cpu_aggr_map__empty_new(nr); > - int cpu, s2; > - struct aggr_cpu_id s1; > + int cpu, idx; > + struct cpu_aggr_map *c = cpu_aggr_map__empty_new(cpus->nr); SNIP 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A2C70C433EF for ; Tue, 4 Jan 2022 14:21:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VEAots9aKXtoSmAjJILDH/3C2LfLOfprbbAYjSD7w8A=; b=rgJ7BfvEgfRL0V 0I+baZCsavzwTQNUTX+yUtlHrHVpopuI7pw+ZS4kd07dqYvKK0DcX978Eq7KPiDklYR93UXdwuB+L RFd1LNI0jzTo3KHYpkcyZD9ONTUC4CCky9Sy5JeXkz5gtF1FJU4xilMjPXT53vuCXHs5Z2XO8/Y4H pPiNTjJW0dk/jBGNRQ+h51Fq97PZ/RJsrm78DHJi1eVsA5EiexrC35L9d7gdgVobirBu5jHicCqS+ PBGkKKVnS5kK6X77DPQSS5LOTEqKRZ1plFgt9vAfJTaFo3xMAHujB4HWQFr263LN+DjlUZ1BA9lf7 onWCW8xA/7opcb23cpfg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n4kfc-00BgZs-KU; Tue, 04 Jan 2022 14:20:12 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n4kfX-00BgXu-EF for linux-arm-kernel@lists.infradead.org; Tue, 04 Jan 2022 14:20:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641306006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tdBXcdlUZgH91vSV8gBFMtFgTf/fDf2VkDsQMplYoag=; b=W2syZLrtg98LPwkFetWikVPH1TWKDNIghIwTwM2jgmg65df4nrzlPeMVMzlz0ANH82WWZl wnOwstiWuBhLiSNEoT4nassAPQ0sSruTas1VCjdtZDdOqb3HdRVbcpfnLEqc1uf2MEcFP+ dqIuoelHsYlIWL0iZQqaQj3QQazBqxo= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-244-P4xA5X8hNHK4poDxwEWTAA-1; Tue, 04 Jan 2022 09:20:05 -0500 X-MC-Unique: P4xA5X8hNHK4poDxwEWTAA-1 Received: by mail-ed1-f69.google.com with SMTP id z10-20020a05640235ca00b003f8efab3342so18323503edc.2 for ; Tue, 04 Jan 2022 06:20:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=tdBXcdlUZgH91vSV8gBFMtFgTf/fDf2VkDsQMplYoag=; b=psab9o2fpu6dxMHn1tZzdeMqZ6TDGLtY4doRmYEaKKmjIu2debEnkXjppSmAX/aRz1 jgWrDKbX9q67UZh1ja/8Fb7ZLccoyFi1dWOoOpn2tFJiRrunmxnZOmTHsQWdZb1VezdC 4LjkCzJv7Jd4HOhAjaIdawTBy9CE5eEEMnm43E4HfO63weTItd5grwTxKucfkOhkoQ46 GNYfudMmsDK2XCFyWghEgf9f48ZALtDlNA+Hv0Bashm2fxt1lJlUAZScivrd7q5zlaJs 8MNciMgw40GKb/Jd/ckF7p/aNQgH7QPRu0QqmoPMUVmnowZ44B3ZjqLo1CrING8ILQBM p2sQ== X-Gm-Message-State: AOAM531PZSACYYiCNyetIlcxsyXcOt+j0gfkCTV7ALPlvncTWA4OQQhV xZwS6Wpmww9+QUV7T62swLkvwtitVHLcuk2yKD7xX6DUDMgjDykSJs+7dXAULB2M8FjP7d8p22a 6WWaGGg0W62ZidcUx+zhHQV08sNcb6lyq4hQ= X-Received: by 2002:a17:907:3f83:: with SMTP id hr3mr41248731ejc.604.1641306004249; Tue, 04 Jan 2022 06:20:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJxDMB0s8rjFyQSN39kRHQDqc01meMLfO5JYh1JLbN/Rupu47T0fL4hC9U8RPK01PTE4BlD7MQ== X-Received: by 2002:a17:907:3f83:: with SMTP id hr3mr41248713ejc.604.1641306004067; Tue, 04 Jan 2022 06:20:04 -0800 (PST) Received: from krava (nat-pool-brq-u.redhat.com. [213.175.37.12]) by smtp.gmail.com with ESMTPSA id f14sm14766323eds.20.2022.01.04.06.20.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:20:03 -0800 (PST) Date: Tue, 4 Jan 2022 15:20:01 +0100 From: Jiri Olsa To: Ian Rogers Cc: Andi Kleen , Namhyung Kim , John Garry , Kajol Jain , "Paul A . Clarke" , Arnaldo Carvalho de Melo , Riccardo Mancini , Kan Liang , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Vineet Singh , James Clark , Mathieu Poirier , Suzuki K Poulose , Mike Leach , Leo Yan , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, zhengjun.xing@intel.com, eranian@google.com Subject: Re: [PATCH v3 18/48] perf cpumap: Refactor cpu_map__build_map Message-ID: References: <20211230072030.302559-1-irogers@google.com> <20211230072030.302559-20-irogers@google.com> MIME-Version: 1.0 In-Reply-To: <20211230072030.302559-20-irogers@google.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jolsa@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220104_062007_619465_4B7165BF X-CRM114-Status: GOOD ( 17.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Dec 29, 2021 at 11:20:00PM -0800, Ian Rogers wrote: SNIP > + return 0; > + > + stat_config.aggr_map = cpu_aggr_map__new(evsel_list->core.cpus, get_id, env); > + if (!stat_config.aggr_map) { > + pr_err("cannot build %s map", aggr_mode__string[stat_config.aggr_mode]); > + return -1; > + } > + stat_config.aggr_get_id = aggr_mode__get_id_file(stat_config.aggr_mode); > return 0; > } > > diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c > index 32f9fc2dd389..ba4468f691c8 100644 > --- a/tools/perf/util/cpumap.c > +++ b/tools/perf/util/cpumap.c > @@ -140,7 +140,7 @@ struct aggr_cpu_id cpu_map__get_socket_aggr_by_cpu(int cpu, void *data __maybe_u > return id; > } > > -static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer) > +static int aggr_cpu_id__cmp(const void *a_pointer, const void *b_pointer) > { > struct aggr_cpu_id *a = (struct aggr_cpu_id *)a_pointer; > struct aggr_cpu_id *b = (struct aggr_cpu_id *)b_pointer; > @@ -157,37 +157,40 @@ static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer) > return a->thread - b->thread; > } > > -int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res, > - struct aggr_cpu_id (*f)(int cpu, void *data), > - void *data) > +struct cpu_aggr_map *cpu_aggr_map__new(const struct perf_cpu_map *cpus, > + aggr_cpu_id_get_t f, s/f/get_id/ ? jirka > + void *data) > { > - int nr = cpus->nr; > - struct cpu_aggr_map *c = cpu_aggr_map__empty_new(nr); > - int cpu, s2; > - struct aggr_cpu_id s1; > + int cpu, idx; > + struct cpu_aggr_map *c = cpu_aggr_map__empty_new(cpus->nr); SNIP _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel