Skip to content

Commit df35e53

Browse files
committed
Merge pull request #2203 from dscho/fix-racy-fsmonitor-gfw
Fix racy fsmonitor The `t7519-status-fsmonitor.sh` tests became a *lot* more flaky with the recent fsmonitor fix (`js/fsmonitor-refresh-after-discarding-index`). That fix, however, did not introduce the flakiness, but it just made it much more likely to be hit. And it seemed to be hit *only* on Windows. The reason, though, is that the fsmonitor feature failed to mark the in-memory index as changed, i.e. in need of writing, and it was the `has_racy_timestamp()` test that hid this bug in most cases (although a lot less on Windows, where the files' mtimes are actually a lot more accurate than on Linux). This fixes gitgitgadget#197 Signed-off-by: Johannes Schindelin <[email protected]>
2 parents f11d6e8 + 88f28ff commit df35e53

File tree

8 files changed

+14
-13
lines changed

8 files changed

+14
-13
lines changed

apply.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4316,7 +4316,7 @@ static int add_index_file(struct apply_state *state,
43164316
"created file '%s'"),
43174317
path);
43184318
}
4319-
fill_stat_cache_info(ce, &st);
4319+
fill_stat_cache_info(state->repo->index, ce, &st);
43204320
}
43214321
if (write_object_file(buf, size, blob_type, &ce->oid) < 0) {
43224322
discard_cache_entry(ce);

builtin/update-index.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ static int add_one_path(const struct cache_entry *old, const char *path, int len
280280
memcpy(ce->name, path, len);
281281
ce->ce_flags = create_ce_flags(0);
282282
ce->ce_namelen = len;
283-
fill_stat_cache_info(ce, st);
283+
fill_stat_cache_info(&the_index, ce, st);
284284
ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
285285

286286
if (index_path(&the_index, &ce->oid, path, st,

cache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@ extern int match_stat_data(const struct stat_data *sd, struct stat *st);
822822
extern int match_stat_data_racy(const struct index_state *istate,
823823
const struct stat_data *sd, struct stat *st);
824824

825-
extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
825+
extern void fill_stat_cache_info(struct index_state *istate, struct cache_entry *ce, struct stat *st);
826826

827827
#define REFRESH_REALLY 0x0001 /* ignore_valid */
828828
#define REFRESH_UNMERGED 0x0002 /* allow unmerged */

diff-lib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
232232

233233
if (!changed && !dirty_submodule) {
234234
ce_mark_uptodate(ce);
235-
mark_fsmonitor_valid(ce);
235+
mark_fsmonitor_valid(istate, ce);
236236
if (!revs->diffopt.flags.find_copies_harder)
237237
continue;
238238
}

entry.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ static int write_entry(struct cache_entry *ce,
373373
if (lstat(ce->name, &st) < 0)
374374
return error_errno("unable to stat just-written file %s",
375375
ce->name);
376-
fill_stat_cache_info(ce, &st);
376+
fill_stat_cache_info(state->istate, ce, &st);
377377
ce->ce_flags |= CE_UPDATE_IN_BASE;
378378
mark_fsmonitor_invalid(state->istate, ce);
379379
state->istate->cache_changed |= CE_ENTRY_CHANGED;

fsmonitor.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ extern void refresh_fsmonitor(struct index_state *istate);
4949
* called any time the cache entry has been updated to reflect the
5050
* current state of the file on disk.
5151
*/
52-
static inline void mark_fsmonitor_valid(struct cache_entry *ce)
52+
static inline void mark_fsmonitor_valid(struct index_state *istate, struct cache_entry *ce)
5353
{
54-
if (core_fsmonitor) {
54+
if (core_fsmonitor && !(ce->ce_flags & CE_FSMONITOR_VALID)) {
55+
istate->cache_changed = 1;
5556
ce->ce_flags |= CE_FSMONITOR_VALID;
5657
trace_printf_key(&trace_fsmonitor, "mark_fsmonitor_clean '%s'", ce->name);
5758
}

preload-index.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ static void *preload_thread(void *_data)
7878
if (ie_match_stat(index, ce, &st, CE_MATCH_RACY_IS_DIRTY|CE_MATCH_IGNORE_FSMONITOR))
7979
continue;
8080
ce_mark_uptodate(ce);
81-
mark_fsmonitor_valid(ce);
81+
mark_fsmonitor_valid(index, ce);
8282
} while (--nr > 0);
8383
if (p->progress) {
8484
struct progress_data *pd = p->progress;

read-cache.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ int match_stat_data(const struct stat_data *sd, struct stat *st)
194194
* cache, ie the parts that aren't tracked by GIT, and only used
195195
* to validate the cache.
196196
*/
197-
void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
197+
void fill_stat_cache_info(struct index_state *istate, struct cache_entry *ce, struct stat *st)
198198
{
199199
fill_stat_data(&ce->ce_stat_data, st);
200200

@@ -203,7 +203,7 @@ void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
203203

204204
if (S_ISREG(st->st_mode)) {
205205
ce_mark_uptodate(ce);
206-
mark_fsmonitor_valid(ce);
206+
mark_fsmonitor_valid(istate, ce);
207207
}
208208
}
209209

@@ -718,7 +718,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
718718
memcpy(ce->name, path, namelen);
719719
ce->ce_namelen = namelen;
720720
if (!intent_only)
721-
fill_stat_cache_info(ce, st);
721+
fill_stat_cache_info(istate, ce, st);
722722
else
723723
ce->ce_flags |= CE_INTENT_TO_ADD;
724724

@@ -1422,7 +1422,7 @@ static struct cache_entry *refresh_cache_ent(struct index_state *istate,
14221422
*/
14231423
if (!S_ISGITLINK(ce->ce_mode)) {
14241424
ce_mark_uptodate(ce);
1425-
mark_fsmonitor_valid(ce);
1425+
mark_fsmonitor_valid(istate, ce);
14261426
}
14271427
return ce;
14281428
}
@@ -1437,7 +1437,7 @@ static struct cache_entry *refresh_cache_ent(struct index_state *istate,
14371437
updated = make_empty_cache_entry(istate, ce_namelen(ce));
14381438
copy_cache_entry(updated, ce);
14391439
memcpy(updated->name, ce->name, ce->ce_namelen + 1);
1440-
fill_stat_cache_info(updated, &st);
1440+
fill_stat_cache_info(istate, updated, &st);
14411441
/*
14421442
* If ignore_valid is not set, we should leave CE_VALID bit
14431443
* alone. Otherwise, paths marked with --no-assume-unchanged

0 commit comments

Comments
 (0)