From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752819AbbI0UaY (ORCPT ); Sun, 27 Sep 2015 16:30:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58809 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751763AbbI0UaX (ORCPT ); Sun, 27 Sep 2015 16:30:23 -0400 Date: Sun, 27 Sep 2015 22:30:16 +0200 From: Jiri Olsa To: He Kuang Cc: a.p.zijlstra@chello.nl, mingo@redhat.com, acme@kernel.org, jolsa@kernel.org, kan.liang@intel.com, adrian.hunter@intel.com, wangnan0@huawei.com, pi3orama@163.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 2/4] perf tools: Prompt error message for wrong terms of hw/sw events Message-ID: <20150927203016.GG24007@krava.redhat.com> References: <1443179511-59238-1-git-send-email-hekuang@huawei.com> <1443179511-59238-2-git-send-email-hekuang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1443179511-59238-2-git-send-email-hekuang@huawei.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Sep 25, 2015 at 11:11:49AM +0000, He Kuang wrote: SNIP > --- a/tools/perf/util/parse-events.c > +++ b/tools/perf/util/parse-events.c > @@ -656,6 +656,9 @@ do { \ > CHECK_TYPE_VAL(STR); > break; > default: > + err->str = strdup("unknown term"); > + err->idx = term->err_term; > + err->help = parse_events_formats_error_string(NULL); > return -EINVAL; > } > > @@ -1875,3 +1878,26 @@ void parse_events_evlist_error(struct parse_events_evlist *data, > err->str = strdup(str); > WARN_ONCE(!err->str, "WARNING: failed to allocate error string"); > } > + > +char *parse_events_formats_error_string(char *additional_terms) > +{ > + char *str; > + static const char *static_terms = "config,config1,config2,name," > + "period,freq,branch_type,time," > + "call-graph,stack-size\n"; > + > + /* valid terms */ > + if (additional_terms) { > + if (!asprintf(&str, "valid terms: %s,%s", > + additional_terms, static_terms)) > + goto fail; > + free(additional_terms); not excited about freeing the additional_terms arg in here, please state it in the comment above the function thanks, jirka