Skip to content

Commit 249c11f

Browse files
dschoGit for Windows Build Agent
authored andcommitted
fscache: implement an FSCache-aware is_mount_point()
When FSCache is active, we can cache the reparse tag and use it directly to determine whether a path refers to an NTFS junction, without any additional, costly I/O. Note: this change only makes a difference with the next commit, which will make use of the FSCache in `git clean` (contingent on `core.fscache` set, of course). Signed-off-by: Johannes Schindelin <[email protected]>
1 parent f2c73ee commit 249c11f

File tree

4 files changed

+40
-1
lines changed

4 files changed

+40
-1
lines changed

compat/mingw.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2577,6 +2577,8 @@ pid_t waitpid(pid_t pid, int *status, int options)
25772577
return -1;
25782578
}
25792579

2580+
int (*win32_is_mount_point)(struct strbuf *path) = mingw_is_mount_point;
2581+
25802582
int mingw_is_mount_point(struct strbuf *path)
25812583
{
25822584
WIN32_FIND_DATAW findbuf = { 0 };

compat/mingw.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,8 @@ static inline void convert_slashes(char *path)
464464
}
465465
struct strbuf;
466466
int mingw_is_mount_point(struct strbuf *path);
467-
#define is_mount_point mingw_is_mount_point
467+
extern int (*win32_is_mount_point)(struct strbuf *path);
468+
#define is_mount_point win32_is_mount_point
468469
#define CAN_UNLINK_MOUNT_POINTS 1
469470
#define PATH_SEP ';'
470471
char *mingw_query_user_email(void);

compat/win32/fscache.c

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,7 @@ int fscache_enable(size_t initial_size)
462462
/* redirect opendir and lstat to the fscache implementations */
463463
opendir = fscache_opendir;
464464
lstat = fscache_lstat;
465+
win32_is_mount_point = fscache_is_mount_point;
465466
}
466467
initialized++;
467468
LeaveCriticalSection(&fscache_cs);
@@ -522,6 +523,7 @@ void fscache_disable(void)
522523
/* reset opendir and lstat to the original implementations */
523524
opendir = dirent_opendir;
524525
lstat = mingw_lstat;
526+
win32_is_mount_point = mingw_is_mount_point;
525527
}
526528
LeaveCriticalSection(&fscache_cs);
527529

@@ -590,6 +592,39 @@ int fscache_lstat(const char *filename, struct stat *st)
590592
return 0;
591593
}
592594

595+
/*
596+
* is_mount_point() replacement, uses cache if enabled, otherwise falls
597+
* back to mingw_is_mount_point().
598+
*/
599+
int fscache_is_mount_point(struct strbuf *path)
600+
{
601+
int dirlen, base, len;
602+
struct heap_fsentry key[2];
603+
struct fsentry *fse;
604+
struct fscache *cache = fscache_getcache();
605+
606+
if (!cache || !do_fscache_enabled(cache, path->buf))
607+
return mingw_is_mount_point(path);
608+
609+
cache->lstat_requests++;
610+
/* split path into path + name */
611+
len = path->len;
612+
if (len && is_dir_sep(path->buf[len - 1]))
613+
len--;
614+
base = len;
615+
while (base && !is_dir_sep(path->buf[base - 1]))
616+
base--;
617+
dirlen = base ? base - 1 : 0;
618+
619+
/* lookup entry for path + name in cache */
620+
fsentry_init(&key[0].ent, NULL, path->buf, dirlen);
621+
fsentry_init(&key[1].ent, &key[0].ent, path->buf + base, len - base);
622+
fse = fscache_get(cache, &key[1].ent);
623+
if (!fse)
624+
return mingw_is_mount_point(path);
625+
return fse->reparse_tag == IO_REPARSE_TAG_MOUNT_POINT;
626+
}
627+
593628
typedef struct fscache_DIR {
594629
struct DIR base_dir; /* extend base struct DIR */
595630
struct fsentry *pfsentry;

compat/win32/fscache.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ void fscache_flush(void);
2222

2323
DIR *fscache_opendir(const char *dir);
2424
int fscache_lstat(const char *file_name, struct stat *buf);
25+
int fscache_is_mount_point(struct strbuf *path);
2526

2627
/* opaque fscache structure */
2728
struct fscache;

0 commit comments

Comments
 (0)