From 4651ece8540a90a42af355e995847fb89192cc81 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 21 Mar 2007 10:09:56 -0700 Subject: Switch over tree descriptors to contain a pre-parsed entry This makes the tree descriptor contain a "struct name_entry" as part of it, and it gets filled in so that it always contains a valid entry. On some benchmarks, it improves performance by up to 15%. That makes tree entry "extract" trivial, and means that we only actually need to decode each tree entry just once: we decode the first one when we initialize the tree descriptor, and each subsequent one when doing "update_tree_entry()". In particular, this means that we don't need to do strlen() both at extract time _and_ at update time. Finally, it also allows more sharing of code (entry_extract(), that wanted a "struct name_entry", just got totally trivial, along with the "tree_entry()" function). Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano --- tree-walk.h | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'tree-walk.h') diff --git a/tree-walk.h b/tree-walk.h index ca0c29fb1a..43458cf8ce 100644 --- a/tree-walk.h +++ b/tree-walk.h @@ -1,17 +1,25 @@ #ifndef TREE_WALK_H #define TREE_WALK_H -struct tree_desc { - const void *buffer; - unsigned int size; -}; - struct name_entry { const unsigned char *sha1; const char *path; unsigned int mode; }; +struct tree_desc { + const void *buffer; + struct name_entry entry; + unsigned int size; +}; + +static inline const unsigned char *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned int *modep) +{ + *pathp = desc->entry.path; + *modep = canon_mode(desc->entry.mode); + return desc->entry.sha1; +} + static inline int tree_entry_len(const char *name, const unsigned char *sha1) { return (char *)sha1 - (char *)name - 1; -- cgit v1.2.1