Skip to content

Commit 691ec68

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 452248c commit 691ec68

File tree

4 files changed

+40
-1
lines changed

4 files changed

+40
-1
lines changed

compat/mingw.c

+2
Original file line numberDiff line numberDiff line change
@@ -2659,6 +2659,8 @@ pid_t waitpid(pid_t pid, int *status, int options)
26592659
return -1;
26602660
}
26612661

2662+
int (*win32_is_mount_point)(struct strbuf *path) = mingw_is_mount_point;
2663+
26622664
int mingw_is_mount_point(struct strbuf *path)
26632665
{
26642666
WIN32_FIND_DATAW findbuf = { 0 };

compat/mingw.h

+2-1
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

+35
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@ int fscache_enable(size_t initial_size)
461461
/* redirect opendir and lstat to the fscache implementations */
462462
opendir = fscache_opendir;
463463
lstat = fscache_lstat;
464+
win32_is_mount_point = fscache_is_mount_point;
464465
}
465466
initialized++;
466467
LeaveCriticalSection(&fscache_cs);
@@ -521,6 +522,7 @@ void fscache_disable(void)
521522
/* reset opendir and lstat to the original implementations */
522523
opendir = dirent_opendir;
523524
lstat = mingw_lstat;
525+
win32_is_mount_point = mingw_is_mount_point;
524526
}
525527
LeaveCriticalSection(&fscache_cs);
526528

@@ -589,6 +591,39 @@ int fscache_lstat(const char *filename, struct stat *st)
589591
return 0;
590592
}
591593

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

compat/win32/fscache.h

+1
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)