From: "Shawn O. Pearce" <spearce@spearce.org>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Junio C Hamano <junkio@cox.net>
Subject: Re: [PATCH 2/3] fast-import: tree allocation cleanups
Date: Sat, 10 Mar 2007 22:21:47 -0500 [thread overview]
Message-ID: <20070311032147.GA10781@spearce.org> (raw)
In-Reply-To: <20070310192114.GA3875@coredump.intra.peff.net>
A nicely done series. Thanks for fixing this performance bug.
Jeff King <peff@peff.net> wrote:
> @@ -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);
> }
This I wouldn't have bothered to do in this patch. It is just
unecessary code churning, as you turn around and change this again
in the next patch. I actually dropped these two hunks from this
patch (but left the dang commit message comment in, whoops) and
moved the first hunk to the next patch.
> @@ -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);
You missed an unsigned short cast here.
> - e->name = to_atom(p, (unsigned short)n);
> + e->name = name;
See? ;-) I put the correct cast into the patch when I applied it.
Your series is applied on top of master and is now in my
fast-import.git fork on repo.or.cz.
--
Shawn.
next prev parent reply other threads:[~2007-03-11 3: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 ` [PATCH 2/3] fast-import: tree allocation cleanups Jeff King
2007-03-11 3:21 ` Shawn O. Pearce [this message]
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=20070311032147.GA10781@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=peff@peff.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.
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).