| Message ID | a0479d02ffedccb65a167463228445a6d62c9f96.1604521275.git.matheus.bernardino@usp.br (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Parallel Checkout (part I) | expand |
On Wed, Nov 4, 2020 at 9:33 PM Matheus Tavares <matheus.bernardino@usp.br> wrote: > > This code will be used by the parallel checkout functions, outside > entry.c, so extract it to a public function. Maybe the title could be a bit more explicit like: "entry: extract update_ce_after_write() from write_entry()" And: s/This code/This new function/ > @@ -371,15 +383,10 @@ static int write_entry(struct cache_entry *ce, > > finish: > if (state->refresh_cache) { Here we check state->refresh_cache ... > - assert(state->istate); > - if (!fstat_done) > - if (lstat(ce->name, &st) < 0) > - return error_errno("unable to stat just-written file %s", > - ce->name); > - fill_stat_cache_info(state->istate, ce, &st); > - ce->ce_flags |= CE_UPDATE_IN_BASE; > - mark_fsmonitor_invalid(state->istate, ce); > - state->istate->cache_changed |= CE_ENTRY_CHANGED; > + if (!fstat_done && lstat(ce->name, &st) < 0) > + return error_errno("unable to stat just-written file %s", > + ce->name); > + update_ce_after_write(state, ce , &st); ... and inside update_ce_after_write() we check state->refresh_cache again. So the check is now done twice. Not a big issue though.
diff --git a/entry.c b/entry.c index b36071a610..1d2df188e5 100644 --- a/entry.c +++ b/entry.c @@ -251,6 +251,18 @@ int finish_delayed_checkout(struct checkout *state, int *nr_checkouts) return errs; } +void update_ce_after_write(const struct checkout *state, struct cache_entry *ce, + struct stat *st) +{ + if (state->refresh_cache) { + assert(state->istate); + fill_stat_cache_info(state->istate, ce, st); + ce->ce_flags |= CE_UPDATE_IN_BASE; + mark_fsmonitor_invalid(state->istate, ce); + state->istate->cache_changed |= CE_ENTRY_CHANGED; + } +} + static int write_entry(struct cache_entry *ce, char *path, const struct checkout *state, int to_tempfile) { @@ -371,15 +383,10 @@ static int write_entry(struct cache_entry *ce, finish: if (state->refresh_cache) { - assert(state->istate); - if (!fstat_done) - if (lstat(ce->name, &st) < 0) - return error_errno("unable to stat just-written file %s", - ce->name); - fill_stat_cache_info(state->istate, ce, &st); - ce->ce_flags |= CE_UPDATE_IN_BASE; - mark_fsmonitor_invalid(state->istate, ce); - state->istate->cache_changed |= CE_ENTRY_CHANGED; + if (!fstat_done && lstat(ce->name, &st) < 0) + return error_errno("unable to stat just-written file %s", + ce->name); + update_ce_after_write(state, ce , &st); } delayed: return 0; diff --git a/entry.h b/entry.h index 60df93ca78..ea7290bcd5 100644 --- a/entry.h +++ b/entry.h @@ -41,5 +41,7 @@ void unlink_entry(const struct cache_entry *ce); void *read_blob_entry(const struct cache_entry *ce, unsigned long *size); int fstat_checkout_output(int fd, const struct checkout *state, struct stat *st); +void update_ce_after_write(const struct checkout *state, struct cache_entry *ce, + struct stat *st); #endif /* ENTRY_H */
This code will be used by the parallel checkout functions, outside entry.c, so extract it to a public function. Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> --- entry.c | 25 ++++++++++++++++--------- entry.h | 2 ++ 2 files changed, 18 insertions(+), 9 deletions(-)