linux-perf-users.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
	Jiri Olsa <jolsa@kernel.org>, David Ahern <dsahern@gmail.com>,
	Namhyung Kim <namhyung@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 13/34] perf test: Handle properly readdir DT_UNKNOWN
Date: Thu, 14 Dec 2017 14:42:26 -0300	[thread overview]
Message-ID: <20171214174247.16841-14-acme@kernel.org> (raw)
In-Reply-To: <20171214174247.16841-1-acme@kernel.org>

From: Jiri Olsa <jolsa@kernel.org>

Some system can return DT_UNKNOWN in readdir's struct dirent::d_type and
we must handle it properly. In this case we can directly check if the
entity we found is directory and skip it.

Reported-by: Michael Petlan <mpetlan@redhat.com>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20171206174535.25380-1-jolsa@kernel.org
[ Split from a larger patch ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/tests/builtin-test.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 766573e236e4..fafa014240cd 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -411,9 +411,9 @@ static const char *shell_test__description(char *description, size_t size,
 	return description ? trim(description + 1) : NULL;
 }
 
-#define for_each_shell_test(dir, ent)		\
+#define for_each_shell_test(dir, base, ent)	\
 	while ((ent = readdir(dir)) != NULL)	\
-		if (ent->d_type == DT_REG && ent->d_name[0] != '.')
+		if (!is_directory(base, ent))
 
 static const char *shell_tests__dir(char *path, size_t size)
 {
@@ -452,7 +452,7 @@ static int shell_tests__max_desc_width(void)
 	if (!dir)
 		return -1;
 
-	for_each_shell_test(dir, ent) {
+	for_each_shell_test(dir, path, ent) {
 		char bf[256];
 		const char *desc = shell_test__description(bf, sizeof(bf), path, ent->d_name);
 
@@ -504,7 +504,7 @@ static int run_shell_tests(int argc, const char *argv[], int i, int width)
 	if (!dir)
 		return -1;
 
-	for_each_shell_test(dir, ent) {
+	for_each_shell_test(dir, st.dir, ent) {
 		int curr = i++;
 		char desc[256];
 		struct test test = {
@@ -614,7 +614,7 @@ static int perf_test__list_shell(int argc, const char **argv, int i)
 	if (!dir)
 		return -1;
 
-	for_each_shell_test(dir, ent) {
+	for_each_shell_test(dir, path, ent) {
 		int curr = i++;
 		char bf[256];
 		struct test t = {
-- 
2.13.6

  parent reply	other threads:[~2017-12-14 17:42 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-14 17:42 [GIT PULL 00/34] perf/core improvements and fixes Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 01/34] perf stat: Define a structure for per-thread shadow stats Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 02/34] perf stat: Extend rbtree to support " Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 03/34] perf stat: Create the runtime_stat init/exit function Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 04/34] perf stat: Update per-thread shadow stats Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 05/34] perf stat: Print " Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 06/34] perf stat: Remove a set of shadow stats static variables Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 07/34] perf stat: Allocate shadow stats buffer for threads Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 08/34] perf stat: Update or print per-thread stats Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 09/34] perf thread_map: Enumerate all threads from /proc Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 10/34] perf stat: Remove --per-thread pid/tid limitation Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 11/34] perf stat: Resort '--per-thread' result Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 12/34] perf utils: Move is_directory() to path.h Arnaldo Carvalho de Melo
2017-12-14 17:42 ` Arnaldo Carvalho de Melo [this message]
2017-12-14 17:42 ` [PATCH 14/34] perf perf: Remove duplicate includes Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 15/34] tools include s390: Grab a copy of arch/s390/include/uapi/asm/unistd.h Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 16/34] perf s390: Generate system call table from asm/unistd.h Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 17/34] perf trace: Use generated syscall table on s390 too Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 18/34] perf annotate: Get the cpuid from evsel->evlist->env in symbol__annotate() Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 19/34] perf annotate: Use perf_env when obtaining the arch name Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 20/34] perf env: Adopt perf_env__arch() from the annotate code Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 21/34] perf probe: Add warning message if there is unexpected event name Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 22/34] perf probe: Cut off the version suffix from " Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 23/34] perf probe: Add __return suffix for return events Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 24/34] perf probe: Find versioned symbols from map Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 25/34] perf string: Add {strdup,strpbrk}_esc() Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 26/34] perf probe: Support escaped character in parser Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 27/34] perf evsel: Fix swap for samples with raw data Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 28/34] perf test shell: Fix check open filename arg using 'perf trace' Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 29/34] tools headers: Synchronize KVM arch ABI headers Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 30/34] tools headers: Synchronize kernel x86 UAPI headers Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 31/34] tools arch s390: Do not include header files from the kernel sources Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 32/34] Revert "perf s390: Always build with -fPIC" Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 33/34] perf s390: Always build with -fPIC Arnaldo Carvalho de Melo
2017-12-14 17:42 ` [PATCH 34/34] perf evsel: Enable ignore_missing_thread for pid option Arnaldo Carvalho de Melo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171214174247.16841-14-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=dsahern@gmail.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).