Skip to content

Commit 60695fb

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 bca3fa8 commit 60695fb

File tree

7 files changed

+32
-0
lines changed

7 files changed

+32
-0
lines changed

Documentation/config.txt

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

664+
core.fscache::
665+
Enable additional caching of file system data for some operations.
666+
+
667+
Git for Windows uses this to bulk-read and cache lstat data of entire
668+
directories (instead of doing lstat file by file).
669+
664670
core.createObject::
665671
You can set this to 'link', in which case a hardlink followed by
666672
a delete of the source are used to make sure that object creation

builtin/commit.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,6 +1366,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
13661366
PATHSPEC_PREFER_FULL,
13671367
prefix, argv);
13681368

1369+
enable_fscache(1);
13691370
read_cache_preload(&s.pathspec);
13701371
refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, &s.pathspec, NULL, NULL);
13711372

cache.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -627,6 +627,8 @@ enum hide_dotfiles_type {
627627
};
628628
extern enum hide_dotfiles_type hide_dotfiles;
629629

630+
extern int core_fscache;
631+
630632
enum branch_track {
631633
BRANCH_TRACK_UNSPECIFIED = -1,
632634
BRANCH_TRACK_NEVER = 0,

config.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -915,6 +915,11 @@ static int git_default_core_config(const char *var, const char *value)
915915
return 0;
916916
}
917917

918+
if (!strcmp(var, "core.fscache")) {
919+
core_fscache = git_config_bool(var, value);
920+
return 0;
921+
}
922+
918923
/* Add other config variables here and to Documentation/config.txt. */
919924
return 0;
920925
}

environment.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */
6464
struct startup_info *startup_info;
6565
unsigned long pack_size_limit_cfg;
6666
enum hide_dotfiles_type hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
67+
int core_fscache;
6768

6869
#ifndef PROTECT_HFS_DEFAULT
6970
#define PROTECT_HFS_DEFAULT 0

git-compat-util.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -874,4 +874,19 @@ struct tm *git_gmtime_r(const time_t *, struct tm *);
874874
#define mark_as_git_dir(x) /* noop */
875875
#endif
876876

877+
/*
878+
* Enable/disable a read-only cache for file system data on platforms that
879+
* support it.
880+
*
881+
* Implementing a live-cache is complicated and requires special platform
882+
* support (inotify, ReadDirectoryChangesW...). enable_fscache shall be used
883+
* to mark sections of git code that extensively read from the file system
884+
* without modifying anything. Implementations can use this to cache e.g. stat
885+
* data or even file content without the need to synchronize with the file
886+
* system.
887+
*/
888+
#ifndef enable_fscache
889+
#define enable_fscache(x) /* noop */
890+
#endif
891+
877892
#endif

preload-index.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ static void preload_index(struct index_state *index,
8484
offset = 0;
8585
work = DIV_ROUND_UP(index->cache_nr, threads);
8686
memset(&data, 0, sizeof(data));
87+
enable_fscache(1);
8788
for (i = 0; i < threads; i++) {
8889
struct thread_data *p = data+i;
8990
p->index = index;
@@ -100,6 +101,7 @@ static void preload_index(struct index_state *index,
100101
if (pthread_join(p->pthread, NULL))
101102
die("unable to join threaded lstat");
102103
}
104+
enable_fscache(0);
103105
}
104106
#endif
105107

0 commit comments

Comments
 (0)