From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <junkio@cox.net>, spearce@spearce.org
Subject: [PATCH 2/3] fast-import: tree allocation cleanups
Date: Sat, 10 Mar 2007 14:21:14 -0500 [thread overview]
Message-ID: <20070310192114.GA3875@coredump.intra.peff.net> (raw)
In-Reply-To: <<20070310191515.GA3416@coredump.intra.peff.net>>
These cleanups are in preparation for improving the
efficiency of the tree-construction code. There should be no
functionality changes.
1. Insert entries into tree_content _after_ they have a name
assigned. This means that the insertion can use a smarter
data structure than an unordered list.
2. Factor out the linear search for existing tree entries in
tree_content_set, which will make it simpler to change.
Most of the line changes here are simply indentation changes.
Signed-off-by: Jeff King <peff@peff.net>
---
fast-import.c | 65 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 38 insertions(+), 27 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index 81bc6ea..ac14a5a 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -594,6 +594,15 @@ static struct tree_content *grow_tree_content(
return r;
}
+static int find_tree_entry(struct tree_content *t, struct atom_str *s)
+{
+ int i;
+ for (i = 0; i < t->entry_count; i++)
+ if (!strcmp(t->entries[i]->name->str_dat, s->str_dat))
+ return i;
+ return -1;
+}
+
static struct tree_entry *new_tree_entry(void)
{
struct tree_entry *e;
@@ -1059,7 +1068,6 @@ static void load_tree(struct tree_entry *root)
if (t->entry_count == t->entry_capacity)
root->tree = t = grow_tree_content(t, t->entry_count);
- t->entries[t->entry_count++] = e;
e->tree = NULL;
c = get_mode(c, &e->versions[1].mode);
@@ -1071,6 +1079,8 @@ static void load_tree(struct tree_entry *root)
hashcpy(e->versions[0].sha1, (unsigned char*)c);
hashcpy(e->versions[1].sha1, (unsigned char*)c);
c += 20;
+
+ t->entries[t->entry_count++] = e;
}
free(buf);
}
@@ -1187,6 +1197,7 @@ static int tree_content_set(
const char *slash1;
unsigned int i, n;
struct tree_entry *e;
+ struct atom_str *name;
slash1 = strchr(p, '/');
if (slash1)
@@ -1194,40 +1205,40 @@ static int tree_content_set(
else
n = strlen(p);
- for (i = 0; i < t->entry_count; i++) {
+ name = to_atom(p, n);
+ i = find_tree_entry(t, name);
+ if (i != -1) {
e = t->entries[i];
- if (e->name->str_len == n && !strncmp(p, e->name->str_dat, n)) {
- if (!slash1) {
- if (e->versions[1].mode == mode
- && !hashcmp(e->versions[1].sha1, sha1))
- return 0;
- e->versions[1].mode = mode;
- hashcpy(e->versions[1].sha1, sha1);
- if (e->tree) {
- release_tree_content_recursive(e->tree);
- e->tree = NULL;
- }
- hashclr(root->versions[1].sha1);
- return 1;
- }
- if (!S_ISDIR(e->versions[1].mode)) {
- e->tree = new_tree_content(8);
- e->versions[1].mode = S_IFDIR;
- }
- if (!e->tree)
- load_tree(e);
- if (tree_content_set(e, slash1 + 1, sha1, mode)) {
- hashclr(root->versions[1].sha1);
- return 1;
+ if (!slash1) {
+ if (e->versions[1].mode == mode
+ && !hashcmp(e->versions[1].sha1, sha1))
+ return 0;
+ e->versions[1].mode = mode;
+ hashcpy(e->versions[1].sha1, sha1);
+ if (e->tree) {
+ release_tree_content_recursive(e->tree);
+ e->tree = NULL;
}
- return 0;
+ hashclr(root->versions[1].sha1);
+ return 1;
+ }
+ if (!S_ISDIR(e->versions[1].mode)) {
+ e->tree = new_tree_content(8);
+ e->versions[1].mode = S_IFDIR;
+ }
+ if (!e->tree)
+ load_tree(e);
+ if (tree_content_set(e, slash1 + 1, sha1, mode)) {
+ hashclr(root->versions[1].sha1);
+ return 1;
}
+ return 0;
}
if (t->entry_count == t->entry_capacity)
root->tree = t = grow_tree_content(t, t->entry_count);
e = new_tree_entry();
- e->name = to_atom(p, (unsigned short)n);
+ e->name = name;
e->versions[0].mode = 0;
hashclr(e->versions[0].sha1);
t->entries[t->entry_count++] = e;
--
1.5.0.3.931.g55c05
next prev parent reply other threads:[~2007-03-10 19:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <<20070310191515.GA3416@coredump.intra.peff.net>
2007-03-10 19:16 ` [PATCH 1/3] fast-import: grow tree storage more aggressively Jeff King
2007-03-10 19:21 ` Jeff King [this message]
2007-03-11 3:21 ` [PATCH 2/3] fast-import: tree allocation cleanups Shawn O. Pearce
2007-03-11 15:51 ` Jeff King
2007-03-11 15:59 ` Jeff King
2007-03-12 19:16 ` Shawn O. Pearce
2007-03-10 19:21 ` [PATCH 3/3] fast-import: improve efficiency of tree_content_set Jeff King
2007-03-10 19:23 ` Jeff King
2007-03-10 19:40 ` [PATCH] fast-import: use binary search in tree_content_remove Jeff King
2007-03-11 3:38 ` Shawn O. Pearce
2007-03-11 16:34 ` Jeff King
2007-03-11 16:54 ` Jeff King
2007-03-11 20:19 ` Shawn O. Pearce
2007-03-12 19:13 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070310192114.GA3875@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=spearce@spearce.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).