From: "Shawn O. Pearce" <spearce@spearce.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: [PATCH 2/4] Hash tags by commit SHA1 in git-describe.
Date: Sat, 13 Jan 2007 17:28:16 -0500 [thread overview]
Message-ID: <20070113222816.GB18011@spearce.org> (raw)
In-Reply-To: <8e29bab8b4b9f53cbdc85e6e783bf3b5d3787f0f.1168727248.git.spearce@spearce.org>
If a project has a very large number of tags then git-describe
will spend a good part of its time looping over the tags testing
them one at a time to determine if it matches a given commit.
For 10 tags this is not a big deal, but for hundreds of tags the
time could become considerable if we don't find an exact match for
the input commit and we need to walk back along the history chain.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
builtin-describe.c | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/builtin-describe.c b/builtin-describe.c
index ad672aa..582ef02 100644
--- a/builtin-describe.c
+++ b/builtin-describe.c
@@ -12,20 +12,20 @@ static const char describe_usage[] =
static int all; /* Default to annotated tags only */
static int tags; /* But allow any tags if --tags is specified */
-
static int abbrev = DEFAULT_ABBREV;
-static int names, allocs;
+static unsigned int names[256], allocs[256];
static struct commit_name {
struct commit *commit;
int prio; /* annotated tag = 2, tag = 1, head = 0 */
char path[FLEX_ARRAY]; /* more */
-} **name_array = NULL;
+} **name_array[256];
static struct commit_name *match(struct commit *cmit)
{
- int i = names;
- struct commit_name **p = name_array;
+ unsigned char m = cmit->object.sha1[0];
+ unsigned int i = names[m];
+ struct commit_name **p = name_array[m];
while (i-- > 0) {
struct commit_name *n = *p++;
@@ -42,17 +42,19 @@ static void add_to_known_names(const char *path,
int idx;
int len = strlen(path)+1;
struct commit_name *name = xmalloc(sizeof(struct commit_name) + len);
+ unsigned char m = commit->object.sha1[0];
name->commit = commit;
name->prio = prio;
memcpy(name->path, path, len);
- idx = names;
- if (idx >= allocs) {
- allocs = (idx + 50) * 3 / 2;
- name_array = xrealloc(name_array, allocs*sizeof(*name_array));
+ idx = names[m];
+ if (idx >= allocs[m]) {
+ allocs[m] = (idx + 50) * 3 / 2;
+ name_array[m] = xrealloc(name_array[m],
+ allocs[m] * sizeof(*name_array));
}
- name_array[idx] = name;
- names = ++idx;
+ name_array[m][idx] = name;
+ names[m] = ++idx;
}
static int get_name(const char *path, const unsigned char *sha1, int flag, void *cb_data)
@@ -121,9 +123,12 @@ static void describe(const char *arg, int last_one)
die("%s is not a valid '%s' object", arg, commit_type);
if (!initialized) {
+ unsigned int m;
initialized = 1;
for_each_ref(get_name, NULL);
- qsort(name_array, names, sizeof(*name_array), compare_names);
+ for (m = 0; m < ARRAY_SIZE(name_array); m++)
+ qsort(name_array[m], names[m],
+ sizeof(*name_array[m]), compare_names);
}
n = match(cmit);
--
1.5.0.rc1.g4494
next parent reply other threads:[~2007-01-13 22:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <8e29bab8b4b9f53cbdc85e6e783bf3b5d3787f0f.1168727248.git.spearce@spearce.org>
2007-01-13 22:28 ` Shawn O. Pearce [this message]
2007-01-14 13:01 ` [PATCH 2/4] Hash tags by commit SHA1 in git-describe Johannes Schindelin
2007-01-14 18:51 ` Junio C Hamano
2007-01-14 23:19 ` Shawn O. Pearce
2007-01-13 22:29 ` [PATCH 3/4] Use binary searching on large buckets " Shawn O. Pearce
2007-01-14 19:11 ` Junio C Hamano
2007-01-14 23:07 ` Shawn O. Pearce
2007-01-13 22:30 ` [PATCH 4/4] Improve git-describe performance by reducing revision listing Shawn O. Pearce
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070113222816.GB18011@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.