From: kajoljain <kjain@linux.ibm.com>
To: Jiri Olsa <jolsa@redhat.com>
Cc: mark.rutland@arm.com, maddy@linux.vnet.ibm.com,
peterz@infradead.org, yao.jin@linux.intel.com, mingo@kernel.org,
kan.liang@linux.intel.com, ak@linux.intel.com,
alexander.shishkin@linux.intel.com, anju@linux.vnet.ibm.com,
mamatha4@linux.vnet.ibm.com, sukadev@linux.vnet.ibm.com,
ravi.bangoria@linux.ibm.com, acme@kernel.org, jmario@redhat.com,
namhyung@kernel.org, tglx@linutronix.de, mpetlan@redhat.com,
gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
linux-perf-users@vger.kernel.org, jolsa@kernel.org,
linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH v5 08/11] perf/tools: Refactoring metricgroup__add_metric function
Date: Wed, 18 Mar 2020 17:11:04 +0530 [thread overview]
Message-ID: <8597c6e5-d604-e60d-e666-3420b20bd3fc@linux.ibm.com> (raw)
In-Reply-To: <20200317150945.GC757893@krava>
On 3/17/20 8:39 PM, Jiri Olsa wrote:
> On Tue, Mar 17, 2020 at 11:53:30AM +0530, Kajol Jain wrote:
>> This patch refactor metricgroup__add_metric function where
>> some part of it move to function metricgroup__add_metric_param.
>> No logic change.
>
> can't compile this change:
>
> [jolsa@krava perf]$ make JOBS=1
> BUILD: Doing 'make -j1' parallel build
> CC util/metricgroup.o
> util/metricgroup.c: In function ‘metricgroup__add_metric_param’:
> util/metricgroup.c:486:6: error: too many arguments to function ‘expr__find_other’
> 486 | if (expr__find_other(pe->metric_expr, NULL, &ids, &idnum, 1) < 0)
> | ^~~~~~~~~~~~~~~~
> In file included from util/metricgroup.c:14:
> util/expr.h:25:5: note: declared here
> 25 | int expr__find_other(const char *expr, const char *one, const char ***other,
> | ^~~~~~~~~~~~~~~~
> mv: cannot stat 'util/.metricgroup.o.tmp': No such file or directory
> make[4]: *** [/home/jolsa/kernel/linux-perf/tools/build/Makefile.build:97: util/metricgroup.o] Error 1
> make[3]: *** [/home/jolsa/kernel/linux-perf/tools/build/Makefile.build:139: util] Error 2
> make[2]: *** [Makefile.perf:616: perf-in.o] Error 2
> make[1]: *** [Makefile.perf:225: sub-make] Error 2
> make: *** [Makefile:70: all] Error 2
Hi Jiri,
I made a mistake while arranging the patches in the series. I'll re-arrange it
and send it again.
Thanks,
Kajol
>
> jirka
>
>>
>> Signed-off-by: Kajol Jain <kjain@linux.ibm.com>
>> ---
>> tools/perf/util/metricgroup.c | 63 +++++++++++++++++++++--------------
>> 1 file changed, 38 insertions(+), 25 deletions(-)
>>
>> diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
>> index c3a8c701609a..b4919bcfbd8b 100644
>> --- a/tools/perf/util/metricgroup.c
>> +++ b/tools/perf/util/metricgroup.c
>> @@ -474,6 +474,41 @@ static bool metricgroup__has_constraint(struct pmu_event *pe)
>> return false;
>> }
>>
>> +static int metricgroup__add_metric_param(struct strbuf *events,
>> + struct list_head *group_list, struct pmu_event *pe)
>> +{
>> +
>> + const char **ids;
>> + int idnum;
>> + struct egroup *eg;
>> + int ret = -EINVAL;
>> +
>> + if (expr__find_other(pe->metric_expr, NULL, &ids, &idnum, 1) < 0)
>> + return ret;
>> +
>> + if (events->len > 0)
>> + strbuf_addf(events, ",");
>> +
>> + if (metricgroup__has_constraint(pe))
>> + metricgroup__add_metric_non_group(events, ids, idnum);
>> + else
>> + metricgroup__add_metric_weak_group(events, ids, idnum);
>> +
>> + eg = malloc(sizeof(*eg));
>> + if (!eg)
>> + ret = -ENOMEM;
>> +
>> + eg->ids = ids;
>> + eg->idnum = idnum;
>> + eg->metric_name = pe->metric_name;
>> + eg->metric_expr = pe->metric_expr;
>> + eg->metric_unit = pe->unit;
>> + list_add_tail(&eg->nd, group_list);
>> + ret = 0;
>> +
>> + return ret;
>> +}
>> +
>> static int metricgroup__add_metric(const char *metric, struct strbuf *events,
>> struct list_head *group_list)
>> {
>> @@ -493,35 +528,13 @@ static int metricgroup__add_metric(const char *metric, struct strbuf *events,
>> continue;
>> if (match_metric(pe->metric_group, metric) ||
>> match_metric(pe->metric_name, metric)) {
>> - const char **ids;
>> - int idnum;
>> - struct egroup *eg;
>>
>> pr_debug("metric expr %s for %s\n", pe->metric_expr, pe->metric_name);
>>
>> - if (expr__find_other(pe->metric_expr,
>> - NULL, &ids, &idnum) < 0)
>> + ret = metricgroup__add_metric_param(events,
>> + group_list, pe);
>> + if (ret == -EINVAL)
>> continue;
>> - if (events->len > 0)
>> - strbuf_addf(events, ",");
>> -
>> - if (metricgroup__has_constraint(pe))
>> - metricgroup__add_metric_non_group(events, ids, idnum);
>> - else
>> - metricgroup__add_metric_weak_group(events, ids, idnum);
>> -
>> - eg = malloc(sizeof(struct egroup));
>> - if (!eg) {
>> - ret = -ENOMEM;
>> - break;
>> - }
>> - eg->ids = ids;
>> - eg->idnum = idnum;
>> - eg->metric_name = pe->metric_name;
>> - eg->metric_expr = pe->metric_expr;
>> - eg->metric_unit = pe->unit;
>> - list_add_tail(&eg->nd, group_list);
>> - ret = 0;
>> }
>> }
>> return ret;
>> --
>> 2.18.1
>>
>
next prev parent reply other threads:[~2020-03-18 11:44 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-17 6:23 [PATCH v5 00/11] powerpc/perf: Add json file metric support for the hv_24x7 socket/chip level events Kajol Jain
2020-03-17 6:23 ` [PATCH v5 01/11] perf expr: Add expr_ prefix for parse_ctx and parse_id Kajol Jain
2020-03-17 6:23 ` [PATCH v5 02/11] perf expr: Add expr_scanner_ctx object Kajol Jain
2020-03-17 6:23 ` [PATCH v5 03/11] powerpc/perf/hv-24x7: Fix inconsistent output values incase multiple hv-24x7 events run Kajol Jain
2020-03-17 6:23 ` [PATCH v5 04/11] powerpc/hv-24x7: Add rtas call in hv-24x7 driver to get processor details Kajol Jain
2020-03-17 6:23 ` [PATCH v5 05/11] powerpc/hv-24x7: Add sysfs files inside hv-24x7 device to show " Kajol Jain
2020-03-17 6:23 ` [PATCH v5 06/11] Documentation/ABI: Add ABI documentation for chips and sockets Kajol Jain
2020-03-17 6:23 ` [PATCH v5 07/11] powerpc/hv-24x7: Update post_mobility_fixup() to handle migration Kajol Jain
2020-03-17 6:23 ` [PATCH v5 08/11] perf/tools: Refactoring metricgroup__add_metric function Kajol Jain
2020-03-17 15:09 ` Jiri Olsa
2020-03-18 11:41 ` kajoljain [this message]
2020-03-17 15:09 ` Jiri Olsa
2020-03-17 15:10 ` Jiri Olsa
2020-03-18 12:17 ` kajoljain
2020-03-17 6:23 ` [PATCH v5 09/11] perf/tools: Enhance JSON/metric infrastructure to handle "?" Kajol Jain
2020-03-17 15:06 ` Jiri Olsa
2020-03-18 12:45 ` kajoljain
2020-03-17 15:07 ` Jiri Olsa
2020-03-18 11:44 ` kajoljain
2020-03-17 15:10 ` Jiri Olsa
2020-03-18 12:18 ` kajoljain
2020-03-17 6:23 ` [PATCH v5 10/11] tools/perf: Enable Hz/hz prinitg for --metric-only option Kajol Jain
2020-03-17 6:23 ` [PATCH v5 11/11] perf/tools/pmu-events/powerpc: Add hv_24x7 socket/chip level metric events Kajol Jain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8597c6e5-d604-e60d-e666-3420b20bd3fc@linux.ibm.com \
--to=kjain@linux.ibm.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=anju@linux.vnet.ibm.com \
--cc=gregkh@linuxfoundation.org \
--cc=jmario@redhat.com \
--cc=jolsa@kernel.org \
--cc=jolsa@redhat.com \
--cc=kan.liang@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=maddy@linux.vnet.ibm.com \
--cc=mamatha4@linux.vnet.ibm.com \
--cc=mark.rutland@arm.com \
--cc=mingo@kernel.org \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=ravi.bangoria@linux.ibm.com \
--cc=sukadev@linux.vnet.ibm.com \
--cc=tglx@linutronix.de \
--cc=yao.jin@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).