From: Stefan Beller <sbeller@google.com>
To: sbeller@google.com
Cc: git@vger.kernel.org, gitster@pobox.com, jamill@microsoft.com,
jonathantanmy@google.com, pclouds@gmail.com
Subject: [PATCH v4 10/13] alloc: add repository argument to alloc_commit_index
Date: Wed, 9 May 2018 17:40:21 -0700 [thread overview]
Message-ID: <20180510004024.93974-11-sbeller@google.com> (raw)
In-Reply-To: <20180510004024.93974-1-sbeller@google.com>
This is a small mechanical change; it doesn't change the
implementation to handle repositories other than the_repository yet.
Use a macro to catch callers passing a repository other than
the_repository at compile time.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
alloc.c | 4 ++--
cache.h | 3 ++-
object.c | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/alloc.c b/alloc.c
index 28b85b22144..277dadd221b 100644
--- a/alloc.c
+++ b/alloc.c
@@ -82,7 +82,7 @@ void *alloc_object_node_the_repository(void)
static struct alloc_state commit_state;
-unsigned int alloc_commit_index(void)
+unsigned int alloc_commit_index_the_repository(void)
{
static unsigned int count;
return count++;
@@ -92,7 +92,7 @@ void *alloc_commit_node_the_repository(void)
{
struct commit *c = alloc_node(&commit_state, sizeof(struct commit));
c->object.type = OBJ_COMMIT;
- c->index = alloc_commit_index();
+ c->index = alloc_commit_index(the_repository);
return c;
}
diff --git a/cache.h b/cache.h
index 01cc207d218..0e6c5dd5639 100644
--- a/cache.h
+++ b/cache.h
@@ -1776,7 +1776,8 @@ extern void *alloc_tag_node_the_repository(void);
extern void *alloc_object_node_the_repository(void);
#define alloc_report(r) alloc_report_##r()
extern void alloc_report_the_repository(void);
-extern unsigned int alloc_commit_index(void);
+#define alloc_commit_index(r) alloc_commit_index_##r()
+extern unsigned int alloc_commit_index_the_repository(void);
/* pkt-line.c */
void packet_trace_identity(const char *prog);
diff --git a/object.c b/object.c
index b8c3f923c51..a365a910859 100644
--- a/object.c
+++ b/object.c
@@ -162,7 +162,7 @@ void *object_as_type(struct object *obj, enum object_type type, int quiet)
return obj;
else if (obj->type == OBJ_NONE) {
if (type == OBJ_COMMIT)
- ((struct commit *)obj)->index = alloc_commit_index();
+ ((struct commit *)obj)->index = alloc_commit_index(the_repository);
obj->type = type;
return obj;
}
--
2.17.0.255.g8bfb7c0704
next prev parent reply other threads:[~2018-05-10 0:40 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-01 21:33 [PATCH 00/13] object store: alloc Stefan Beller
2018-05-01 21:33 ` [PATCH 01/13] repository: introduce object parser field Stefan Beller
2018-05-02 17:17 ` Duy Nguyen
2018-05-02 17:26 ` Stefan Beller
2018-05-02 17:58 ` Duy Nguyen
2018-05-02 20:30 ` Jonathan Tan
2018-05-01 21:33 ` [PATCH 02/13] object: add repository argument to create_object Stefan Beller
2018-05-01 21:43 ` Eric Sunshine
2018-05-01 21:33 ` [PATCH 03/13] object: add repository argument to grow_object_hash Stefan Beller
2018-05-01 21:33 ` [PATCH 04/13] alloc: add repository argument to alloc_blob_node Stefan Beller
2018-05-02 20:34 ` Jonathan Tan
2018-05-01 21:33 ` [PATCH 05/13] alloc: add repository argument to alloc_tree_node Stefan Beller
2018-05-01 21:33 ` [PATCH 06/13] alloc: add repository argument to alloc_commit_node Stefan Beller
2018-05-01 21:33 ` [PATCH 07/13] alloc: add repository argument to alloc_tag_node Stefan Beller
2018-05-01 21:33 ` [PATCH 08/13] alloc: add repository argument to alloc_object_node Stefan Beller
2018-05-01 21:33 ` [PATCH 09/13] alloc: add repository argument to alloc_report Stefan Beller
2018-05-01 21:34 ` [PATCH 10/13] alloc: add repository argument to alloc_commit_index Stefan Beller
2018-05-01 21:34 ` [PATCH 11/13] object: allow grow_object_hash to handle arbitrary repositories Stefan Beller
2018-05-01 21:34 ` [PATCH 12/13] object: allow create_object " Stefan Beller
2018-05-02 20:36 ` Jonathan Tan
2018-05-01 21:34 ` [PATCH 13/13] alloc: allow arbitrary repositories for alloc functions Stefan Beller
2018-05-02 17:44 ` Duy Nguyen
2018-05-03 17:24 ` Stefan Beller
2018-05-03 17:35 ` Duy Nguyen
2018-05-02 20:50 ` Jonathan Tan
2018-05-03 17:25 ` Stefan Beller
2018-05-03 14:58 ` Duy Nguyen
2018-05-02 17:01 ` [PATCH 00/13] object store: alloc Duy Nguyen
2018-05-02 18:07 ` Jameson Miller
2018-05-02 18:22 ` Duy Nguyen
2018-05-02 18:44 ` Jameson Miller
2018-05-03 22:45 ` Stefan Beller
2018-05-07 14:05 ` Junio C Hamano
2018-05-07 20:53 ` Stefan Beller
2018-05-07 22:59 ` [PATCH v2 " Stefan Beller
2018-05-07 22:59 ` [PATCH v2 01/13] repository: introduce parsed objects field Stefan Beller
2018-05-08 17:23 ` Jonathan Tan
2018-05-07 22:59 ` [PATCH v2 02/13] object: add repository argument to create_object Stefan Beller
2018-05-07 22:59 ` [PATCH v2 03/13] object: add repository argument to grow_object_hash Stefan Beller
2018-05-07 22:59 ` [PATCH v2 04/13] alloc: add repository argument to alloc_blob_node Stefan Beller
2018-05-07 22:59 ` [PATCH v2 05/13] alloc: add repository argument to alloc_tree_node Stefan Beller
2018-05-07 22:59 ` [PATCH v2 06/13] alloc: add repository argument to alloc_commit_node Stefan Beller
2018-05-07 22:59 ` [PATCH v2 07/13] alloc: add repository argument to alloc_tag_node Stefan Beller
2018-05-07 22:59 ` [PATCH v2 08/13] alloc: add repository argument to alloc_object_node Stefan Beller
2018-05-07 22:59 ` [PATCH v2 09/13] alloc: add repository argument to alloc_report Stefan Beller
2018-05-07 22:59 ` [PATCH v2 10/13] alloc: add repository argument to alloc_commit_index Stefan Beller
2018-05-07 22:59 ` [PATCH v2 11/13] object: allow grow_object_hash to handle arbitrary repositories Stefan Beller
2018-05-07 22:59 ` [PATCH v2 12/13] object: allow create_object " Stefan Beller
2018-05-07 22:59 ` [PATCH v2 13/13] alloc: allow arbitrary repositories for alloc functions Stefan Beller
2018-05-08 10:10 ` Jeff King
2018-05-08 15:00 ` Duy Nguyen
2018-05-08 18:38 ` Stefan Beller
2018-05-08 17:45 ` Jonathan Tan
2018-05-08 19:37 ` [PATCH v3 00/13] object store: alloc Stefan Beller
2018-05-08 19:37 ` [PATCH v3 01/13] repository: introduce parsed objects field Stefan Beller
2018-05-08 19:37 ` [PATCH v3 02/13] object: add repository argument to create_object Stefan Beller
2018-05-08 19:37 ` [PATCH v3 03/13] object: add repository argument to grow_object_hash Stefan Beller
2018-05-08 19:37 ` [PATCH v3 04/13] alloc: add repository argument to alloc_blob_node Stefan Beller
2018-05-08 19:37 ` [PATCH v3 05/13] alloc: add repository argument to alloc_tree_node Stefan Beller
2018-05-08 19:37 ` [PATCH v3 06/13] alloc: add repository argument to alloc_commit_node Stefan Beller
2018-05-08 19:37 ` [PATCH v3 07/13] alloc: add repository argument to alloc_tag_node Stefan Beller
2018-05-08 19:37 ` [PATCH v3 08/13] alloc: add repository argument to alloc_object_node Stefan Beller
2018-05-08 19:37 ` [PATCH v3 09/13] alloc: add repository argument to alloc_report Stefan Beller
2018-05-08 19:37 ` [PATCH v3 10/13] alloc: add repository argument to alloc_commit_index Stefan Beller
2018-05-08 19:37 ` [PATCH v3 11/13] object: allow grow_object_hash to handle arbitrary repositories Stefan Beller
2018-05-08 19:37 ` [PATCH v3 12/13] object: allow create_object " Stefan Beller
2018-05-08 19:37 ` [PATCH v3 13/13] alloc: allow arbitrary repositories for alloc functions Stefan Beller
2018-05-08 20:04 ` Jonathan Tan
2018-05-08 20:37 ` Stefan Beller
2018-05-09 15:54 ` Duy Nguyen
2018-05-09 17:18 ` Duy Nguyen
2018-05-09 19:20 ` Stefan Beller
2018-05-10 15:43 ` Duy Nguyen
2018-05-10 0:40 ` [PATCH v4 00/13] object store: alloc Stefan Beller
2018-05-10 0:40 ` [PATCH v4 01/13] repository: introduce parsed objects field Stefan Beller
2018-05-10 0:40 ` [PATCH v4 02/13] object: add repository argument to create_object Stefan Beller
2018-05-10 0:40 ` [PATCH v4 03/13] object: add repository argument to grow_object_hash Stefan Beller
2018-05-10 0:40 ` [PATCH v4 04/13] alloc: add repository argument to alloc_blob_node Stefan Beller
2018-05-10 0:40 ` [PATCH v4 05/13] alloc: add repository argument to alloc_tree_node Stefan Beller
2018-05-10 0:40 ` [PATCH v4 06/13] alloc: add repository argument to alloc_commit_node Stefan Beller
2018-05-10 0:40 ` [PATCH v4 07/13] alloc: add repository argument to alloc_tag_node Stefan Beller
2018-05-10 0:40 ` [PATCH v4 08/13] alloc: add repository argument to alloc_object_node Stefan Beller
2018-05-10 0:40 ` [PATCH v4 09/13] alloc: add repository argument to alloc_report Stefan Beller
2018-05-10 0:40 ` Stefan Beller [this message]
2018-05-10 0:40 ` [PATCH v4 11/13] object: allow grow_object_hash to handle arbitrary repositories Stefan Beller
2018-05-10 0:40 ` [PATCH v4 12/13] object: allow create_object " Stefan Beller
2018-05-10 0:40 ` [PATCH v4 13/13] alloc: allow arbitrary repositories for alloc functions Stefan Beller
2018-05-10 17:16 ` [PATCH v4 00/13] object store: alloc Jonathan Tan
2018-05-10 17:32 ` Stefan Beller
2018-05-10 20:56 ` Jonathan Tan
2018-05-10 22:36 ` Stefan Beller
2018-05-11 19:17 ` [PATCH] alloc: allow arbitrary repositories for alloc functions Stefan Beller
2018-05-11 19:38 ` Eric Sunshine
2018-05-15 21:48 ` Stefan Beller
2018-05-16 2:27 ` Junio C Hamano
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=20180510004024.93974-11-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jamill@microsoft.com \
--cc=jonathantanmy@google.com \
--cc=pclouds@gmail.com \
/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).