From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: git@vger•kernel.org, Christian Couder <chriscool@tuxfamily•org>,
Jakub Narebski <jnareb@gmail•com>,
Eric Sunshine <sunshine@sunshineco•com>
Subject: Re: [PATCH 02/15] commit: push commit_index update into alloc_commit_node
Date: Tue, 10 Jun 2014 14:31:58 -0700 [thread overview]
Message-ID: <xmqqfvjc8n8x.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140609180959.GB20315@sigill.intra.peff.net> (Jeff King's message of "Mon, 9 Jun 2014 14:09:59 -0400")
Jeff King <peff@peff•net> writes:
> This will make the alloc_report output a little uglier (it will say
> raw_commit), but I don't think anyone cares. And I wanted to make sure
> there wasn't an easy way to accidentally call the wrong alloc function
> that doesn't handle the index.
Thanks; I like this change.
>
> alloc.c | 12 ++++++++++--
> commit.c | 2 --
> 2 files changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/alloc.c b/alloc.c
> index 38ff7e7..eb22a45 100644
> --- a/alloc.c
> +++ b/alloc.c
> @@ -47,10 +47,18 @@ union any_object {
>
> DEFINE_ALLOCATOR(blob, struct blob)
> DEFINE_ALLOCATOR(tree, struct tree)
> -DEFINE_ALLOCATOR(commit, struct commit)
> +DEFINE_ALLOCATOR(raw_commit, struct commit)
> DEFINE_ALLOCATOR(tag, struct tag)
> DEFINE_ALLOCATOR(object, union any_object)
>
> +void *alloc_commit_node(void)
> +{
> + static int commit_count;
> + struct commit *c = alloc_raw_commit_node();
> + c->index = commit_count++;
> + return c;
> +}
> +
> static void report(const char *name, unsigned int count, size_t size)
> {
> fprintf(stderr, "%10s: %8u (%"PRIuMAX" kB)\n",
> @@ -64,7 +72,7 @@ void alloc_report(void)
> {
> REPORT(blob, struct blob);
> REPORT(tree, struct tree);
> - REPORT(commit, struct commit);
> + REPORT(raw_commit, struct commit);
> REPORT(tag, struct tag);
> REPORT(object, union any_object);
> }
> diff --git a/commit.c b/commit.c
> index f479331..21957ee 100644
> --- a/commit.c
> +++ b/commit.c
> @@ -17,7 +17,6 @@ static struct commit_extra_header *read_commit_extra_header_lines(const char *bu
> int save_commit_buffer = 1;
>
> const char *commit_type = "commit";
> -static int commit_count;
>
> static struct commit *check_commit(struct object *obj,
> const unsigned char *sha1,
> @@ -64,7 +63,6 @@ struct commit *lookup_commit(const unsigned char *sha1)
> struct object *obj = lookup_object(sha1);
> if (!obj) {
> struct commit *c = alloc_commit_node();
> - c->index = commit_count++;
> return create_object(sha1, OBJ_COMMIT, c);
> }
> if (!obj->type)
next prev parent reply other threads:[~2014-06-10 21:32 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-09 18:02 [PATCH 0/15] store length of commit->buffer Jeff King
2014-06-09 18:09 ` [PATCH 01/15] alloc: include any-object allocations in alloc_report Jeff King
2014-06-09 18:09 ` [PATCH 02/15] commit: push commit_index update into alloc_commit_node Jeff King
2014-06-10 21:31 ` Junio C Hamano [this message]
2014-06-09 18:10 ` [PATCH 03/15] do not create "struct commit" with xcalloc Jeff King
2014-06-10 21:35 ` Junio C Hamano
2014-06-10 21:49 ` Jeff King
2014-06-09 18:10 ` [PATCH 04/15] logmsg_reencode: return const buffer Jeff King
2014-06-10 1:36 ` Eric Sunshine
2014-06-09 18:10 ` [PATCH 05/15] sequencer: use logmsg_reencode in get_message Jeff King
2014-06-10 21:40 ` Junio C Hamano
2014-06-10 21:50 ` Jeff King
2014-06-09 18:11 ` [PATCH 06/15] provide a helper to free commit buffer Jeff King
2014-06-09 18:11 ` [PATCH 07/15] provide a helper to set the " Jeff King
2014-06-09 18:11 ` [PATCH 08/15] provide helpers to access " Jeff King
2014-06-10 8:00 ` Eric Sunshine
2014-06-09 18:12 ` [PATCH 09/15] use get_cached_commit_buffer where appropriate Jeff King
2014-06-09 18:12 ` [PATCH 10/15] use get_commit_buffer to avoid duplicate code Jeff King
2014-06-10 8:01 ` Eric Sunshine
2014-06-10 20:34 ` Jeff King
2014-06-09 18:13 ` [PATCH 11/15] convert logmsg_reencode to get_commit_buffer Jeff King
2014-06-09 18:13 ` [PATCH 12/15] use get_commit_buffer everywhere Jeff King
2014-06-09 22:40 ` Junio C Hamano
2014-06-10 0:02 ` Jeff King
2014-06-10 0:22 ` Jeff King
2014-06-10 16:06 ` Junio C Hamano
2014-06-10 21:27 ` Jeff King
2014-06-09 18:15 ` [PATCH 13/15] commit-slab: provide a static initializer Jeff King
2014-06-09 18:15 ` [PATCH 14/15] commit: convert commit->buffer to a slab Jeff King
2014-06-09 18:15 ` [PATCH 15/15] commit: record buffer length in cache Jeff King
2014-06-10 5:12 ` Christian Couder
2014-06-10 5:27 ` Jeff King
2014-06-10 20:33 ` Jeff King
2014-06-10 21:30 ` Christian Couder
2014-06-10 21:35 ` [PATCH v2 0/17] store length of commit->buffer Jeff King
2014-06-10 21:36 ` [PATCH 01/17] commit_tree: take a pointer/len pair rather than a const strbuf Jeff King
2014-06-10 21:38 ` [PATCH 02/17] replace dangerous uses of strbuf_attach Jeff King
2014-06-10 21:38 ` [PATCH 03/17] alloc: include any-object allocations in alloc_report Jeff King
2014-06-10 21:39 ` [PATCH 04/17] commit: push commit_index update into alloc_commit_node Jeff King
2014-06-10 21:39 ` [PATCH 05/17] do not create "struct commit" with xcalloc Jeff King
2014-06-10 21:39 ` [PATCH 06/17] logmsg_reencode: return const buffer Jeff King
2014-06-10 21:39 ` [PATCH 07/17] sequencer: use logmsg_reencode in get_message Jeff King
2014-06-10 21:40 ` [PATCH 08/17] provide a helper to free commit buffer Jeff King
2014-06-12 18:22 ` Junio C Hamano
2014-06-12 20:08 ` Jeff King
2014-06-12 22:05 ` Jeff King
2014-06-10 21:40 ` [PATCH 09/17] provide a helper to set the " Jeff King
2014-06-10 21:40 ` [PATCH 10/17] provide helpers to access " Jeff King
2014-06-10 21:40 ` [PATCH 11/17] use get_cached_commit_buffer where appropriate Jeff King
2014-06-10 21:41 ` [PATCH 12/17] use get_commit_buffer to avoid duplicate code Jeff King
2014-06-10 21:41 ` [PATCH 13/17] convert logmsg_reencode to get_commit_buffer Jeff King
2014-06-10 21:41 ` [PATCH 14/17] use get_commit_buffer everywhere Jeff King
2014-06-10 21:42 ` [PATCH 15/17] commit-slab: provide a static initializer Jeff King
2014-06-12 18:15 ` Junio C Hamano
2014-06-12 19:51 ` Jeff King
2014-06-10 21:43 ` [PATCH 16/17] commit: convert commit->buffer to a slab Jeff King
2014-06-10 21:44 ` [PATCH 17/17] commit: record buffer length in cache Jeff King
2014-06-10 21:46 ` [PATCH v2 0/17] store length of commit->buffer Jeff King
2014-06-12 17:22 ` Junio C Hamano
2014-06-13 6:32 ` [PATCH v2] reuse cached commit buffer when parsing signatures Jeff King
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=xmqqfvjc8n8x.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=chriscool@tuxfamily$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=jnareb@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox