Fix index preloading for racy dirty case
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Nov 2008 17:01:20 +0000 (09:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Nov 2008 17:49:12 +0000 (09:49 -0800)
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>
preload-index.c
index 6253578c9683c981144433c8da210e763e38f274..a6855837a4b85e475d556527335d89c8b0e3a02c 100644 (file)
@@ -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);