merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
Vincent Ambo
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
174
third_party/git/fsmonitor.c
vendored
174
third_party/git/fsmonitor.c
vendored
|
|
@ -6,19 +6,42 @@
|
|||
#include "run-command.h"
|
||||
#include "strbuf.h"
|
||||
|
||||
#define INDEX_EXTENSION_VERSION (1)
|
||||
#define HOOK_INTERFACE_VERSION (1)
|
||||
#define INDEX_EXTENSION_VERSION1 (1)
|
||||
#define INDEX_EXTENSION_VERSION2 (2)
|
||||
#define HOOK_INTERFACE_VERSION1 (1)
|
||||
#define HOOK_INTERFACE_VERSION2 (2)
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
static int fsmonitor_hook_version(void)
|
||||
{
|
||||
int hook_version;
|
||||
|
||||
if (git_config_get_int("core.fsmonitorhookversion", &hook_version))
|
||||
return -1;
|
||||
|
||||
if (hook_version == HOOK_INTERFACE_VERSION1 ||
|
||||
hook_version == HOOK_INTERFACE_VERSION2)
|
||||
return hook_version;
|
||||
|
||||
warning("Invalid hook version '%i' in core.fsmonitorhookversion. "
|
||||
"Must be 1 or 2.", hook_version);
|
||||
return -1;
|
||||
}
|
||||
|
||||
int read_fsmonitor_extension(struct index_state *istate, const void *data,
|
||||
unsigned long sz)
|
||||
{
|
||||
|
|
@ -27,17 +50,26 @@ int read_fsmonitor_extension(struct index_state *istate, const void *data,
|
|||
uint32_t ewah_size;
|
||||
struct ewah_bitmap *fsmonitor_dirty;
|
||||
int ret;
|
||||
uint64_t timestamp;
|
||||
struct strbuf last_update = STRBUF_INIT;
|
||||
|
||||
if (sz < sizeof(uint32_t) + sizeof(uint64_t) + sizeof(uint32_t))
|
||||
if (sz < sizeof(uint32_t) + 1 + sizeof(uint32_t))
|
||||
return error("corrupt fsmonitor extension (too short)");
|
||||
|
||||
hdr_version = get_be32(index);
|
||||
index += sizeof(uint32_t);
|
||||
if (hdr_version != INDEX_EXTENSION_VERSION)
|
||||
if (hdr_version == INDEX_EXTENSION_VERSION1) {
|
||||
timestamp = get_be64(index);
|
||||
strbuf_addf(&last_update, "%"PRIu64"", timestamp);
|
||||
index += sizeof(uint64_t);
|
||||
} else if (hdr_version == INDEX_EXTENSION_VERSION2) {
|
||||
strbuf_addstr(&last_update, index);
|
||||
index += last_update.len + 1;
|
||||
} else {
|
||||
return error("bad fsmonitor version %d", hdr_version);
|
||||
}
|
||||
|
||||
istate->fsmonitor_last_update = get_be64(index);
|
||||
index += sizeof(uint64_t);
|
||||
istate->fsmonitor_last_update = strbuf_detach(&last_update, NULL);
|
||||
|
||||
ewah_size = get_be32(index);
|
||||
index += sizeof(uint32_t);
|
||||
|
|
@ -50,32 +82,45 @@ 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)
|
||||
{
|
||||
uint32_t hdr_version;
|
||||
uint64_t tm;
|
||||
uint32_t ewah_start;
|
||||
uint32_t ewah_size = 0;
|
||||
int fixup = 0;
|
||||
|
||||
put_be32(&hdr_version, INDEX_EXTENSION_VERSION);
|
||||
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_VERSION2);
|
||||
strbuf_add(sb, &hdr_version, sizeof(uint32_t));
|
||||
|
||||
put_be64(&tm, istate->fsmonitor_last_update);
|
||||
strbuf_add(sb, &tm, sizeof(uint64_t));
|
||||
strbuf_addstr(sb, istate->fsmonitor_last_update);
|
||||
strbuf_addch(sb, 0); /* Want to keep a NUL */
|
||||
|
||||
fixup = sb->len;
|
||||
strbuf_add(sb, &ewah_size, sizeof(uint32_t)); /* we'll fix this up later */
|
||||
|
||||
|
|
@ -92,9 +137,9 @@ void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate)
|
|||
}
|
||||
|
||||
/*
|
||||
* Call the query-fsmonitor hook passing the time of the last saved results.
|
||||
* Call the query-fsmonitor hook passing the last update token of the saved results.
|
||||
*/
|
||||
static int query_fsmonitor(int version, uint64_t last_update, struct strbuf *query_result)
|
||||
static int query_fsmonitor(int version, const char *last_update, struct strbuf *query_result)
|
||||
{
|
||||
struct child_process cp = CHILD_PROCESS_INIT;
|
||||
|
||||
|
|
@ -103,7 +148,7 @@ static int query_fsmonitor(int version, uint64_t last_update, struct strbuf *que
|
|||
|
||||
argv_array_push(&cp.args, core_fsmonitor);
|
||||
argv_array_pushf(&cp.args, "%d", version);
|
||||
argv_array_pushf(&cp.args, "%" PRIuMAX, (uintmax_t)last_update);
|
||||
argv_array_pushf(&cp.args, "%s", last_update);
|
||||
cp.use_shell = 1;
|
||||
cp.dir = get_git_work_tree();
|
||||
|
||||
|
|
@ -130,14 +175,18 @@ static void fsmonitor_refresh_callback(struct index_state *istate, const char *n
|
|||
void refresh_fsmonitor(struct index_state *istate)
|
||||
{
|
||||
struct strbuf query_result = STRBUF_INIT;
|
||||
int query_success = 0;
|
||||
size_t bol; /* beginning of line */
|
||||
int query_success = 0, hook_version = -1;
|
||||
size_t bol = 0; /* beginning of line */
|
||||
uint64_t last_update;
|
||||
struct strbuf last_update_token = STRBUF_INIT;
|
||||
char *buf;
|
||||
unsigned int i;
|
||||
|
||||
if (!core_fsmonitor || istate->fsmonitor_has_run_once)
|
||||
return;
|
||||
|
||||
hook_version = fsmonitor_hook_version();
|
||||
|
||||
istate->fsmonitor_has_run_once = 1;
|
||||
|
||||
trace_printf_key(&trace_fsmonitor, "refresh fsmonitor");
|
||||
|
|
@ -146,26 +195,60 @@ void refresh_fsmonitor(struct index_state *istate)
|
|||
* should be inclusive to ensure we don't miss potential changes.
|
||||
*/
|
||||
last_update = getnanotime();
|
||||
if (hook_version == HOOK_INTERFACE_VERSION1)
|
||||
strbuf_addf(&last_update_token, "%"PRIu64"", last_update);
|
||||
|
||||
/*
|
||||
* If we have a last update time, call query_fsmonitor for the set of
|
||||
* changes since that time, else assume everything is possibly dirty
|
||||
* If we have a last update token, call query_fsmonitor for the set of
|
||||
* changes since that token, else assume everything is possibly dirty
|
||||
* and check it all.
|
||||
*/
|
||||
if (istate->fsmonitor_last_update) {
|
||||
query_success = !query_fsmonitor(HOOK_INTERFACE_VERSION,
|
||||
istate->fsmonitor_last_update, &query_result);
|
||||
if (hook_version == -1 || hook_version == HOOK_INTERFACE_VERSION2) {
|
||||
query_success = !query_fsmonitor(HOOK_INTERFACE_VERSION2,
|
||||
istate->fsmonitor_last_update, &query_result);
|
||||
|
||||
if (query_success) {
|
||||
if (hook_version < 0)
|
||||
hook_version = HOOK_INTERFACE_VERSION2;
|
||||
|
||||
/*
|
||||
* First entry will be the last update token
|
||||
* Need to use a char * variable because static
|
||||
* analysis was suggesting to use strbuf_addbuf
|
||||
* but we don't want to copy the entire strbuf
|
||||
* only the the chars up to the first NUL
|
||||
*/
|
||||
buf = query_result.buf;
|
||||
strbuf_addstr(&last_update_token, buf);
|
||||
if (!last_update_token.len) {
|
||||
warning("Empty last update token.");
|
||||
query_success = 0;
|
||||
} else {
|
||||
bol = last_update_token.len + 1;
|
||||
}
|
||||
} else if (hook_version < 0) {
|
||||
hook_version = HOOK_INTERFACE_VERSION1;
|
||||
if (!last_update_token.len)
|
||||
strbuf_addf(&last_update_token, "%"PRIu64"", last_update);
|
||||
}
|
||||
}
|
||||
|
||||
if (hook_version == HOOK_INTERFACE_VERSION1) {
|
||||
query_success = !query_fsmonitor(HOOK_INTERFACE_VERSION1,
|
||||
istate->fsmonitor_last_update, &query_result);
|
||||
}
|
||||
|
||||
trace_performance_since(last_update, "fsmonitor process '%s'", core_fsmonitor);
|
||||
trace_printf_key(&trace_fsmonitor, "fsmonitor process '%s' returned %s",
|
||||
core_fsmonitor, query_success ? "success" : "failure");
|
||||
}
|
||||
|
||||
/* a fsmonitor process can return '/' to indicate all entries are invalid */
|
||||
if (query_success && query_result.buf[0] != '/') {
|
||||
if (query_success && query_result.buf[bol] != '/') {
|
||||
/* Mark all entries returned by the monitor as dirty */
|
||||
buf = query_result.buf;
|
||||
bol = 0;
|
||||
for (i = 0; i < query_result.len; i++) {
|
||||
for (i = bol; i < query_result.len; i++) {
|
||||
if (buf[i] != '\0')
|
||||
continue;
|
||||
fsmonitor_refresh_callback(istate, buf + bol);
|
||||
|
|
@ -173,31 +256,47 @@ 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;
|
||||
}
|
||||
strbuf_release(&query_result);
|
||||
|
||||
/* Now that we've updated istate, save the last_update time */
|
||||
istate->fsmonitor_last_update = last_update;
|
||||
/* Now that we've updated istate, save the last_update_token */
|
||||
FREE_AND_NULL(istate->fsmonitor_last_update);
|
||||
istate->fsmonitor_last_update = strbuf_detach(&last_update_token, NULL);
|
||||
}
|
||||
|
||||
void add_fsmonitor(struct index_state *istate)
|
||||
{
|
||||
unsigned int i;
|
||||
struct strbuf last_update = STRBUF_INIT;
|
||||
|
||||
if (!istate->fsmonitor_last_update) {
|
||||
trace_printf_key(&trace_fsmonitor, "add fsmonitor");
|
||||
istate->cache_changed |= FSMONITOR_CHANGED;
|
||||
istate->fsmonitor_last_update = getnanotime();
|
||||
strbuf_addf(&last_update, "%"PRIu64"", getnanotime());
|
||||
istate->fsmonitor_last_update = strbuf_detach(&last_update, NULL);
|
||||
|
||||
/* reset the fsmonitor state */
|
||||
for (i = 0; i < istate->cache_nr; i++)
|
||||
|
|
@ -219,7 +318,7 @@ void remove_fsmonitor(struct index_state *istate)
|
|||
if (istate->fsmonitor_last_update) {
|
||||
trace_printf_key(&trace_fsmonitor, "remove fsmonitor");
|
||||
istate->cache_changed |= FSMONITOR_CHANGED;
|
||||
istate->fsmonitor_last_update = 0;
|
||||
FREE_AND_NULL(istate->fsmonitor_last_update);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -236,11 +335,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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue