git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 37/38] refs: make lock generic

From
Michael Haggerty <mhagger@alum.mit.edu>
Date
Sep 4, 2016, 16:08 UTC
Message-ID
<21555b1c09974a58972940745c5778a119b0a0fa.1473003903.git.mhagger@alum.mit.edu>
In-Reply-To
<cover.1473003902.git.mhagger@alum.mit.edu>
From: David Turner <dturner@twopensource.com>

Instead of including a files-backend-specific struct ref_lock, change the generic ref_update struct to include a void pointer that backends can use for their own arbitrary data.

Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 refs/files-backend.c | 25 +++++++++++++------------
 refs/refs-internal.h |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 7cc4191..0714c3f 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3552,9 +3552,8 @@ static int lock_ref_for_update(struct files_ref_store *refs,
 
 	ret = lock_raw_ref(refs, update->refname, mustexist,
 			   affected_refnames, NULL,
-			   &update->lock, &referent,
+			   &lock, &referent,
 			   &update->type, err);
-
 	if (ret) {
 		char *reason;
 
@@ -3565,7 +3564,7 @@ static int lock_ref_for_update(struct files_ref_store *refs,
 		return ret;
 	}
 
-	lock = update->lock;
+	update->backend_data = lock;
 
 	if (update->type & REF_ISSYMREF) {
 		if (update->flags & REF_NODEREF) {
@@ -3613,7 +3612,8 @@ static int lock_ref_for_update(struct files_ref_store *refs,
 		for (parent_update = update->parent_update;
 		     parent_update;
 		     parent_update = parent_update->parent_update) {
-			oidcpy(&parent_update->lock->old_oid, &lock->old_oid);
+			struct ref_lock *parent_lock = parent_update->backend_data;
+			oidcpy(&parent_lock->old_oid, &lock->old_oid);
 		}
 	}
 
@@ -3634,7 +3634,7 @@ static int lock_ref_for_update(struct files_ref_store *refs,
 			 * The lock was freed upon failure of
 			 * write_ref_to_lockfile():
 			 */
-			update->lock = NULL;
+			update->backend_data = NULL;
 			strbuf_addf(err,
 				    "cannot update ref '%s': %s",
 				    update->refname, write_err);
@@ -3752,7 +3752,7 @@ static int files_transaction_commit(struct ref_store *ref_store,
 	/* Perform updates first so live commits remain referenced */
 	for (i = 0; i < transaction->nr; i++) {
 		struct ref_update *update = transaction->updates[i];
-		struct ref_lock *lock = update->lock;
+		struct ref_lock *lock = update->backend_data;
 
 		if (update->flags & REF_NEEDS_COMMIT ||
 		    update->flags & REF_LOG_ONLY) {
@@ -3765,7 +3765,7 @@ static int files_transaction_commit(struct ref_store *ref_store,
 					    lock->ref_name, old_msg);
 				free(old_msg);
 				unlock_ref(lock);
-				update->lock = NULL;
+				update->backend_data = NULL;
 				ret = TRANSACTION_GENERIC_ERROR;
 				goto cleanup;
 			}
@@ -3775,7 +3775,7 @@ static int files_transaction_commit(struct ref_store *ref_store,
 			if (commit_ref(lock)) {
 				strbuf_addf(err, "couldn't set '%s'", lock->ref_name);
 				unlock_ref(lock);
-				update->lock = NULL;
+				update->backend_data = NULL;
 				ret = TRANSACTION_GENERIC_ERROR;
 				goto cleanup;
 			}
@@ -3784,17 +3784,18 @@ static int files_transaction_commit(struct ref_store *ref_store,
 	/* Perform deletes now that updates are safely completed */
 	for (i = 0; i < transaction->nr; i++) {
 		struct ref_update *update = transaction->updates[i];
+		struct ref_lock *lock = update->backend_data;
 
 		if (update->flags & REF_DELETING &&
 		    !(update->flags & REF_LOG_ONLY)) {
-			if (delete_ref_loose(update->lock, update->type, err)) {
+			if (delete_ref_loose(lock, update->type, err)) {
 				ret = TRANSACTION_GENERIC_ERROR;
 				goto cleanup;
 			}
 
 			if (!(update->flags & REF_ISPRUNING))
 				string_list_append(&refs_to_delete,
-						   update->lock->ref_name);
+						   lock->ref_name);
 		}
 	}
 
@@ -3810,8 +3811,8 @@ static int files_transaction_commit(struct ref_store *ref_store,
 	transaction->state = REF_TRANSACTION_CLOSED;
 
 	for (i = 0; i < transaction->nr; i++)
-		if (transaction->updates[i]->lock)
-			unlock_ref(transaction->updates[i]->lock);
+		if (transaction->updates[i]->backend_data)
+			unlock_ref(transaction->updates[i]->backend_data);
 	string_list_clear(&refs_to_delete, 0);
 	free(head_ref);
 	string_list_clear(&affected_refnames, 0);
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index c598cb1..681982b 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -162,7 +162,7 @@ struct ref_update {
 	 */
 	unsigned int flags;
 
-	struct ref_lock *lock;
+	void *backend_data;
 	unsigned int type;
 	char *msg;
 

-- 
2.9.3
Previous: Michael HaggertyNext: Michael Haggerty
Message 23 of 49 in “Virtualization of the refs API”
  1. 00/38 Virtualization of the refs APIMichael Haggerty, Sep 4, 2016
  2. 06/38 add_packed_ref(): add a files_ref_store argumentMichael Haggerty, Sep 4, 2016
  3. 02/38 rename_ref_available(): add docstringMichael Haggerty, Sep 4, 2016
  4. Jakub NarębskiSep 6, 2016
  5. Michael HaggertySep 7, 2016
  6. 01/38 resolve_gitlink_ref(): eliminate temporary variableMichael Haggerty, Sep 4, 2016
  7. 04/38 refs: add a backend method structureMichael Haggerty, Sep 4, 2016
  8. David TurnerSep 4, 2016
  9. 07/38 get_packed_ref(): add a files_ref_store argumentMichael Haggerty, Sep 4, 2016
  10. 14/38 read_raw_ref(): take a (struct ref_store *) argumentMichael Haggerty, Sep 4, 2016
  11. 10/38 refs: add a transaction_commit() methodMichael Haggerty, Sep 4, 2016
  12. 03/38 refs: rename struct ref_cache to files_ref_storeMichael Haggerty, Sep 4, 2016
  13. 16/38 resolve_gitlink_ref(): implement using resolve_ref_recursively()Michael Haggerty, Sep 4, 2016
  14. 18/38 resolve_gitlink_ref(): rename path parameter to submoduleMichael Haggerty, Sep 4, 2016
  15. 08/38 resolve_missing_loose_ref(): add a files_ref_store argumentMichael Haggerty, Sep 4, 2016
  16. 31/38 refs: add method iterator_beginMichael Haggerty, Sep 4, 2016
  17. 35/38 refs: add methods to init refs dbMichael Haggerty, Sep 4, 2016
  18. 38/38 refs: implement iteration over only per-worktree refsMichael Haggerty, Sep 4, 2016
  19. David TurnerSep 8, 2016
  20. 32/38 refs: add methods for reflogMichael Haggerty, Sep 4, 2016
  21. 33/38 refs: add method for initial ref transaction commitMichael Haggerty, Sep 4, 2016
  22. 29/38 split_symref_update(): add a files_ref_store argumentMichael Haggerty, Sep 4, 2016
  23. 37/38 refs: make lock genericMichael Haggerty, Sep 4, 2016
  24. 30/38 files_ref_iterator_begin(): take a ref_store argumentMichael Haggerty, Sep 4, 2016
  25. 22/38 refs: make create_symref() virtualMichael Haggerty, Sep 4, 2016
  26. 15/38 resolve_ref_recursively(): new functionMichael Haggerty, Sep 4, 2016
  27. 27/38 lock_ref_for_update(): add a files_ref_store argumentMichael Haggerty, Sep 4, 2016
  28. 36/38 refs: add method to rename refsMichael Haggerty, Sep 4, 2016
  29. 26/38 commit_ref_update(): add a files_ref_store argumentMichael Haggerty, Sep 4, 2016
  30. 28/38 lock_ref_sha1_basic(): add a files_ref_store argumentMichael Haggerty, Sep 4, 2016
  31. 34/38 refs: make delete_refs() virtualMichael Haggerty, Sep 4, 2016
  32. 12/38 resolve_packed_ref(): rename function from resolve_missing_loose_ref()Michael Haggerty, Sep 4, 2016
  33. 13/38 resolve_gitlink_packed_ref(): remove functionMichael Haggerty, Sep 4, 2016
  34. 19/38 refs: make read_raw_ref() virtualMichael Haggerty, Sep 4, 2016
  35. 25/38 lock_raw_ref(): add a files_ref_store argumentMichael Haggerty, Sep 4, 2016
  36. 11/38 refs: reorder definitionsMichael Haggerty, Sep 4, 2016
  37. 17/38 resolve_gitlink_ref(): avoid memory allocation in many casesMichael Haggerty, Sep 4, 2016
  38. 24/38 repack_without_refs(): add a files_ref_store argumentMichael Haggerty, Sep 4, 2016
  39. 20/38 refs: make verify_refname_available() virtualMichael Haggerty, Sep 4, 2016
  40. 05/38 refs: create a base class "ref_store" for files_ref_storeMichael Haggerty, Sep 4, 2016
  41. David TurnerSep 4, 2016
  42. Michael HaggertySep 5, 2016
  43. Stefan BellerSep 5, 2016
  44. David TurnerSep 5, 2016
  45. 09/38 {lock,commit,rollback}_packed_refs(): add files_ref_store argumentsMichael Haggerty, Sep 4, 2016
  46. 21/38 refs: make pack_refs() virtualMichael Haggerty, Sep 4, 2016
  47. 23/38 refs: make peel_ref() virtualMichael Haggerty, Sep 4, 2016
  48. Junio C HamanoSep 7, 2016
  49. Michael HaggertySep 8, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.