From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: Stefan Beller <sbeller@google.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Ronnie Sahlberg <ronniesahlberg@gmail.com>,
git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v2 19/24] expire_reflog(): treat the policy callback data as opaque
Date: Fri, 12 Dec 2014 09:56:58 +0100 [thread overview]
Message-ID: <1418374623-5566-20-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1418374623-5566-1-git-send-email-mhagger@alum.mit.edu>
Now that expire_reflog() doesn't actually look in the
expire_reflog_policy_cb data structure, we can make it opaque:
* Change the callers of expire_reflog() to pass it a pointer to an
entire "struct expire_reflog_policy_cb" rather than a pointer to a
"struct cmd_reflog_expire_cb".
* Change expire_reflog() to accept the argument as a "void *" and
simply pass it through to the policy functions.
* Change the policy functions, reflog_expiry_prepare(),
reflog_expiry_cleanup(), and should_expire_reflog_ent(), to accept
"void *cb_data" arguments and cast them back to "struct
expire_reflog_policy_cb" internally.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Stefan Beller <sbeller@google.com>
---
builtin/reflog.c | 72 ++++++++++++++++++++++++++++----------------------------
1 file changed, 36 insertions(+), 36 deletions(-)
diff --git a/builtin/reflog.c b/builtin/reflog.c
index d36c2c6..0df5721 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -43,7 +43,7 @@ struct expire_reflog_policy_cb {
} unreachable_expire_kind;
struct commit_list *mark_list;
unsigned long mark_limit;
- struct cmd_reflog_expire_cb *cmd;
+ struct cmd_reflog_expire_cb cmd;
struct commit *tip_commit;
struct commit_list *tips;
};
@@ -309,22 +309,22 @@ static int should_expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
struct expire_reflog_policy_cb *cb = cb_data;
struct commit *old, *new;
- if (timestamp < cb->cmd->expire_total)
+ if (timestamp < cb->cmd.expire_total)
return 1;
old = new = NULL;
- if (cb->cmd->stalefix &&
+ if (cb->cmd.stalefix &&
(!keep_entry(&old, osha1) || !keep_entry(&new, nsha1)))
return 1;
- if (timestamp < cb->cmd->expire_unreachable) {
+ if (timestamp < cb->cmd.expire_unreachable) {
if (cb->unreachable_expire_kind == UE_ALWAYS)
return 1;
if (unreachable(cb, old, osha1) || unreachable(cb, new, nsha1))
return 1;
}
- if (cb->cmd->recno && --(cb->cmd->recno) == 0)
+ if (cb->cmd.recno && --(cb->cmd.recno) == 0)
return 1;
return 0;
@@ -378,9 +378,11 @@ static int push_tip_to_list(const char *refname, const unsigned char *sha1,
static void reflog_expiry_prepare(const char *refname,
const unsigned char *sha1,
- struct expire_reflog_policy_cb *cb)
+ void *cb_data)
{
- if (!cb->cmd->expire_unreachable || !strcmp(refname, "HEAD")) {
+ struct expire_reflog_policy_cb *cb = cb_data;
+
+ if (!cb->cmd.expire_unreachable || !strcmp(refname, "HEAD")) {
cb->tip_commit = NULL;
cb->unreachable_expire_kind = UE_HEAD;
} else {
@@ -391,7 +393,7 @@ static void reflog_expiry_prepare(const char *refname,
cb->unreachable_expire_kind = UE_NORMAL;
}
- if (cb->cmd->expire_unreachable <= cb->cmd->expire_total)
+ if (cb->cmd.expire_unreachable <= cb->cmd.expire_total)
cb->unreachable_expire_kind = UE_ALWAYS;
cb->mark_list = NULL;
@@ -405,13 +407,15 @@ static void reflog_expiry_prepare(const char *refname,
} else {
commit_list_insert(cb->tip_commit, &cb->mark_list);
}
- cb->mark_limit = cb->cmd->expire_total;
+ cb->mark_limit = cb->cmd.expire_total;
mark_reachable(cb);
}
}
-static void reflog_expiry_cleanup(struct expire_reflog_policy_cb *cb)
+static void reflog_expiry_cleanup(void *cb_data)
{
+ struct expire_reflog_policy_cb *cb = cb_data;
+
if (cb->unreachable_expire_kind != UE_ALWAYS) {
if (cb->unreachable_expire_kind == UE_HEAD) {
struct commit_list *elem;
@@ -425,19 +429,17 @@ static void reflog_expiry_cleanup(struct expire_reflog_policy_cb *cb)
}
static int expire_reflog(const char *refname, const unsigned char *sha1,
- unsigned int flags, struct cmd_reflog_expire_cb *cmd)
+ unsigned int flags, void *policy_cb_data)
{
static struct lock_file reflog_lock;
struct expire_reflog_cb cb;
- struct expire_reflog_policy_cb policy_cb;
struct ref_lock *lock;
char *log_file;
int status = 0;
memset(&cb, 0, sizeof(cb));
- memset(&policy_cb, 0, sizeof(policy_cb));
cb.flags = flags;
- cb.policy_cb = &policy_cb;
+ cb.policy_cb = policy_cb_data;
/*
* The reflog file is locked by holding the lock on the
@@ -476,11 +478,9 @@ static int expire_reflog(const char *refname, const unsigned char *sha1,
}
}
- policy_cb.cmd = cmd;
-
- reflog_expiry_prepare(refname, sha1, &policy_cb);
+ reflog_expiry_prepare(refname, sha1, cb.policy_cb);
for_each_reflog_ent(refname, expire_reflog_ent, &cb);
- reflog_expiry_cleanup(&policy_cb);
+ reflog_expiry_cleanup(cb.policy_cb);
if (!(flags & EXPIRE_REFLOGS_DRY_RUN)) {
if (close_lock_file(&reflog_lock)) {
@@ -653,7 +653,7 @@ static void set_reflog_expiry_param(struct cmd_reflog_expire_cb *cb, int slot, c
static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
{
- struct cmd_reflog_expire_cb cb;
+ struct expire_reflog_policy_cb cb;
unsigned long now = time(NULL);
int i, status, do_all;
int explicit_expiry = 0;
@@ -667,25 +667,25 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
do_all = status = 0;
memset(&cb, 0, sizeof(cb));
- cb.expire_total = default_reflog_expire;
- cb.expire_unreachable = default_reflog_expire_unreachable;
+ cb.cmd.expire_total = default_reflog_expire;
+ cb.cmd.expire_unreachable = default_reflog_expire_unreachable;
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
if (!strcmp(arg, "--dry-run") || !strcmp(arg, "-n"))
flags |= EXPIRE_REFLOGS_DRY_RUN;
else if (starts_with(arg, "--expire=")) {
- if (parse_expiry_date(arg + 9, &cb.expire_total))
+ if (parse_expiry_date(arg + 9, &cb.cmd.expire_total))
die(_("'%s' is not a valid timestamp"), arg);
explicit_expiry |= EXPIRE_TOTAL;
}
else if (starts_with(arg, "--expire-unreachable=")) {
- if (parse_expiry_date(arg + 21, &cb.expire_unreachable))
+ if (parse_expiry_date(arg + 21, &cb.cmd.expire_unreachable))
die(_("'%s' is not a valid timestamp"), arg);
explicit_expiry |= EXPIRE_UNREACH;
}
else if (!strcmp(arg, "--stale-fix"))
- cb.stalefix = 1;
+ cb.cmd.stalefix = 1;
else if (!strcmp(arg, "--rewrite"))
flags |= EXPIRE_REFLOGS_REWRITE;
else if (!strcmp(arg, "--updateref"))
@@ -709,11 +709,11 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
* even in older repository. We cannot trust what's reachable
* from reflog if the repository was pruned with older git.
*/
- if (cb.stalefix) {
- init_revisions(&cb.revs, prefix);
+ if (cb.cmd.stalefix) {
+ init_revisions(&cb.cmd.revs, prefix);
if (flags & EXPIRE_REFLOGS_VERBOSE)
printf("Marking reachable objects...");
- mark_reachable_objects(&cb.revs, 0, 0, NULL);
+ mark_reachable_objects(&cb.cmd.revs, 0, 0, NULL);
if (flags & EXPIRE_REFLOGS_VERBOSE)
putchar('\n');
}
@@ -726,7 +726,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
for_each_reflog(collect_reflog, &collected);
for (i = 0; i < collected.nr; i++) {
struct collected_reflog *e = collected.e[i];
- set_reflog_expiry_param(&cb, explicit_expiry, e->reflog);
+ set_reflog_expiry_param(&cb.cmd, explicit_expiry, e->reflog);
status |= expire_reflog(e->reflog, e->sha1, flags, &cb);
free(e);
}
@@ -740,7 +740,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
status |= error("%s points nowhere!", argv[i]);
continue;
}
- set_reflog_expiry_param(&cb, explicit_expiry, ref);
+ set_reflog_expiry_param(&cb.cmd, explicit_expiry, ref);
status |= expire_reflog(ref, sha1, flags, &cb);
}
return status;
@@ -750,15 +750,15 @@ static int count_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
const char *email, unsigned long timestamp, int tz,
const char *message, void *cb_data)
{
- struct cmd_reflog_expire_cb *cb = cb_data;
- if (!cb->expire_total || timestamp < cb->expire_total)
- cb->recno++;
+ struct expire_reflog_policy_cb *cb = cb_data;
+ if (!cb->cmd.expire_total || timestamp < cb->cmd.expire_total)
+ cb->cmd.recno++;
return 0;
}
static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
{
- struct cmd_reflog_expire_cb cb;
+ struct expire_reflog_policy_cb cb;
int i, status = 0;
unsigned int flags = 0;
@@ -805,12 +805,12 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
recno = strtoul(spec + 2, &ep, 10);
if (*ep == '}') {
- cb.recno = -recno;
+ cb.cmd.recno = -recno;
for_each_reflog_ent(ref, count_reflog_ent, &cb);
} else {
- cb.expire_total = approxidate(spec + 2);
+ cb.cmd.expire_total = approxidate(spec + 2);
for_each_reflog_ent(ref, count_reflog_ent, &cb);
- cb.expire_total = 0;
+ cb.cmd.expire_total = 0;
}
status |= expire_reflog(ref, sha1, flags, &cb);
--
2.1.3
next prev parent reply other threads:[~2014-12-12 8:57 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-12 8:56 [PATCH v2 00/24] Add reflog_expire() to the references API Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 01/24] refs.c: make ref_transaction_create a wrapper for ref_transaction_update Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 02/24] refs.c: make ref_transaction_delete " Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 03/24] refs.c: add a function to append a reflog entry to a fd Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 04/24] expire_reflog(): it's not an each_ref_fn anymore Michael Haggerty
2014-12-12 18:09 ` Stefan Beller
2014-12-12 8:56 ` [PATCH v2 05/24] expire_reflog(): rename "ref" parameter to "refname" Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 06/24] expire_reflog(): return early if the reference has no reflog Michael Haggerty
2014-12-12 18:15 ` Stefan Beller
2014-12-12 8:56 ` [PATCH v2 07/24] expire_reflog(): use a lock_file for rewriting the reflog file Michael Haggerty
2014-12-12 18:57 ` Stefan Beller
2014-12-12 8:56 ` [PATCH v2 08/24] Extract function should_expire_reflog_ent() Michael Haggerty
2014-12-12 20:02 ` Stefan Beller
2014-12-12 8:56 ` [PATCH v2 09/24] expire_reflog(): extract two policy-related functions Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 10/24] expire_reflog(): add a "flags" argument Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 11/24] expire_reflog(): move dry_run to flags argument Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 12/24] expire_reflog(): move updateref " Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 13/24] Rename expire_reflog_cb to expire_reflog_policy_cb Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 14/24] struct expire_reflog_cb: a new callback data type Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 15/24] expire_reflog(): pass flags through to expire_reflog_ent() Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 16/24] expire_reflog(): move verbose to flags argument Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 17/24] expire_reflog(): move rewrite " Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 18/24] Move newlog and last_kept_sha1 to "struct expire_reflog_cb" Michael Haggerty
2014-12-12 8:56 ` Michael Haggerty [this message]
2014-12-12 8:56 ` [PATCH v2 20/24] reflog_expire(): new function in the reference API Michael Haggerty
2014-12-12 8:57 ` [PATCH v2 21/24] refs.c: remove unlock_ref/close_ref/commit_ref from the refs api Michael Haggerty
2014-12-12 8:57 ` [PATCH v2 22/24] lock_any_ref_for_update(): inline function Michael Haggerty
2014-12-12 20:04 ` Stefan Beller
2014-12-12 8:57 ` [PATCH v2 23/24] refs.c: don't expose the internal struct ref_lock in the header file Michael Haggerty
2014-12-12 8:57 ` [PATCH v2 24/24] refs.c: let fprintf handle the formatting Michael Haggerty
2014-12-12 20:58 ` [PATCH v2 00/24] Add reflog_expire() to the references API 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=1418374623-5566-20-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=ronniesahlberg@gmail.com \
--cc=sbeller@google.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).