[PATCH 08/16] Make in-memory format aware of stat_crc
- From
Thomas Gummerer <t.gummerer@gmail.com>
- Date
- Aug 2, 2012, 11:01 UTC
- Message-ID
- <1343905326-23790-9-git-send-email-t.gummerer@gmail.com>
- In-Reply-To
- <1343905326-23790-1-git-send-email-t.gummerer@gmail.com>
Make the in-memory format aware of the stat_crc used by index-v5. It is simply ignored by index version prior to v5.
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> --- cache.h | 1 + read-cache.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+)
diff --git a/cache.h b/cache.h index 3aa70d8..7247944 100644 --- a/cache.h +++ b/cache.h @@ -133,6 +133,7 @@ struct cache_entry { unsigned int ce_flags; unsigned int ce_namelen; unsigned char sha1[20]; + uint32_t ce_stat_crc; struct cache_entry *next; struct cache_entry *dir_next; char name[FLEX_ARRAY]; /* more */ diff --git a/read-cache.c b/read-cache.c index 1c804e1..dfe5ee2 100644 --- a/read-cache.c +++ b/read-cache.c @@ -67,6 +67,31 @@ void rename_index_entry_at(struct index_state *istate, int nr, const char *new_n add_index_entry(istate, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE); } +static uint32_t calculate_stat_crc(struct cache_entry *ce) +{ + unsigned int ctimens = 0; + uint32_t stat, stat_crc; + + stat = htonl(ce->ce_ctime.sec); + stat_crc = crc32(0, (Bytef*)&stat, 4); +#ifdef USE_NSEC + ctimens = ce->ce_ctime.nsec; +#endif + stat = htonl(ctimens); + stat_crc = crc32(stat_crc, (Bytef*)&stat, 4); + stat = htonl(ce->ce_ino); + stat_crc = crc32(stat_crc, (Bytef*)&stat, 4); + stat = htonl(ce->ce_size); + stat_crc = crc32(stat_crc, (Bytef*)&stat, 4); + stat = htonl(ce->ce_dev); + stat_crc = crc32(stat_crc, (Bytef*)&stat, 4); + stat = htonl(ce->ce_uid); + stat_crc = crc32(stat_crc, (Bytef*)&stat, 4); + stat = htonl(ce->ce_gid); + stat_crc = crc32(stat_crc, (Bytef*)&stat, 4); + return stat_crc; +} + /* * This only updates the "non-critical" parts of the directory * cache, ie the parts that aren't tracked by GIT, and only used @@ -89,6 +114,8 @@ void fill_stat_cache_info(struct cache_entry *ce, struct stat *st) if (S_ISREG(st->st_mode)) ce_mark_uptodate(ce); + + ce->ce_stat_crc = calculate_stat_crc(ce); } static int ce_compare_data(struct cache_entry *ce, struct stat *st)
-- 1.7.10.886.gdf6792c.dirty