diff options
| author | Vicent Marti <tanoku@gmail.com> | 2011-07-07 01:46:20 +0200 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2011-07-07 02:54:07 +0200 |
| commit | de18f276683a5cf3d85d001f6521e52c8c802e60 (patch) | |
| tree | 01db449c1fa2d11568aca66bf4a5ef9d1a5c60f3 /src/index.c | |
| parent | c63aa494595a6d6e6d97cfa1bbc1741a0b2e0cc6 (diff) | |
| download | libgit2-de18f276683a5cf3d85d001f6521e52c8c802e60.tar.gz | |
vector: Timsort all of the things
Drop the GLibc implementation of Merge Sort and replace it with Timsort.
The algorithm has been tuned to work on arrays of pointers (void **),
so there's no longer a need to abstract the byte-width of each element
in the array.
All the comparison callbacks now take pointers-to-elements, not
pointers-to-pointers, so there's now one less level of dereferencing.
E.g.
int index_cmp(const void *a, const void *b)
{
- const git_index_entry *entry_a = *(const git_index_entry **)(a);
+ const git_index_entry *entry_a = (const git_index_entry *)(a);
The result is up to a 40% speed-up when sorting vectors. Memory usage
remains lineal.
A new `bsearch` implementation has been added, whose callback also
supplies pointer-to-elements, to uniform the Vector API again.
Diffstat (limited to 'src/index.c')
| -rw-r--r-- | src/index.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/index.c b/src/index.c index dd33db92a..353c30025 100644 --- a/src/index.c +++ b/src/index.c @@ -109,15 +109,15 @@ static int write_index(git_index *index, git_filebuf *file); int index_srch(const void *key, const void *array_member) { const char *filename = (const char *)key; - const git_index_entry *entry = *(const git_index_entry **)(array_member); + const git_index_entry *entry = (const git_index_entry *)(array_member); return strcmp(filename, entry->path); } int index_cmp(const void *a, const void *b) { - const git_index_entry *entry_a = *(const git_index_entry **)(a); - const git_index_entry *entry_b = *(const git_index_entry **)(b); + const git_index_entry *entry_a = (const git_index_entry *)(a); + const git_index_entry *entry_b = (const git_index_entry *)(b); return strcmp(entry_a->path, entry_b->path); } @@ -125,15 +125,15 @@ int index_cmp(const void *a, const void *b) int unmerged_srch(const void *key, const void *array_member) { const char *path = (const char *) key; - const git_index_entry_unmerged *entry = *(const git_index_entry_unmerged **) (array_member); + const git_index_entry_unmerged *entry = (const git_index_entry_unmerged *)(array_member); return strcmp(path, entry->path); } int unmerged_cmp(const void *a, const void *b) { - const git_index_entry_unmerged *info_a = *(const git_index_entry_unmerged **)(a); - const git_index_entry_unmerged *info_b = *(const git_index_entry_unmerged **)(b); + const git_index_entry_unmerged *info_a = (const git_index_entry_unmerged *)(a); + const git_index_entry_unmerged *info_b = (const git_index_entry_unmerged *)(b); return strcmp(info_a->path, info_b->path); } |
