Skip to content

Commit 54c58b6

Browse files
kbleesdscho
authored andcommitted
add infrastructure for read-only file system level caches
Add a macro to mark code sections that only read from the file system, along with a config option and documentation. This facilitates implementation of relatively simple file system level caches without the need to synchronize with the file system. Enable read-only sections for 'git status' and preload_index. Signed-off-by: Karsten Blees <[email protected]>
1 parent a940556 commit 54c58b6

File tree

6 files changed

+32
-0
lines changed

6 files changed

+32
-0
lines changed

Documentation/config.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -875,6 +875,12 @@ relatively high IO latencies. When enabled, Git will do the
875875
index comparison to the filesystem data in parallel, allowing
876876
overlapping IO's. Defaults to true.
877877

878+
core.fscache::
879+
Enable additional caching of file system data for some operations.
880+
+
881+
Git for Windows uses this to bulk-read and cache lstat data of entire
882+
directories (instead of doing lstat file by file).
883+
878884
core.unsetenvvars::
879885
EXPERIMENTAL, Windows-only: comma-separated list of environment
880886
variables' names that need to be unset before spawning any other

builtin/commit.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1401,6 +1401,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
14011401
PATHSPEC_PREFER_FULL,
14021402
prefix, argv);
14031403

1404+
enable_fscache(1);
14041405
read_cache_preload(&s.pathspec);
14051406
refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, &s.pathspec, NULL, NULL);
14061407

compat/mingw.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ enum hide_dotfiles_type {
211211

212212
static enum hide_dotfiles_type hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
213213
static char *unset_environment_variables;
214+
int core_fscache;
214215

215216
int mingw_core_config(const char *var, const char *value, void *cb)
216217
{
@@ -222,6 +223,11 @@ int mingw_core_config(const char *var, const char *value, void *cb)
222223
return 0;
223224
}
224225

226+
if (!strcmp(var, "core.fscache")) {
227+
core_fscache = git_config_bool(var, value);
228+
return 0;
229+
}
230+
225231
if (!strcmp(var, "core.unsetenvvars")) {
226232
free(unset_environment_variables);
227233
unset_environment_variables = xstrdup(value);

compat/mingw.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ typedef _sigset_t sigset_t;
1111
#undef _POSIX_THREAD_SAFE_FUNCTIONS
1212
#endif
1313

14+
extern int core_fscache;
15+
1416
extern int mingw_core_config(const char *var, const char *value, void *cb);
1517
#define platform_core_config mingw_core_config
1618

git-compat-util.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,6 +1177,21 @@ static inline int is_missing_file_error(int errno_)
11771177
return (errno_ == ENOENT || errno_ == ENOTDIR);
11781178
}
11791179

1180+
/*
1181+
* Enable/disable a read-only cache for file system data on platforms that
1182+
* support it.
1183+
*
1184+
* Implementing a live-cache is complicated and requires special platform
1185+
* support (inotify, ReadDirectoryChangesW...). enable_fscache shall be used
1186+
* to mark sections of git code that extensively read from the file system
1187+
* without modifying anything. Implementations can use this to cache e.g. stat
1188+
* data or even file content without the need to synchronize with the file
1189+
* system.
1190+
*/
1191+
#ifndef enable_fscache
1192+
#define enable_fscache(x) /* noop */
1193+
#endif
1194+
11801195
extern int cmd_main(int, const char **);
11811196

11821197
/*

preload-index.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ static void preload_index(struct index_state *index,
9292
offset = 0;
9393
work = DIV_ROUND_UP(index->cache_nr, threads);
9494
memset(&data, 0, sizeof(data));
95+
enable_fscache(1);
9596
for (i = 0; i < threads; i++) {
9697
struct thread_data *p = data+i;
9798
p->index = index;
@@ -108,6 +109,7 @@ static void preload_index(struct index_state *index,
108109
if (pthread_join(p->pthread, NULL))
109110
die("unable to join threaded lstat");
110111
}
112+
enable_fscache(0);
111113
}
112114
#endif
113115

0 commit comments

Comments
 (0)