Skip to content

Commit 5e89527

Browse files
Yang Jihongnamhyung
Yang Jihong
authored andcommitted
perf sched: Move curr_thread initialization to perf_sched__map()
The curr_thread is used only for the 'perf sched map'. Put initialization in perf_sched__map() to reduce unnecessary actions in other commands. Simple functional testing: # perf sched record perf bench sched messaging # Running 'sched/messaging' benchmark: # 20 sender and receiver processes per group # 10 groups == 400 processes run Total time: 0.197 [sec] [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 15.526 MB perf.data (140095 samples) ] # perf sched map *A0 451264.532445 secs A0 => migration/0:15 *. 451264.532468 secs . => swapper:0 . *B0 451264.532537 secs B0 => migration/1:21 . *. 451264.532560 secs . . *C0 451264.532644 secs C0 => migration/2:27 . . *. 451264.532668 secs . . . *D0 451264.532753 secs D0 => migration/3:33 . . . *. 451264.532778 secs . . . . *E0 451264.532861 secs E0 => migration/4:39 . . . . *. 451264.532886 secs . . . . . *F0 451264.532973 secs F0 => migration/5:45 <SNIP> A7 A7 A7 A7 A7 *A7 . . . . . . . . . . 451264.790785 secs A7 A7 A7 A7 A7 A7 *A7 . . . . . . . . . 451264.790858 secs A7 A7 A7 A7 A7 A7 A7 *A7 . . . . . . . . 451264.790934 secs A7 A7 A7 A7 A7 A7 A7 A7 *A7 . . . . . . . 451264.791004 secs A7 A7 A7 A7 A7 A7 A7 A7 A7 *A7 . . . . . . 451264.791075 secs A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 *A7 . . . . . 451264.791143 secs A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 *A7 . . . . 451264.791232 secs A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 *A7 . . . 451264.791336 secs A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 *A7 . . 451264.791407 secs A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 *A7 . 451264.791484 secs A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 A7 *A7 451264.791553 secs # echo $? 0 Signed-off-by: Yang Jihong <[email protected]> Signed-off-by: Namhyung Kim <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent ef76a5a commit 5e89527

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

tools/perf/builtin-sched.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3266,9 +3266,13 @@ static int perf_sched__map(struct perf_sched *sched)
32663266
{
32673267
int rc = -1;
32683268

3269-
if (setup_map_cpus(sched))
3269+
sched->curr_thread = calloc(MAX_CPUS, sizeof(*(sched->curr_thread)));
3270+
if (!sched->curr_thread)
32703271
return rc;
32713272

3273+
if (setup_map_cpus(sched))
3274+
goto out_free_curr_thread;
3275+
32723276
if (setup_color_pids(sched))
32733277
goto out_put_map_cpus;
32743278

@@ -3291,6 +3295,9 @@ static int perf_sched__map(struct perf_sched *sched)
32913295
out_put_map_cpus:
32923296
zfree(&sched->map.comp_cpus);
32933297
perf_cpu_map__put(sched->map.cpus);
3298+
3299+
out_free_curr_thread:
3300+
zfree(&sched->curr_thread);
32943301
return rc;
32953302
}
32963303

@@ -3576,11 +3583,6 @@ int cmd_sched(int argc, const char **argv)
35763583
unsigned int i;
35773584
int ret = 0;
35783585

3579-
sched.curr_thread = calloc(MAX_CPUS, sizeof(*sched.curr_thread));
3580-
if (!sched.curr_thread) {
3581-
ret = -ENOMEM;
3582-
goto out;
3583-
}
35843586
sched.cpu_last_switched = calloc(MAX_CPUS, sizeof(*sched.cpu_last_switched));
35853587
if (!sched.cpu_last_switched) {
35863588
ret = -ENOMEM;
@@ -3662,7 +3664,6 @@ int cmd_sched(int argc, const char **argv)
36623664
out:
36633665
free(sched.curr_pid);
36643666
free(sched.cpu_last_switched);
3665-
free(sched.curr_thread);
36663667

36673668
return ret;
36683669
}

0 commit comments

Comments
 (0)