From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933689AbcAMJmp (ORCPT ); Wed, 13 Jan 2016 04:42:45 -0500 Received: from terminus.zytor.com ([198.137.202.10]:48764 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932963AbcAMJmm (ORCPT ); Wed, 13 Jan 2016 04:42:42 -0500 Date: Wed, 13 Jan 2016 01:42:04 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: acme@redhat.com, dsahern@gmail.com, peterz@infradead.org, wangnan0@huawei.com, mingo@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, namhyung@kernel.org, hpa@zytor.com, andi@firstfloor.org, jolsa@kernel.org Reply-To: peterz@infradead.org, dsahern@gmail.com, acme@redhat.com, wangnan0@huawei.com, mingo@kernel.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, andi@firstfloor.org, jolsa@kernel.org In-Reply-To: <1452334589-8782-2-git-send-email-namhyung@kernel.org> References: <1452334589-8782-2-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Add file_only config option to strlist Git-Commit-ID: dd8232bc9d13b729d92590b55befd14e49f81eca X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: dd8232bc9d13b729d92590b55befd14e49f81eca Gitweb: http://git.kernel.org/tip/dd8232bc9d13b729d92590b55befd14e49f81eca Author: Namhyung Kim AuthorDate: Sat, 9 Jan 2016 19:16:27 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 12 Jan 2016 12:42:07 -0300 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 Cc: Andi Kleen Cc: David Ahern Cc: Jiri Olsa Cc: Peter Zijlstra Cc: Wang Nan 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 --- tools/perf/util/strlist.c | 8 ++++++++ tools/perf/util/strlist.h | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/strlist.c b/tools/perf/util/strlist.c index bdf98f6..0d3dfcb 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 297565a..ca99002 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; };