undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid using 'lstat()' to figure out directories

Browse Source 
If we have an up-to-date index entry for a file in that directory, we
can know that the directories leading up to that file must be
directories.  No need to do an lstat() on the directory.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Linus Torvalds 2009-07-09 13:14:28 -07:00 committed by Junio C Hamano
parent caa6b7825a
commit 443e061a41
1 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
dir.c
View File

@ -566,18 +566,55 @@ static int in_pathspec(const char *path, int len, const struct path_simplify *si
return 0; return 0;
} }
static int get_index_dtype(const char *path, int len)
{
int pos;
struct cache_entry *ce;
ce = cache_name_exists(path, len, 0);
if (ce) {
if (!ce_uptodate(ce))
return DT_UNKNOWN;
if (S_ISGITLINK(ce->ce_mode))
return DT_DIR;
/*
* Nobody actually cares about the
* difference between DT_LNK and DT_REG
*/
return DT_REG;
}
/* Try to look it up as a directory */
pos = cache_name_pos(path, len);
if (pos >= 0)
return DT_UNKNOWN;
pos = -pos-1;
while (pos < active_nr) {
ce = active_cache[pos++];
if (strncmp(ce->name, path, len))
break;
if (ce->name[len] > '/')
break;
if (ce->name[len] < '/')
continue;
if (!ce_uptodate(ce))
break; /* continue? */
return DT_DIR;
}
return DT_UNKNOWN;
}
static int get_dtype(struct dirent *de, const char *path, int len) static int get_dtype(struct dirent *de, const char *path, int len)
{ {
int dtype = de ? DTYPE(de) : DT_UNKNOWN; int dtype = de ? DTYPE(de) : DT_UNKNOWN;
struct cache_entry *ce;
struct stat st; struct stat st;
if (dtype != DT_UNKNOWN) if (dtype != DT_UNKNOWN)
return dtype; return dtype;
ce = cache_name_exists(path, len, 0); dtype = get_index_dtype(path, len);
if (ce && ce_uptodate(ce)) if (dtype != DT_UNKNOWN)
st.st_mode = ce->ce_mode; return dtype;
else if (lstat(path, &st)) if (lstat(path, &st))
return dtype; return dtype;
if (S_ISREG(st.st_mode)) if (S_ISREG(st.st_mode))
return DT_REG; return DT_REG;