From 76857f8ee825e6896248264d866f8fa5a717057e Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 3 Aug 2017 04:13:12 +0000 Subject: [PATCH] dir.c: reduce syscalls * dir.c (glob_helper): utilize d_type even if no recursive pattern, to reduce stat/lstat syscalls in subsequent glob_helper. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59481 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- dir.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dir.c b/dir.c index f4608bcab4..5ab88144c1 100644 --- a/dir.c +++ b/dir.c @@ -1940,7 +1940,7 @@ glob_helper( pathtype = path_noent; } } - if (match_dir && pathtype == path_unknown) { + if (match_dir && (pathtype == path_unknown || pathtype == path_symlink)) { if (do_stat(fd, base, &st, flags, enc) == 0) { pathtype = IFTODT(st.st_mode); } @@ -2042,14 +2042,12 @@ glob_helper( break; } name = buf + pathlen + (dirsep != 0); - if (recursive && dotfile < ((flags & FNM_DOTMATCH) ? 2 : 1)) { + if (dotfile < ((flags & FNM_DOTMATCH) ? 2 : 1) && #ifdef DT_UNKNOWN - if ((new_pathtype = dp->d_type) != (rb_pathtype_t)DT_UNKNOWN) - /* Got it. We need nothing more. */ - ; - else + ((new_pathtype = dp->d_type) == (rb_pathtype_t)DT_UNKNOWN) && /* fall back to call lstat(2) */ #endif + recursive) { /* RECURSIVE never match dot files unless FNM_DOTMATCH is set */ if (do_lstat(fd, buf, &st, flags, enc) == 0) new_pathtype = IFTODT(st.st_mode);