perf tools: Allow passing a list to intlist__new

Just like strlist allows passing a list of entries to parse.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-em50vqvvmlnc6k9tw4xtixus@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

3 files changed, 28 insertions, 3 deletions

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index e05ba817f8ce..7978c8117b7f 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -694,7 +694,7 @@ static void perf_event__process_sample(struct perf_tool *tool,
                 static struct intlist *seen;
 
                 if (!seen)
-                        seen = intlist__new();
+                        seen = intlist__new(NULL);
 
                 if (!intlist__has_entry(seen, event->ip.pid)) {
                         pr_err("Can't find guest [%d]'s kernel information\n",
diff --git a/tools/perf/util/intlist.c b/tools/perf/util/intlist.c
index cbf0c32ce403..11a8d86f7fea 100644
--- a/tools/perf/util/intlist.c
+++ b/tools/perf/util/intlist.c
@@ -73,7 +73,26 @@ struct int_node *intlist__find(struct intlist *ilist, int i)
         return node;
 }
 
-struct intlist *intlist__new(void)
+static int intlist__parse_list(struct intlist *ilist, const char *s)
+{
+        char *sep;
+        int err;
+
+        do {
+                long value = strtol(s, &sep, 10);
+                err = -EINVAL;
+                if (*sep != ',' && *sep != '\0')
+                        break;
+                err = intlist__add(ilist, value);
+                if (err)
+                        break;
+                s = sep + 1;
+        } while (*sep != '\0');
+
+        return err;
+}
+
+struct intlist *intlist__new(const char *slist)
 {
         struct intlist *ilist = malloc(sizeof(*ilist));
 
@@ -82,9 +101,15 @@ struct intlist *intlist__new(void)
                 ilist->rblist.node_cmp    = intlist__node_cmp;
                 ilist->rblist.node_new    = intlist__node_new;
                 ilist->rblist.node_delete = intlist__node_delete;
+
+                if (slist && intlist__parse_list(ilist, slist))
+                        goto out_delete;
         }
 
         return ilist;
+out_delete:
+        intlist__delete(ilist);
+        return NULL;
 }
 
 void intlist__delete(struct intlist *ilist)
diff --git a/tools/perf/util/intlist.h b/tools/perf/util/intlist.h
index 6d63ab90db50..62351dad848f 100644
--- a/tools/perf/util/intlist.h
+++ b/tools/perf/util/intlist.h
@@ -15,7 +15,7 @@ struct intlist {
         struct rblist rblist;
 };
 
-struct intlist *intlist__new(void);
+struct intlist *intlist__new(const char *slist);
 void intlist__delete(struct intlist *ilist);
 
 void intlist__remove(struct intlist *ilist, struct int_node *in);