Skip to content

Commit b194d6b

Browse files
committed
Export the preload_index() function
The purpose of this function is to stat() the files listed in the index in a multi-threaded fashion. It is called directly after reading the index in the read_index_preloaded() function. However, in some cases we may want to separate the index reading from the preloading step, e.g. in builtin/add.c, where we need to load the index before we parse the pathspecs (which needs to error out if one of the pathspecs refers to a path within a submodule, for which the index must have been read already), and only then will we want to preload, possibly limited by the just-parsed pathspecs. So let's just export that function to allow calling it separately. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 26d45d6 commit b194d6b

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

cache.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,7 @@ extern int daemonize(void);
566566
/* Initialize and use the cache information */
567567
struct lock_file;
568568
extern int read_index(struct index_state *);
569+
extern void preload_index(struct index_state *, const struct pathspec *pathspec);
569570
extern int read_index_preload(struct index_state *, const struct pathspec *pathspec);
570571
extern int do_read_index(struct index_state *istate, const char *path,
571572
int must_exist); /* for testting only! */

preload-index.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
#include "dir.h"
77

88
#ifdef NO_PTHREADS
9-
static void preload_index(struct index_state *index,
10-
const struct pathspec *pathspec)
9+
void preload_index(struct index_state *index, const struct pathspec *pathspec)
1110
{
1211
; /* nothing */
1312
}
@@ -71,8 +70,7 @@ static void *preload_thread(void *_data)
7170
return NULL;
7271
}
7372

74-
static void preload_index(struct index_state *index,
75-
const struct pathspec *pathspec)
73+
void preload_index(struct index_state *index, const struct pathspec *pathspec)
7674
{
7775
int threads, i, work, offset;
7876
struct thread_data data[MAX_PARALLEL];

0 commit comments

Comments
 (0)