perf strlist: Remove dont_dupstr logic, used only once

Ian Rogers noticed that 678ed6b707e4b2db ("perf strlist: Don't write to
const memory") breaks the 'Remove thread map' 'perf test' entry, because
it keeps pointers to the temporary string introduced to avoid touching
the const memory.

This is because the thread_map__new_by_[pt]id_str() were the only
methods using the slist->dont_dupstr knob to keep pointers to the
original const string list, as it uses strtol to parse numbers and it
stops at the comma.

As this is the only case of dont_dupstr use, dupstr being the default,
and it gets in the way of getting rid of the last const-correctness,
remove this knob, with it:

  $ perf test 37
  37: Remove thread map   : Ok
  $

Fixes: 678ed6b707e4b2db ("perf strlist: Don't write to const memory")
Reported-by: Ian Rogers <irogers@google.com>
Tested-by: Ian Rogers <irogers@google.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/strlist.c b/tools/perf/util/strlist.c
index 98883672fcf47102c51c32f28a61b4034bb1c996..50add72575e0c60c80084713caaf8e678e53384d 100644 (file)
--- a/tools/perf/util/strlist.c
+++ b/tools/perf/util/strlist.c
@@ -12,20 +12,16 @@
 #include <linux/zalloc.h>
 
 static
-struct rb_node *strlist__node_new(struct rblist *rblist, const void *entry)
+struct rb_node *strlist__node_new(struct rblist *rblist __maybe_unused, const void *entry)
 {
        const char *s = entry;
        struct rb_node *rc = NULL;
-       struct strlist *strlist = container_of(rblist, struct strlist, rblist);
        struct str_node *snode = malloc(sizeof(*snode));
 
        if (snode != NULL) {
-               if (strlist->dupstr) {
-                       s = strdup(s);
-                       if (s == NULL)
-                               goto out_delete;
-               }
-               snode->s = s;
+               snode->s = strdup(s);
+               if (snode->s == NULL)
+                       goto out_delete;
                rc = &snode->rb_node;
        }
 
@@ -36,20 +32,18 @@ out_delete:
        return NULL;
 }
 
-static void str_node__delete(struct str_node *snode, bool dupstr)
+static void str_node__delete(struct str_node *snode)
 {
-       if (dupstr)
-               zfree((char **)&snode->s);
+       zfree((char **)&snode->s);
        free(snode);
 }
 
 static
-void strlist__node_delete(struct rblist *rblist, struct rb_node *rb_node)
+void strlist__node_delete(struct rblist *rblist __maybe_unused, struct rb_node *rb_node)
 {
-       struct strlist *slist = container_of(rblist, struct strlist, rblist);
        struct str_node *snode = container_of(rb_node, struct str_node, rb_node);
 
-       str_node__delete(snode, slist->dupstr);
+       str_node__delete(snode);
 }
 
 static int strlist__node_cmp(struct rb_node *rb_node, const void *entry)
@@ -165,12 +159,10 @@ struct strlist *strlist__new(const char *list, const struct strlist_config *conf
        struct strlist *slist = malloc(sizeof(*slist));
 
        if (slist != NULL) {
-               bool dupstr = true;
                bool file_only = false;
                const char *dirname = NULL;
 
                if (config) {
-                       dupstr = !config->dont_dupstr;
                        dirname = config->dirname;
                        file_only = config->file_only;
                }
@@ -180,7 +172,6 @@ struct strlist *strlist__new(const char *list, const struct strlist_config *conf
                slist->rblist.node_new    = strlist__node_new;
                slist->rblist.node_delete = strlist__node_delete;
 
-               slist->dupstr    = dupstr;
                slist->file_only = file_only;
 
                if (list && strlist__parse_list(slist, list, dirname) != 0)

diff --git a/tools/perf/util/strlist.h b/tools/perf/util/strlist.h
index 7e82c71dcc422d7ebdb81bcd0b2bc7c4653b64aa..3e9533e66ca9ee11371ac342fb1a0fda856dfbf6 100644 (file)
--- a/tools/perf/util/strlist.h
+++ b/tools/perf/util/strlist.h
@@ -14,7 +14,6 @@ struct str_node {
 
 struct strlist {
        struct rblist rblist;
-       bool          dupstr;
        bool          file_only;
 };
 
@@ -24,7 +23,6 @@ struct strlist {
  *             found
  */
 struct strlist_config {
-       bool dont_dupstr;
        bool file_only;
        const char *dirname;
 };

diff --git a/tools/perf/util/thread_map.c b/tools/perf/util/thread_map.c
index ca193c1374ed4823dde3594d9013d992e94d6d68..48c70f149e9201dcc6886a6d217e671f9e4f186f 100644 (file)
--- a/tools/perf/util/thread_map.c
+++ b/tools/perf/util/thread_map.c
@@ -164,19 +164,16 @@ static struct perf_thread_map *thread_map__new_by_pid_str(const char *pid_str)
        struct dirent **namelist = NULL;
        int i, j = 0;
        pid_t pid, prev_pid = INT_MAX;
-       char *end_ptr;
        struct str_node *pos;
-       struct strlist_config slist_config = { .dont_dupstr = true, };
-       struct strlist *slist = strlist__new(pid_str, &slist_config);
+       struct strlist *slist = strlist__new(pid_str, NULL);
 
        if (!slist)
                return NULL;
 
        strlist__for_each_entry(pos, slist) {
-               pid = strtol(pos->s, &end_ptr, 10);
+               pid = strtol(pos->s, NULL, 10);
 
-               if (pid == INT_MIN || pid == INT_MAX ||
-                   (*end_ptr != '\0' && *end_ptr != ','))
+               if (pid == INT_MIN || pid == INT_MAX)
                        goto out_free_threads;
 
                if (pid == prev_pid)
@@ -223,24 +220,21 @@ struct perf_thread_map *thread_map__new_by_tid_str(const char *tid_str)
        struct perf_thread_map *threads = NULL, *nt;
        int ntasks = 0;
        pid_t tid, prev_tid = INT_MAX;
-       char *end_ptr;
        struct str_node *pos;
-       struct strlist_config slist_config = { .dont_dupstr = true, };
        struct strlist *slist;
 
        /* perf-stat expects threads to be generated even if tid not given */
        if (!tid_str)
                return perf_thread_map__new_dummy();
 
-       slist = strlist__new(tid_str, &slist_config);
+       slist = strlist__new(tid_str, NULL);
        if (!slist)
                return NULL;
 
        strlist__for_each_entry(pos, slist) {
-               tid = strtol(pos->s, &end_ptr, 10);
+               tid = strtol(pos->s, NULL, 10);
 
-               if (tid == INT_MIN || tid == INT_MAX ||
-                   (*end_ptr != '\0' && *end_ptr != ','))
+               if (tid == INT_MIN || tid == INT_MAX)
                        goto out_free_threads;
 
                if (tid == prev_tid)