From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757650AbbIDGZV (ORCPT ); Fri, 4 Sep 2015 02:25:21 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:36448 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750973AbbIDGZT (ORCPT ); Fri, 4 Sep 2015 02:25:19 -0400 Date: Fri, 4 Sep 2015 15:09:47 +0900 From: Namhyung Kim To: =?utf-8?B?5bmz5p2+6ZuF5bezIC8gSElSQU1BVFXvvIxNQVNBTUk=?= Cc: Arnaldo Carvalho de Melo , Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML , Wang Nan Subject: Re: [RFC/PATCH 2/3] perf probe: Rename __event_package to probe_event_package Message-ID: <20150904060947.GA2771@sejong> References: <1441301337-18954-1-git-send-email-namhyung@kernel.org> <1441301337-18954-2-git-send-email-namhyung@kernel.org> <50399556C9727B4D88A595C8584AAB375250BD03@GSjpTKYDCembx32.service.hitachi.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <50399556C9727B4D88A595C8584AAB375250BD03@GSjpTKYDCembx32.service.hitachi.net> User-Agent: Mutt/1.5.23+102 (2ca89bed6448) (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Sep 04, 2015 at 02:11:09AM +0000, 平松雅巳 / HIRAMATU，MASAMI wrote: > > From: Namhyung Kim [mailto:namhyung@gmail.com] On Behalf Of Namhyung Kim > > > > The struct __event_package can be accessed now from other than > > probe-event.c code. So rename it to more specific name. > > > > Cc: Masami Hiramatsu > > Signed-off-by: Namhyung Kim > > --- > > tools/perf/util/probe-event.c | 18 ++++++------------ > > tools/perf/util/probe-event.h | 10 ++++++++++ > > 2 files changed, 16 insertions(+), 12 deletions(-) > > > > diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c > > index 8eaa03428d72..eef39338bb2a 100644 > > --- a/tools/perf/util/probe-event.c > > +++ b/tools/perf/util/probe-event.c > > @@ -2759,20 +2759,14 @@ static int convert_to_probe_trace_events(struct perf_probe_event *pev, > > return find_probe_trace_events_from_map(pev, tevs); > > } > > > > -struct __event_package { > > - struct perf_probe_event *pev; > > - struct probe_trace_event *tevs; > > - int ntevs; > > -}; > > - > > -static int __add_perf_probe_events(struct perf_probe_event *pevs, int npevs, > > - struct __event_package **ppkgs) > > +int __add_perf_probe_events(struct perf_probe_event *pevs, int npevs, > > + struct probe_event_package **ppkgs) > > OK, since now we have probe_event_package object, this function should be > refactored as pkgs = probe_event_packages__new(pevs, npevs)(allocate, initialize) > , probe_event_packages__convert(pkgs) and probe_event_packages__apply(pkgs). I think it'd be better using Wang Nan's patch below. https://lkml.org/lkml/2015/8/29/25 I'll send v2 with this change. Thanks, Namhyung > > > { > > int i, ret; > > - struct __event_package *pkgs; > > + struct probe_event_package *pkgs; > > > > ret = 0; > > - pkgs = zalloc(sizeof(struct __event_package) * npevs); > > + pkgs = zalloc(sizeof(struct probe_event_package) * npevs); > > > > if (pkgs == NULL) > > return -ENOMEM; > > @@ -2813,7 +2807,7 @@ static int __add_perf_probe_events(struct perf_probe_event *pevs, int npevs, > > return 0; > > } > > > > -static void cleanup_perf_probe_events(struct __event_package *pkgs, int npevs) > > +void cleanup_perf_probe_events(struct probe_event_package *pkgs, int npevs) > > This also should be perf_event_pacakges__delete() :) > > Thanks! > > > { > > int i, j; > > > > @@ -2833,7 +2827,7 @@ static void cleanup_perf_probe_events(struct __event_package *pkgs, int npevs) > > int add_perf_probe_events(struct perf_probe_event *pevs, int npevs) > > { > > int ret; > > - struct __event_package *pkgs = NULL; > > + struct probe_event_package *pkgs = NULL; > > > > ret = __add_perf_probe_events(pevs, npevs, &pkgs); > > cleanup_perf_probe_events(pkgs, npevs); > > diff --git a/tools/perf/util/probe-event.h b/tools/perf/util/probe-event.h > > index 6e7ec68a4aa8..73f922fa7cac 100644 > > --- a/tools/perf/util/probe-event.h > > +++ b/tools/perf/util/probe-event.h > > @@ -89,6 +89,12 @@ struct perf_probe_event { > > struct perf_probe_arg *args; /* Arguments */ > > }; > > > > +struct probe_event_package { > > + struct perf_probe_event *pev; > > + struct probe_trace_event *tevs; > > + int ntevs; > > +}; > > + > > /* Line range */ > > struct line_range { > > char *file; /* File name */ > > @@ -138,6 +144,10 @@ extern void line_range__clear(struct line_range *lr); > > extern int line_range__init(struct line_range *lr); > > > > extern int add_perf_probe_events(struct perf_probe_event *pevs, int npevs); > > +extern int __add_perf_probe_events(struct perf_probe_event *pevs, int npevs, > > + struct probe_event_package **ppkgs); > > +extern void cleanup_perf_probe_events(struct probe_event_package *pkgs, > > + int npevs); > > extern int del_perf_probe_events(struct strfilter *filter); > > extern int show_perf_probe_events(struct strfilter *filter); > > extern int show_line_range(struct line_range *lr, const char *module, > > -- > > 2.5.0 >