perf tools: Add file_only config option to strlist

If strlist_config.dirname is present, the strlist__new() tries to load
stirngs from dirname/list file first but if it failes it falls back to
add 'list' as string.  But sometimes it's not desired so adds new
file_only field to prevent it.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1452334589-8782-2-git-send-email-namhyung@kernel.org
[ Add documentation for strlist_config::file_only, in the struct definition */
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

2 files changed, 16 insertions, 1 deletions

diff --git a/tools/perf/util/strlist.c b/tools/perf/util/strlist.c
index bdf98f6f27bb..0d3dfcb919b4 100644
--- a/tools/perf/util/strlist.c
+++ b/tools/perf/util/strlist.c
@@ -126,6 +126,11 @@ static int strlist__parse_list_entry(struct strlist *slist, const char *s,
                         err = strlist__load(slist, subst);
                         goto out;
                 }
+
+                if (slist->file_only) {
+                        err = -ENOENT;
+                        goto out;
+                }
         }
 
         err = strlist__add(slist, s);
@@ -157,11 +162,13 @@ struct strlist *strlist__new(const char *list, const struct strlist_config *conf
 
         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;
                 }
 
                 rblist__init(&slist->rblist);
@@ -170,6 +177,7 @@ struct strlist *strlist__new(const char *list, const struct strlist_config *conf
                 slist->rblist.node_delete = strlist__node_delete;
 
                 slist->dupstr    = dupstr;
+                slist->file_only = file_only;
 
                 if (list && strlist__parse_list(slist, list, dirname) != 0)
                         goto out_error;
diff --git a/tools/perf/util/strlist.h b/tools/perf/util/strlist.h
index 297565aa7535..ca990029e243 100644
--- a/tools/perf/util/strlist.h
+++ b/tools/perf/util/strlist.h
@@ -13,11 +13,18 @@ struct str_node {
 
 struct strlist {
         struct rblist rblist;
-        bool           dupstr;
+        bool          dupstr;
+        bool          file_only;
 };
 
+/*
+ * @file_only: When dirname is present, only consider entries as filenames,
+ *             that should not be added to the list if dirname/entry is not
+ *             found
+ */
 struct strlist_config {
         bool dont_dupstr;
+        bool file_only;
         const char *dirname;
 };