Sync with maint

[thirdparty/git.git] / fsmonitor.c

diff --git a/fsmonitor.c b/fsmonitor.c
index 231e83a94db58e4efb2f4d7a1dbe90220bd2f317..868cca01e250896054b1f7025c7180c87ab1b88d 100644 (file)
--- a/fsmonitor.c
+++ b/fsmonitor.c
@@ -14,8 +14,13 @@ struct trace_key trace_fsmonitor = TRACE_KEY_INIT(FSMONITOR);
 static void fsmonitor_ewah_callback(size_t pos, void *is)
 {
        struct index_state *istate = (struct index_state *)is;
-       struct cache_entry *ce = istate->cache[pos];
+       struct cache_entry *ce;
 
+       if (pos >= istate->cache_nr)
+               BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" >= %u)",
+                   (uintmax_t)pos, istate->cache_nr);
+
+       ce = istate->cache[pos];
        ce->ce_flags &= ~CE_FSMONITOR_VALID;
 }
 
@@ -50,17 +55,25 @@ int read_fsmonitor_extension(struct index_state *istate, const void *data,
        }
        istate->fsmonitor_dirty = fsmonitor_dirty;
 
+       if (!istate->split_index &&
+           istate->fsmonitor_dirty->bit_size > istate->cache_nr)
+               BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)",
+                   (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr);
+
        trace_printf_key(&trace_fsmonitor, "read fsmonitor extension successful");
        return 0;
 }
 
 void fill_fsmonitor_bitmap(struct index_state *istate)
 {
-       unsigned int i;
+       unsigned int i, skipped = 0;
        istate->fsmonitor_dirty = ewah_new();
-       for (i = 0; i < istate->cache_nr; i++)
-               if (!(istate->cache[i]->ce_flags & CE_FSMONITOR_VALID))
-                       ewah_set(istate->fsmonitor_dirty, i);
+       for (i = 0; i < istate->cache_nr; i++) {
+               if (istate->cache[i]->ce_flags & CE_REMOVE)
+                       skipped++;
+               else if (!(istate->cache[i]->ce_flags & CE_FSMONITOR_VALID))
+                       ewah_set(istate->fsmonitor_dirty, i - skipped);
+       }
 }
 
 void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate)
@@ -71,6 +84,11 @@ void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate)
        uint32_t ewah_size = 0;
        int fixup = 0;
 
+       if (!istate->split_index &&
+           istate->fsmonitor_dirty->bit_size > istate->cache_nr)
+               BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)",
+                   (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr);
+
        put_be32(&hdr_version, INDEX_EXTENSION_VERSION);
        strbuf_add(sb, &hdr_version, sizeof(uint32_t));
 
@@ -173,13 +191,26 @@ void refresh_fsmonitor(struct index_state *istate)
                }
                if (bol < query_result.len)
                        fsmonitor_refresh_callback(istate, buf + bol);
+
+               /* Now mark the untracked cache for fsmonitor usage */
+               if (istate->untracked)
+                       istate->untracked->use_fsmonitor = 1;
        } else {
+
+               /* We only want to run the post index changed hook if we've actually changed entries, so keep track
+                * if we actually changed entries or not */
+               int is_cache_changed = 0;
                /* Mark all entries invalid */
-               for (i = 0; i < istate->cache_nr; i++)
-                       istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID;
+               for (i = 0; i < istate->cache_nr; i++) {
+                       if (istate->cache[i]->ce_flags & CE_FSMONITOR_VALID) {
+                               is_cache_changed = 1;
+                               istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID;
+                       }
+               }
 
                /* If we're going to check every file, ensure we save the results */
-               istate->cache_changed |= FSMONITOR_CHANGED;
+               if (is_cache_changed)
+                       istate->cache_changed |= FSMONITOR_CHANGED;
 
                if (istate->untracked)
                        istate->untracked->use_fsmonitor = 0;
@@ -236,11 +267,12 @@ void tweak_fsmonitor(struct index_state *istate)
                        }
 
                        /* Mark all previously saved entries as dirty */
+                       if (istate->fsmonitor_dirty->bit_size > istate->cache_nr)
+                               BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)",
+                                   (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr);
                        ewah_each_bit(istate->fsmonitor_dirty, fsmonitor_ewah_callback, istate);
 
-                       /* Now mark the untracked cache for fsmonitor usage */
-                       if (istate->untracked)
-                               istate->untracked->use_fsmonitor = 1;
+                       refresh_fsmonitor(istate);
                }
 
                ewah_free(istate->fsmonitor_dirty);