Skip to content

Commit a33956e

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 95f72f9 commit a33956e

File tree

4 files changed

+39
-1
lines changed

4 files changed

+39
-1
lines changed

compat/mingw.c

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

2399+
int (*win32_is_mount_point)(struct strbuf *path) = mingw_is_mount_point;
2400+
23992401
int mingw_is_mount_point(struct strbuf *path)
24002402
{
24012403
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: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,7 @@ int fscache_enable(size_t initial_size)
444444
/* redirect opendir and lstat to the fscache implementations */
445445
opendir = fscache_opendir;
446446
lstat = fscache_lstat;
447+
win32_is_mount_point = fscache_is_mount_point;
447448
}
448449
initialized++;
449450
LeaveCriticalSection(&fscache_cs);
@@ -504,6 +505,7 @@ void fscache_disable(void)
504505
/* reset opendir and lstat to the original implementations */
505506
opendir = dirent_opendir;
506507
lstat = mingw_lstat;
508+
win32_is_mount_point = mingw_is_mount_point;
507509
}
508510
LeaveCriticalSection(&fscache_cs);
509511

@@ -571,6 +573,38 @@ int fscache_lstat(const char *filename, struct stat *st)
571573
return 0;
572574
}
573575

576+
/*
577+
* is_mount_point() replacement, uses cache if enabled, otherwise falls
578+
* back to mingw_is_mount_point().
579+
*/
580+
int fscache_is_mount_point(struct strbuf *path)
581+
{
582+
int dirlen, base, len;
583+
struct fsentry key[2], *fse;
584+
struct fscache *cache = fscache_getcache();
585+
586+
if (!cache || !do_fscache_enabled(cache, path->buf))
587+
return mingw_is_mount_point(path);
588+
589+
cache->lstat_requests++;
590+
/* split path into path + name */
591+
len = path->len;
592+
if (len && is_dir_sep(path->buf[len - 1]))
593+
len--;
594+
base = len;
595+
while (base && !is_dir_sep(path->buf[base - 1]))
596+
base--;
597+
dirlen = base ? base - 1 : 0;
598+
599+
/* lookup entry for path + name in cache */
600+
fsentry_init(key, NULL, path->buf, dirlen);
601+
fsentry_init(key + 1, key, path->buf + base, len - base);
602+
fse = fscache_get(cache, key + 1);
603+
if (!fse)
604+
return mingw_is_mount_point(path);
605+
return fse->reparse_tag == IO_REPARSE_TAG_MOUNT_POINT;
606+
}
607+
574608
typedef struct fscache_DIR {
575609
struct DIR base_dir; /* extend base struct DIR */
576610
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)