From: "tip-bot2 for Kajol Jain" <tip-bot2@linutronix.de> To: linux-tip-commits@vger.kernel.org Cc: Kajol Jain <kjain@linux.ibm.com>, Jiri Olsa <jolsa@redhat.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Andi Kleen <ak@linux.intel.com>, Anju T Sudhakar <anju@linux.vnet.ibm.com>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, Jin Yao <yao.jin@linux.intel.com>, Joe Mario <jmario@redhat.com>, Kan Liang <kan.liang@linux.intel.com>, Madhavan Srinivasan <maddy@linux.vnet.ibm.com>, Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>, Mark Rutland <mark.rutland@arm.com>, Michael Ellerman <mpe@ellerman.id.au>, Michael Petlan <mpetlan@redhat.com>, Namhyung Kim <namhyung@kernel.org>, Paul Mackerras <paulus@ozlabs.org>, Peter Zijlstra <peterz@infradead.org>, Ravi Bangoria <ravi.bangoria@linux.ibm.com>, Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>, Thomas Gleixner <tglx@linutronix.de>, linuxppc-dev@lists.ozlabs.org, Arnaldo Carvalho de Melo <acme@redhat.com>, x86 <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org> Subject: [tip: perf/core] perf metrictroup: Split the metricgroup__add_metric function Date: Wed, 22 Apr 2020 12:17:27 -0000 [thread overview] Message-ID: <158755784797.28353.3422186725377296528.tip-bot2@tip-bot2> (raw) In-Reply-To: <20200401203340.31402-4-kjain@linux.ibm.com> The following commit has been merged into the perf/core branch of tip: Commit-ID: 47352aba40035ab3fdc50dd03a94456feabed7d8 Gitweb: https://git.kernel.org/tip/47352aba40035ab3fdc50dd03a94456feabed7d8 Author: Kajol Jain <kjain@linux.ibm.com> AuthorDate: Thu, 02 Apr 2020 02:03:36 +05:30 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitterDate: Thu, 16 Apr 2020 12:19:13 -03:00 perf metrictroup: Split the metricgroup__add_metric function This patch refactors metricgroup__add_metric function where some part of it move to function metricgroup__add_metric_param. No logic change. Signed-off-by: Kajol Jain <kjain@linux.ibm.com> Acked-by: Jiri Olsa <jolsa@redhat.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Anju T Sudhakar <anju@linux.vnet.ibm.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Jin Yao <yao.jin@linux.intel.com> Cc: Joe Mario <jmario@redhat.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com> Cc: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michael Petlan <mpetlan@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@ozlabs.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com> Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linuxppc-dev@lists.ozlabs.org Link: http://lore.kernel.org/lkml/20200401203340.31402-4-kjain@linux.ibm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/util/metricgroup.c | 60 +++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 926449a..7ad81c8 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -485,6 +485,39 @@ static bool metricgroup__has_constraint(struct pmu_event *pe) return false; } +static int __metricgroup__add_metric(struct strbuf *events, + struct list_head *group_list, struct pmu_event *pe) +{ + + const char **ids; + int idnum; + struct egroup *eg; + + if (expr__find_other(pe->metric_expr, NULL, &ids, &idnum) < 0) + return -EINVAL; + + 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) + return -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); + + return 0; +} + static int metricgroup__add_metric(const char *metric, struct strbuf *events, struct list_head *group_list) { @@ -504,35 +537,12 @@ 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) - 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; + ret = __metricgroup__add_metric(events, group_list, pe); + if (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;
WARNING: multiple messages have this Message-ID (diff)
From: "tip-bot2 for Kajol Jain" <tip-bot2@linutronix.de> To: linux-tip-commits@vger.kernel.org Cc: Mark Rutland <mark.rutland@arm.com>, Madhavan Srinivasan <maddy@linux.vnet.ibm.com>, Peter Zijlstra <peterz@infradead.org>, Jin Yao <yao.jin@linux.intel.com>, Jiri Olsa <jolsa@redhat.com>, Kan Liang <kan.liang@linux.intel.com>, Andi Kleen <ak@linux.intel.com>, x86 <x86@kernel.org>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Anju T Sudhakar <anju@linux.vnet.ibm.com>, Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>, Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>, Ravi Bangoria <ravi.bangoria@linux.ibm.com>, Kajol Jain <kjain@linux.ibm.com>, Arnaldo Carvalho de Melo <acme@redhat.com>, Joe Mario <jmario@redhat.com>, Namhyung Kim <namhyung@kernel.org>, Thomas Gleixner <tglx@linutronix.de>, Michael Petlan <mpetlan@redhat.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, LKML <linux-kernel@vger.kernel.org>, linuxppc-dev@lists.ozlabs.org Subject: [tip: perf/core] perf metrictroup: Split the metricgroup__add_metric function Date: Wed, 22 Apr 2020 12:17:27 -0000 [thread overview] Message-ID: <158755784797.28353.3422186725377296528.tip-bot2@tip-bot2> (raw) In-Reply-To: <20200401203340.31402-4-kjain@linux.ibm.com> The following commit has been merged into the perf/core branch of tip: Commit-ID: 47352aba40035ab3fdc50dd03a94456feabed7d8 Gitweb: https://git.kernel.org/tip/47352aba40035ab3fdc50dd03a94456feabed7d8 Author: Kajol Jain <kjain@linux.ibm.com> AuthorDate: Thu, 02 Apr 2020 02:03:36 +05:30 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitterDate: Thu, 16 Apr 2020 12:19:13 -03:00 perf metrictroup: Split the metricgroup__add_metric function This patch refactors metricgroup__add_metric function where some part of it move to function metricgroup__add_metric_param. No logic change. Signed-off-by: Kajol Jain <kjain@linux.ibm.com> Acked-by: Jiri Olsa <jolsa@redhat.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Anju T Sudhakar <anju@linux.vnet.ibm.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Jin Yao <yao.jin@linux.intel.com> Cc: Joe Mario <jmario@redhat.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com> Cc: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michael Petlan <mpetlan@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@ozlabs.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com> Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linuxppc-dev@lists.ozlabs.org Link: http://lore.kernel.org/lkml/20200401203340.31402-4-kjain@linux.ibm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/util/metricgroup.c | 60 +++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 926449a..7ad81c8 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -485,6 +485,39 @@ static bool metricgroup__has_constraint(struct pmu_event *pe) return false; } +static int __metricgroup__add_metric(struct strbuf *events, + struct list_head *group_list, struct pmu_event *pe) +{ + + const char **ids; + int idnum; + struct egroup *eg; + + if (expr__find_other(pe->metric_expr, NULL, &ids, &idnum) < 0) + return -EINVAL; + + 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) + return -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); + + return 0; +} + static int metricgroup__add_metric(const char *metric, struct strbuf *events, struct list_head *group_list) { @@ -504,35 +537,12 @@ 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) - 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; + ret = __metricgroup__add_metric(events, group_list, pe); + if (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;
next prev parent reply other threads:[~2020-04-22 12:18 UTC|newest] Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-01 20:33 [PATCH v8 0/7] powerpc/perf: Add json file metric support for the hv_24x7 socket/chip level events Kajol Jain 2020-04-01 20:33 ` Kajol Jain 2020-04-01 20:33 ` [PATCH v8 1/7] perf expr: Add expr_ prefix for parse_ctx and parse_id Kajol Jain 2020-04-01 20:33 ` Kajol Jain 2020-04-06 14:13 ` Arnaldo Carvalho de Melo 2020-04-06 14:13 ` Arnaldo Carvalho de Melo 2020-04-07 7:11 ` kajoljain 2020-04-07 7:11 ` kajoljain 2020-04-22 12:17 ` [tip: perf/core] " tip-bot2 for Jiri Olsa 2020-04-22 12:17 ` tip-bot2 for Jiri Olsa 2020-04-01 20:33 ` [PATCH v8 2/7] perf expr: Add expr_scanner_ctx object Kajol Jain 2020-04-01 20:33 ` Kajol Jain 2020-04-22 12:17 ` [tip: perf/core] " tip-bot2 for Jiri Olsa 2020-04-22 12:17 ` tip-bot2 for Jiri Olsa 2020-04-01 20:33 ` [PATCH v8 3/7] perf/tools: Refactoring metricgroup__add_metric function Kajol Jain 2020-04-01 20:33 ` Kajol Jain 2020-04-22 12:17 ` tip-bot2 for Kajol Jain [this message] 2020-04-22 12:17 ` [tip: perf/core] perf metrictroup: Split the " tip-bot2 for Kajol Jain 2020-04-01 20:33 ` [PATCH v8 4/7] perf/tools: Enhance JSON/metric infrastructure to handle "?" Kajol Jain 2020-04-01 20:33 ` Kajol Jain 2020-05-01 15:56 ` Ian Rogers 2020-05-01 15:56 ` Ian Rogers 2020-05-01 15:56 ` Ian Rogers 2020-05-08 13:05 ` [tip: perf/core] perf metricgroups: " tip-bot2 for Kajol Jain 2020-05-08 13:05 ` tip-bot2 for Kajol Jain 2020-04-01 20:33 ` [PATCH v8 5/7] perf/tests/expr: Added test for runtime param in metric expression Kajol Jain 2020-04-01 20:33 ` Kajol Jain 2020-05-08 13:05 ` [tip: perf/core] perf tests expr: " tip-bot2 for Kajol Jain 2020-05-08 13:05 ` tip-bot2 for Kajol Jain 2020-04-01 20:33 ` [PATCH v8 6/7] tools/perf: Enable Hz/hz prinitg for --metric-only option Kajol Jain 2020-04-01 20:33 ` Kajol Jain 2020-04-02 12:49 ` Jiri Olsa 2020-04-02 12:49 ` Jiri Olsa 2020-04-02 20:42 ` Andi Kleen 2020-04-02 20:42 ` Andi Kleen 2020-05-08 13:05 ` [tip: perf/core] perf tools: " tip-bot2 for Kajol Jain 2020-05-08 13:05 ` tip-bot2 for Kajol Jain 2020-04-01 20:33 ` [PATCH v8 7/7] perf/tools/pmu-events/powerpc: Add hv_24x7 socket/chip level metric events Kajol Jain 2020-04-01 20:33 ` Kajol Jain 2020-05-08 13:05 ` [tip: perf/core] perf vendor events power9: " tip-bot2 for Kajol Jain 2020-05-08 13:05 ` tip-bot2 for Kajol Jain 2020-04-02 21:27 ` [PATCH v8 0/7] powerpc/perf: Add json file metric support for the hv_24x7 socket/chip level events Jiri Olsa 2020-04-02 21:27 ` Jiri Olsa 2020-04-28 6:32 ` kajoljain 2020-04-28 6:32 ` kajoljain 2020-04-29 14:46 ` Arnaldo Carvalho de Melo 2020-04-29 14:46 ` Arnaldo Carvalho de Melo
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=158755784797.28353.3422186725377296528.tip-bot2@tip-bot2 \ --to=tip-bot2@linutronix.de \ --cc=acme@redhat.com \ --cc=ak@linux.intel.com \ --cc=alexander.shishkin@linux.intel.com \ --cc=anju@linux.vnet.ibm.com \ --cc=benh@kernel.crashing.org \ --cc=gregkh@linuxfoundation.org \ --cc=jmario@redhat.com \ --cc=jolsa@redhat.com \ --cc=kan.liang@linux.intel.com \ --cc=kjain@linux.ibm.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-tip-commits@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=mpe@ellerman.id.au \ --cc=mpetlan@redhat.com \ --cc=namhyung@kernel.org \ --cc=paulus@ozlabs.org \ --cc=peterz@infradead.org \ --cc=ravi.bangoria@linux.ibm.com \ --cc=sukadev@linux.vnet.ibm.com \ --cc=tglx@linutronix.de \ --cc=x86@kernel.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.