perf sched map: Add --fuzzy-name option for fuzzy matching in task names

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
 .  *-   B0  .   .   .   -   .   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
*-   .   B0  .   D0  .   E0  .   131040.641581 secs

Suggested-by: Chen Yu <yu.c.chen@intel.com>
Reviewed-and-tested-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Signed-off-by: Madadi Vineeth Reddy <vineethr@linux.ibm.com>
Link: https://lore.kernel.org/r/20240707182716.22054-4-vineethr@linux.ibm.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

diff --git a/tools/perf/Documentation/perf-sched.txt b/tools/perf/Documentation/perf-sched.txt
index 4f8216ee4a7466a8bb922570459e024e40c0a843..84d49f9241b11af1574f4533d734650f7b9af5f4 100644 (file)
--- a/tools/perf/Documentation/perf-sched.txt
+++ b/tools/perf/Documentation/perf-sched.txt
@@ -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::

diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 7de29c2f3d233ee88956a0ceac1010e09f2e2af4..8750b5f2d49b49cff9ceecc6f5e170dac177e70e 100644 (file)
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -158,6 +158,7 @@ struct perf_sched_map {
        const char              *color_cpus_str;
        const char              *task_name;
        struct strlist          *task_names;
+       bool                    fuzzy;
        struct perf_cpu_map     *cpus;
        const char              *cpus_str;
 };
@@ -1541,12 +1542,16 @@ map__findnew_thread(struct perf_sched *sched, struct machine *machine, pid_t pid
        return thread;
 }
 
-static bool sched_match_task(const char *comm_str, struct strlist *task_names)
+static bool sched_match_task(struct perf_sched *sched, const char *comm_str)
 {
+       bool fuzzy_match = sched->map.fuzzy;
+       struct strlist *task_names = sched->map.task_names;
        struct str_node *node;
 
        strlist__for_each_entry(node, task_names) {
-               if (strcmp(comm_str, node->s) == 0)
+               bool match_found = fuzzy_match ? !!strstr(comm_str, node->s) :
+                                                       !strcmp(comm_str, node->s);
+               if (match_found)
                        return true;
        }
 
@@ -1622,7 +1627,6 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,
        const char *color = PERF_COLOR_NORMAL;
        char stimestamp[32];
        const char *str;
-       struct strlist *task_names = sched->map.task_names;
 
        BUG_ON(this_cpu.cpu >= MAX_CPUS || this_cpu.cpu < 0);
 
@@ -1674,7 +1678,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(str, task_names)) {
+               } else if (!sched->map.task_name || sched_match_task(sched, str)) {
                        tr->shortname[0] = sched->next_shortname1;
                        tr->shortname[1] = sched->next_shortname2;
 
@@ -1703,15 +1707,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, task_names)) {
-               if (!sched_match_task(thread__comm_str(sched_out), task_names))
+       if (sched->map.task_name && !sched_match_task(sched, str)) {
+               if (!sched_match_task(sched, thread__comm_str(sched_out)))
                        goto out;
                else
                        goto sched_out;
 
        } else {
                str = thread__comm_str(sched_out);
-               if (!(sched->map.task_name && !sched_match_task(str, task_names)))
+               if (!(sched->map.task_name && !sched_match_task(sched, str)))
                        proceed = 1;
        }
 
@@ -3655,6 +3659,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[] = {