git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: mhagger@alum.mit.edu, Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH 04/20] refs.c: add transaction.status and track OPEN/CLOSED/ERROR
Date: Tue, 15 Jul 2014 16:34:02 -0700	[thread overview]
Message-ID: <1405467258-24102-5-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1405467258-24102-1-git-send-email-sahlberg@google.com>

Track the state of a transaction in a new state field. Check the field for
sanity, i.e. that state must be OPEN when _commit/_create/_delete or
_update is called or else die(BUG:...)

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 refs.c | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/refs.c b/refs.c
index 9cb7908..d015285 100644
--- a/refs.c
+++ b/refs.c
@@ -3387,6 +3387,25 @@ struct ref_update {
 };
 
 /*
+ * Transaction states.
+ * OPEN:   The transaction is in a valid state and can accept new updates.
+ *         An OPEN transaction can be committed.
+ * CLOSED: If an open transaction is successfully committed the state will
+ *         change to CLOSED. No further changes can be made to a CLOSED
+ *         transaction.
+ *         CLOSED means that all updates have been successfully committed and
+ *         the only thing that remains is to free the completed transaction.
+ * ERROR:  The transaction has failed and is no longer committable.
+ *         No further changes can be made to a CLOSED transaction and it must
+ *         be rolled back using transaction_free.
+ */
+enum ref_transaction_state {
+	REF_TRANSACTION_OPEN   = 0,
+	REF_TRANSACTION_CLOSED = 1,
+	REF_TRANSACTION_ERROR  = 2,
+};
+
+/*
  * Data structure for holding a reference transaction, which can
  * consist of checks and updates to multiple references, carried out
  * as atomically as possible.  This structure is opaque to callers.
@@ -3395,6 +3414,7 @@ struct ref_transaction {
 	struct ref_update **updates;
 	size_t alloc;
 	size_t nr;
+	enum ref_transaction_state state;
 };
 
 struct ref_transaction *ref_transaction_begin(struct strbuf *err)
@@ -3437,6 +3457,9 @@ int ref_transaction_update(struct ref_transaction *transaction,
 {
 	struct ref_update *update;
 
+	if (transaction->state != REF_TRANSACTION_OPEN)
+		die("BUG: update called for transaction that is not open");
+
 	if (have_old && !old_sha1)
 		die("BUG: have_old is true but old_sha1 is NULL");
 
@@ -3457,6 +3480,9 @@ int ref_transaction_create(struct ref_transaction *transaction,
 {
 	struct ref_update *update;
 
+	if (transaction->state != REF_TRANSACTION_OPEN)
+		die("BUG: create called for transaction that is not open");
+
 	if (!new_sha1 || is_null_sha1(new_sha1))
 		die("BUG: create ref with null new_sha1");
 
@@ -3477,6 +3503,9 @@ int ref_transaction_delete(struct ref_transaction *transaction,
 {
 	struct ref_update *update;
 
+	if (transaction->state != REF_TRANSACTION_OPEN)
+		die("BUG: delete called for transaction that is not open");
+
 	if (have_old && !old_sha1)
 		die("BUG: have_old is true but old_sha1 is NULL");
 
@@ -3532,8 +3561,13 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 	int n = transaction->nr;
 	struct ref_update **updates = transaction->updates;
 
-	if (!n)
+	if (transaction->state != REF_TRANSACTION_OPEN)
+		die("BUG: commit called for transaction that is not open");
+
+	if (!n) {
+		transaction->state = REF_TRANSACTION_CLOSED;
 		return 0;
+	}
 
 	/* Allocate work space */
 	delnames = xmalloc(sizeof(*delnames) * n);
@@ -3595,6 +3629,9 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 	clear_loose_ref_cache(&ref_cache);
 
 cleanup:
+	transaction->state = ret ? REF_TRANSACTION_ERROR
+		: REF_TRANSACTION_CLOSED;
+
 	for (i = 0; i < n; i++)
 		if (updates[i]->lock)
 			unlock_ref(updates[i]->lock);
-- 
2.0.1.442.g7fe6834.dirty

  parent reply	other threads:[~2014-07-15 23:35 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-15 23:33 [PATCH 00/20] ref transactions part 2 Ronnie Sahlberg
2014-07-15 23:33 ` [PATCH 01/20] refs.c: change ref_transaction_create to do error checking and return status Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 02/20] refs.c: update ref_transaction_delete to check for error " Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 03/20] refs.c: make ref_transaction_begin take an err argument Ronnie Sahlberg
2014-07-15 23:34 ` Ronnie Sahlberg [this message]
2014-07-15 23:34 ` [PATCH 05/20] tag.c: use ref transactions when doing updates Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 06/20] replace.c: use the ref transaction functions for updates Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 07/20] commit.c: use ref transactions " Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 08/20] sequencer.c: use ref transactions for all ref updates Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 09/20] fast-import.c: change update_branch to use ref transactions Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 10/20] branch.c: use ref transaction for all ref updates Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 11/20] refs.c: change update_ref to use a transaction Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 12/20] receive-pack.c: use a reference transaction for updating the refs Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 13/20] fast-import.c: use a ref transaction when dumping tags Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 14/20] walker.c: use ref transaction for ref updates Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 15/20] refs.c: make lock_ref_sha1 static Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 16/20] refs.c: remove the update_ref_lock function Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 17/20] refs.c: remove the update_ref_write function Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 18/20] refs.c: remove lock_ref_sha1 Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 19/20] refs.c: make prune_ref use a transaction to delete the ref Ronnie Sahlberg
2014-07-15 23:34 ` [PATCH 20/20] refs.c: make delete_ref use a transaction Ronnie Sahlberg
2014-07-15 23:37 ` [PATCH 00/20] ref transactions part 2 Ronnie Sahlberg
2014-07-16 22:16   ` Junio C Hamano
2014-07-16 22:52     ` Ronnie Sahlberg

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=1405467258-24102-5-git-send-email-sahlberg@google.com \
    --to=sahlberg@google.com \
    --cc=git@vger.kernel.org \
    --cc=mhagger@alum.mit.edu \
    /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).