From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 4/5] streaming.c: stop passing around "object_info *" to open()
Date: Wed, 5 May 2021 14:33:31 +0200 [thread overview]
Message-ID: <patch-4.5-44e79d6cb66-20210505T122816Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-0.5-00000000000-20210505T122816Z-avarab@gmail.com>
Change the streaming interface to stop passing around the "struct
object_info" the open() functions.
As seen in 7ef2d9a2604 (streaming: read non-delta incrementally from a
pack, 2011-05-13) which introduced the "st->u.in_pack" assignments
being changed here only the open_istream_pack_non_delta() path need
these.
So let's instead do this when preparing the selected callback in the
istream_source() function. This might also allow the compiler to
reduce the lifetime of the "oi" variable, as we've moved it from
"git_istream()" to "istream_source()".
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
streaming.c | 42 ++++++++++++++++++++----------------------
1 file changed, 20 insertions(+), 22 deletions(-)
diff --git a/streaming.c b/streaming.c
index 7e039df388b..f6059ee828e 100644
--- a/streaming.c
+++ b/streaming.c
@@ -10,7 +10,6 @@
typedef int (*open_istream_fn)(struct git_istream *,
struct repository *,
- struct object_info *,
const struct object_id *,
enum object_type *);
typedef int (*close_istream_fn)(struct git_istream *);
@@ -232,7 +231,6 @@ static struct stream_vtbl loose_vtbl = {
};
static int open_istream_loose(struct git_istream *st, struct repository *r,
- struct object_info *oi,
const struct object_id *oid,
enum object_type *type)
{
@@ -337,15 +335,12 @@ static struct stream_vtbl pack_non_delta_vtbl = {
static int open_istream_pack_non_delta(struct git_istream *st,
struct repository *r,
- struct object_info *oi,
const struct object_id *oid,
enum object_type *type)
{
struct pack_window *window;
enum object_type in_pack_type;
- st->u.in_pack.pack = oi->u.packed.pack;
- st->u.in_pack.pos = oi->u.packed.offset;
window = NULL;
in_pack_type = unpack_object_header(st->u.in_pack.pack,
@@ -400,8 +395,7 @@ static struct stream_vtbl incore_vtbl = {
};
static int open_istream_incore(struct git_istream *st, struct repository *r,
- struct object_info *oi, const struct object_id *oid,
- enum object_type *type)
+ const struct object_id *oid, enum object_type *type)
{
st->u.incore.buf = read_object_file_extended(r, oid, type, &st->size, 0);
st->u.incore.read_ptr = 0;
@@ -414,26 +408,30 @@ static int open_istream_incore(struct git_istream *st, struct repository *r,
* static helpers variables and functions for users of streaming interface
*****************************************************************************/
-static open_istream_fn istream_source(struct repository *r,
+static open_istream_fn istream_source(struct git_istream *st,
+ struct repository *r,
const struct object_id *oid,
- enum object_type *type,
- struct object_info *oi)
+ enum object_type *type)
{
unsigned long size;
int status;
+ struct object_info oi = OBJECT_INFO_INIT;
- oi->typep = type;
- oi->sizep = &size;
- status = oid_object_info_extended(r, oid, oi, 0);
+ oi.typep = type;
+ oi.sizep = &size;
+ status = oid_object_info_extended(r, oid, &oi, 0);
if (status < 0)
return NULL;
- switch (oi->whence) {
+ switch (oi.whence) {
case OI_LOOSE:
return open_istream_loose;
case OI_PACKED:
- if (!oi->u.packed.is_delta && big_file_threshold < size)
+ if (!oi.u.packed.is_delta && big_file_threshold < size) {
+ st->u.in_pack.pack = oi.u.packed.pack;
+ st->u.in_pack.pos = oi.u.packed.offset;
return open_istream_pack_non_delta;
+ }
/* fallthru */
default:
return open_istream_incore;
@@ -462,17 +460,17 @@ struct git_istream *open_istream(struct repository *r,
unsigned long *size,
struct stream_filter *filter)
{
- struct git_istream *st;
- struct object_info oi = OBJECT_INFO_INIT;
+ struct git_istream *st = xmalloc(sizeof(*st));
const struct object_id *real = lookup_replace_object(r, oid);
- open_istream_fn open_fn = istream_source(r, real, type, &oi);
+ open_istream_fn open_fn = istream_source(st, r, real, type);
- if (!open_fn)
+ if (!open_fn) {
+ free(st);
return NULL;
+ }
- st = xmalloc(sizeof(*st));
- if (open_fn(st, r, &oi, real, type)) {
- if (open_istream_incore(st, r, &oi, real, type)) {
+ if (open_fn(st, r, real, type)) {
+ if (open_istream_incore(st, r, real, type)) {
free(st);
return NULL;
}
--
2.31.1.838.g7ac6e98bb53
next prev parent reply other threads:[~2021-05-05 12:33 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-05 12:33 [PATCH 0/5] streaming.c: refactor for smaller + easier to understand code Ævar Arnfjörð Bjarmason
2021-05-05 12:33 ` [PATCH 1/5] streaming.c: avoid forward declarations Ævar Arnfjörð Bjarmason
2021-05-05 12:33 ` [PATCH 2/5] streaming.c: remove enum/function/vtbl indirection Ævar Arnfjörð Bjarmason
2021-05-05 13:42 ` Jeff King
2021-05-06 0:14 ` Junio C Hamano
2021-05-05 12:33 ` [PATCH 3/5] streaming.c: remove {open,close,read}_method_decl() macros Ævar Arnfjörð Bjarmason
2021-05-05 13:44 ` Jeff King
2021-05-05 12:33 ` Ævar Arnfjörð Bjarmason [this message]
2021-05-05 13:49 ` [PATCH 4/5] streaming.c: stop passing around "object_info *" to open() Jeff King
2021-05-05 12:33 ` [PATCH 5/5] streaming.c: move {open,close,read} from vtable to "struct git_istream" Ævar Arnfjörð Bjarmason
2021-05-05 13:55 ` Jeff King
2021-05-05 13:57 ` [PATCH 0/5] streaming.c: refactor for smaller + easier to understand code 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
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=patch-4.5-44e79d6cb66-20210505T122816Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).