Skip to content

Commit 978a181

Browse files
committed
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 2332abe commit 978a181

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
@@ -2693,6 +2693,8 @@ pid_t waitpid(pid_t pid, int *status, int options)
26932693
return -1;
26942694
}
26952695

2696+
int (*win32_is_mount_point)(struct strbuf *path) = mingw_is_mount_point;
2697+
26962698
int mingw_is_mount_point(struct strbuf *path)
26972699
{
26982700
WIN32_FIND_DATAW findbuf = { 0 };

compat/mingw.h

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

compat/win32/fscache.c

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,7 @@ int fscache_enable(size_t initial_size)
466466
/* redirect opendir and lstat to the fscache implementations */
467467
opendir = fscache_opendir;
468468
lstat = fscache_lstat;
469+
win32_is_mount_point = fscache_is_mount_point;
469470
}
470471
initialized++;
471472
LeaveCriticalSection(&fscache_cs);
@@ -526,6 +527,7 @@ void fscache_disable(void)
526527
/* reset opendir and lstat to the original implementations */
527528
opendir = dirent_opendir;
528529
lstat = mingw_lstat;
530+
win32_is_mount_point = mingw_is_mount_point;
529531
}
530532
LeaveCriticalSection(&fscache_cs);
531533

@@ -596,6 +598,39 @@ int fscache_lstat(const char *filename, struct stat *st)
596598
return 0;
597599
}
598600

601+
/*
602+
* is_mount_point() replacement, uses cache if enabled, otherwise falls
603+
* back to mingw_is_mount_point().
604+
*/
605+
int fscache_is_mount_point(struct strbuf *path)
606+
{
607+
int dirlen, base, len;
608+
struct heap_fsentry key[2];
609+
struct fsentry *fse;
610+
struct fscache *cache = fscache_getcache();
611+
612+
if (!cache || !do_fscache_enabled(cache, path->buf))
613+
return mingw_is_mount_point(path);
614+
615+
cache->lstat_requests++;
616+
/* split path into path + name */
617+
len = path->len;
618+
if (len && is_dir_sep(path->buf[len - 1]))
619+
len--;
620+
base = len;
621+
while (base && !is_dir_sep(path->buf[base - 1]))
622+
base--;
623+
dirlen = base ? base - 1 : 0;
624+
625+
/* lookup entry for path + name in cache */
626+
fsentry_init(&key[0].u.ent, NULL, path->buf, dirlen);
627+
fsentry_init(&key[1].u.ent, &key[0].u.ent, path->buf + base, len - base);
628+
fse = fscache_get(cache, &key[1].u.ent);
629+
if (!fse)
630+
return mingw_is_mount_point(path);
631+
return fse->reparse_tag == IO_REPARSE_TAG_MOUNT_POINT;
632+
}
633+
599634
typedef struct fscache_DIR {
600635
struct DIR base_dir; /* extend base struct DIR */
601636
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)