Introduce --task-name and --fuzzy-name options in perf sched map
v5 cover Introduce --task-name and --fuzzy-name options in perf sched map
This patchset aims to reduce the amount of output printed on the terminal when using perf sched map, allowing users to focus only on the tasks of interest.
This helps in visualizing how a benchmark or a task is spread over the available CPUs while also knowing which CPUs are idle(.) and which are not(-). This will be more useful as number of CPUs increase.
Changelog:
=========
Changes in v5:
- Split the changes into different commits. (Namhyung Kim)
- Rebase against perf-tools-next commit c7a5592e8e4d ("perf mem: Fix a segfault with NULL event->name")
- Link to v4: https://lore.kernel.org/all/[email protected]/
Changes in v4:
- Handle possible memory allocation failures. (Chen Yu)
- Link to v3: https://lore.kernel.org/all/[email protected]/
Changes in v3:
- Print the sched-out timestamp as a row when using the --command-name option. (Namhyung Kim)
- Refactor the code.
- Rebase against perf-tools-next commit eae7044b67a6 ("perf hist: Honor symbol conf.skip_empty")
- Link to v2: https://lore.kernel.org/all/[email protected]/
Changes in v2:
- Add support for giving multiple command-names in CSV. (Namhyung Kim)
- Add fuzzy name matching option. (Chen Yu)
- Add Reviewed-and-tested-by tag from Athira Rajeev.
- Rebase against perf-tools-next commit d2307fd4f989 ("perf maps: Add/use a sorted insert for fixup overlap and insert")
- Link to v1: https://lore.kernel.org/all/[email protected]/
Madadi Vineeth Reddy (3):
perf sched map: Add task-name option to filter the output map perf sched map: Add support for multiple task names using CSV perf sched map: Add --fuzzy-name option for fuzzy matching in task
names
tools/perf/Documentation/perf-sched.txt | 10 ++ tools/perf/builtin-sched.c | 224 ++++++++++++++++++++---- 2 files changed, 198 insertions(+), 36 deletions(-)
Signature · 1 line
2.43.2
PATCH v5 1/3 perf sched map: Add task-name option to filter the output map
By default, perf sched map prints sched-in events for all the tasks which may not be required all the time as it prints lot of symbols and rows to the terminal.
With --task-name option, one could specify the specific task name for which the map has to be shown. This would help in analyzing the CPU usage patterns easier for that specific task. Since multiple PID's might have the same task name, using task-name filter would be more useful for debugging.
For other tasks, instead of printing the symbol, '-' is printed and the same '.' is used to represent idle. '-' is used instead of symbol for other tasks because it helps in clear visualization of task of interest and secondly the symbol itself doesn't mean anything because the sched-in of that symbol will not be printed(first sched-in contains pid and the corresponding symbol).
When using the --task-name option, the sched-out time is represented by a '*-'. Since not all task sched-in events are printed, the sched-out time of the relevant task might be lost. This representation ensures that the sched-out time of the interested task is not overlooked.
6.10.0-rc1
==========
*A0 131040.639793 secs A0 => migration/0:19 *. 131040.639801 secs . => swapper:0 . *B0 131040.639830 secs B0 => migration/1:24 . *. 131040.639836 secs . . *C0 131040.640108 secs C0 => migration/2:30 . . *. 131040.640163 secs . . . *D0 131040.640386 secs D0 => migration/3:36 . . . *. 131040.640395 secs
6.10.0-rc1 + patch (--task-name wdavdaemon)
=============
. *A0 . . . . - . 131040.641346 secs A0 => wdavdaemon:62509 . A0 *B0 . . . - . 131040.641378 secs B0 => wdavdaemon:62274 - *- - - - - - - 131040.641379 secs *C0 . B0 . . . . . 131040.641572 secs C0 => wdavdaemon:62283 C0 . B0 . *D0 . . . 131040.641572 secs D0 => wdavdaemon:62277 C0 . B0 . D0 . *E0 . 131040.641578 secs E0 => wdavdaemon:62270 *- - - - - - - - 131040.641581 secs - - - - - - *- - 131040.641583 secs
--- tools/perf/Documentation/perf-sched.txt | 6 + tools/perf/builtin-sched.c | 161 ++++++++++++++++++------ 2 files changed, 131 insertions(+), 36 deletions(-)
tools/perf/Documentation/perf-sched.txt +6 -0
@@ -130,6 +130,12 @@ OPTIONS for 'perf sched map' --color-pids:: Highlight the given pids. +--task-name <task>:: + Map output only for the given task name. The sched-out + time is printed and is represented by '*-' for the given + task name + ('-' indicates other tasks while '.' is idle). + OPTIONS for 'perf sched timehist' --------------------------------- -k::
tools/perf/builtin-sched.c +125 -36
249 lines not on this page · raw message
Signature · 1 line
2.43.2
Namhyung Kim
maintainerRe: [PATCH v5 1/3] perf sched map: Add task-name option to filter the output map
Hello,
Quoted 35 lines · Madadi Vineeth Reddy
By default, perf sched map prints sched-in events for all the tasks which may not be required all the time as it prints lot of symbols and rows to the terminal.
With --task-name option, one could specify the specific task name for which the map has to be shown. This would help in analyzing the CPU usage patterns easier for that specific task. Since multiple PID's might have the same task name, using task-name filter would be more useful for debugging.
For other tasks, instead of printing the symbol, '-' is printed and the same '.' is used to represent idle. '-' is used instead of symbol for other tasks because it helps in clear visualization of task of interest and secondly the symbol itself doesn't mean anything because the sched-in of that symbol will not be printed(first sched-in contains pid and the corresponding symbol).
When using the --task-name option, the sched-out time is represented by a '*-'. Since not all task sched-in events are printed, the sched-out time of the relevant task might be lost. This representation ensures that the sched-out time of the interested task is not overlooked.
6.10.0-rc1
==========*A0 131040.639793 secs A0 => migration/0:19 *. 131040.639801 secs . => swapper:0 . *B0 131040.639830 secs B0 => migration/1:24 . *. 131040.639836 secs . . *C0 131040.640108 secs C0 => migration/2:30 . . *. 131040.640163 secs . . . *D0 131040.640386 secs D0 => migration/3:36 . . . *. 131040.640395 secs6.10.0-rc1 + patch (--task-name wdavdaemon)
=============
Quoted 8 lines
. *A0 . . . . - . 131040.641346 secs A0 => wdavdaemon:62509 . A0 *B0 . . . - . 131040.641378 secs B0 => wdavdaemon:62274 - *- - - - - - - 131040.641379 secs *C0 . B0 . . . . . 131040.641572 secs C0 => wdavdaemon:62283 C0 . B0 . *D0 . . . 131040.641572 secs D0 => wdavdaemon:62277 C0 . B0 . D0 . *E0 . 131040.641578 secs E0 => wdavdaemon:62270 *- - - - - - - - 131040.641581 secs - - - - - - *- - 131040.641583 secs
It seems the last two lines should be like below..
*- - B0 - D0 - E0 - 131040.641581 secs - - B0 - D0 - *- - 131040.641583 secs
Quoted 46 lines
Reviewed-and-tested-by Athira Rajeev <[email protected]>Signed-off-by Madadi Vineeth Reddy <[email protected]>--- tools/perf/Documentation/perf-sched.txt | 6 + tools/perf/builtin-sched.c | 161 ++++++++++++++++++------ 2 files changed, 131 insertions(+), 36 deletions(-)tools/perf/Documentation/perf-sched.txt +6
-0@@ -130,6 +130,12 @@ OPTIONS for 'perf sched map' --color-pids:: Highlight the given pids. +--task-name <task>:: + Map output only for the given task name. The sched-out + time is printed and is represented by '*-' for the given + task name + ('-' indicates other tasks while '.' is idle). + OPTIONS for 'perf sched timehist' --------------------------------- -k::tools/perf/builtin-sched.c +2
-0@@ -156,6 +156,7 @@ struct perf_sched_map {const char *color_pids_str;struct perf_cpu_map *color_cpus;const char *color_cpus_str; +const char *task_name;struct perf_cpu_map *cpus;const char *cpus_str; };@@ -177,6 +178,7 @@ struct perf_sched {struct perf_cpu max_cpu;u32 *curr_pid;struct thread **curr_thread; +struct thread **curr_out_thread;char next_shortname1;char next_shortname2;unsigned int replay_repeat;
tools/perf/builtin-sched.c map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pid · line 1543
Quoted 4 lines
tools/perf/builtin-sched.c +1
-0@@ -1538,23 +1540,89 @@ map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pidreturn thread; } +static bool sched_match_task (const char *comm_str,const char *commands)
It'd be easier if you pass the sched pointer.
static bool sched_match_task(struct perf_sched *sched, const char *comm_str) {
...
Quoted 7 lines
tools/perf/builtin-sched.c +7
-0+{ +char *commands_copy =NULL ; +char *token =NULL ; +bool match_found = false; + + commands_copy =strdup (commands); +if (commands_copy ==NULL )
tools/perf/builtin-sched.c map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pid · line 1560
Quoted 10 lines
tools/perf/builtin-sched.c +10
-0+return NULL ; + + token =strtok (commands_copy,"," ); + +while (token !=NULL && !match_found) { + match_found = !strcmp (comm_str, token); + token =strtok (NULL ,"," ); + } + +free (commands_copy);
Why is this needed? I think we only support a single command and then simply check with strcmp().
Also if you add multiple string support, you need to parse the string when you parse the command line arguments, not when you match.
tools/perf/builtin-sched.c map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pid · line 1569
Quoted 9 lines
tools/perf/builtin-sched.c +9
-0+return match_found; +} + +static void print_sched_map (struct perf_sched *sched,struct perf_cpu this_cpu,int cpus_nr, +const char *color,bool sched_out) +{ +for (int i =0 ; i < cpus_nr; i++) { +struct perf_cpu cpu = { + .cpu = sched->map.comp ? sched->map.comp_cpus[i].cpu : i,
Please fix the indentation.
Thanks,
Namhyung
Quoted 216 lines
tools/perf/builtin-sched.c +96
-36+ }; +struct thread *curr_thread = sched->curr_thread[cpu.cpu]; +struct thread *curr_out_thread = sched->curr_out_thread[cpu.cpu]; +struct thread_runtime *curr_tr; +const char *pid_color = color; +const char *cpu_color = color; +char symbol =' ' ; +struct thread *thread_to_check = sched_out ? curr_out_thread : curr_thread; + +if (thread_to_check &&thread__has_color (thread_to_check)) + pid_color =COLOR_PIDS ; + +if (sched->map.color_cpus &&perf_cpu_map__has (sched->map.color_cpus, cpu)) + cpu_color =COLOR_CPUS ; + +if (cpu.cpu == this_cpu.cpu) + symbol ='*' ; + +color_fprintf (stdout, cpu.cpu != this_cpu.cpu ? color : cpu_color,"%c" , symbol); + + thread_to_check = sched_out ? sched->curr_out_thread[cpu.cpu] : + sched->curr_thread[cpu.cpu]; + +if (thread_to_check) { + curr_tr =thread__get_runtime (thread_to_check); +if (curr_tr ==NULL ) +return ; + +if (sched_out) +color_fprintf (stdout, color,"- " ); +else +color_fprintf (stdout, pid_color,"%2s " , curr_tr->shortname); + }else +color_fprintf (stdout, color," " ); + } +} +static int map_switch_event (struct perf_sched *sched,struct evsel *evsel,struct perf_sample *sample,struct machine *machine) {const u32 next_pid =evsel__intval (evsel, sample,"next_pid" ); -struct thread *sched_in; +const u32 prev_pid =evsel__intval (evsel, sample,"prev_pid" ); +struct thread *sched_in, *sched_out;struct thread_runtime *tr;int new_shortname;u64 timestamp0, timestamp = sample->time;s64 delta; -int i;struct perf_cpu this_cpu = { .cpu = sample->cpu, };int cpus_nr; +int proceed;bool new_cpu = false;const char *color =PERF_COLOR_NORMAL ;char stimestamp[32 ]; +const char *str;BUG_ON (this_cpu.cpu >=MAX_CPUS || this_cpu.cpu <0 );@@ -1583,7 +1651,8 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel, } sched_in =map__findnew_thread (sched, machine,-1 , next_pid); -if (sched_in ==NULL ) + sched_out =map__findnew_thread (sched, machine,-1 , prev_pid); +if (sched_in ==NULL || sched_out ==NULL )return -1 ; tr =thread__get_runtime (sched_in);@@ -1593,6 +1662,7 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel, } sched->curr_thread[this_cpu.cpu] =thread__get (sched_in); + sched->curr_out_thread[this_cpu.cpu] =thread__get (sched_out); new_shortname =0 ;if (!tr->shortname[0 ]) {@@ -1603,7 +1673,8 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,*/ tr->shortname[0 ] ='.' ; tr->shortname[1 ] =' ' ; - }else { + }else if (!sched->map.task_name ||sched_match_task (thread__comm_str (sched_in), + sched->map.task_name)) { tr->shortname[0 ] = sched->next_shortname1; tr->shortname[1 ] = sched->next_shortname2;@@ -1616,6 +1687,9 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,else sched->next_shortname2 ='0' ; } + }else { + tr->shortname[0 ] ='-' ; + tr->shortname[1 ] =' ' ; } new_shortname =1 ; }@@ -1623,42 +1697,28 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,if (sched->map.cpus && !perf_cpu_map__has (sched->map.cpus, this_cpu)) goto out; -printf (" " ); - -for (i =0 ; i < cpus_nr; i++) { -struct perf_cpu cpu = { - .cpu = sched->map.comp ? sched->map.comp_cpus[i].cpu : i, - }; -struct thread *curr_thread = sched->curr_thread[cpu.cpu]; -struct thread_runtime *curr_tr; -const char *pid_color = color; -const char *cpu_color = color; - -if (curr_thread &&thread__has_color (curr_thread)) - pid_color =COLOR_PIDS ; - -if (sched->map.cpus && !perf_cpu_map__has (sched->map.cpus, cpu)) -continue ; - -if (sched->map.color_cpus &&perf_cpu_map__has (sched->map.color_cpus, cpu)) - cpu_color =COLOR_CPUS ; - -if (cpu.cpu != this_cpu.cpu) -color_fprintf (stdout, color," " ); + proceed =0 ; + str =thread__comm_str (sched_in); +/* +* Check which of sched_in and sched_out matches the passed --task-name +* arguments and call the corresponding print_sched_map. +*/ +if (sched->map.task_name && !sched_match_task (str, sched->map.task_name)) { +if (!sched_match_task (thread__comm_str (sched_out), sched->map.task_name)) + goto out;else -color_fprintf (stdout, cpu_color,"*" ); + goto sched_out; -if (sched->curr_thread[cpu.cpu]) { - curr_tr =thread__get_runtime (sched->curr_thread[cpu.cpu]); -if (curr_tr ==NULL ) { -thread__put (sched_in); -return -1 ; - } -color_fprintf (stdout, pid_color,"%2s " , curr_tr->shortname); - }else -color_fprintf (stdout, color," " ); + }else { + str =thread__comm_str (sched_out); +if (!(sched->map.task_name && !sched_match_task (str, sched->map.task_name))) + proceed =1 ; } +printf (" " ); + +print_sched_map (sched, this_cpu, cpus_nr, color, false); +timestamp__scnprintf_usec (timestamp, stimestamp,sizeof (stimestamp));color_fprintf (stdout, color," %12s secs " , stimestamp);if (new_shortname || tr->comm_changed || (verbose >0 &&thread__tid (sched_in))) {@@ -1675,9 +1735,32 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,if (sched->map.comp && new_cpu)color_fprintf (stdout, color," (CPU %d)" , this_cpu); +if (proceed !=1 ) { +color_fprintf (stdout, color,"\n" ); + goto out; + } + +sched_out: +if (sched->map.task_name) { + tr =thread__get_runtime (sched->curr_out_thread[this_cpu.cpu]); +if (strcmp (tr->shortname,"" ) ==0 ) + goto out; + +if (proceed ==1 ) +color_fprintf (stdout, color,"\n" ); + +printf (" " ); +print_sched_map (sched, this_cpu, cpus_nr, color, true); +timestamp__scnprintf_usec (timestamp, stimestamp,sizeof (stimestamp)); +color_fprintf (stdout, color," %12s secs " , stimestamp); + } +color_fprintf (stdout, color,"\n" ); out: +if (sched->map.task_name) +thread__put (sched_out); +thread__put (sched_in);return 0 ;@@ -3310,6 +3393,10 @@ static int perf_sched__map(struct perf_sched *sched)if (!sched->curr_thread)return rc; + sched->curr_out_thread =calloc (MAX_CPUS ,sizeof (*(sched->curr_out_thread))); +if (!sched->curr_out_thread) +return rc; +if (setup_cpus_switch_event (sched)) goto out_free_curr_thread;@@ -3563,6 +3650,8 @@ int cmd_sched(int argc, const char **argv) "highlight given CPUs in map"),OPT_STRING (0 ,"cpus" , &sched.map.cpus_str,"cpus" ,"display given CPUs in map" ), +OPT_STRING (0 ,"task-name" , &sched.map.task_name,"task" , +"map output only for the given task name" ),OPT_PARENT (sched_options) }; const struct option timehist_options[] = {Signature · 1 line
2.43.2
Re: [PATCH v5 1/3] perf sched map: Add task-name option to filter the output map
Hi Namhyung,
Quoted 47 lines · Namhyung Kim
Hello,
Quoted 35 lines · Madadi Vineeth Reddy
By default, perf sched map prints sched-in events for all the tasks which may not be required all the time as it prints lot of symbols and rows to the terminal.
With --task-name option, one could specify the specific task name for which the map has to be shown. This would help in analyzing the CPU usage patterns easier for that specific task. Since multiple PID's might have the same task name, using task-name filter would be more useful for debugging.
For other tasks, instead of printing the symbol, '-' is printed and the same '.' is used to represent idle. '-' is used instead of symbol for other tasks because it helps in clear visualization of task of interest and secondly the symbol itself doesn't mean anything because the sched-in of that symbol will not be printed(first sched-in contains pid and the corresponding symbol).
When using the --task-name option, the sched-out time is represented by a '*-'. Since not all task sched-in events are printed, the sched-out time of the relevant task might be lost. This representation ensures that the sched-out time of the interested task is not overlooked.
6.10.0-rc1
==========*A0 131040.639793 secs A0 => migration/0:19 *. 131040.639801 secs . => swapper:0 . *B0 131040.639830 secs B0 => migration/1:24 . *. 131040.639836 secs . . *C0 131040.640108 secs C0 => migration/2:30 . . *. 131040.640163 secs . . . *D0 131040.640386 secs D0 => migration/3:36 . . . *. 131040.640395 secs6.10.0-rc1 + patch (--task-name wdavdaemon)
=============Quoted 8 lines
. *A0 . . . . - . 131040.641346 secs A0 => wdavdaemon:62509 . A0 *B0 . . . - . 131040.641378 secs B0 => wdavdaemon:62274 - *- - - - - - - 131040.641379 secs *C0 . B0 . . . . . 131040.641572 secs C0 => wdavdaemon:62283 C0 . B0 . *D0 . . . 131040.641572 secs D0 => wdavdaemon:62277 C0 . B0 . D0 . *E0 . 131040.641578 secs E0 => wdavdaemon:62270 *- - - - - - - - 131040.641581 secs - - - - - - *- - 131040.641583 secs
Quoted 5 lines
It seems the last two lines should be like below..
*- - B0 - D0 - E0 - 131040.641581 secs - - B0 - D0 - *- - 131040.641583 secs
Sure, I included the line only for sched-out, but I will change it.
Quoted 49 lines
Quoted 49 lines
Reviewed-and-tested-by Athira Rajeev <[email protected]>Signed-off-by Madadi Vineeth Reddy <[email protected]>--- tools/perf/Documentation/perf-sched.txt | 6 + tools/perf/builtin-sched.c | 161 ++++++++++++++++++------ 2 files changed, 131 insertions(+), 36 deletions(-)tools/perf/Documentation/perf-sched.txt +6
-0@@ -130,6 +130,12 @@ OPTIONS for 'perf sched map' --color-pids:: Highlight the given pids. +--task-name <task>:: + Map output only for the given task name. The sched-out + time is printed and is represented by '*-' for the given + task name + ('-' indicates other tasks while '.' is idle). + OPTIONS for 'perf sched timehist' --------------------------------- -k::tools/perf/builtin-sched.c +2
-0@@ -156,6 +156,7 @@ struct perf_sched_map {const char *color_pids_str;struct perf_cpu_map *color_cpus;const char *color_cpus_str; +const char *task_name;struct perf_cpu_map *cpus;const char *cpus_str; };@@ -177,6 +178,7 @@ struct perf_sched {struct perf_cpu max_cpu;u32 *curr_pid;struct thread **curr_thread; +struct thread **curr_out_thread;char next_shortname1;char next_shortname2;unsigned int replay_repeat;@@ -1538,23 +1540,89 @@ map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pidreturn thread; }
Quoted 8 lines
tools/perf/builtin-sched.c map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pid · line 1543
Quoted 1 line
tools/perf/builtin-sched.c +1
-0+static bool sched_match_task (const char *comm_str,const char *commands)It'd be easier if you pass the sched pointer.
static bool
sched_match_task(struct perf_sched *sched, const char *comm_str){ ...
Sure.
Quoted 13 lines
Quoted 13 lines
tools/perf/builtin-sched.c +12
-0+{ +char *commands_copy =NULL ; +char *token =NULL ; +bool match_found = false; + + commands_copy =strdup (commands); +if (commands_copy ==NULL ) +return NULL ; + + token =strtok (commands_copy,"," ); + +while (token !=NULL && !match_found) {
Quoted 9 lines
tools/perf/builtin-sched.c map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pid · line 1560
Quoted 5 lines
tools/perf/builtin-sched.c +5
-0+ match_found = !strcmp (comm_str, token); + token =strtok (NULL ,"," ); + } + +free (commands_copy);Why is this needed? I think we only support a single command and then simply check with
strcmp().
Sorry about that, I got confused while splitting into different commits. I'll fix it.
Quoted 3 lines
Also if you add multiple string support, you need to parse the string when you parse the command line arguments, not when you match.
Right. Will do that.
Quoted 13 lines
tools/perf/builtin-sched.c map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pid · line 1569
Quoted 10 lines
tools/perf/builtin-sched.c +9
-0+return match_found; +} + +static void print_sched_map (struct perf_sched *sched,struct perf_cpu this_cpu,int cpus_nr, +const char *color,bool sched_out) +{ +for (int i =0 ; i < cpus_nr; i++) { +struct perf_cpu cpu = { + .cpu = sched->map.comp ? sched->map.comp_cpus[i].cpu : i,Please fix the indentation.
Sure. Thank you for the review.
Thanks and Regards
Madadi Vineeth Reddy
Quoted 220 lines
Thanks,
NamhyungQuoted 216 lines
tools/perf/builtin-sched.c +96
-36+ }; +struct thread *curr_thread = sched->curr_thread[cpu.cpu]; +struct thread *curr_out_thread = sched->curr_out_thread[cpu.cpu]; +struct thread_runtime *curr_tr; +const char *pid_color = color; +const char *cpu_color = color; +char symbol =' ' ; +struct thread *thread_to_check = sched_out ? curr_out_thread : curr_thread; + +if (thread_to_check &&thread__has_color (thread_to_check)) + pid_color =COLOR_PIDS ; + +if (sched->map.color_cpus &&perf_cpu_map__has (sched->map.color_cpus, cpu)) + cpu_color =COLOR_CPUS ; + +if (cpu.cpu == this_cpu.cpu) + symbol ='*' ; + +color_fprintf (stdout, cpu.cpu != this_cpu.cpu ? color : cpu_color,"%c" , symbol); + + thread_to_check = sched_out ? sched->curr_out_thread[cpu.cpu] : + sched->curr_thread[cpu.cpu]; + +if (thread_to_check) { + curr_tr =thread__get_runtime (thread_to_check); +if (curr_tr ==NULL ) +return ; + +if (sched_out) +color_fprintf (stdout, color,"- " ); +else +color_fprintf (stdout, pid_color,"%2s " , curr_tr->shortname); + }else +color_fprintf (stdout, color," " ); + } +} +static int map_switch_event (struct perf_sched *sched,struct evsel *evsel,struct perf_sample *sample,struct machine *machine) {const u32 next_pid =evsel__intval (evsel, sample,"next_pid" ); -struct thread *sched_in; +const u32 prev_pid =evsel__intval (evsel, sample,"prev_pid" ); +struct thread *sched_in, *sched_out;struct thread_runtime *tr;int new_shortname;u64 timestamp0, timestamp = sample->time;s64 delta; -int i;struct perf_cpu this_cpu = { .cpu = sample->cpu, };int cpus_nr; +int proceed;bool new_cpu = false;const char *color =PERF_COLOR_NORMAL ;char stimestamp[32 ]; +const char *str;BUG_ON (this_cpu.cpu >=MAX_CPUS || this_cpu.cpu <0 );@@ -1583,7 +1651,8 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel, } sched_in =map__findnew_thread (sched, machine,-1 , next_pid); -if (sched_in ==NULL ) + sched_out =map__findnew_thread (sched, machine,-1 , prev_pid); +if (sched_in ==NULL || sched_out ==NULL )return -1 ; tr =thread__get_runtime (sched_in);@@ -1593,6 +1662,7 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel, } sched->curr_thread[this_cpu.cpu] =thread__get (sched_in); + sched->curr_out_thread[this_cpu.cpu] =thread__get (sched_out); new_shortname =0 ;if (!tr->shortname[0 ]) {@@ -1603,7 +1673,8 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,*/ tr->shortname[0 ] ='.' ; tr->shortname[1 ] =' ' ; - }else { + }else if (!sched->map.task_name ||sched_match_task (thread__comm_str (sched_in), + sched->map.task_name)) { tr->shortname[0 ] = sched->next_shortname1; tr->shortname[1 ] = sched->next_shortname2;@@ -1616,6 +1687,9 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,else sched->next_shortname2 ='0' ; } + }else { + tr->shortname[0 ] ='-' ; + tr->shortname[1 ] =' ' ; } new_shortname =1 ; }@@ -1623,42 +1697,28 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,if (sched->map.cpus && !perf_cpu_map__has (sched->map.cpus, this_cpu)) goto out; -printf (" " ); - -for (i =0 ; i < cpus_nr; i++) { -struct perf_cpu cpu = { - .cpu = sched->map.comp ? sched->map.comp_cpus[i].cpu : i, - }; -struct thread *curr_thread = sched->curr_thread[cpu.cpu]; -struct thread_runtime *curr_tr; -const char *pid_color = color; -const char *cpu_color = color; - -if (curr_thread &&thread__has_color (curr_thread)) - pid_color =COLOR_PIDS ; - -if (sched->map.cpus && !perf_cpu_map__has (sched->map.cpus, cpu)) -continue ; - -if (sched->map.color_cpus &&perf_cpu_map__has (sched->map.color_cpus, cpu)) - cpu_color =COLOR_CPUS ; - -if (cpu.cpu != this_cpu.cpu) -color_fprintf (stdout, color," " ); + proceed =0 ; + str =thread__comm_str (sched_in); +/* +* Check which of sched_in and sched_out matches the passed --task-name +* arguments and call the corresponding print_sched_map. +*/ +if (sched->map.task_name && !sched_match_task (str, sched->map.task_name)) { +if (!sched_match_task (thread__comm_str (sched_out), sched->map.task_name)) + goto out;else -color_fprintf (stdout, cpu_color,"*" ); + goto sched_out; -if (sched->curr_thread[cpu.cpu]) { - curr_tr =thread__get_runtime (sched->curr_thread[cpu.cpu]); -if (curr_tr ==NULL ) { -thread__put (sched_in); -return -1 ; - } -color_fprintf (stdout, pid_color,"%2s " , curr_tr->shortname); - }else -color_fprintf (stdout, color," " ); + }else { + str =thread__comm_str (sched_out); +if (!(sched->map.task_name && !sched_match_task (str, sched->map.task_name))) + proceed =1 ; } +printf (" " ); + +print_sched_map (sched, this_cpu, cpus_nr, color, false); +timestamp__scnprintf_usec (timestamp, stimestamp,sizeof (stimestamp));color_fprintf (stdout, color," %12s secs " , stimestamp);if (new_shortname || tr->comm_changed || (verbose >0 &&thread__tid (sched_in))) {@@ -1675,9 +1735,32 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,if (sched->map.comp && new_cpu)color_fprintf (stdout, color," (CPU %d)" , this_cpu); +if (proceed !=1 ) { +color_fprintf (stdout, color,"\n" ); + goto out; + } + +sched_out: +if (sched->map.task_name) { + tr =thread__get_runtime (sched->curr_out_thread[this_cpu.cpu]); +if (strcmp (tr->shortname,"" ) ==0 ) + goto out; + +if (proceed ==1 ) +color_fprintf (stdout, color,"\n" ); + +printf (" " ); +print_sched_map (sched, this_cpu, cpus_nr, color, true); +timestamp__scnprintf_usec (timestamp, stimestamp,sizeof (stimestamp)); +color_fprintf (stdout, color," %12s secs " , stimestamp); + } +color_fprintf (stdout, color,"\n" ); out: +if (sched->map.task_name) +thread__put (sched_out); +thread__put (sched_in);return 0 ;@@ -3310,6 +3393,10 @@ static int perf_sched__map(struct perf_sched *sched)if (!sched->curr_thread)return rc; + sched->curr_out_thread =calloc (MAX_CPUS ,sizeof (*(sched->curr_out_thread))); +if (!sched->curr_out_thread) +return rc; +if (setup_cpus_switch_event (sched)) goto out_free_curr_thread;@@ -3563,6 +3650,8 @@ int cmd_sched(int argc, const char **argv) "highlight given CPUs in map"),OPT_STRING (0 ,"cpus" , &sched.map.cpus_str,"cpus" ,"display given CPUs in map" ), +OPT_STRING (0 ,"task-name" , &sched.map.task_name,"task" , +"map output only for the given task name" ),OPT_PARENT (sched_options) }; const struct option timehist_options[] = {Signature · 1 line
2.43.2
PATCH v5 2/3 perf sched map: Add support for multiple task names using CSV
In reply to Madadi Vineeth ReddyTo track the scheduling patterns of multiple tasks simultaneously, multiple task names can be specified using a comma separator without any whitespace.
Sample output for --task-name perf,wdavdaemon
=============
. *A0 . . . . - . 131040.641346 secs A0 => wdavdaemon:62509 . A0 *B0 . . . - . 131040.641378 secs B0 => wdavdaemon:62274 - *- - - - - - - 131040.641379 secs *C0 . B0 . . . . . 131040.641572 secs C0 => wdavdaemon:62283
...
- *- - - - - - - 131041.395649 secs . . . . . . . *X2 131041.403969 secs X2 => perf:70211 - - - - - - - *- 131041.404006 secs
--- tools/perf/Documentation/perf-sched.txt | 5 +- tools/perf/builtin-sched.c | 77 +++++++++++++++++++++---- 2 files changed, 69 insertions(+), 13 deletions(-)
tools/perf/Documentation/perf-sched.txt +3 -2
@@ -131,9 +131,10 @@ OPTIONS for 'perf sched map' Highlight the given pids. --task-name <task>:: - Map output only for the given task name. The sched-out + Map output only for the given task name(s). Separate the + task names with a comma (without whitespace). The sched-out time is printed and is represented by '*-' for the given - task name + task name(s). ('-' indicates other tasks while '.' is idle). OPTIONS for 'perf sched timehist'
tools/perf/builtin-sched.c +66 -11
141 lines not on this page · raw message
Signature · 1 line
2.43.2
Namhyung Kim
maintainerRe: [PATCH v5 2/3] perf sched map: Add support for multiple task names using CSV
Quoted 47 lines · Madadi Vineeth Reddy
To track the scheduling patterns of multiple tasks simultaneously, multiple task names can be specified using a comma separator without any whitespace.
Sample output for --task-name perf,wdavdaemon
=============. *A0 . . . . - . 131040.641346 secs A0 => wdavdaemon:62509 . A0 *B0 . . . - . 131040.641378 secs B0 => wdavdaemon:62274 - *- - - - - - - 131040.641379 secs *C0 . B0 . . . . . 131040.641572 secs C0 => wdavdaemon:62283...
- *- - - - - - - 131041.395649 secs . . . . . . . *X2 131041.403969 secs X2 => perf:70211 - - - - - - - *- 131041.404006 secsSuggested-by Namhyung Kim <[email protected]>Reviewed-and-tested-by Athira Rajeev <[email protected]>Signed-off-by Madadi Vineeth Reddy <[email protected]>--- tools/perf/Documentation/perf-sched.txt | 5 +- tools/perf/builtin-sched.c | 77 +++++++++++++++++++++---- 2 files changed, 69 insertions(+), 13 deletions(-)tools/perf/Documentation/perf-sched.txt +3
-2@@ -131,9 +131,10 @@ OPTIONS for 'perf sched map' Highlight the given pids. --task-name <task>:: - Map output only for the given task name. The sched-out + Map output only for the given task name(s). Separate the + task names with a comma (without whitespace). The sched-out time is printed and is represented by '*-' for the given - task name + task name(s). ('-' indicates other tasks while '.' is idle). OPTIONS for 'perf sched timehist'tools/perf/builtin-sched.c +0
-0
tools/perf/builtin-sched.c map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pid · line 1543
Quoted 5 lines
tools/perf/builtin-sched.c +1
-1@@ -1540,24 +1540,72 @@ map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pidreturn thread; } -static bool sched_match_task (const char *comm_str,const char *commands) +struct CommandList {
Please don't use camel case.
tools/perf/builtin-sched.c map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pid · line 1545
Quoted 2 lines
tools/perf/builtin-sched.c +2
-0+char **command_list; +int command_count;
If you name the list as commands (or cmds) you can remove the prefix and use it like commands->list or cmds->count.
Actually I was thinking about strlist API and it'd do most of the work you did here. You may want to add the fuzzy (or substring) matching there.
tools/perf/builtin-sched.c map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pid · line 1555
Quoted 10 lines
tools/perf/builtin-sched.c +10
-0+}; + +static void free_command_list (struct CommandList *cmd_list) +{ +if (cmd_list) { +for (int i =0 ; i < cmd_list->command_count; i++) +free (cmd_list->command_list[i]); +free (cmd_list->command_list); +free (cmd_list); + }
Then it could be just strlist__delete().
Quoted 11 lines
tools/perf/builtin-sched.c +4
-1+} + +static struct CommandList *parse_commands (const char *commands) {char *commands_copy =NULL ; +struct CommandList *cmd_list =NULL ;char *token =NULL ; -bool match_found = false; commands_copy =strdup (commands);if (commands_copy ==NULL )
tools/perf/builtin-sched.c map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pid · line 1575
Quoted 10 lines
tools/perf/builtin-sched.c +8
-0return NULL ; + cmd_list =malloc (sizeof (struct CommandList )); +if (cmd_list ==NULL ) { +free (commands_copy); +return NULL ; + } + + cmd_list->command_count =0 ; + cmd_list->command_list =NULL ;
You can use zalloc() and remove the zero initialization.
Quoted 16 lines
tools/perf/builtin-sched.c +12
-2+ token =strtok (commands_copy,"," ); +while (token !=NULL ) { + cmd_list->command_list =realloc (cmd_list->command_list,sizeof (char *) + *(cmd_list->command_count +1 )); +if (cmd_list->command_list ==NULL ) { +free_command_list (cmd_list); +free (commands_copy); +return NULL ; + } -while (token !=NULL && !match_found) { - match_found = !strcmp (comm_str, token); + cmd_list->command_list[cmd_list->command_count] =strdup (token); +if (cmd_list->command_list[cmd_list->command_count] ==NULL ) { +free_command_list (cmd_list);
tools/perf/builtin-sched.c map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pid · line 1599
Quoted 10 lines
tools/perf/builtin-sched.c +6
-0+free (commands_copy); +return NULL ; + } + + cmd_list->command_count++; token =strtok (NULL ,"," ); }free (commands_copy); +return cmd_list;
And this could be just strlist__new(commands, NULL).
Thanks,
Namhyung
Quoted 86 lines
tools/perf/builtin-sched.c +23
-7+} + +static bool sched_match_task (const char *comm_str,struct CommandList *cmd_list) +{ +bool match_found = false; + +for (int i =0 ; i < cmd_list->command_count && !match_found; i++) + match_found = !strcmp (comm_str, cmd_list->command_list[i]); +return match_found; }@@ -1624,6 +1672,8 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,char stimestamp[32 ];const char *str; +struct CommandList *cmd_list =NULL ; +BUG_ON (this_cpu.cpu >=MAX_CPUS || this_cpu.cpu <0 );if (this_cpu.cpu > sched->max_cpu.cpu)@@ -1664,7 +1714,11 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel, sched->curr_thread[this_cpu.cpu] =thread__get (sched_in); sched->curr_out_thread[this_cpu.cpu] =thread__get (sched_out); +if (sched->map.task_name) + cmd_list =parse_commands (sched->map.task_name); + new_shortname =0 ; + str =thread__comm_str (sched_in);if (!tr->shortname[0 ]) {if (!strcmp (thread__comm_str (sched_in),"swapper" )) {/* @@ -1673,8 +1727,7 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,*/ tr->shortname[0 ] ='.' ; tr->shortname[1 ] =' ' ; - }else if (!sched->map.task_name ||sched_match_task (thread__comm_str (sched_in), - sched->map.task_name)) { + }else if (!sched->map.task_name ||sched_match_task (str, cmd_list)) { tr->shortname[0 ] = sched->next_shortname1; tr->shortname[1 ] = sched->next_shortname2;@@ -1703,15 +1756,15 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,* Check which of sched_in and sched_out matches the passed --task-name * arguments and call the corresponding print_sched_map. */ -if (sched->map.task_name && !sched_match_task (str, sched->map.task_name)) { -if (!sched_match_task (thread__comm_str (sched_out), sched->map.task_name)) +if (sched->map.task_name && !sched_match_task (str, cmd_list)) { +if (!sched_match_task (thread__comm_str (sched_out), cmd_list)) goto out;else goto sched_out; }else { str =thread__comm_str (sched_out); -if (!(sched->map.task_name && !sched_match_task (str, sched->map.task_name))) +if (!(sched->map.task_name && !sched_match_task (str, cmd_list))) proceed =1 ; }@@ -1758,8 +1811,10 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,color_fprintf (stdout, color,"\n" ); out: -if (sched->map.task_name) +if (sched->map.task_name) { +free_command_list (cmd_list);thread__put (sched_out); + }thread__put (sched_in);@@ -3651,7 +3706,7 @@ int cmd_sched(int argc, const char **argv)OPT_STRING (0 ,"cpus" , &sched.map.cpus_str,"cpus" ,"display given CPUs in map" ),OPT_STRING (0 ,"task-name" , &sched.map.task_name,"task" , -"map output only for the given task name" ), +"map output only for the given task name(s)." ),OPT_PARENT (sched_options) }; const struct option timehist_options[] = {Signature · 1 line
2.43.2
Re: [PATCH v5 2/3] perf sched map: Add support for multiple task names using CSV
Hi Namhyung,
Quoted 51 lines · Namhyung Kim
Quoted 50 lines · Madadi Vineeth Reddy
To track the scheduling patterns of multiple tasks simultaneously, multiple task names can be specified using a comma separator without any whitespace.
Sample output for --task-name perf,wdavdaemon
=============. *A0 . . . . - . 131040.641346 secs A0 => wdavdaemon:62509 . A0 *B0 . . . - . 131040.641378 secs B0 => wdavdaemon:62274 - *- - - - - - - 131040.641379 secs *C0 . B0 . . . . . 131040.641572 secs C0 => wdavdaemon:62283...
- *- - - - - - - 131041.395649 secs . . . . . . . *X2 131041.403969 secs X2 => perf:70211 - - - - - - - *- 131041.404006 secsSuggested-by Namhyung Kim <[email protected]>Reviewed-and-tested-by Athira Rajeev <[email protected]>Signed-off-by Madadi Vineeth Reddy <[email protected]>--- tools/perf/Documentation/perf-sched.txt | 5 +- tools/perf/builtin-sched.c | 77 +++++++++++++++++++++---- 2 files changed, 69 insertions(+), 13 deletions(-)tools/perf/Documentation/perf-sched.txt +3
-2@@ -131,9 +131,10 @@ OPTIONS for 'perf sched map' Highlight the given pids. --task-name <task>:: - Map output only for the given task name. The sched-out + Map output only for the given task name(s). Separate the + task names with a comma (without whitespace). The sched-out time is printed and is represented by '*-' for the given - task name + task name(s). ('-' indicates other tasks while '.' is idle). OPTIONS for 'perf sched timehist'tools/perf/builtin-sched.c +0
-0@@ -1540,24 +1540,72 @@ map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pidreturn thread; }
Quoted 5 lines
tools/perf/builtin-sched.c map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pid · line 1543
Quoted 2 lines
tools/perf/builtin-sched.c +1
-1-static bool sched_match_task (const char *comm_str,const char *commands) +struct CommandList {Please don't use camel case.
Sure.
Quoted 10 lines
tools/perf/builtin-sched.c map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pid · line 1545
Quoted 2 lines
tools/perf/builtin-sched.c +2
-0+char **command_list; +int command_count;If you name the list as commands (or cmds) you can remove the prefix and use it like
commands->listorcmds->count.Actually I was thinking about strlist API and it'd do most of the work you did here. You may want to add the fuzzy (or substring) matching there.
OK, thanks for the suggestion. Will use that.
Quoted 27 lines
tools/perf/builtin-sched.c map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pid · line 1555
Quoted 10 lines
tools/perf/builtin-sched.c +10
-0+}; + +static void free_command_list (struct CommandList *cmd_list) +{ +if (cmd_list) { +for (int i =0 ; i < cmd_list->command_count; i++) +free (cmd_list->command_list[i]); +free (cmd_list->command_list); +free (cmd_list); + }Then it could be just
strlist__delete().Quoted 13 lines
tools/perf/builtin-sched.c +4
-1+} + +static struct CommandList *parse_commands (const char *commands) {char *commands_copy =NULL ; +struct CommandList *cmd_list =NULL ;char *token =NULL ; -bool match_found = false; commands_copy =strdup (commands);if (commands_copy ==NULL )return NULL ;
Quoted 11 lines
tools/perf/builtin-sched.c map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pid · line 1575
Quoted 8 lines
tools/perf/builtin-sched.c +8
-0+ cmd_list =malloc (sizeof (struct CommandList )); +if (cmd_list ==NULL ) { +free (commands_copy); +return NULL ; + } + + cmd_list->command_count =0 ; + cmd_list->command_list =NULL ;You can use
zalloc()and remove the zero initialization.
Sure.
Quoted 25 lines
Quoted 25 lines
tools/perf/builtin-sched.c +17
-2+ token =strtok (commands_copy,"," ); +while (token !=NULL ) { + cmd_list->command_list =realloc (cmd_list->command_list,sizeof (char *) + *(cmd_list->command_count +1 )); +if (cmd_list->command_list ==NULL ) { +free_command_list (cmd_list); +free (commands_copy); +return NULL ; + } -while (token !=NULL && !match_found) { - match_found = !strcmp (comm_str, token); + cmd_list->command_list[cmd_list->command_count] =strdup (token); +if (cmd_list->command_list[cmd_list->command_count] ==NULL ) { +free_command_list (cmd_list); +free (commands_copy); +return NULL ; + } + + cmd_list->command_count++; token =strtok (NULL ,"," ); }
Quoted 5 lines
tools/perf/builtin-sched.c map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pid · line 1599
Quoted 2 lines
tools/perf/builtin-sched.c +1
-0free (commands_copy); +return cmd_list;And this could be just
strlist__new(commands, NULL).
Thank you for the feedback. I will fix them in v6.
Thanks and Regards
Madadi Vineeth Reddy
Quoted 90 lines
Thanks,
NamhyungQuoted 86 lines
tools/perf/builtin-sched.c +23
-7+} + +static bool sched_match_task (const char *comm_str,struct CommandList *cmd_list) +{ +bool match_found = false; + +for (int i =0 ; i < cmd_list->command_count && !match_found; i++) + match_found = !strcmp (comm_str, cmd_list->command_list[i]); +return match_found; }@@ -1624,6 +1672,8 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,char stimestamp[32 ];const char *str; +struct CommandList *cmd_list =NULL ; +BUG_ON (this_cpu.cpu >=MAX_CPUS || this_cpu.cpu <0 );if (this_cpu.cpu > sched->max_cpu.cpu)@@ -1664,7 +1714,11 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel, sched->curr_thread[this_cpu.cpu] =thread__get (sched_in); sched->curr_out_thread[this_cpu.cpu] =thread__get (sched_out); +if (sched->map.task_name) + cmd_list =parse_commands (sched->map.task_name); + new_shortname =0 ; + str =thread__comm_str (sched_in);if (!tr->shortname[0 ]) {if (!strcmp (thread__comm_str (sched_in),"swapper" )) {/* @@ -1673,8 +1727,7 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,*/ tr->shortname[0 ] ='.' ; tr->shortname[1 ] =' ' ; - }else if (!sched->map.task_name ||sched_match_task (thread__comm_str (sched_in), - sched->map.task_name)) { + }else if (!sched->map.task_name ||sched_match_task (str, cmd_list)) { tr->shortname[0 ] = sched->next_shortname1; tr->shortname[1 ] = sched->next_shortname2;@@ -1703,15 +1756,15 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,* Check which of sched_in and sched_out matches the passed --task-name * arguments and call the corresponding print_sched_map. */ -if (sched->map.task_name && !sched_match_task (str, sched->map.task_name)) { -if (!sched_match_task (thread__comm_str (sched_out), sched->map.task_name)) +if (sched->map.task_name && !sched_match_task (str, cmd_list)) { +if (!sched_match_task (thread__comm_str (sched_out), cmd_list)) goto out;else goto sched_out; }else { str =thread__comm_str (sched_out); -if (!(sched->map.task_name && !sched_match_task (str, sched->map.task_name))) +if (!(sched->map.task_name && !sched_match_task (str, cmd_list))) proceed =1 ; }@@ -1758,8 +1811,10 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,color_fprintf (stdout, color,"\n" ); out: -if (sched->map.task_name) +if (sched->map.task_name) { +free_command_list (cmd_list);thread__put (sched_out); + }thread__put (sched_in);@@ -3651,7 +3706,7 @@ int cmd_sched(int argc, const char **argv)OPT_STRING (0 ,"cpus" , &sched.map.cpus_str,"cpus" ,"display given CPUs in map" ),OPT_STRING (0 ,"task-name" , &sched.map.task_name,"task" , -"map output only for the given task name" ), +"map output only for the given task name(s)." ),OPT_PARENT (sched_options) }; const struct option timehist_options[] = {Signature · 1 line
2.43.2
PATCH v5 3/3 perf sched map: Add --fuzzy-name option for fuzzy matching in task names
In reply to Madadi Vineeth ReddyThe --fuzzy-name option can be used if fuzzy name matching is required. For example, "taskname" can be matched to any string that contains "taskname" as its substring.
Sample output for --task-name wdav --fuzzy-name
=============
. *A0 . . . . - . 131040.641346 secs A0 => wdavdaemon:62509 . A0 *B0 . . . - . 131040.641378 secs B0 => wdavdaemon:62274 - *- - - - - - - 131040.641379 secs *C0 . B0 . . . . . 131040.641572 secs C0 => wdavdaemon:62283 C0 . B0 . *D0 . . . 131040.641572 secs D0 => wdavdaemon:62277 C0 . B0 . D0 . *E0 . 131040.641578 secs E0 => wdavdaemon:62270 *- - - - - - - - 131040.641581 secs
--- tools/perf/Documentation/perf-sched.txt | 3 +++ tools/perf/builtin-sched.c | 22 +++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-)
tools/perf/Documentation/perf-sched.txt +3 -0
@@ -137,6 +137,9 @@ OPTIONS for 'perf sched map' task name(s). ('-' indicates other tasks while '.' is idle). +--fuzzy-name:: + Given task name(s) can be partially matched (fuzzy matching). + OPTIONS for 'perf sched timehist' --------------------------------- -k::
tools/perf/builtin-sched.c +15 -7
@@ -157,6 +157,7 @@ struct perf_sched_map {struct perf_cpu_map *color_cpus;const char *color_cpus_str;const char *task_name; +bool fuzzy;struct perf_cpu_map *cpus;const char *cpus_str; };
@@ -1599,12 +1600,16 @@ static struct CommandList *parse_commands(const char *commands)return cmd_list; } -static bool sched_match_task (const char *comm_str,struct CommandList *cmd_list) +static bool sched_match_task (const char *comm_str,struct CommandList *cmd_list,bool fuzzy_match) {bool match_found = false; -for (int i =0 ; i < cmd_list->command_count && !match_found; i++) - match_found = !strcmp (comm_str, cmd_list->command_list[i]); +for (int i =0 ; i < cmd_list->command_count && !match_found; i++) { +if (fuzzy_match) + match_found = !!strstr (comm_str, cmd_list->command_list[i]); +else + match_found = !strcmp (comm_str, cmd_list->command_list[i]); + }return match_found; }
@@ -1727,7 +1732,8 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,*/ tr->shortname[0 ] ='.' ; tr->shortname[1 ] =' ' ; - }else if (!sched->map.task_name ||sched_match_task (str, cmd_list)) { + }else if (!sched->map.task_name ||sched_match_task (str, cmd_list, + sched->map.fuzzy)) { tr->shortname[0 ] = sched->next_shortname1; tr->shortname[1 ] = sched->next_shortname2;
@@ -1756,15 +1762,15 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,* Check which of sched_in and sched_out matches the passed --task-name * arguments and call the corresponding print_sched_map. */ -if (sched->map.task_name && !sched_match_task (str, cmd_list)) { -if (!sched_match_task (thread__comm_str (sched_out), cmd_list)) +if (sched->map.task_name && !sched_match_task (str, cmd_list, sched->map.fuzzy)) { +if (!sched_match_task (thread__comm_str (sched_out), cmd_list, sched->map.fuzzy)) goto out;else goto sched_out; }else { str =thread__comm_str (sched_out); -if (!(sched->map.task_name && !sched_match_task (str, cmd_list))) +if (!(sched->map.task_name && !sched_match_task (str, cmd_list, sched->map.fuzzy))) proceed =1 ; }
@@ -3707,6 +3713,8 @@ int cmd_sched(int argc, const char **argv) "display given CPUs in map"),OPT_STRING (0 ,"task-name" , &sched.map.task_name,"task" ,"map output only for the given task name(s)." ), +OPT_BOOLEAN (0 ,"fuzzy-name" , &sched.map.fuzzy, +"given command name can be partially matched (fuzzy matching)" ),OPT_PARENT (sched_options) }; const struct option timehist_options[] = {
Signature · 1 line
2.43.2
Namhyung Kim
maintainerRe: [PATCH v5 3/3] perf sched map: Add --fuzzy-name option for fuzzy matching in task names
Quoted 9 lines · Madadi Vineeth Reddy
The --fuzzy-name option can be used if fuzzy name matching is required. For example, "taskname" can be matched to any string that contains "taskname" as its substring.
Sample output for --task-name wdav --fuzzy-name
=============. *A0 . . . . - . 131040.641346 secs A0 => wdavdaemon:62509 . A0 *B0 . . . - . 131040.641378 secs B0 => wdavdaemon:62274 - *- - - - - - - 131040.641379 secs
- *- B0 - - - - - 131040.641379 secs
Quoted 4 lines
*C0 . B0 . . . . . 131040.641572 secs C0 => wdavdaemon:62283 C0 . B0 . *D0 . . . 131040.641572 secs D0 => wdavdaemon:62277 C0 . B0 . D0 . *E0 . 131040.641578 secs E0 => wdavdaemon:62270 *- - - - - - - - 131040.641581 secs
*- - B0 - D0 - E0 - 131040.641581 secs
Thanks,
Namhyung
Quoted 96 lines
Suggested-by Chen Yu <[email protected]>Reviewed-and-tested-by Athira Rajeev <[email protected]>Signed-off-by Madadi Vineeth Reddy <[email protected]>--- tools/perf/Documentation/perf-sched.txt | 3 +++ tools/perf/builtin-sched.c | 22 +++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-)tools/perf/Documentation/perf-sched.txt +3
-0@@ -137,6 +137,9 @@ OPTIONS for 'perf sched map' task name(s). ('-' indicates other tasks while '.' is idle). +--fuzzy-name:: + Given task name(s) can be partially matched (fuzzy matching). + OPTIONS for 'perf sched timehist' --------------------------------- -k::tools/perf/builtin-sched.c +15
-7@@ -157,6 +157,7 @@ struct perf_sched_map {struct perf_cpu_map *color_cpus;const char *color_cpus_str;const char *task_name; +bool fuzzy;struct perf_cpu_map *cpus;const char *cpus_str; };@@ -1599,12 +1600,16 @@ static struct CommandList *parse_commands(const char *commands)return cmd_list; } -static bool sched_match_task (const char *comm_str,struct CommandList *cmd_list) +static bool sched_match_task (const char *comm_str,struct CommandList *cmd_list,bool fuzzy_match) {bool match_found = false; -for (int i =0 ; i < cmd_list->command_count && !match_found; i++) - match_found = !strcmp (comm_str, cmd_list->command_list[i]); +for (int i =0 ; i < cmd_list->command_count && !match_found; i++) { +if (fuzzy_match) + match_found = !!strstr (comm_str, cmd_list->command_list[i]); +else + match_found = !strcmp (comm_str, cmd_list->command_list[i]); + }return match_found; }@@ -1727,7 +1732,8 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,*/ tr->shortname[0 ] ='.' ; tr->shortname[1 ] =' ' ; - }else if (!sched->map.task_name ||sched_match_task (str, cmd_list)) { + }else if (!sched->map.task_name ||sched_match_task (str, cmd_list, + sched->map.fuzzy)) { tr->shortname[0 ] = sched->next_shortname1; tr->shortname[1 ] = sched->next_shortname2;@@ -1756,15 +1762,15 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,* Check which of sched_in and sched_out matches the passed --task-name * arguments and call the corresponding print_sched_map. */ -if (sched->map.task_name && !sched_match_task (str, cmd_list)) { -if (!sched_match_task (thread__comm_str (sched_out), cmd_list)) +if (sched->map.task_name && !sched_match_task (str, cmd_list, sched->map.fuzzy)) { +if (!sched_match_task (thread__comm_str (sched_out), cmd_list, sched->map.fuzzy)) goto out;else goto sched_out; }else { str =thread__comm_str (sched_out); -if (!(sched->map.task_name && !sched_match_task (str, cmd_list))) +if (!(sched->map.task_name && !sched_match_task (str, cmd_list, sched->map.fuzzy))) proceed =1 ; }@@ -3707,6 +3713,8 @@ int cmd_sched(int argc, const char **argv) "display given CPUs in map"),OPT_STRING (0 ,"task-name" , &sched.map.task_name,"task" ,"map output only for the given task name(s)." ), +OPT_BOOLEAN (0 ,"fuzzy-name" , &sched.map.fuzzy, +"given command name can be partially matched (fuzzy matching)" ),OPT_PARENT (sched_options) }; const struct option timehist_options[] = {Signature · 1 line
2.43.2
Re: [PATCH v5 3/3] perf sched map: Add --fuzzy-name option for fuzzy matching in task names
Hi Namhyung,
Quoted 11 lines · Namhyung Kim
Quoted 9 lines · Madadi Vineeth Reddy
The --fuzzy-name option can be used if fuzzy name matching is required. For example, "taskname" can be matched to any string that contains "taskname" as its substring.
Sample output for --task-name wdav --fuzzy-name
=============. *A0 . . . . - . 131040.641346 secs A0 => wdavdaemon:62509 . A0 *B0 . . . - . 131040.641378 secs B0 => wdavdaemon:62274 - *- - - - - - - 131040.641379 secs
Quoted 9 lines
- *- B0 - - - - - 131040.641379 secs
Quoted 4 lines
*C0 . B0 . . . . . 131040.641572 secs C0 => wdavdaemon:62283 C0 . B0 . *D0 . . . 131040.641572 secs D0 => wdavdaemon:62277 C0 . B0 . D0 . *E0 . 131040.641578 secs E0 => wdavdaemon:62270 *- - - - - - - - 131040.641581 secs*- - B0 - D0 - E0 - 131040.641581 secs
Understood. Thank you for the review.
Thanks and Regards
Madadi Vineeth Reddy
Quoted 99 lines
Thanks,
NamhyungQuoted 96 lines
Suggested-by Chen Yu <[email protected]>Reviewed-and-tested-by Athira Rajeev <[email protected]>Signed-off-by Madadi Vineeth Reddy <[email protected]>--- tools/perf/Documentation/perf-sched.txt | 3 +++ tools/perf/builtin-sched.c | 22 +++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-)tools/perf/Documentation/perf-sched.txt +3
-0@@ -137,6 +137,9 @@ OPTIONS for 'perf sched map' task name(s). ('-' indicates other tasks while '.' is idle). +--fuzzy-name:: + Given task name(s) can be partially matched (fuzzy matching). + OPTIONS for 'perf sched timehist' --------------------------------- -k::tools/perf/builtin-sched.c +15
-7@@ -157,6 +157,7 @@ struct perf_sched_map {struct perf_cpu_map *color_cpus;const char *color_cpus_str;const char *task_name; +bool fuzzy;struct perf_cpu_map *cpus;const char *cpus_str; };@@ -1599,12 +1600,16 @@ static struct CommandList *parse_commands(const char *commands)return cmd_list; } -static bool sched_match_task (const char *comm_str,struct CommandList *cmd_list) +static bool sched_match_task (const char *comm_str,struct CommandList *cmd_list,bool fuzzy_match) {bool match_found = false; -for (int i =0 ; i < cmd_list->command_count && !match_found; i++) - match_found = !strcmp (comm_str, cmd_list->command_list[i]); +for (int i =0 ; i < cmd_list->command_count && !match_found; i++) { +if (fuzzy_match) + match_found = !!strstr (comm_str, cmd_list->command_list[i]); +else + match_found = !strcmp (comm_str, cmd_list->command_list[i]); + }return match_found; }@@ -1727,7 +1732,8 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,*/ tr->shortname[0 ] ='.' ; tr->shortname[1 ] =' ' ; - }else if (!sched->map.task_name ||sched_match_task (str, cmd_list)) { + }else if (!sched->map.task_name ||sched_match_task (str, cmd_list, + sched->map.fuzzy)) { tr->shortname[0 ] = sched->next_shortname1; tr->shortname[1 ] = sched->next_shortname2;@@ -1756,15 +1762,15 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,* Check which of sched_in and sched_out matches the passed --task-name * arguments and call the corresponding print_sched_map. */ -if (sched->map.task_name && !sched_match_task (str, cmd_list)) { -if (!sched_match_task (thread__comm_str (sched_out), cmd_list)) +if (sched->map.task_name && !sched_match_task (str, cmd_list, sched->map.fuzzy)) { +if (!sched_match_task (thread__comm_str (sched_out), cmd_list, sched->map.fuzzy)) goto out;else goto sched_out; }else { str =thread__comm_str (sched_out); -if (!(sched->map.task_name && !sched_match_task (str, cmd_list))) +if (!(sched->map.task_name && !sched_match_task (str, cmd_list, sched->map.fuzzy))) proceed =1 ; }@@ -3707,6 +3713,8 @@ int cmd_sched(int argc, const char **argv) "display given CPUs in map"),OPT_STRING (0 ,"task-name" , &sched.map.task_name,"task" ,"map output only for the given task name(s)." ), +OPT_BOOLEAN (0 ,"fuzzy-name" , &sched.map.fuzzy, +"given command name can be partially matched (fuzzy matching)" ),OPT_PARENT (sched_options) }; const struct option timehist_options[] = {Signature · 1 line
2.43.2