summaryrefslogtreecommitdiff
path: root/preload-index.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-17 17:01:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-11-17 17:49:12 (GMT)
commit7c4ea599b0d44e46c4f96bf955b62d96126b53ff (patch)
tree67d2fb34dd65d47532ff84943c933bc3abdd3844 /preload-index.c
parent671c9b7e315db89081cc69f83a8f405e4aca37bc (diff)
downloadgit-7c4ea599b0d44e46c4f96bf955b62d96126b53ff.zip
git-7c4ea599b0d44e46c4f96bf955b62d96126b53ff.tar.gz
git-7c4ea599b0d44e46c4f96bf955b62d96126b53ff.tar.bz2
Fix index preloading for racy dirty case
In the threaded index preloading case, we must be sure to always use the CE_MATCH_RACY_IS_DIRTY flag when calling ie_match_stat(), in order to make sure that we only ever look at the stat() data, and don't try to do anything fancy. Because most of git internals are not thread-safe, and must not be called in parallel. Otherwise, what happens is that if the timestamps indicate that an entry _might_ be dirty, we might start actually comparing filesystem data with the object database. And we mustn't do that, because that would involve looking up and creating the object structure, and that whole code sequence with read_sha1_file() where we look up and add objects to the hashes is definitely not thread-safe. Nor do we want to add locking, because the whole point of the preload was to be simple and not affect anything else. With CE_MATCH_RACY_IS_DIRTY, we get what we wanted, and we'll just leave the hard cases well alone, to be done later in the much simpler serial case. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'preload-index.c')
-rw-r--r--preload-index.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/preload-index.c b/preload-index.c
index 6253578..a685583 100644
--- a/preload-index.c
+++ b/preload-index.c
@@ -43,7 +43,7 @@ static void *preload_thread(void *_data)
continue;
if (lstat(ce->name, &st))
continue;
- if (ie_match_stat(index, ce, &st, 0))
+ if (ie_match_stat(index, ce, &st, CE_MATCH_RACY_IS_DIRTY))
continue;
ce_mark_uptodate(ce);
} while (--nr > 0);