#include "fsmonitor.h"
#include "config.h"
#include "progress.h"
-
-#ifdef NO_PTHREADS
-static void preload_index(struct index_state *index,
- const struct pathspec *pathspec,
- unsigned int refresh_flags)
-{
- ; /* nothing */
-}
-#else
-
-#include <pthread.h>
+#include "thread-utils.h"
+#include "repository.h"
/*
* Mostly randomly chosen maximum thread counts: we
return NULL;
}
-static void preload_index(struct index_state *index,
- const struct pathspec *pathspec,
- unsigned int refresh_flags)
+void preload_index(struct index_state *index,
+ const struct pathspec *pathspec,
+ unsigned int refresh_flags)
{
int threads, i, work, offset;
struct thread_data data[MAX_PARALLEL];
struct progress_data pd;
- if (!core_preload_index)
+ if (!HAVE_THREADS || !core_preload_index)
return;
threads = index->cache_nr / THREAD_COST;
for (i = 0; i < threads; i++) {
struct thread_data *p = data+i;
+ int err;
+
p->index = index;
if (pathspec)
copy_pathspec(&p->pathspec, pathspec);
if (pd.progress)
p->progress = &pd;
offset += work;
- if (pthread_create(&p->pthread, NULL, preload_thread, p))
- die("unable to create threaded lstat");
+ err = pthread_create(&p->pthread, NULL, preload_thread, p);
+
+ if (err)
+ die(_("unable to create threaded lstat: %s"), strerror(err));
}
for (i = 0; i < threads; i++) {
struct thread_data *p = data+i;
trace_performance_leave("preload index");
}
-#endif
-int read_index_preload(struct index_state *index,
- const struct pathspec *pathspec,
- unsigned int refresh_flags)
+int repo_read_index_preload(struct repository *repo,
+ const struct pathspec *pathspec,
+ unsigned int refresh_flags)
{
- int retval = read_index(index);
+ int retval = repo_read_index(repo);
- preload_index(index, pathspec, refresh_flags);
+ preload_index(repo->index, pathspec, refresh_flags);
return retval;
}