From: Stefan Beller <sbeller@google.com>
To: sbeller@google.com
Cc: git@vger.kernel.org, jonathantanmy@google.com, l.s.r@web.de,
pclouds@gmail.com, sandals@crustytoothpaste.net,
sunshine@sunshineco.com
Subject: [PATCH 04/15] replace-object: eliminate replace objects prepared flag
Date: Wed, 11 Apr 2018 17:21:07 -0700 [thread overview]
Message-ID: <20180412002118.102976-5-sbeller@google.com> (raw)
In-Reply-To: <20180412002118.102976-1-sbeller@google.com>
Make the oidmap a pointer.
That way we eliminate the need for the global boolean
variable 'replace_object_prepared' as we can put this information
into the pointer being NULL or not.
Another advantage of this is that we would more quickly catch
code that tries to access replace-map without initializing it.
This also allows the '#include "oidmap.h"' introduced in a previous
patch to be replaced by the forward declaration of 'struct oidmap;'.
Keeping the type opaque discourages circumventing accessor functions;
not dragging in other headers avoids some compile time overhead.
One disadvantage of this is change is performance as we need to
pay the overhead for a malloc. The alternative of moving the
global variable into the object store is less modular code.
Helped-by: René Scharfe <l.s.r@web.de>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
object-store.h | 2 +-
replace_object.c | 16 +++++++++-------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/object-store.h b/object-store.h
index c04b4c95eb..1ff862c7f9 100644
--- a/object-store.h
+++ b/object-store.h
@@ -99,7 +99,7 @@ struct raw_object_store {
* Objects that should be substituted by other objects
* (see git-replace(1)).
*/
- struct oidmap replace_map;
+ struct oidmap *replace_map;
/*
* private data
diff --git a/replace_object.c b/replace_object.c
index afbdf2df25..953fa9cc40 100644
--- a/replace_object.c
+++ b/replace_object.c
@@ -25,7 +25,7 @@ static int register_replace_ref(const char *refname,
oidcpy(&repl_obj->replacement, oid);
/* Register new object */
- if (oidmap_put(&the_repository->objects->replace_map, repl_obj))
+ if (oidmap_put(the_repository->objects->replace_map, repl_obj))
die("duplicate replace ref: %s", refname);
return 0;
@@ -33,14 +33,16 @@ static int register_replace_ref(const char *refname,
static void prepare_replace_object(void)
{
- static int replace_object_prepared;
-
- if (replace_object_prepared)
+ if (the_repository->objects->replace_map)
return;
+ the_repository->objects->replace_map =
+ xmalloc(sizeof(*the_repository->objects->replace_map));
+ oidmap_init(the_repository->objects->replace_map, 0);
+
for_each_replace_ref(register_replace_ref, NULL);
- replace_object_prepared = 1;
- if (!the_repository->objects->replace_map.map.tablesize)
+
+ if (!the_repository->objects->replace_map->map.tablesize)
check_replace_refs = 0;
}
@@ -64,7 +66,7 @@ const struct object_id *do_lookup_replace_object(const struct object_id *oid)
/* Try to recursively replace the object */
while (depth-- > 0) {
struct replace_object *repl_obj =
- oidmap_get(&the_repository->objects->replace_map, cur);
+ oidmap_get(the_repository->objects->replace_map, cur);
if (!repl_obj)
return cur;
cur = &repl_obj->replacement;
--
2.17.0.484.g0c8726318c-goog
next prev parent reply other threads:[~2018-04-12 0:21 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-06 23:21 [RFC PATCH 00/19] object-store refactoring 3 (replace objects, main ref store) Stefan Beller
2018-04-06 23:21 ` [PATCH 01/19] replace_object.c: rename to use dash in file name Stefan Beller
2018-04-06 23:21 ` [PATCH 02/19] replace-object: move replace_object to object store Stefan Beller
2018-04-09 13:51 ` Derrick Stolee
2018-04-06 23:21 ` [PATCH 03/19] object-store: move lookup_replace_object to replace-object.h Stefan Beller
2018-04-06 23:21 ` [PATCH 04/19] replace-object: move replace objects prepared flag to object store Stefan Beller
2018-04-06 23:21 ` [PATCH 05/19] replace-object: check_replace_refs is safe in multi repo environment Stefan Beller
2018-04-06 23:21 ` [PATCH 06/19] refs: add repository argument to get_main_ref_store Stefan Beller
2018-04-07 6:53 ` Eric Sunshine
2018-04-09 18:51 ` Stefan Beller
2018-04-06 23:21 ` [PATCH 07/19] refs: add repository argument to for_each_replace_ref Stefan Beller
2018-04-06 23:21 ` [PATCH 08/19] replace-object: add repository argument to replace_object_pos Stefan Beller
2018-04-06 23:21 ` [PATCH 09/19] replace-object: add repository argument to register_replace_object Stefan Beller
2018-04-06 23:21 ` [PATCH 10/19] replace-object: add repository argument to prepare_replace_object Stefan Beller
2018-04-06 23:21 ` [PATCH 11/19] replace-object: add repository argument to do_lookup_replace_object Stefan Beller
2018-04-06 23:21 ` [PATCH 12/19] replace-object: add repository argument to lookup_replace_object Stefan Beller
2018-04-06 23:21 ` [PATCH 13/19] refs: store the main ref store inside the repository struct Stefan Beller
2018-04-07 6:54 ` Eric Sunshine
2018-04-06 23:21 ` [PATCH 14/19] refs: allow for_each_replace_ref to handle arbitrary repositories Stefan Beller
2018-04-06 23:21 ` [PATCH 15/19] replace-object: allow replace_object_pos " Stefan Beller
2018-04-06 23:21 ` [PATCH 16/19] replace-object: allow register_replace_object " Stefan Beller
2018-04-06 23:21 ` [PATCH 17/19] replace-object: allow prepare_replace_object " Stefan Beller
2018-04-06 23:21 ` [PATCH 18/19] replace-object: allow do_lookup_replace_object " Stefan Beller
2018-04-06 23:21 ` [PATCH 19/19] replace-object: allow lookup_replace_object " Stefan Beller
2018-04-07 4:58 ` [RFC PATCH 00/19] object-store refactoring 3 (replace objects, main ref store) René Scharfe
2018-04-09 17:44 ` Stefan Beller
2018-04-07 9:50 ` Duy Nguyen
2018-04-09 17:39 ` Stefan Beller
2018-04-09 13:58 ` Derrick Stolee
[not found] ` <nycvar.QRO.7.76.6.1804091038430.55@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
2018-04-09 17:36 ` Stefan Beller
2018-04-09 22:45 ` [PATCHv2 00/16] " Stefan Beller
2018-04-09 22:45 ` [PATCH 01/16] replace_object: use oidmap Stefan Beller
2018-04-10 2:57 ` Junio C Hamano
2018-04-09 22:45 ` [PATCH 02/16] replace_object.c: rename to use dash in file name Stefan Beller
2018-04-10 3:00 ` Junio C Hamano
2018-04-10 17:57 ` Stefan Beller
2018-04-10 21:26 ` [PATCH 0/6] Rename files to use dashes instead of underscores Stefan Beller
2018-04-10 21:26 ` [PATCH 1/6] write_or_die.c: rename to use dashes in file name Stefan Beller
2018-04-10 21:26 ` [PATCH 2/6] unicode_width.h: rename to use dash " Stefan Beller
2018-04-10 21:26 ` [PATCH 3/6] exec_cmd: " Stefan Beller
2018-04-10 21:26 ` [PATCH 4/6] sha1_name.c: " Stefan Beller
2018-04-10 21:26 ` [PATCH 5/6] sha1_file.c: " Stefan Beller
2018-04-10 21:26 ` [PATCH 6/6] replace_object.c: " Stefan Beller
2018-04-10 21:28 ` [PATCH 0/6] Rename files to use dashes instead of underscores Stefan Beller
2018-04-10 22:39 ` Johannes Schindelin
2018-04-10 22:47 ` Stefan Beller
2018-04-11 23:13 ` brian m. carlson
2018-04-09 22:45 ` [PATCH 03/16] replace-object: move replace_map to object store Stefan Beller
2018-04-10 3:10 ` Junio C Hamano
2018-04-09 22:45 ` [PATCH 04/16] object-store: move lookup_replace_object to replace-object.h Stefan Beller
2018-04-09 22:45 ` [PATCH 05/16] replace-object: eliminate replace objects prepared flag Stefan Beller
2018-04-10 3:21 ` Junio C Hamano
2018-04-10 7:32 ` René Scharfe
2018-04-09 22:45 ` [PATCH 06/16] replace-object: check_replace_refs is safe in multi repo environment Stefan Beller
2018-04-10 3:37 ` Junio C Hamano
2018-04-09 22:45 ` [PATCH 07/16] refs: add repository argument to get_main_ref_store Stefan Beller
2018-04-10 13:36 ` Michael Haggerty
2018-04-10 18:27 ` Stefan Beller
2018-04-09 22:45 ` [PATCH 08/16] refs: add repository argument to for_each_replace_ref Stefan Beller
2018-04-09 22:45 ` [PATCH 09/16] replace-object: add repository argument to prepare_replace_object Stefan Beller
2018-04-09 22:45 ` [PATCH 10/16] replace-object: add repository argument to do_lookup_replace_object Stefan Beller
2018-04-09 22:45 ` [PATCH 11/16] replace-object: add repository argument to lookup_replace_object Stefan Beller
2018-04-09 22:45 ` [PATCH 12/16] refs: store the main ref store inside the repository struct Stefan Beller
2018-04-09 23:24 ` Brandon Williams
2018-04-09 23:29 ` Stefan Beller
2018-04-09 23:35 ` Brandon Williams
2018-04-10 14:02 ` Michael Haggerty
2018-04-10 18:38 ` Stefan Beller
2018-04-09 22:45 ` [PATCH 13/16] refs: allow for_each_replace_ref to handle arbitrary repositories Stefan Beller
2018-04-09 22:45 ` [PATCH 14/16] replace-object: allow prepare_replace_object " Stefan Beller
2018-04-09 22:45 ` [PATCH 15/16] replace-object: allow do_lookup_replace_object " Stefan Beller
2018-04-09 22:45 ` [PATCH 16/16] replace-object: allow lookup_replace_object " Stefan Beller
2018-04-09 23:25 ` [PATCHv2 00/16] object-store refactoring 3 (replace objects, main ref store) Brandon Williams
2018-04-09 23:31 ` Stefan Beller
2018-04-12 0:21 ` [PATCHv3 00/15] replace_object.c: rename to use dash in file name Stefan Beller
2018-04-12 0:21 ` [PATCH 01/15] replace_object: use oidmap Stefan Beller
2018-04-12 0:21 ` [PATCH 02/15] replace-object: move replace_map to object store Stefan Beller
2018-04-12 0:21 ` [PATCH 03/15] object-store: move lookup_replace_object to replace-object.h Stefan Beller
2018-04-12 0:21 ` Stefan Beller [this message]
2018-04-12 0:21 ` [PATCH 05/15] replace-object: check_replace_refs is safe in multi repo environment Stefan Beller
2018-04-12 0:21 ` [PATCH 06/15] refs: add repository argument to get_main_ref_store Stefan Beller
2018-04-12 0:21 ` [PATCH 07/15] refs: add repository argument to for_each_replace_ref Stefan Beller
2018-04-12 0:21 ` [PATCH 08/15] replace-object: add repository argument to prepare_replace_object Stefan Beller
2018-04-12 0:21 ` [PATCH 09/15] replace-object: add repository argument to do_lookup_replace_object Stefan Beller
2018-04-12 0:21 ` [PATCH 10/15] replace-object: add repository argument to lookup_replace_object Stefan Beller
2018-04-12 0:21 ` [PATCH 11/15] refs: store the main ref store inside the repository struct Stefan Beller
2018-04-12 0:21 ` [PATCH 12/15] refs: allow for_each_replace_ref to handle arbitrary repositories Stefan Beller
2018-04-12 0:21 ` [PATCH 13/15] replace-object: allow prepare_replace_object " Stefan Beller
2018-04-12 0:21 ` [PATCH 14/15] replace-object: allow do_lookup_replace_object " Stefan Beller
2018-04-12 0:21 ` [PATCH 15/15] replace-object: allow lookup_replace_object " Stefan Beller
2018-04-12 11:43 ` [PATCHv3 00/15] replace_object.c: rename to use dash in file name Derrick Stolee
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=20180412002118.102976-5-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=l.s.r@web.de \
--cc=pclouds@gmail.com \
--cc=sandals@crustytoothpaste.net \
--cc=sunshine@sunshineco.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.
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).