mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reflog: change one->many worktree->refnames to use a string_list

Browse Source 
Change the FLEX_ARRAY pattern added in bda3a31cc7 (reflog-expire:
Avoid creating new files in a directory inside readdir(3) loop,
2008-01-25) the string-list API instead.

This does not change any behavior, allows us to delete much of this
code as it's replaced by things we get from the string-list API for
free, as a result we need just one struct to keep track of this data,
instead of two.

The "DUP" -> "string_list_append_nodup(..., strbuf_detach(...))"
pattern here is the same as that used in a recent memory leak fix in
b202e51b15 (grep: fix a "path_list" memory leak, 2021-10-22).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2021-12-22 05:06:42 +01:00
committed by Junio C Hamano
parent 46fbe418b2
commit f2919bae98
1 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
builtin/reflog.c
View File

@ -48,16 +48,9 @@ struct expire_reflog_policy_cb {
struct commit_list *tips; struct commit_list *tips;
}; };
struct collected_reflog { struct worktree_reflogs {
struct object_id oid; struct worktree *worktree;
char reflog[FLEX_ARRAY]; struct string_list reflogs;
};
struct collect_reflog_cb {
struct collected_reflog **e;
int alloc;
int nr;
struct worktree *wt;
}; };
/* Remember to update object flag allocation in object.h */ /* Remember to update object flag allocation in object.h */
@ -403,24 +396,20 @@ static void reflog_expiry_cleanup(void *cb_data)
static int collect_reflog(const char *ref, const struct object_id *oid, int unused, void *cb_data) static int collect_reflog(const char *ref, const struct object_id *oid, int unused, void *cb_data)
{ {
struct collected_reflog *e; struct worktree_reflogs *cb = cb_data;
struct collect_reflog_cb *cb = cb_data; struct worktree *worktree = cb->worktree;
struct strbuf newref = STRBUF_INIT; struct strbuf newref = STRBUF_INIT;
/* /*
* Avoid collecting the same shared ref multiple times because * Avoid collecting the same shared ref multiple times because
* they are available via all worktrees. * they are available via all worktrees.
*/ */
if (!cb->wt->is_current && ref_type(ref) == REF_TYPE_NORMAL) if (!worktree->is_current && ref_type(ref) == REF_TYPE_NORMAL)
return 0; return 0;
strbuf_worktree_ref(cb->wt, &newref, ref); strbuf_worktree_ref(worktree, &newref, ref);
FLEX_ALLOC_STR(e, reflog, newref.buf); string_list_append_nodup(&cb->reflogs, strbuf_detach(&newref, NULL));
strbuf_release(&newref);
oidcpy(&e->oid, oid);
ALLOC_GROW(cb->e, cb->nr + 1, cb->alloc);
cb->e[cb->nr++] = e;
return 0; return 0;
} }
@ -609,33 +598,33 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
} }
if (do_all) { if (do_all) {
struct collect_reflog_cb collected; struct worktree_reflogs collected = {
.reflogs = STRING_LIST_INIT_DUP,
};
struct string_list_item *item;
struct worktree **worktrees, **p; struct worktree **worktrees, **p;
int i;
memset(&collected, 0, sizeof(collected));
worktrees = get_worktrees(); worktrees = get_worktrees();
for (p = worktrees; *p; p++) { for (p = worktrees; *p; p++) {
if (!all_worktrees && !(*p)->is_current) if (!all_worktrees && !(*p)->is_current)
continue; continue;
collected.wt = *p; collected.worktree = *p;
refs_for_each_reflog(get_worktree_ref_store(*p), refs_for_each_reflog(get_worktree_ref_store(*p),
collect_reflog, &collected); collect_reflog, &collected);
} }
free_worktrees(worktrees); free_worktrees(worktrees);
for (i = 0; i < collected.nr; i++) {
struct collected_reflog *e = collected.e[i]; for_each_string_list_item(item, &collected.reflogs) {
struct expire_reflog_policy_cb cb = { .cmd = cmd }; struct expire_reflog_policy_cb cb = { .cmd = cmd };
set_reflog_expiry_param(&cb.cmd, explicit_expiry, e->reflog); set_reflog_expiry_param(&cb.cmd, explicit_expiry, item->string);
status |= reflog_expire(e->reflog, flags, status |= reflog_expire(item->string, flags,
reflog_expiry_prepare, reflog_expiry_prepare,
should_expire_reflog_ent, should_expire_reflog_ent,
reflog_expiry_cleanup, reflog_expiry_cleanup,
&cb); &cb);
free(e);
} }
free(collected.e); string_list_clear(&collected.reflogs, 0);
} }
for (; i < argc; i++) { for (; i < argc; i++) {