A new command is added to file watcher to send back the list of
updated files to git. These entries will have CE_WATCHED removed. The
remaining CE_WATCHED entries will have CE_VALID set (i.e. no changes
and no lstat either).
The file watcher keeps reporting the same "updated" list until it
receives "forget" commands, which should only be issued after the
updated index is written down. This ensures that if git crashes half
way before it could update the index (or multiple processes is reading
the same index), "updated" info is not lost. After the index is
updated (e.g. in this case because of toggling CE_WATCHED bits), git
sends the new index signature to the file watcher.
The file watcher does not cache stat info and send back to git. Its
main purpose is to reduce lstat on most untouched files, not to
completely eliminate lstat.
One can see that, assuming CE_WATCHED is magically set in some
entries, they will be all cleared over the time and we need to do
lstat on all entries. We haven't talked about how CE_WATCHED is set
yet. More to come later.
TODO: get as many paths as possible in one packet to reduce round
trips
Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
---
cache.h | 1 +
file-watcher.c | 35 +++++++++++++++++++---
read-cache.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
3 files changed, 119 insertions(+), 8 deletions(-)
diff --git a/cache.h b/cache.h
index 6a182b5..2eddc1e 100644
--- a/cache.h
+++ b/cache.h
@@ -282,6 +282,7 @@ struct index_state {
struct hash_table dir_hash;
unsigned char sha1[20];
int watcher;
+ struct string_list *updated_entries;
};
extern struct index_state the_index;
diff --git a/file-watcher.c b/file-watcher.c
index 66b44e5..6aeed4d 100644
--- a/file-watcher.c
+++ b/file-watcher.c
@@ -1,7 +1,16 @@
#include "cache.h"
#include "sigchain.h"
+#include "string-list.h"
static char index_signature[41];
+static struct string_list updated = STRING_LIST_INIT_DUP;
+static int updated_sorted;
+
+static void reset(const char *sig)
+{
+ string_list_clear(&updated, 0);
+ strlcpy(index_signature, sig, sizeof(index_signature));
+}
static int handle_command(int fd, char *msg, int msgsize)
{
@@ -22,10 +31,28 @@ static int handle_command(int fd, char *msg, int msgsize)
sendtof(fd, 0, &sun, socklen, "hello %s", index_signature);
if (!strcmp(index_signature, arg))
return 0;
- /*
- * Index SHA-1 mismatch, something has gone
- * wrong. Clean up and start over.
- */
+ reset(arg);
+ } else if ((arg = skip_prefix(msg, "reset "))) {
+ reset(arg);
+ } else if (!strcmp(msg, "status")) {
+ int i;
+ for (i = 0; i < updated.nr; i++)
+ sendto(fd, updated.items[i].string,
+ strlen(updated.items[i].string),
+ 0, &sun, socklen);
+ sendtof(fd, 0, &sun, socklen, "%c", 0);
+ } else if ((arg = skip_prefix(msg, "forget "))) {
+ struct string_list_item *item;
+ if (!updated_sorted) {
+ sort_string_list(&updated);
+ updated_sorted = 1;
+ }
+ item = string_list_lookup(&updated, arg);
+ if (item)
+ unsorted_string_list_delete_item(&updated,
+ item - updated.items,
+ 0);
+ } else if ((arg = skip_prefix(msg, "bye "))) {
strlcpy(index_signature, arg, sizeof(index_signature));
} else {
die("unrecognized command %s", msg);
diff --git a/read-cache.c b/read-cache.c
index 506d488..caa2298 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1443,6 +1443,55 @@ static struct cache_entry *create_from_disk(struct
ondisk_cache_entry *ondisk,
return ce;
}
+static void update_watched_files(struct index_state *istate)
+{
+ int i;
+ if (istate->watcher == -1)
+ return;
+ if (writef(istate->watcher, "status") < 0)
+ goto failed;
+ for (;;) {
+ char line[1024];
+ int len;
+ len = read(istate->watcher, line, sizeof(line) - 1);
+ if (len <= 0)
+ goto failed;
+ line[len] = '\0';
+ if (len == 1 && line[0] == '\0')
+ break;
+ i = index_name_pos(istate, line, len);
+ if (i < 0)
+ continue;
+ if (istate->cache[i]->ce_flags & CE_WATCHED) {
+ istate->cache[i]->ce_flags &= ~CE_WATCHED;
+ istate->cache_changed = 1;
+ }
+ if (!istate->updated_entries) {
+ struct string_list *sl;
+ sl = xmalloc(sizeof(*sl));
+ memset(sl, 0, sizeof(*sl));
+ sl->strdup_strings = 1;
+ istate->updated_entries = sl;
+ }
+ string_list_append(istate->updated_entries, line);
+ }
+
+ for (i = 0; i < istate->cache_nr; i++)
+ if (istate->cache[i]->ce_flags & CE_WATCHED)
+ istate->cache[i]->ce_flags |= CE_VALID;
+ return;
+failed:
+ if (istate->updated_entries) {
+ string_list_clear(istate->updated_entries, 0);
+ free(istate->updated_entries);
+ istate->updated_entries = NULL;
+ }
+ writef(istate->watcher, "reset %s", sha1_to_hex(istate->sha1));
+ for (i = 0; i < istate->cache_nr; i++)
+ istate->cache[i]->ce_flags &= ~CE_WATCHED;
+ istate->cache_changed = 1;
+}
+
static void connect_watcher(struct index_state *istate, const char *path)
{
struct stat st;
@@ -1473,8 +1522,10 @@ static void connect_watcher(struct index_state *istate,
const char *path)
len = read(istate->watcher, line, sizeof(line) - 1);
if (len > 0) {
line[len] = '\0';
- if (!strcmp(sb.buf, line))
+ if (!strcmp(sb.buf, line)) {
+ update_watched_files(istate);
return; /* good */
+ }
}
}
@@ -1486,6 +1537,20 @@ static void connect_watcher(struct index_state *istate,
const char *path)
}
}
+static void farewell_watcher(struct index_state *istate,
+ const unsigned char *sha1)
+{
+ if (istate->watcher == -1)
+ return;
+ if (istate->updated_entries) {
+ int i;
+ for (i = 0; i < istate->updated_entries->nr; i++)
+ writef(istate->watcher, "forget %s",
+ istate->updated_entries->items[i].string);
+ }
+ writef(istate->watcher, "bye %s", sha1_to_hex(sha1));
+}
+
/* remember to discard_cache() before reading a different cache! */
int read_index_from(struct index_state *istate, const char *path)
{
@@ -1605,6 +1670,11 @@ int discard_index(struct index_state *istate)
close(istate->watcher);
istate->watcher = -1;
}
+ if (istate->updated_entries) {
+ string_list_clear(istate->updated_entries, 0);
+ free(istate->updated_entries);
+ istate->updated_entries = NULL;
+ }
return 0;
}
@@ -1665,7 +1735,7 @@ static int write_index_ext_header(git_SHA_CTX *context,
int fd,
(ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
}
-static int ce_flush(git_SHA_CTX *context, int fd)
+static int ce_flush(git_SHA_CTX *context, int fd, unsigned char *sha1)
{
unsigned int left = write_buffer_len;
@@ -1683,6 +1753,8 @@ static int ce_flush(git_SHA_CTX *context, int fd)
/* Append the SHA1 signature at the end */
git_SHA1_Final(write_buffer + left, context);
+ if (sha1)
+ hashcpy(sha1, write_buffer + left);
left += 20;
return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
}
@@ -1847,12 +1919,22 @@ int write_index(struct index_state *istate, int newfd)
int entries = istate->cache_nr;
struct stat st;
struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
+ unsigned char sha1[20];
for (i = removed = extended = 0; i < entries; i++) {
if (cache[i]->ce_flags & CE_REMOVE)
removed++;
- else if (cache[i]->ce_flags & CE_WATCHED)
+ else if (cache[i]->ce_flags & CE_WATCHED) {
+ /*
+ * CE_VALID when used with CE_WATCHED is not
+ * supposed to be persistent. Next time git
+ * runs, if this entry is still watched and
+ * nothing has changed, CE_VALID will be
+ * reinstated.
+ */
+ cache[i]->ce_flags &= ~CE_VALID;
has_watches++;
+ }
/* reduce extended entries if possible */
cache[i]->ce_flags &= ~CE_EXTENDED;
@@ -1945,8 +2027,9 @@ int write_index(struct index_state *istate, int newfd)
return -1;
}
- if (ce_flush(&c, newfd) || fstat(newfd, &st))
+ if (ce_flush(&c, newfd, sha1) || fstat(newfd, &st))
return -1;
+ farewell_watcher(istate, sha1);
istate->timestamp.sec = (unsigned int)st.st_mtime;
istate->timestamp.nsec = ST_MTIME_NSEC(st);
return 0;
--
1.8.5.2.240.g8478abd
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
