lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 22 Apr 2020 13:44:32 +0200 From: Jiri Olsa <jolsa@...hat.com> To: John Garry <john.garry@...wei.com> Cc: peterz@...radead.org, mingo@...hat.com, acme@...nel.org, mark.rutland@....com, alexander.shishkin@...ux.intel.com, namhyung@...nel.org, will@...nel.org, ak@...ux.intel.com, linuxarm@...wei.com, linux-kernel@...r.kernel.org, qiangqing.zhang@....com, irogers@...gle.com, robin.murphy@....com, zhangshaokun@...ilicon.com, linux-arm-kernel@...ts.infradead.org Subject: Re: [RFC PATCH v2 10/13] perf metricgroup: Split up metricgroup__add_metric() On Fri, Apr 17, 2020 at 06:41:21PM +0800, John Garry wrote: SNIP > static int metricgroup__add_metric(const char *metric, struct strbuf *events, > struct list_head *group_list) > { > @@ -502,37 +542,12 @@ static int metricgroup__add_metric(const char *metric, struct strbuf *events, > break; > if (!pe->metric_expr) > 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) > - 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; also this place got changed just recently a lot, so you might want to rebase to the Arnaldo's latest perf/core jirka > + if (match_pe_metric(pe, metric)) { > + ret = metricgroup__add_metric_pmu_event(pe, events, > + group_list); > + if (ret) > + return ret; > } > } > return ret; > -- > 2.16.4 >
Powered by blists - more mailing lists