Used for the evlist initialization.
Reviewed-by: Howard Chu <howardchu95@gmail.com>
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/python.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
index b600b6379b4e..4a3015e7dc83 100644
--- a/tools/perf/util/python.c
+++ b/tools/perf/util/python.c
@@ -1339,12 +1339,18 @@ static PyObject *pyrf__parse_events(PyObject *self, PyObject *args)
struct evlist evlist = {};
struct parse_events_error err;
PyObject *result;
+ PyObject *pcpus = NULL, *pthreads = NULL;
+ struct perf_cpu_map *cpus;
+ struct perf_thread_map *threads;
- if (!PyArg_ParseTuple(args, "s", &input))
+ if (!PyArg_ParseTuple(args, "s|OO", &input, &pcpus, &pthreads))
return NULL;
+ threads = pthreads ? ((struct pyrf_thread_map *)pthreads)->threads : NULL;
+ cpus = pcpus ? ((struct pyrf_cpu_map *)pcpus)->cpus : NULL;
+
parse_events_error__init(&err);
- evlist__init(&evlist, NULL, NULL);
+ evlist__init(&evlist, cpus, threads);
if (parse_events(&evlist, input, &err)) {
parse_events_error__print(&err, input);
PyErr_SetFromErrno(PyExc_OSError);
--
2.48.1.711.g2feabab25a-goog
On Fri, Feb 28, 2025 at 02:23:03PM -0800, Ian Rogers wrote:
> Used for the evlist initialization.
>
> Reviewed-by: Howard Chu <howardchu95@gmail.com>
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/util/python.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
> index b600b6379b4e..4a3015e7dc83 100644
> --- a/tools/perf/util/python.c
> +++ b/tools/perf/util/python.c
> @@ -1339,12 +1339,18 @@ static PyObject *pyrf__parse_events(PyObject *self, PyObject *args)
> struct evlist evlist = {};
> struct parse_events_error err;
> PyObject *result;
> + PyObject *pcpus = NULL, *pthreads = NULL;
> + struct perf_cpu_map *cpus;
> + struct perf_thread_map *threads;
>
> - if (!PyArg_ParseTuple(args, "s", &input))
> + if (!PyArg_ParseTuple(args, "s|OO", &input, &pcpus, &pthreads))
> return NULL;
>
> + threads = pthreads ? ((struct pyrf_thread_map *)pthreads)->threads : NULL;
> + cpus = pcpus ? ((struct pyrf_cpu_map *)pcpus)->cpus : NULL;
I wonder if it needs any type checks before accessing them.
Thanks,
Namhyung
> +
> parse_events_error__init(&err);
> - evlist__init(&evlist, NULL, NULL);
> + evlist__init(&evlist, cpus, threads);
> if (parse_events(&evlist, input, &err)) {
> parse_events_error__print(&err, input);
> PyErr_SetFromErrno(PyExc_OSError);
> --
> 2.48.1.711.g2feabab25a-goog
>
On Mon, Mar 10, 2025 at 3:12 PM Namhyung Kim <namhyung@kernel.org> wrote:
>
> On Fri, Feb 28, 2025 at 02:23:03PM -0800, Ian Rogers wrote:
> > Used for the evlist initialization.
> >
> > Reviewed-by: Howard Chu <howardchu95@gmail.com>
> > Signed-off-by: Ian Rogers <irogers@google.com>
> > ---
> > tools/perf/util/python.c | 10 ++++++++--
> > 1 file changed, 8 insertions(+), 2 deletions(-)
> >
> > diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
> > index b600b6379b4e..4a3015e7dc83 100644
> > --- a/tools/perf/util/python.c
> > +++ b/tools/perf/util/python.c
> > @@ -1339,12 +1339,18 @@ static PyObject *pyrf__parse_events(PyObject *self, PyObject *args)
> > struct evlist evlist = {};
> > struct parse_events_error err;
> > PyObject *result;
> > + PyObject *pcpus = NULL, *pthreads = NULL;
> > + struct perf_cpu_map *cpus;
> > + struct perf_thread_map *threads;
> >
> > - if (!PyArg_ParseTuple(args, "s", &input))
> > + if (!PyArg_ParseTuple(args, "s|OO", &input, &pcpus, &pthreads))
> > return NULL;
> >
> > + threads = pthreads ? ((struct pyrf_thread_map *)pthreads)->threads : NULL;
> > + cpus = pcpus ? ((struct pyrf_cpu_map *)pcpus)->cpus : NULL;
>
> I wonder if it needs any type checks before accessing them.
Agreed. We don't do it yet elsewhere:
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util/python.c?h=perf-tools-next#n769
although there keywords potentially avoid ambiguity. Given this I
think improving the typing is follow up work.
Thanks,
Ian
> Thanks,
> Namhyung
>
> > +
> > parse_events_error__init(&err);
> > - evlist__init(&evlist, NULL, NULL);
> > + evlist__init(&evlist, cpus, threads);
> > if (parse_events(&evlist, input, &err)) {
> > parse_events_error__print(&err, input);
> > PyErr_SetFromErrno(PyExc_OSError);
> > --
> > 2.48.1.711.g2feabab25a-goog
> >
Hi Ian,
On Mon, Mar 10, 2025 at 05:28:48PM -0700, Ian Rogers wrote:
> On Mon, Mar 10, 2025 at 3:12 PM Namhyung Kim <namhyung@kernel.org> wrote:
> >
> > On Fri, Feb 28, 2025 at 02:23:03PM -0800, Ian Rogers wrote:
> > > Used for the evlist initialization.
> > >
> > > Reviewed-by: Howard Chu <howardchu95@gmail.com>
> > > Signed-off-by: Ian Rogers <irogers@google.com>
> > > ---
> > > tools/perf/util/python.c | 10 ++++++++--
> > > 1 file changed, 8 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
> > > index b600b6379b4e..4a3015e7dc83 100644
> > > --- a/tools/perf/util/python.c
> > > +++ b/tools/perf/util/python.c
> > > @@ -1339,12 +1339,18 @@ static PyObject *pyrf__parse_events(PyObject *self, PyObject *args)
> > > struct evlist evlist = {};
> > > struct parse_events_error err;
> > > PyObject *result;
> > > + PyObject *pcpus = NULL, *pthreads = NULL;
> > > + struct perf_cpu_map *cpus;
> > > + struct perf_thread_map *threads;
> > >
> > > - if (!PyArg_ParseTuple(args, "s", &input))
> > > + if (!PyArg_ParseTuple(args, "s|OO", &input, &pcpus, &pthreads))
> > > return NULL;
> > >
> > > + threads = pthreads ? ((struct pyrf_thread_map *)pthreads)->threads : NULL;
> > > + cpus = pcpus ? ((struct pyrf_cpu_map *)pcpus)->cpus : NULL;
> >
> > I wonder if it needs any type checks before accessing them.
>
> Agreed. We don't do it yet elsewhere:
> https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util/python.c?h=perf-tools-next#n769
> although there keywords potentially avoid ambiguity. Given this I
> think improving the typing is follow up work.
Sounds good.
Thanks,
Namhyung
> >
> > > +
> > > parse_events_error__init(&err);
> > > - evlist__init(&evlist, NULL, NULL);
> > > + evlist__init(&evlist, cpus, threads);
> > > if (parse_events(&evlist, input, &err)) {
> > > parse_events_error__print(&err, input);
> > > PyErr_SetFromErrno(PyExc_OSError);
> > > --
> > > 2.48.1.711.g2feabab25a-goog
> > >
On Fri, Feb 28, 2025 at 02:23:03PM -0800, Ian Rogers wrote:
> Used for the evlist initialization.
Reviewed-by: Arnaldo Carvalho de Melo <acme@redhat.com>
- Arnaldo
> Reviewed-by: Howard Chu <howardchu95@gmail.com>
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/util/python.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
> index b600b6379b4e..4a3015e7dc83 100644
> --- a/tools/perf/util/python.c
> +++ b/tools/perf/util/python.c
> @@ -1339,12 +1339,18 @@ static PyObject *pyrf__parse_events(PyObject *self, PyObject *args)
> struct evlist evlist = {};
> struct parse_events_error err;
> PyObject *result;
> + PyObject *pcpus = NULL, *pthreads = NULL;
> + struct perf_cpu_map *cpus;
> + struct perf_thread_map *threads;
>
> - if (!PyArg_ParseTuple(args, "s", &input))
> + if (!PyArg_ParseTuple(args, "s|OO", &input, &pcpus, &pthreads))
> return NULL;
>
> + threads = pthreads ? ((struct pyrf_thread_map *)pthreads)->threads : NULL;
> + cpus = pcpus ? ((struct pyrf_cpu_map *)pcpus)->cpus : NULL;
> +
> parse_events_error__init(&err);
> - evlist__init(&evlist, NULL, NULL);
> + evlist__init(&evlist, cpus, threads);
> if (parse_events(&evlist, input, &err)) {
> parse_events_error__print(&err, input);
> PyErr_SetFromErrno(PyExc_OSError);
> --
> 2.48.1.711.g2feabab25a-goog
© 2016 - 2025 Red Hat, Inc.