mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
3bd28eb299
ba1b9cac ("fsmonitor: delay updating state until after split index
is merged", 2017-10-27) resolved the problem of the fsmonitor data
being applied to the non-base index when reading; however, a similar
problem exists when writing the index. Specifically, writing of the
fsmonitor extension happens only after the work to split the index
has been applied -- as such, the information in the index is only
for the non-"base" index, and thus the extension information
contains only partial data.
When saving, compute the ewah bitmap before the index is split, and
store it in the fsmonitor_dirty field, mirroring the behavior that
occurred during reading. fsmonitor_dirty is kept from being leaked by
being freed when the extension data is written -- which always happens
precisely once, no matter the split index configuration.
Signed-off-by: Alex Vandiver <alexmv@dropbox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
73 lines
2.3 KiB
C
73 lines
2.3 KiB
C
#ifndef FSMONITOR_H
|
|
#define FSMONITOR_H
|
|
|
|
extern struct trace_key trace_fsmonitor;
|
|
|
|
/*
|
|
* Read the fsmonitor index extension and (if configured) restore the
|
|
* CE_FSMONITOR_VALID state.
|
|
*/
|
|
extern int read_fsmonitor_extension(struct index_state *istate, const void *data, unsigned long sz);
|
|
|
|
/*
|
|
* Fill the fsmonitor_dirty ewah bits with their state from the index,
|
|
* before it is split during writing.
|
|
*/
|
|
extern void fill_fsmonitor_bitmap(struct index_state *istate);
|
|
|
|
/*
|
|
* Write the CE_FSMONITOR_VALID state into the fsmonitor index
|
|
* extension. Reads from the fsmonitor_dirty ewah in the index.
|
|
*/
|
|
extern void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate);
|
|
|
|
/*
|
|
* Add/remove the fsmonitor index extension
|
|
*/
|
|
extern void add_fsmonitor(struct index_state *istate);
|
|
extern void remove_fsmonitor(struct index_state *istate);
|
|
|
|
/*
|
|
* Add/remove the fsmonitor index extension as necessary based on the current
|
|
* core.fsmonitor setting.
|
|
*/
|
|
extern void tweak_fsmonitor(struct index_state *istate);
|
|
|
|
/*
|
|
* Run the configured fsmonitor integration script and clear the
|
|
* CE_FSMONITOR_VALID bit for any files returned as dirty. Also invalidate
|
|
* any corresponding untracked cache directory structures. Optimized to only
|
|
* run the first time it is called.
|
|
*/
|
|
extern void refresh_fsmonitor(struct index_state *istate);
|
|
|
|
/*
|
|
* Set the given cache entries CE_FSMONITOR_VALID bit. This should be
|
|
* called any time the cache entry has been updated to reflect the
|
|
* current state of the file on disk.
|
|
*/
|
|
static inline void mark_fsmonitor_valid(struct cache_entry *ce)
|
|
{
|
|
if (core_fsmonitor) {
|
|
ce->ce_flags |= CE_FSMONITOR_VALID;
|
|
trace_printf_key(&trace_fsmonitor, "mark_fsmonitor_clean '%s'", ce->name);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Clear the given cache entry's CE_FSMONITOR_VALID bit and invalidate
|
|
* any corresponding untracked cache directory structures. This should
|
|
* be called any time git creates or modifies a file that should
|
|
* trigger an lstat() or invalidate the untracked cache for the
|
|
* corresponding directory
|
|
*/
|
|
static inline void mark_fsmonitor_invalid(struct index_state *istate, struct cache_entry *ce)
|
|
{
|
|
if (core_fsmonitor) {
|
|
ce->ce_flags &= ~CE_FSMONITOR_VALID;
|
|
untracked_cache_invalidate_path(istate, ce->name);
|
|
trace_printf_key(&trace_fsmonitor, "mark_fsmonitor_invalid '%s'", ce->name);
|
|
}
|
|
}
|
|
|
|
#endif
|