Skip to content

Commit 1d1d9af

Browse files
captain5050acmel
authored andcommitted
perf python: Fix cpu_map__item() building
Value should be built as an integer. Switch some uses of perf_cpu_map to use the library API. Fixes: 6d18804 ("perf cpumap: Give CPUs their own type") Signed-off-by: Ian Rogers <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Alexey Bayduraev <[email protected]> Cc: Andi Kleen <[email protected]> Cc: André Almeida <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Andy Shevchenko <[email protected]> Cc: Darren Hart <[email protected]> Cc: Davidlohr Bueso <[email protected]> Cc: Dmitriy Vyukov <[email protected]> Cc: Eric Dumazet <[email protected]> Cc: German Gomez <[email protected]> Cc: Ian Rogers <[email protected]> Cc: James Clark <[email protected]> Cc: Jin Yao <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: John Garry <[email protected]> Cc: Kajol Jain <[email protected]> Cc: Kan Liang <[email protected]> Cc: Leo Yan <[email protected]> Cc: Madhavan Srinivasan <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Masami Hiramatsu <[email protected]> Cc: Miaoqian Lin <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Riccardo Mancini <[email protected]> Cc: Shunsuke Nakamura <[email protected]> Cc: Song Liu <[email protected]> Cc: Stephane Eranian <[email protected]> Cc: Stephen Brennan <[email protected]> Cc: Steven Rostedt (VMware) <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Thomas Richter <[email protected]> Cc: Yury Norov <[email protected]> Link: http://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 9edcde6 commit 1d1d9af

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tools/perf/util/python.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -638,17 +638,17 @@ static Py_ssize_t pyrf_cpu_map__length(PyObject *obj)
638638
{
639639
struct pyrf_cpu_map *pcpus = (void *)obj;
640640

641-
return pcpus->cpus->nr;
641+
return perf_cpu_map__nr(pcpus->cpus);
642642
}
643643

644644
static PyObject *pyrf_cpu_map__item(PyObject *obj, Py_ssize_t i)
645645
{
646646
struct pyrf_cpu_map *pcpus = (void *)obj;
647647

648-
if (i >= pcpus->cpus->nr)
648+
if (i >= perf_cpu_map__nr(pcpus->cpus))
649649
return NULL;
650650

651-
return Py_BuildValue("i", pcpus->cpus->map[i]);
651+
return Py_BuildValue("i", perf_cpu_map__cpu(pcpus->cpus, i).cpu);
652652
}
653653

654654
static PySequenceMethods pyrf_cpu_map__sequence_methods = {

0 commit comments

Comments
 (0)