[PATCH 1/5] read-cache: add watchman 'WAMA' extension
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Nov 1, 2015, 13:55 UTC
- Message-ID
- <1446386146-10438-2-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1446386146-10438-1-git-send-email-pclouds@gmail.com>
The extension contains a bitmap, one bit for each entry in the index. If the n-th bit is zero, the n-th entry is considered unchanged, we can ce_mark_uptodate() it without refreshing. If the bit is non-zero and we found out the corresponding file is clean after refresh, we can clear the bit.
The 'skipping refresh' bit is not in this patch yet as we would need watchman. More details in later patches.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- cache.h | 4 ++++ read-cache.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 73 insertions(+), 2 deletions(-)
diff --git a/cache.h b/cache.h index 9633acc..a05fd31 100644 --- a/cache.h +++ b/cache.h @@ -163,6 +163,8 @@ struct cache_entry { #define CE_VALID (0x8000) #define CE_STAGESHIFT 12 +#define CE_NO_WATCH (0x0001) + /* * Range 0xFFFF0FFF in ce_flags is divided into * two parts: in-memory flags and on-disk ones. @@ -298,6 +300,7 @@ static inline unsigned int canon_mode(unsigned int mode) #define CACHE_TREE_CHANGED (1 << 5) #define SPLIT_INDEX_ORDERED (1 << 6) #define UNTRACKED_CHANGED (1 << 7) +#define WATCHMAN_CHANGED (1 << 8) struct split_index; struct untracked_cache; @@ -322,6 +325,7 @@ struct index_state { struct untracked_cache *untracked; void *mmap; size_t mmap_size; + char *last_update; }; extern struct index_state the_index; diff --git a/read-cache.c b/read-cache.c index f609776..893223e 100644 --- a/read-cache.c +++ b/read-cache.c @@ -19,6 +19,7 @@ #include "split-index.h" #include "utf8.h" #include "shm.h" +#include "ewah/ewok.h" static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, unsigned int options); @@ -41,11 +42,13 @@ static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */ #define CACHE_EXT_LINK 0x6c696e6b /* "link" */ #define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */ +#define CACHE_EXT_WATCHMAN 0x57414D41 /* "WAMA" */ /* changes that can be kept in $GIT_DIR/index (basically all extensions) */ #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \ CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \ - SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED) + SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED | \ + WATCHMAN_CHANGED) struct index_state the_index; static const char *alternate_index_output; @@ -1224,8 +1227,13 @@ int refresh_index(struct index_state *istate, unsigned int flags, continue; new = refresh_cache_ent(istate, ce, options, &cache_errno, &changed); - if (new == ce) + if (new == ce) { + if (ce->ce_flags & CE_NO_WATCH) { + ce->ce_flags &= ~CE_NO_WATCH; + istate->cache_changed |= WATCHMAN_CHANGED; + } continue; + } if (!new) { const char *fmt; @@ -1369,6 +1377,48 @@ static int verify_hdr(const struct cache_header *hdr, unsigned long size) return 0; } +static void mark_no_watchman(size_t pos, void *data) +{ + struct index_state *istate = data; + assert(pos < istate->cache_nr); + istate->cache[pos]->ce_flags |= CE_NO_WATCH; +} + +static int read_watchman_ext(struct index_state *istate, const void *data, + unsigned long sz) +{ + struct ewah_bitmap *bitmap; + int ret, len; + + if (memchr(data, 0, sz) == NULL) + return error("invalid extension"); + len = strlen(data) + 1; + bitmap = ewah_new(); + ret = ewah_read_mmap(bitmap, (const char *)data + len, sz - len); + if (ret != sz - len) { + ewah_free(bitmap); + return error("fail to parse ewah bitmap"); + } + istate->last_update = xstrdup(data); + ewah_each_bit(bitmap, mark_no_watchman, istate); + ewah_free(bitmap); + return 0; +} + +static void write_watchman_ext(struct strbuf *sb, struct index_state* istate) +{ + struct ewah_bitmap *bitmap; + int i; + + strbuf_add(sb, istate->last_update, strlen(istate->last_update) + 1); + bitmap = ewah_new(); + for (i = 0; i < istate->cache_nr; i++) + if (istate->cache[i]->ce_flags & CE_NO_WATCH) + ewah_set(bitmap, i); + ewah_serialize_strbuf(bitmap, sb); + ewah_free(bitmap); +} + static int read_index_extension(struct index_state *istate, const char *ext, void *data, unsigned long sz) { @@ -1386,6 +1436,11 @@ static int read_index_extension(struct index_state *istate, case CACHE_EXT_UNTRACKED: istate->untracked = read_untracked_extension(data, sz); break; + + case CACHE_EXT_WATCHMAN: + read_watchman_ext(istate, data, sz); + break; + default: if (*ext < 'A' || 'Z' < *ext) return error("index uses %.4s extension, which we do not understand", @@ -1794,6 +1849,8 @@ int discard_index(struct index_state *istate) istate->untracked = NULL; istate->from_shm = 0; istate->to_shm = 0; + free(istate->last_update); + istate->last_update = NULL; return 0; } @@ -2191,6 +2248,16 @@ static int do_write_index(struct index_state *istate, int newfd, if (err) return -1; } + if (!strip_extensions && istate->last_update) { + struct strbuf sb = STRBUF_INIT; + + write_watchman_ext(&sb, istate); + err = write_index_ext_header(&c, newfd, CACHE_EXT_WATCHMAN, sb.len) < 0 + || ce_write(&c, newfd, sb.buf, sb.len) < 0; + strbuf_release(&sb); + if (err) + return -1; + } if (ce_flush(&c, newfd, istate->sha1) || fstat(newfd, &st)) return -1;
-- 2.2.0.513.g477eb31