From: Harald Nordgren <haraldnordgren@gmail.com>
To: git@vger.kernel.org, avarab@gmail.com, peff@peff.net,
gitster@pobox.com, sunshine@sunshineco.com
Cc: Harald Nordgren <haraldnordgren@gmail.com>
Subject: [PATCH v13 3/4] ref-filter: factor ref_array pushing into its own function
Date: Mon, 9 Apr 2018 01:58:14 +0200 [thread overview]
Message-ID: <20180408235815.36582-3-haraldnordgren@gmail.com> (raw)
In-Reply-To: <20180408235815.36582-1-haraldnordgren@gmail.com>
In-Reply-To: <20180402005248.52418-1-haraldnordgren@gmail.com>
From: Jeff King <peff@peff.net>
In preparation for callers constructing their own ref_array
structs, let's move our own internal push operation into its
own function.
While we're at it, we can replace REALLOC_ARRAY() with
ALLOC_GROW(), which should give the growth operation
amortized linear complexity (as opposed to growing by one,
which is potentially quadratic, though in-place realloc
growth often makes this faster in practice).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com>
---
ref-filter.c | 16 +++++++++++++---
ref-filter.h | 8 ++++++++
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index c1c3cc948..6e9328b27 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1840,6 +1840,18 @@ static struct ref_array_item *new_ref_array_item(const char *refname,
return ref;
}
+struct ref_array_item *ref_array_push(struct ref_array *array,
+ const char *refname,
+ const struct object_id *oid)
+{
+ struct ref_array_item *ref = new_ref_array_item(refname, oid);
+
+ ALLOC_GROW(array->items, array->nr + 1, array->alloc);
+ array->items[array->nr++] = ref;
+
+ return ref;
+}
+
static int ref_kind_from_refname(const char *refname)
{
unsigned int i;
@@ -1930,13 +1942,11 @@ static int ref_filter_handler(const char *refname, const struct object_id *oid,
* to do its job and the resulting list may yet to be pruned
* by maxcount logic.
*/
- ref = new_ref_array_item(refname, oid);
+ ref = ref_array_push(ref_cbdata->array, refname, oid);
ref->commit = commit;
ref->flag = flag;
ref->kind = kind;
- REALLOC_ARRAY(ref_cbdata->array->items, ref_cbdata->array->nr + 1);
- ref_cbdata->array->items[ref_cbdata->array->nr++] = ref;
return 0;
}
diff --git a/ref-filter.h b/ref-filter.h
index 68268f9eb..76cf87cb6 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -135,4 +135,12 @@ void setup_ref_filter_porcelain_msg(void);
void pretty_print_ref(const char *name, const struct object_id *oid,
const struct ref_format *format);
+/*
+ * Push a single ref onto the array; this can be used to construct your own
+ * ref_array without using filter_refs().
+ */
+struct ref_array_item *ref_array_push(struct ref_array *array,
+ const char *refname,
+ const struct object_id *oid);
+
#endif /* REF_FILTER_H */
--
2.14.3 (Apple Git-98)
next prev parent reply other threads:[~2018-04-08 23:58 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-02 0:52 [PATCH] ls-remote: create option to sort by versions Harald Nordgren
2018-04-02 6:37 ` Ævar Arnfjörð Bjarmason
2018-04-02 16:26 ` Harald Nordgren
2018-04-02 17:32 ` Ævar Arnfjörð Bjarmason
2018-04-02 17:42 ` Harald Nordgren
2018-04-02 17:46 ` Jeff King
2018-04-02 18:32 ` Junio C Hamano
2018-04-02 20:03 ` Harald Nordgren
2018-04-02 22:11 ` [PATCH v5] ls-remote: create '--sort' option Harald Nordgren
2018-04-02 22:53 ` Eric Sunshine
2018-04-02 22:54 ` Eric Sunshine
2018-04-03 0:48 ` [PATCH v6] " Harald Nordgren
2018-04-02 21:05 ` [PATCH v4] " Harald Nordgren
2018-04-04 17:11 ` [PATCH v7] " Harald Nordgren
2018-04-04 17:18 ` Harald Nordgren
2018-04-04 17:47 ` Harald Nordgren
2018-04-04 18:56 ` Jeff King
2018-04-04 18:55 ` Jeff King
2018-04-04 23:01 ` [PATCH v8] " Harald Nordgren
2018-04-04 23:11 ` Harald Nordgren
2018-04-06 18:58 ` Jeff King
2018-04-06 18:58 ` [PATCH 1/3] ref-filter: use "struct object_id" consistently Jeff King
2018-04-06 18:59 ` [PATCH 2/3] ref-filter: make ref_array_item allocation more consistent Jeff King
2018-04-06 18:59 ` [PATCH 3/3] ref-filter: factor ref_array pushing into its own function Jeff King
2018-04-06 19:27 ` Derrick Stolee
2018-04-07 15:22 ` Harald Nordgren
2018-04-08 23:18 ` Junio C Hamano
2018-04-09 3:57 ` Jeff King
2018-04-04 23:32 ` [PATCH v9] ls-remote: create '--sort' option Harald Nordgren
2018-04-05 0:04 ` [PATCH v10] " Harald Nordgren
2018-04-07 16:42 ` [PATCH v11 1/4] ref-filter: use "struct object_id" consistently Harald Nordgren
2018-04-08 1:06 ` Eric Sunshine
2018-04-08 12:27 ` Harald Nordgren
2018-04-07 16:42 ` [PATCH v11 2/4] ref-filter: make ref_array_item allocation more consistent Harald Nordgren
2018-04-07 16:42 ` [PATCH v11 3/4] ref-filter: factor ref_array pushing into its own function Harald Nordgren
2018-04-07 16:42 ` [PATCH v11 4/4] ls-remote: create '--sort' option Harald Nordgren
2018-04-08 1:48 ` Eric Sunshine
2018-04-08 12:28 ` [PATCH v12 1/4] ref-filter: use "struct object_id" consistently Harald Nordgren
2018-04-08 12:28 ` [PATCH v12 2/4] ref-filter: make ref_array_item allocation more consistent Harald Nordgren
2018-04-08 12:28 ` [PATCH v12 3/4] ref-filter: factor ref_array pushing into its own function Harald Nordgren
2018-04-08 12:28 ` [PATCH v12 4/4] ls-remote: create '--sort' option Harald Nordgren
2018-04-08 22:16 ` Junio C Hamano
2018-04-09 0:09 ` Harald Nordgren
2018-04-09 0:09 ` Harald Nordgren
2018-04-09 0:48 ` Junio C Hamano
2018-04-09 2:31 ` Eric Sunshine
2018-04-08 23:58 ` [PATCH v13 1/4] ref-filter: use "struct object_id" consistently Harald Nordgren
2018-04-08 23:58 ` [PATCH v13 2/4] ref-filter: make ref_array_item allocation more consistent Harald Nordgren
2018-04-08 23:58 ` Harald Nordgren [this message]
2018-04-08 23:58 ` [PATCH v13 4/4] ls-remote: create '--sort' option Harald Nordgren
2018-04-09 0:56 ` Junio C Hamano
2018-04-09 1:45 ` Harald Nordgren
2018-04-09 1:42 ` [PATCH v14 1/4] ref-filter: use "struct object_id" consistently Harald Nordgren
2018-04-09 1:42 ` [PATCH v14 2/4] ref-filter: make ref_array_item allocation more consistent Harald Nordgren
2018-04-11 17:57 ` Harald Nordgren
2018-04-11 18:07 ` Stefan Beller
2018-04-11 18:30 ` Todd Zullinger
2018-04-11 18:56 ` Eric Sunshine
2018-04-11 23:25 ` Junio C Hamano
2018-04-09 1:42 ` [PATCH v14 3/4] ref-filter: factor ref_array pushing into its own function Harald Nordgren
2018-04-09 1:42 ` [PATCH v14 4/4] ls-remote: create '--sort' option Harald Nordgren
2018-05-12 8:45 ` René Scharfe
2018-05-12 9:55 ` 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=20180408235815.36582-3-haraldnordgren@gmail.com \
--to=haraldnordgren@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.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.
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).