git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Cc: Junio C Hamano <gitster@pobox.com>,
	GIT Mailing-list <git@vger.kernel.org>
Subject: [PATCH 5/7] alloc: factor out commit index
Date: Fri, 11 Jul 2014 04:48:47 -0400	[thread overview]
Message-ID: <20140711084847.GE5625@sigill.intra.peff.net> (raw)
In-Reply-To: <20140711084141.GA5521@sigill.intra.peff.net>

We keep a static counter to set the commit index on newly
allocated objects. However, since we also need to set the
index on any_objects which are converted to commits, let's
make the counter available as a public function.

While we're moving it, let's make sure the counter is
allocated as an unsigned integer to match the index field in
"struct commit".

Signed-off-by: Jeff King <peff@peff.net>
---
 alloc.c | 9 +++++++--
 cache.h | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/alloc.c b/alloc.c
index fd5fcb7..21f3d81 100644
--- a/alloc.c
+++ b/alloc.c
@@ -64,11 +64,16 @@ DEFINE_ALLOCATOR(object, OBJ_NONE, union any_object)
 
 static struct alloc_state commit_state;
 
+unsigned int alloc_commit_index(void)
+{
+	static unsigned int count;
+	return count++;
+}
+
 void *alloc_commit_node(void)
 {
-	static int commit_count;
 	struct commit *c = alloc_node(&commit_state, OBJ_COMMIT, sizeof(struct commit));
-	c->index = commit_count++;
+	c->index = alloc_commit_index();
 	return c;
 }
 
diff --git a/cache.h b/cache.h
index df65231..42a5e86 100644
--- a/cache.h
+++ b/cache.h
@@ -1376,6 +1376,7 @@ extern void *alloc_commit_node(void);
 extern void *alloc_tag_node(void);
 extern void *alloc_object_node(void);
 extern void alloc_report(void);
+extern unsigned int alloc_commit_index(void);
 
 /* trace.c */
 __attribute__((format (printf, 1, 2)))
-- 
2.0.0.566.gfe3e6b2

  parent reply	other threads:[~2014-07-11  8:48 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-10 23:59 [PATCH v3 2/2] alloc.c: remove the redundant commit_count variable Ramsay Jones
2014-07-11  0:30 ` Jeff King
2014-07-11  0:59   ` Ramsay Jones
2014-07-11  8:32     ` Jeff King
2014-07-11  9:41       ` Ramsay Jones
2014-07-11  8:41   ` [PATCH 0/7] ensure index is set for all OBJ_COMMIT objects variable Jeff King
2014-07-11  8:42     ` [PATCH 1/7] alloc.c: remove the alloc_raw_commit_node() function Jeff King
2014-07-11  8:46     ` [PATCH 2/7] move setting of object->type to alloc_* functions Jeff King
2014-07-12 14:44       ` Ramsay Jones
2014-07-12 18:05         ` Jeff King
2014-07-13  6:41           ` Jeff King
2014-07-13  6:41             ` [PATCH v2 1/8] alloc.c: remove the alloc_raw_commit_node() function Jeff King
2014-07-15 20:06               ` Junio C Hamano
2014-07-13  6:41             ` [PATCH v2 2/8] alloc: write out allocator definitions Jeff King
2014-07-15 20:11               ` Junio C Hamano
2014-07-13  6:41             ` [PATCH v2 3/8] move setting of object->type to alloc_* functions Jeff King
2014-07-15 20:12               ` Junio C Hamano
2014-07-13  6:42             ` [PATCH v2 4/8] parse_object_buffer: do not set object type Jeff King
2014-07-13  6:42             ` [PATCH v2 5/8] add object_as_type helper for casting objects Jeff King
2014-07-13  6:42             ` [PATCH v2 6/8] alloc: factor out commit index Jeff King
2014-07-13  6:42             ` [PATCH v2 7/8] object_as_type: set " Jeff King
2014-07-13  6:42             ` [PATCH v2 8/8] diff-tree: avoid lookup_unknown_object Jeff King
2014-07-13 19:27             ` [PATCH 2/7] move setting of object->type to alloc_* functions Ramsay Jones
2014-07-14  5:57               ` Jeff King
2014-07-14 11:03                 ` Ramsay Jones
2014-07-12 14:55       ` Ramsay Jones
2014-07-12 18:07         ` Jeff King
2014-07-11  8:46     ` [PATCH 3/7] parse_object_buffer: do not set object type Jeff King
2014-07-11  8:48     ` [PATCH 4/7] add object_as_type helper for casting objects Jeff King
2014-07-11 10:45       ` Ramsay Jones
2014-07-11 16:59         ` Jeff King
2014-07-11  8:48     ` Jeff King [this message]
2014-07-11  8:49     ` [PATCH 6/7] object_as_type: set commit index Jeff King
2014-07-11  8:50     ` [PATCH 7/7] diff-tree: avoid lookup_unknown_object Jeff King
2014-07-11 10:31     ` [PATCH 0/7] ensure index is set for all OBJ_COMMIT objects variable Ramsay Jones

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=20140711084847.GE5625@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=ramsay@ramsay1.demon.co.uk \
    /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 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 NNTP newsgroup(s).