Merge pull request #971 from jeffhostetler/jeffhostetler/add_preload_fscache

dscho · dscho · commit 79f371f9e63a · 2018-10-12T23:03:34.000+02:00
add: use preload-index and fscache for performance
diff --git a/builtin/add.c b/builtin/add.c
@@ -461,6 +461,10 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 
 	die_path_inside_submodule(&the_index, &pathspec);
 
+	enable_fscache(1);
+	/* We do not really re-read the index but update the up-to-date flags */
+	preload_index(&the_index, &pathspec);
+
 	if (add_new_files){
 		int baselen;
 
diff --git a/cache.h b/cache.h
@@ -659,6 +659,7 @@ extern int daemonize(void);
 /* Initialize and use the cache information */
 struct lock_file;
 extern int read_index(struct index_state *);
+extern void preload_index(struct index_state *, const struct pathspec *pathspec);
 extern int read_index_preload(struct index_state *, const struct pathspec *pathspec);
 extern int do_read_index(struct index_state *istate, const char *path,
 			 int must_exist); /* for testting only! */
diff --git a/preload-index.c b/preload-index.c
@@ -7,8 +7,7 @@
 #include "fsmonitor.h"
 
 #ifdef NO_PTHREADS
-static void preload_index(struct index_state *index,
-			 const struct pathspec *pathspec)
+void preload_index(struct index_state *index, const struct pathspec *pathspec)
{
 	; /* nothing */
 }
@@ -73,8 +72,7 @@ static void *preload_thread(void *_data)
 	return NULL;
 }
 
-static void preload_index(struct index_state *index,
-			 const struct pathspec *pathspec)
+void preload_index(struct index_state *index, const struct pathspec *pathspec)
{
 	int threads, i, work, offset;
 	struct thread_data data[MAX_PARALLEL];

-Original file line number
+Diff line change
 /* Initialize and use the cache information */
 structlock_file;
 externintread_index(structindex_state*);
 +externvoidpreload_index(structindex_state*, conststructpathspec*pathspec);
 externintread_index_preload(structindex_state*, conststructpathspec*pathspec);
 externintdo_read_index(structindex_state*istate, constchar*path,
 intmust_exist); /* for testting only! */
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,7 @@`
`7`	`7`	`#include"fsmonitor.h"`
`8`	`8`
`9`	`9`	`#ifdefNO_PTHREADS`
`10`		`-staticvoidpreload_index(structindex_state*index,`
`11`		`-conststructpathspec*pathspec)`
	`10`	`+voidpreload_index(structindex_stateindex, conststructpathspecpathspec)`
`12`	`11`	`{`
`13`	`12`	`; /* nothing */`
`14`	`13`	`}`
`@@ -73,8 +72,7 @@ static void preload_thread(void _data)`
`73`	`72`	`returnNULL;`
`74`	`73`	`}`
`75`	`74`
`76`		`-staticvoidpreload_index(structindex_state*index,`
`77`		`-conststructpathspec*pathspec)`
	`75`	`+voidpreload_index(structindex_stateindex, conststructpathspecpathspec)`
`78`	`76`	`{`
`79`	`77`	`intthreads, i, work, offset;`
`80`	`78`	`structthread_datadata[MAX_PARALLEL];`