global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-18 22:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

dir.c: make add_excludes aware of fscache during status

Browse Source 
Teach read_directory_recursive() and add_excludes() to
be aware of optional fscache and avoid trying to open()
and fstat() non-existant ".gitignore" files in every
directory in the worktree.

The current code in add_excludes() calls open() and then
fstat() for a ".gitignore" file in each directory present
in the worktree.  Change that when fscache is enabled to
call lstat() first and if present, call open().

This seems backwards because both lstat needs to do more
work than fstat.  But when fscache is enabled, fscache will
already know if the .gitignore file exists and can completely
avoid the IO calls.  This works because of the lstat diversion
to mingw_lstat when fscache is enabled.

This reduced status times on a 350K file enlistment of the
Windows repo on a NVMe SSD by 0.25 seconds.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
This commit is contained in:
Jeff Hostetler
2017-11-01 15:05:44 -04:00
committed by Johannes Schindelin
parent 904d65cb5a
commit bc01f63c8b
4 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
compat/win32/fscache.c
View File

@@ -8,6 +8,11 @@ static volatile long enabled;
static struct hashmap map;
static CRITICAL_SECTION mutex;
int fscache_is_enabled(void)
{
return enabled;
}
/*
* An entry in the file system cache. Used for both entire directory listings
* and file entries.

3
compat/win32/fscache.h
View File

@@ -4,6 +4,9 @@
int fscache_enable(int enable);
#define enable_fscache(x) fscache_enable(x)
int fscache_is_enabled(void);
#define is_fscache_enabled() (fscache_is_enabled())
DIR *fscache_opendir(const char *dir);
int fscache_lstat(const char *file_name, struct stat *buf);

27
dir.c
View File

@@ -824,12 +824,27 @@ static int add_excludes(const char *fname, const char *base, int baselen,
size_t size = 0;
char *buf;
fd = open(fname, O_RDONLY);
if (fd < 0 || fstat(fd, &st) < 0) {
if (fd < 0)
warn_on_fopen_errors(fname);
else
close(fd);
if (is_fscache_enabled()) {
if (lstat(fname, &st) < 0) {
fd = -1;
} else {
fd = open(fname, O_RDONLY);
if (fd < 0)
warn_on_fopen_errors(fname);
}
} else {
fd = open(fname, O_RDONLY);
if (fd < 0 || fstat(fd, &st) < 0) {
if (fd < 0)
warn_on_fopen_errors(fname);
else {
close(fd);
fd = -1;
}
}
}
if (fd < 0) {
if (!istate)
return -1;
r = read_skip_worktree_file_from_index(istate, fname,

4
git-compat-util.h
View File

@@ -1261,6 +1261,10 @@ static inline int is_missing_file_error(int errno_)
#define enable_fscache(x) /* noop */
#endif
#ifndef is_fscache_enabled
#define is_fscache_enabled() (0)
#endif
extern int cmd_main(int, const char **);
/*