From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752169AbbINVgg (ORCPT <rfc822;w@1wt.eu>);
	Mon, 14 Sep 2015 17:36:36 -0400
Received: from casper.infradead.org ([85.118.1.10]:39872 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751723AbbINVgf (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 14 Sep 2015 17:36:35 -0400
Date: Mon, 14 Sep 2015 18:36:27 -0300
From: Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>
To: =?iso-8859-1?Q?Rapha=EBl?= Beamonte <raphael.beamonte@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>, Jiri Olsa <jolsa@kernel.org>,
        lkml <linux-kernel@vger.kernel.org>, David Ahern <dsahern@gmail.com>,
        Ingo Molnar <mingo@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
        Peter Zijlstra <a.p.zijlstra@chello.nl>,
        Matt Fleming <matt@codeblueprint.co.uk>
Subject: Re: [PATCH 4/5] perf tools: Propagate error info from tp_format
Message-ID: <20150914213627.GL5250@kernel.org>
References: <1441615087-13886-1-git-send-email-jolsa@kernel.org>
 <1441615087-13886-5-git-send-email-jolsa@kernel.org>
 <20150909205813.GV3475@kernel.org>
 <20150910082452.GC19014@krava.brq.redhat.com>
 <20150914205303.GF5250@kernel.org>
 <CAE_Gge3UTwmoaWNTYhW3z+xADC8ns_i+KA+z+GKU1pgGSbJvqA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CAE_Gge3UTwmoaWNTYhW3z+xADC8ns_i+KA+z+GKU1pgGSbJvqA@mail.gmail.com>
X-Url: http://acmel.wordpress.com
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Em Mon, Sep 14, 2015 at 04:59:41PM -0400, Raphaël Beamonte escreveu:
> 2015-09-14 16:53 GMT-04:00 Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>:
> > +++ b/tools/perf/util/evsel.c
> > @@ -234,7 +234,9 @@ struct perf_evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int
> >         struct perf_evsel *evsel = zalloc(perf_evsel__object.size);
> >         int err = -ENOMEM;
> >
> > -       if (evsel != NULL) {
> > +       if (evsel == NULL) {
> > +               goto out_err;
> > +       } else {
> 
> Is the else really necessary after a goto?

Not really, we can remove it and all would be equivalent (the code
with/without should be the same), its just that I wanted to avoid
touching the identation to reduce patch size and since we need o open a
brace to declare that attr variable...

- Arnaldo
 
> >                 struct perf_event_attr attr = {
> >                         .type          = PERF_TYPE_TRACEPOINT,
> >                         .sample_type   = (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME |
> > @@ -261,6 +263,7 @@ struct perf_evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int
> >  out_free:
> >         zfree(&evsel->name);
> >         free(evsel);
> > +out_err:
> >         return ERR_PTR(err);
> >  }
> >
> > diff --git a/tools/perf/util/trace-event.c b/tools/perf/util/trace-event.c
> > index 8e3a60e3e15f..802bb868d446 100644
> > --- a/tools/perf/util/trace-event.c
> > +++ b/tools/perf/util/trace-event.c
> > @@ -100,7 +100,7 @@ struct event_format*
> >  trace_event__tp_format(const char *sys, const char *name)
> >  {
> >         if (!tevent_initialized && trace_event__init2())
> > -               return NULL;
> > +               return ERR_PTR(-ENOMEM);
> >
> >         return tp_format(sys, name);
> >  }