summaryrefslogtreecommitdiff
path: root/tree-walk.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2007-03-21 17:09:56 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-21 18:15:26 (GMT)
commit4651ece8540a90a42af355e995847fb89192cc81 (patch)
tree274ddb9d65ca6c0df89585a3a62d1befb1ddd7cb /tree-walk.h
parent6fda5e5180c2e7c130978361aea53b4e66f36823 (diff)
downloadgit-4651ece8540a90a42af355e995847fb89192cc81.zip
git-4651ece8540a90a42af355e995847fb89192cc81.tar.gz
git-4651ece8540a90a42af355e995847fb89192cc81.tar.bz2
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 <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'tree-walk.h')
-rw-r--r--tree-walk.h18
1 files changed, 13 insertions, 5 deletions
diff --git a/tree-walk.h b/tree-walk.h
index ca0c29f..43458cf 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;