2006-03-30 08:55:43 +02:00
|
|
|
#ifndef TREE_WALK_H
|
|
|
|
|
#define TREE_WALK_H
|
|
|
|
|
|
|
|
|
|
struct name_entry {
|
|
|
|
|
const unsigned char *sha1;
|
|
|
|
|
const char *path;
|
|
|
|
|
unsigned int mode;
|
|
|
|
|
};
|
|
|
|
|
|
2007-03-21 18:09:56 +01:00
|
|
|
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;
|
tree-walk: finally switch over tree descriptors to contain a pre-parsed entry
This continues 4651ece8 (Switch over tree descriptors to contain a
pre-parsed entry) and moves the only rest computational part
mode = canon_mode(mode)
from tree_entry_extract() to tree entry decode phase - to
decode_tree_entry().
The reason to do it, is that canon_mode() is at least 2 conditional
jumps for regular files, and that could be noticeable should canon_mode()
be invoked several times.
That does not matter for current Git codebase, where typical tree
traversal is
while (t->size) {
sha1 = tree_entry_extract(t, &path, &mode);
...
update_tree_entry(t);
}
i.e. we do t -> sha1,path.mode "extraction" only once per entry. In such
cases, it does not matter performance-wise, where that mode
canonicalization is done - either once in tree_entry_extract(), or once
in decode_tree_entry() called by update_tree_entry() - it is
approximately the same.
But for future code, which could need to work with several tree_desc's
in parallel, it could be handy to operate on tree_desc descriptors, and
do "extracts" only when needed, or at all, access only relevant part of
it through structure fields directly.
And for such situations, having canon_mode() be done once in decode
phase is better - we won't need to pay the performance price of 2 extra
conditional jumps on every t->mode access.
So let's move mode canonicalization to decode_tree_entry(). That was the
final bit. Now after tree entry is decoded, it is fully ready and could
be accessed either directly via field, or through tree_entry_extract()
which this time got really "totally trivial".
Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-02-06 12:36:31 +01:00
|
|
|
*modep = desc->entry.mode;
|
2007-03-21 18:09:56 +01:00
|
|
|
return desc->entry.sha1;
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-24 08:36:09 +02:00
|
|
|
static inline int tree_entry_len(const struct name_entry *ne)
|
2007-03-18 04:06:24 +01:00
|
|
|
{
|
2011-10-24 08:36:09 +02:00
|
|
|
return (const char *)ne->sha1 - ne->path - 1;
|
2007-03-18 04:06:24 +01:00
|
|
|
}
|
|
|
|
|
|
2006-03-30 08:55:43 +02:00
|
|
|
void update_tree_entry(struct tree_desc *);
|
2007-03-21 18:08:25 +01:00
|
|
|
void init_tree_desc(struct tree_desc *desc, const void *buf, unsigned long size);
|
2006-03-30 08:55:43 +02:00
|
|
|
|
2010-08-25 04:53:11 +02:00
|
|
|
/*
|
|
|
|
|
* Helper function that does both tree_entry_extract() and update_tree_entry()
|
|
|
|
|
* and returns true for success
|
|
|
|
|
*/
|
tree_entry(): new tree-walking helper function
This adds a "tree_entry()" function that combines the common operation of
doing a "tree_entry_extract()" + "update_tree_entry()".
It also has a simplified calling convention, designed for simple loops
that traverse over a whole tree: the arguments are pointers to the tree
descriptor and a name_entry structure to fill in, and it returns a boolean
"true" if there was an entry left to be gotten in the tree.
This allows tree traversal with
struct tree_desc desc;
struct name_entry entry;
desc.buf = tree->buffer;
desc.size = tree->size;
while (tree_entry(&desc, &entry) {
... use "entry.{path, sha1, mode, pathlen}" ...
}
which is not only shorter than writing it out in full, it's hopefully less
error prone too.
[ It's actually a tad faster too - we don't need to recalculate the entry
pathlength in both extract and update, but need to do it only once.
Also, some callers can avoid doing a "strlen()" on the result, since
it's returned as part of the name_entry structure.
However, by now we're talking just 1% speedup on "git-rev-list --objects
--all", and we're definitely at the point where tree walking is no
longer the issue any more. ]
NOTE! Not everybody wants to use this new helper function, since some of
the tree walkers very much on purpose do the descriptor update separately
from the entry extraction. So the "extract + update" sequence still
remains as the core sequence, this is just a simplified interface.
We should probably add a silly two-line inline helper function for
initializing the descriptor from the "struct tree" too, just to cut down
on the noise from that common "desc" initializer.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-30 18:45:45 +02:00
|
|
|
int tree_entry(struct tree_desc *, struct name_entry *);
|
|
|
|
|
|
2006-03-30 08:55:43 +02:00
|
|
|
void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1);
|
|
|
|
|
|
2008-03-06 03:59:29 +01:00
|
|
|
struct traverse_info;
|
2008-03-06 05:06:18 +01:00
|
|
|
typedef int (*traverse_callback_t)(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *);
|
2008-03-06 04:44:06 +01:00
|
|
|
int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info);
|
2006-03-30 08:55:43 +02:00
|
|
|
|
2008-03-06 03:59:29 +01:00
|
|
|
struct traverse_info {
|
|
|
|
|
struct traverse_info *prev;
|
|
|
|
|
struct name_entry name;
|
|
|
|
|
int pathlen;
|
2011-08-29 21:26:05 +02:00
|
|
|
struct pathspec *pathspec;
|
2008-03-06 03:59:29 +01:00
|
|
|
|
2013-06-16 01:44:43 +02:00
|
|
|
unsigned long df_conflicts;
|
2008-03-06 03:59:29 +01:00
|
|
|
traverse_callback_t fn;
|
|
|
|
|
void *data;
|
2010-08-11 10:38:07 +02:00
|
|
|
int show_all_errors;
|
2008-03-06 03:59:29 +01:00
|
|
|
};
|
2006-03-30 08:55:43 +02:00
|
|
|
|
2006-04-19 23:05:47 +02:00
|
|
|
int get_tree_entry(const unsigned char *, const char *, unsigned char *, unsigned *);
|
2008-03-06 03:59:29 +01:00
|
|
|
extern char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n);
|
|
|
|
|
extern void setup_traverse_info(struct traverse_info *info, const char *base);
|
|
|
|
|
|
|
|
|
|
static inline int traverse_path_len(const struct traverse_info *info, const struct name_entry *n)
|
|
|
|
|
{
|
2011-10-24 08:36:09 +02:00
|
|
|
return info->pathlen + tree_entry_len(n);
|
2008-03-06 03:59:29 +01:00
|
|
|
}
|
2006-04-19 23:05:47 +02:00
|
|
|
|
2011-10-24 08:36:10 +02:00
|
|
|
/* in general, positive means "kind of interesting" */
|
|
|
|
|
enum interesting {
|
|
|
|
|
all_entries_not_interesting = -1, /* no, and no subsequent entries will be either */
|
|
|
|
|
entry_not_interesting = 0,
|
|
|
|
|
entry_interesting = 1,
|
|
|
|
|
all_entries_interesting = 2 /* yes, and all subsequent entries will be */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
extern enum interesting tree_entry_interesting(const struct name_entry *,
|
|
|
|
|
struct strbuf *, int,
|
|
|
|
|
const struct pathspec *ps);
|
2010-12-15 16:02:40 +01:00
|
|
|
|
2006-03-30 08:55:43 +02:00
|
|
|
#endif
|