sha1_file: convert check_sha1_signature to struct object_id

diff --git a/preload-index.c b/preload-index.c
index 49cb08df96faa90101bb25d8f96acaffc066f19b..4d08d4487460f839f39f667c714f1bb85fa1e144 100644 (file)
--- a/preload-index.c
+++ b/preload-index.c
@@ -2,9 +2,13 @@
  * Copyright (C) 2008 Linus Torvalds
  */
 #include "cache.h"
+#include "pathspec.h"
+#include "dir.h"
+#include "fsmonitor.h"
 
 #ifdef NO_PTHREADS
-static void preload_index(struct index_state *index, const char **pathspec)
+static void preload_index(struct index_state *index,
+                         const struct pathspec *pathspec)
 {
        ; /* nothing */
 }
@@ -24,7 +28,7 @@ static void preload_index(struct index_state *index, const char **pathspec)
 struct thread_data {
        pthread_t pthread;
        struct index_state *index;
-       const char **pathspec;
+       struct pathspec pathspec;
        int offset, nr;
 };
 
@@ -34,11 +38,8 @@ static void *preload_thread(void *_data)
        struct thread_data *p = _data;
        struct index_state *index = p->index;
        struct cache_entry **cep = index->cache + p->offset;
-       struct cache_def cache;
-       struct pathspec pathspec;
+       struct cache_def cache = CACHE_DEF_INIT;
 
-       init_pathspec(&pathspec, p->pathspec);
-       memset(&cache, 0, sizeof(cache));
        nr = p->nr;
        if (nr + p->offset > index->cache_nr)
                nr = index->cache_nr - p->offset;
@@ -53,39 +54,50 @@ static void *preload_thread(void *_data)
                        continue;
                if (ce_uptodate(ce))
                        continue;
-               if (!ce_path_match(ce, &pathspec))
+               if (ce_skip_worktree(ce))
+                       continue;
+               if (ce->ce_flags & CE_FSMONITOR_VALID)
+                       continue;
+               if (!ce_path_match(ce, &p->pathspec, NULL))
                        continue;
                if (threaded_has_symlink_leading_path(&cache, ce->name, ce_namelen(ce)))
                        continue;
                if (lstat(ce->name, &st))
                        continue;
-               if (ie_match_stat(index, ce, &st, CE_MATCH_RACY_IS_DIRTY))
+               if (ie_match_stat(index, ce, &st, CE_MATCH_RACY_IS_DIRTY|CE_MATCH_IGNORE_FSMONITOR))
                        continue;
                ce_mark_uptodate(ce);
+               mark_fsmonitor_valid(ce);
        } while (--nr > 0);
-       free_pathspec(&pathspec);
+       cache_def_clear(&cache);
        return NULL;
 }
 
-static void preload_index(struct index_state *index, const char **pathspec)
+static void preload_index(struct index_state *index,
+                         const struct pathspec *pathspec)
 {
        int threads, i, work, offset;
        struct thread_data data[MAX_PARALLEL];
+       uint64_t start = getnanotime();
 
        if (!core_preload_index)
                return;
 
        threads = index->cache_nr / THREAD_COST;
+       if ((index->cache_nr > 1) && (threads < 2) && getenv("GIT_FORCE_PRELOAD_TEST"))
+               threads = 2;
        if (threads < 2)
                return;
        if (threads > MAX_PARALLEL)
                threads = MAX_PARALLEL;
        offset = 0;
        work = DIV_ROUND_UP(index->cache_nr, threads);
+       memset(&data, 0, sizeof(data));
        for (i = 0; i < threads; i++) {
                struct thread_data *p = data+i;
                p->index = index;
-               p->pathspec = pathspec;
+               if (pathspec)
+                       copy_pathspec(&p->pathspec, pathspec);
                p->offset = offset;
                p->nr = work;
                offset += work;
@@ -97,10 +109,12 @@ static void preload_index(struct index_state *index, const char **pathspec)
                if (pthread_join(p->pthread, NULL))
                        die("unable to join threaded lstat");
        }
+       trace_performance_since(start, "preload index");
 }
 #endif
 
-int read_index_preload(struct index_state *index, const char **pathspec)
+int read_index_preload(struct index_state *index,
+                      const struct pathspec *pathspec)
 {
        int retval = read_index(index);