Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1486453

[PATCH 01/61] perf symbols: Do not open device files again

Show all headers | View raw

Moving the regular file check into the entry
of the dso__read_binary_type_filename function.

This way we can eliminate some calls and extend
the file check for all cases.

Link: http://lkml.kernel.org/n/tip-np802m7jwzd7fu09vx2tp23y@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/perf/util/dso.c    | 8 +++-----
 tools/perf/util/symbol.c | 3 ---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index 774f6ec884d5..9a027a0cc037 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -43,6 +43,9 @@ int dso__read_binary_type_filename(const struct dso *dso,
 	int ret = 0;
 	size_t len;
 
+	if (!is_regular_file(filename))
+		return -1;
+
 	switch (type) {
 	case DSO_BINARY_TYPE__DEBUGLINK: {
 		char *debuglink;
@@ -53,11 +56,6 @@ int dso__read_binary_type_filename(const struct dso *dso,
 			debuglink--;
 		if (*debuglink == '/')
 			debuglink++;
-
-		ret = -1;
-		if (!is_regular_file(filename))
-			break;
-
 		ret = filename__read_debuglink(filename, debuglink,
 					       size - (debuglink - filename));
 		}
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 19c9c558454f..827a58ce29f0 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1466,9 +1466,6 @@ int dso__load(struct dso *dso, struct map *map)
 						   root_dir, name, PATH_MAX))
 			continue;
 
-		if (!is_regular_file(name))
-			continue;
-
 		/* Name is now the name of the next image to try */
 		if (symsrc__init(ss, dso, name, symtab_type) < 0)
 			continue;
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 01/61] perf symbols: Do not open device files again Jiri Olsa <jolsa@kernel.org> - 2016-09-19 15:20 +0200
  Re: [PATCH 01/61] perf symbols: Do not open device files again Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-09-20 17:30 +0200
    Re: [PATCH 01/61] perf symbols: Do not open device files again Jiri Olsa <jolsa@redhat.com> - 2016-09-20 17:40 +0200
      [PATCHv2 01/61] perf symbols: Do not open device files Jiri Olsa <jolsa@redhat.com> - 2016-09-20 18:20 +0200
        [tip:perf/core] perf symbols: Do not open device files tip-bot for Jiri Olsa <tipbot@zytor.com> - 2016-09-20 23:50 +0200

csiph-web