Skip to content
Permalink
Browse files

Merge pull request #1468 from atetubou/fscache_checkout_flush

checkout.c: enable fscache for checkout again
  • Loading branch information...
dscho committed Feb 27, 2018
2 parents 9d58696 + 71cc0bd commit 07867ae2bad76ab7b5c258379eb7cd200b2ab96d
Showing with 60 additions and 0 deletions.
  1. +2 −0 builtin/checkout.c
  2. +12 −0 compat/win32/fscache.c
  3. +3 −0 compat/win32/fscache.h
  4. +3 −0 entry.c
  5. +4 −0 git-compat-util.h
  6. +36 −0 t/t7201-co.sh
@@ -359,6 +359,7 @@ static int checkout_paths(const struct checkout_opts *opts,
state.istate = &the_index;

enable_delayed_checkout(&state);
enable_fscache(1);
for (pos = 0; pos < active_nr; pos++) {
struct cache_entry *ce = active_cache[pos];
if (ce->ce_flags & CE_MATCHED) {
@@ -373,6 +374,7 @@ static int checkout_paths(const struct checkout_opts *opts,
pos = skip_same_name(ce, pos) - 1;
}
}
enable_fscache(0);
errs |= finish_delayed_checkout(&state);

if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
@@ -411,6 +411,18 @@ int fscache_enable(int enable)
return result;
}

/*
* Flush cached stats result when fscache is enabled.
*/
void fscache_flush()
{
if (enabled) {
EnterCriticalSection(&mutex);
fscache_clear();
LeaveCriticalSection(&mutex);
}
}

/*
* Lstat replacement, uses the cache if enabled, otherwise redirects to
* mingw_lstat.
@@ -7,6 +7,9 @@ int fscache_enable(int enable);
int fscache_enabled(const char *path);
#define is_fscache_enabled(path) fscache_enabled(path)

void fscache_flush();
#define flush_fscache() fscache_flush()

DIR *fscache_opendir(const char *dir);
int fscache_lstat(const char *file_name, struct stat *buf);

@@ -366,6 +366,9 @@ static int write_entry(struct cache_entry *ce,
}

finish:
// Flush cached lstat in fscache after writing disk.
flush_fscache();

if (state->refresh_cache) {
assert(state->istate);
if (!fstat_done)
@@ -1282,6 +1282,10 @@ static inline int is_missing_file_error(int errno_)
#define is_fscache_enabled(path) (0)
#endif

#ifndef flush_fscache
#define flush_fscache() /* noop */
#endif

extern int cmd_main(int, const char **);

/*
@@ -32,6 +32,42 @@ fill () {
}


test_expect_success MINGW 'fscache flush cache' '
git init fscache-test &&
cd fscache-test &&
git config core.fscache 1 &&
echo A > test.txt &&
git add test.txt &&
git commit -m A &&
echo B >> test.txt &&
git checkout . &&
test -z "$(git status -s)" &&
echo A > expect.txt &&
test_cmp expect.txt test.txt &&
cd .. &&
rm -rf fscache-test
'

test_expect_success MINGW 'fscache flush cache dir' '
git init fscache-test &&
cd fscache-test &&
git config core.fscache 1 &&
echo A > test.txt &&
git add test.txt &&
git commit -m A &&
rm test.txt &&
mkdir test.txt &&
touch test.txt/test.txt &&
git checkout . &&
test -z "$(git status -s)" &&
echo A > expect.txt &&
test_cmp expect.txt test.txt &&
cd .. &&
rm -rf fscache-test
'

test_expect_success setup '
fill x y z > same &&

0 comments on commit 07867ae

Please sign in to comment.
You can’t perform that action at this time.