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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 A1FF4C43464 for ; Fri, 18 Sep 2020 13:31:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 60A69206DB for ; Fri, 18 Sep 2020 13:31:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XfPENFPz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726673AbgIRNb5 (ORCPT ); Fri, 18 Sep 2020 09:31:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:37507 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726126AbgIRNb5 (ORCPT ); Fri, 18 Sep 2020 09:31:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600435915; 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=ncMAkUGj6RVEFkBElvUjnFBlBpNaTyc6eD0LmUBKC4E=; b=XfPENFPzVrtBxp4hGyzVfmEn4xgn2rz66sflaDQ6v6uGdbyekUJQ/nbhlghlcjNS5IqzUD 9FAes+v/bbXgCKdndLSJYHrmdg5gAOgrg+RCe3cG8ou2EN1T15RXEaHHm3PdIdGcDPDobe 8cFeKfEWWPBDzbIaXZADKB/gJ3IO+XI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-498-c09jnrsZNxiB40MAi6pksw-1; Fri, 18 Sep 2020 09:31:53 -0400 X-MC-Unique: c09jnrsZNxiB40MAi6pksw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 96ED080F055; Fri, 18 Sep 2020 13:31:49 +0000 (UTC) Received: from krava (ovpn-114-24.ams2.redhat.com [10.36.114.24]) by smtp.corp.redhat.com (Postfix) with SMTP id C8D411002382; Fri, 18 Sep 2020 13:31:46 +0000 (UTC) Date: Fri, 18 Sep 2020 15:31:45 +0200 From: Jiri Olsa To: Namhyung Kim Cc: Arnaldo Carvalho de Melo , Ingo Molnar , Peter Zijlstra , Mark Rutland , Alexander Shishkin , Stephane Eranian , LKML , Andi Kleen , Ian Rogers Subject: Re: [PATCH 1/4] perf evsel: Add evsel__clone() function Message-ID: <20200918133145.GA2626435@krava> References: <20200916063129.1061487-1-namhyung@kernel.org> <20200916063129.1061487-2-namhyung@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200916063129.1061487-2-namhyung@kernel.org> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Sep 16, 2020 at 03:31:26PM +0900, Namhyung Kim wrote: SNIP > +struct evsel *evsel__clone(struct evsel *orig) > +{ > + struct evsel *evsel; > + struct evsel_config_term *pos, *tmp; > + > + BUG_ON(orig->core.fd); > + BUG_ON(orig->counts); > + BUG_ON(orig->priv); > + BUG_ON(orig->per_pkg_mask); > + > + /* cannot handle BPF objects for now */ > + if (orig->bpf_obj) > + return NULL; > + > + evsel = evsel__new(&orig->core.attr); > + if (evsel == NULL) > + return NULL; > + > + evsel->core.cpus = perf_cpu_map__get(orig->core.cpus); > + evsel->core.own_cpus = perf_cpu_map__get(orig->core.own_cpus); > + evsel->core.threads = perf_thread_map__get(orig->core.threads); > + evsel->core.nr_members = orig->core.nr_members; > + evsel->core.system_wide = orig->core.system_wide; > + > + if (orig->name) > + evsel->name = strdup(orig->name); > + if (orig->group_name) > + evsel->group_name = strdup(orig->group_name); > + if (orig->pmu_name) > + evsel->pmu_name = strdup(orig->pmu_name); > + if (orig->filter) > + evsel->filter = strdup(orig->filter); we should check those strdup results > + evsel->cgrp = cgroup__get(orig->cgrp); > + evsel->tp_format = orig->tp_format; > + evsel->handler = orig->handler; > + evsel->leader = orig->leader; > + > + evsel->max_events = orig->max_events; > + evsel->tool_event = orig->tool_event; > + evsel->unit = orig->unit; > + evsel->scale = orig->scale; > + evsel->snapshot = orig->snapshot; > + evsel->per_pkg = orig->per_pkg; > + evsel->percore = orig->percore; > + evsel->precise_max = orig->precise_max; > + evsel->use_uncore_alias = orig->use_uncore_alias; > + evsel->is_libpfm_event = orig->is_libpfm_event; > + > + evsel->exclude_GH = orig->exclude_GH; > + evsel->sample_read = orig->sample_read; > + evsel->auto_merge_stats = orig->auto_merge_stats; > + evsel->collect_stat = orig->collect_stat; > + evsel->weak_group = orig->weak_group; so all those evsel's members are possibly defined in parse time right? perhaps we should separate them in the struct? and make some note about evsel__clone function that new members should be considered for copy in evsel__close.. or something like that > + > + list_for_each_entry(pos, &orig->config_terms, list) { > + tmp = malloc(sizeof(*tmp)); > + if (tmp == NULL) { > + evsel__delete(evsel); > + evsel = NULL; > + break; > + } > + > + *tmp = *pos; > + if (tmp->free_str) { > + tmp->val.str = strdup(pos->val.str); > + if (tmp->val.str == NULL) { > + evsel__delete(evsel); > + evsel = NULL; > + free(tmp); > + break; > + } > + } > + list_add_tail(&tmp->list, &evsel->config_terms); > + } could this go in separate function? copy_terms thanks, jirka > + > + return evsel; > +} > + > /* > * Returns pointer with encoded error via interface. > */ > diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h > index 35e3f6d66085..507c31d6a389 100644 > --- a/tools/perf/util/evsel.h > +++ b/tools/perf/util/evsel.h > @@ -169,6 +169,7 @@ static inline struct evsel *evsel__new(struct perf_event_attr *attr) > return evsel__new_idx(attr, 0); > } > > +struct evsel *evsel__clone(struct evsel *orig); > struct evsel *evsel__newtp_idx(const char *sys, const char *name, int idx); > > /* > -- > 2.28.0.618.gf4bc123cb7-goog >