Skip to content

Commit e64cf00

Browse files
kbleesdscho
authored andcommitted
mingw: 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 28d3259 commit e64cf00

File tree

6 files changed

+33
-0
lines changed

6 files changed

+33
-0
lines changed

Documentation/config/core.txt

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

688+
core.fscache::
689+
Enable additional caching of file system data for some operations.
690+
+
691+
Git for Windows uses this to bulk-read and cache lstat data of entire
692+
directories (instead of doing lstat file by file).
693+
688694
core.unsetenvvars::
689695
Windows-only: comma-separated list of environment variables'
690696
names that need to be unset before spawning any other process.

builtin/commit.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1580,6 +1580,7 @@ struct repository *repo UNUSED)
15801580
PATHSPEC_PREFER_FULL,
15811581
prefix, argv);
15821582

1583+
enable_fscache(1);
15831584
if (status_format != STATUS_FORMAT_PORCELAIN &&
15841585
status_format != STATUS_FORMAT_PORCELAIN_V2)
15851586
progress_flag = REFRESH_PROGRESS;

compat/mingw.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ enum hide_dotfiles_type {
245245
static int core_restrict_inherited_handles = -1;
246246
static enum hide_dotfiles_type hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
247247
static char *unset_environment_variables;
248+
int core_fscache;
248249

249250
int mingw_core_config(const char *var, const char *value,
250251
const struct config_context *ctx UNUSED,
@@ -258,6 +259,11 @@ int mingw_core_config(const char *var, const char *value,
258259
return 0;
259260
}
260261

262+
if (!strcmp(var, "core.fscache")) {
263+
core_fscache = git_config_bool(var, value);
264+
return 0;
265+
}
266+
261267
if (!strcmp(var, "core.unsetenvvars")) {
262268
if (!value)
263269
return config_error_nonbool(var);

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
struct config_context;
1517
int mingw_core_config(const char *var, const char *value,
1618
const struct config_context *ctx, void *cb);

git-compat-util.h

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

1548+
/*
1549+
* Enable/disable a read-only cache for file system data on platforms that
1550+
* support it.
1551+
*
1552+
* Implementing a live-cache is complicated and requires special platform
1553+
* support (inotify, ReadDirectoryChangesW...). enable_fscache shall be used
1554+
* to mark sections of git code that extensively read from the file system
1555+
* without modifying anything. Implementations can use this to cache e.g. stat
1556+
* data or even file content without the need to synchronize with the file
1557+
* system.
1558+
*/
1559+
#ifndef enable_fscache
1560+
#define enable_fscache(x) /* noop */
1561+
#endif
1562+
15481563
int cmd_main(int, const char **);
15491564

15501565
/*

preload-index.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ void preload_index(struct index_state *index,
135135
pthread_mutex_init(&pd.mutex, NULL);
136136
}
137137

138+
enable_fscache(1);
138139
for (i = 0; i < threads; i++) {
139140
struct thread_data *p = data+i;
140141
int err;
@@ -170,6 +171,8 @@ void preload_index(struct index_state *index,
170171

171172
trace2_data_intmax("index", NULL, "preload/sum_lstat", t2_sum_lstat);
172173
trace2_region_leave("index", "preload", NULL);
174+
175+
enable_fscache(0);
173176
}
174177

175178
int repo_read_index_preload(struct repository *repo,

0 commit comments

Comments
 (0)