Allow to make multiple reflog updates to the same ref during a transaction.
This means we only need to lock the reflog once, during the first update that
touches the reflog, and that all further updates can just write the reflog
entry since the reflog is already locked.
This allows us to write code such as:
t = transaction_begin()
transaction_reflog_update(t, "foo", REFLOG_TRUNCATE, NULL);
loop-over-somehting...
transaction_reflog_update(t, "foo", 0, <message>);
transaction_commit(t)
where we first truncate the reflog and then build the new content one line at a
time.
Signed-off-by: Ronnie Sahlberg <sahlb...@google.com>
---
refs.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 49 insertions(+), 9 deletions(-)
diff --git a/refs.c b/refs.c
index a3f60ad..e7ede03 100644
--- a/refs.c
+++ b/refs.c
@@ -37,6 +37,10 @@ static inline int bad_ref_char(int ch)
* need to lock the loose ref during the transaction.
*/
#define REF_ISPACKONLY 0x0200
+/** Only the first reflog update needs to lock the reflog file. Further updates
+ * just use the lock taken by the first update.
+ */
+#define UPDATE_REFLOG_NOLOCK 0x0300
/*
* Try to read one refname component from the front of refname. Return
@@ -3252,6 +3256,7 @@ enum transaction_update_type {
UPDATE_LOG = 1,
};
+
/**
* Information needed for a single ref update. Set new_sha1 to the
* new value or to zero to delete the ref. To check the old value
@@ -3262,7 +3267,7 @@ struct ref_update {
enum transaction_update_type update_type;
unsigned char new_sha1[20];
unsigned char old_sha1[20];
- int flags; /* REF_NODEREF? */
+ int flags; /* REF_NODEREF? or private flags */
int have_old; /* 1 if old_sha1 is valid, 0 otherwise */
struct ref_lock *lock;
int type;
@@ -3270,8 +3275,9 @@ struct ref_update {
/* used by reflog updates */
int reflog_fd;
- struct lock_file reflog_lock;
+ struct lock_file *reflog_lock;
const char *committer;
+ struct ref_update *orig_update; /* For UPDATE_REFLOG_NOLOCK */
const char refname[FLEX_ARRAY];
};
@@ -3349,8 +3355,23 @@ int transaction_update_reflog(struct ref_transaction
*transaction,
int flags)
{
struct ref_update *update;
+ int i;
update = add_update(transaction, refname, UPDATE_LOG);
+ update->flags = flags;
+ for (i = 0; i < transaction->nr - 1; i++) {
+ if (transaction->updates[i]->update_type != UPDATE_LOG)
+ continue;
+ if (!strcmp(transaction->updates[i]->refname,
+ update->refname)) {
+ update->flags |= UPDATE_REFLOG_NOLOCK;
+ update->orig_update = transaction->updates[i];
+ break;
+ }
+ }
+ if (!(update->flags & UPDATE_REFLOG_NOLOCK))
+ update->reflog_lock = xcalloc(1, sizeof(struct lock_file));
+
hashcpy(update->new_sha1, new_sha1);
hashcpy(update->old_sha1, old_sha1);
update->reflog_fd = -1;
@@ -3366,7 +3387,6 @@ int transaction_update_reflog(struct ref_transaction
*transaction,
}
if (msg)
update->msg = xstrdup(msg);
- update->flags = flags;
return 0;
}
@@ -3479,7 +3499,7 @@ static int ref_update_reject_duplicates(struct ref_update
**updates, int n,
struct strbuf *err)
{
int i;
- for (i = 1; i < n; i++)
+ for (i = 1; i < n; i++) {
if (updates[i]->update_type != UPDATE_SHA1)
continue;
if (!strcmp(updates[i - 1]->refname, updates[i]->refname)) {
@@ -3490,6 +3510,7 @@ static int ref_update_reject_duplicates(struct ref_update
**updates, int n,
return 1;
}
+ }
return 0;
}
@@ -3558,10 +3579,15 @@ int transaction_commit(struct ref_transaction
*transaction,
if (update->update_type != UPDATE_LOG)
continue;
+ if (update->flags & UPDATE_REFLOG_NOLOCK) {
+ update->reflog_fd = update->orig_update->reflog_fd;
+ update->reflog_lock = update->orig_update->reflog_lock;
+ continue;
+ }
update->reflog_fd = hold_lock_file_for_append(
- &update->reflog_lock,
+ update->reflog_lock,
git_path("logs/%s", update->refname),
- 0);
+ LOCK_NODEREF);
if (update->reflog_fd < 0) {
const char *str = "Cannot lock reflog for '%s'.";
@@ -3630,20 +3656,22 @@ int transaction_commit(struct ref_transaction
*transaction,
update->new_sha1,
update->committer,
update->msg)) {
- rollback_lock_file(&update->reflog_lock);
+ rollback_lock_file(update->reflog_lock);
update->reflog_fd = -1;
}
}
- /* Unock all reflog files */
+ /* Commit all reflog files */
for (i = 0; i < n; i++) {
struct ref_update *update = updates[i];
if (update->update_type != UPDATE_LOG)
continue;
+ if (update->flags & UPDATE_REFLOG_NOLOCK)
+ continue;
if (update->reflog_fd == -1)
continue;
- if (commit_lock_file(&update->reflog_lock)) {
+ if (commit_lock_file(update->reflog_lock)) {
update->reflog_fd = -1;
}
}
@@ -3654,6 +3682,18 @@ int transaction_commit(struct ref_transaction
*transaction,
clear_loose_ref_cache(&ref_cache);
cleanup:
+ /* Rollback any reflog files that are still open */
+ for (i = 0; i < n; i++) {
+ struct ref_update *update = updates[i];
+
+ if (update->update_type != UPDATE_LOG)
+ continue;
+ if (update->flags & UPDATE_REFLOG_NOLOCK)
+ continue;
+ if (update->reflog_fd == -1)
+ continue;
+ rollback_lock_file(update->reflog_lock);
+ }
transaction->status = ret ? REF_TRANSACTION_ERROR
: REF_TRANSACTION_CLOSED;
--
2.0.0.rc3.506.g3739a35
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
