Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit 119a8f8

Browse files
committed
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 7f5b617 commit 119a8f8

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
@@ -631,6 +631,12 @@ relatively high IO latencies. When enabled, Git will do the
631631
index comparison to the filesystem data in parallel, allowing
632632
overlapping IO's. Defaults to true.
633633

634+
core.fscache::
635+
Enable additional caching of file system data for some operations.
636+
+
637+
Git for Windows uses this to bulk-read and cache lstat data of entire
638+
directories (instead of doing lstat file by file).
639+
634640
core.createObject::
635641
You can set this to 'link', in which case a hardlink followed by
636642
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
@@ -1368,6 +1368,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
13681368
PATHSPEC_PREFER_FULL,
13691369
prefix, argv);
13701370

1371+
enable_fscache(1);
13711372
read_cache_preload(&s.pathspec);
13721373
refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, &s.pathspec, NULL, NULL);
13731374

cache.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,8 @@ enum hide_dotfiles_type {
648648
};
649649
extern enum hide_dotfiles_type hide_dotfiles;
650650

651+
extern int core_fscache;
652+
651653
enum branch_track {
652654
BRANCH_TRACK_UNSPECIFIED = -1,
653655
BRANCH_TRACK_NEVER = 0,

config.c

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

884+
if (!strcmp(var, "core.fscache")) {
885+
core_fscache = git_config_bool(var, value);
886+
return 0;
887+
}
888+
884889
/* Add other config variables here and to Documentation/config.txt. */
885890
return 0;
886891
}

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
/*
6970
* The character that begins a commented line in user-editable file

git-compat-util.h

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

797+
/*
798+
* Enable/disable a read-only cache for file system data on platforms that
799+
* support it.
800+
*
801+
* Implementing a live-cache is complicated and requires special platform
802+
* support (inotify, ReadDirectoryChangesW...). enable_fscache shall be used
803+
* to mark sections of git code that extensively read from the file system
804+
* without modifying anything. Implementations can use this to cache e.g. stat
805+
* data or even file content without the need to synchronize with the file
806+
* system.
807+
*/
808+
#ifndef enable_fscache
809+
#define enable_fscache(x) /* noop */
810+
#endif
811+
797812
#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)