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

[PATCH 10/30] refs: wrap top-level ref_dirs in ref_entries

From
mhagger@alum.mit.edu <mhagger@alum.mit.edu>
Date
Apr 24, 2012, 22:45 UTC
Message-ID
<1335307536-26914-11-git-send-email-mhagger@alum.mit.edu>
In-Reply-To
<1335307536-26914-1-git-send-email-mhagger@alum.mit.edu>
From: Michael Haggerty <mhagger@alum.mit.edu>

Wrap the top-level ref_dirs in REF_DIR style ref_entries so that we have the flag and name available when dealing with them. This affects:

* cache_ref::loose
* cache_ref::packed
* extra_refs

The next several commits will expand the use of ref_entry as opposed to ref_dir, culminating in the ability of a ref_entry representing a directory of loose references to load itself only when used.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 refs.c |   37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/refs.c b/refs.c
index 989c10d..4c92dc9 100644
--- a/refs.c
+++ b/refs.c
@@ -606,26 +606,26 @@ static int is_refname_available(const char *refname, const char *oldrefname,
  */
 static struct ref_cache {
 	struct ref_cache *next;
-	char did_loose;
-	char did_packed;
-	struct ref_dir loose;
-	struct ref_dir packed;
+	struct ref_entry *loose;
+	struct ref_entry *packed;
 	/* The submodule name, or "" for the main repo. */
 	char name[FLEX_ARRAY];
 } *ref_cache;
 
 static void clear_packed_ref_cache(struct ref_cache *refs)
 {
-	if (refs->did_packed)
-		clear_ref_dir(&refs->packed);
-	refs->did_packed = 0;
+	if (refs->packed) {
+		free_ref_entry(refs->packed);
+		refs->packed = NULL;
+	}
 }
 
 static void clear_loose_ref_cache(struct ref_cache *refs)
 {
-	if (refs->did_loose)
-		clear_ref_dir(&refs->loose);
-	refs->did_loose = 0;
+	if (refs->loose) {
+		free_ref_entry(refs->loose);
+		refs->loose = NULL;
+	}
 }
 
 static struct ref_cache *create_ref_cache(const char *submodule)
@@ -739,22 +739,22 @@ static void read_packed_refs(FILE *f, struct ref_dir *dir)
 
 static struct ref_dir *get_packed_refs(struct ref_cache *refs)
 {
-	if (!refs->did_packed) {
+	if (!refs->packed) {
 		const char *packed_refs_file;
 		FILE *f;
 
+		refs->packed = create_dir_entry("");
 		if (*refs->name)
 			packed_refs_file = git_path_submodule(refs->name, "packed-refs");
 		else
 			packed_refs_file = git_path("packed-refs");
 		f = fopen(packed_refs_file, "r");
 		if (f) {
-			read_packed_refs(f, &refs->packed);
+			read_packed_refs(f, &refs->packed->u.subdir);
 			fclose(f);
 		}
-		refs->did_packed = 1;
 	}
-	return &refs->packed;
+	return &refs->packed->u.subdir;
 }
 
 void add_packed_ref(const char *refname, const unsigned char *sha1)
@@ -832,12 +832,13 @@ static void get_ref_dir(struct ref_cache *refs, const char *dirname,
 
 static struct ref_dir *get_loose_refs(struct ref_cache *refs)
 {
-	if (!refs->did_loose) {
+	if (!refs->loose) {
+		refs->loose = create_dir_entry("");
 		get_ref_dir(refs, "refs/",
-			    &search_for_subdir(&refs->loose, "refs/", 1)->u.subdir);
-		refs->did_loose = 1;
+			    &search_for_subdir(&refs->loose->u.subdir,
+					       "refs/", 1)->u.subdir);
 	}
-	return &refs->loose;
+	return &refs->loose->u.subdir;
 }
 
 /* We allow "recursive" symbolic refs. Only within reason, though */

-- 
1.7.10
Previous: mhagger@alum.mit.eduNext: Michael Haggerty
Message 11 of 37 in “Read loose references lazily”
  1. 00/30 Read loose references lazilymhagger@alum.mit.edu, Apr 24, 2012
  2. 01/30 get_ref_dir(): return early if directory cannot be readmhagger@alum.mit.edu, Apr 24, 2012
  3. 02/30 get_ref_dir(): use a strbuf to hold refnamemhagger@alum.mit.edu, Apr 24, 2012
  4. 03/30 get_ref_dir(): rename "base" parameter to "dirname"mhagger@alum.mit.edu, Apr 24, 2012
  5. 04/30 get_ref_dir(): require that the dirname argument ends in '/'mhagger@alum.mit.edu, Apr 24, 2012
  6. 05/30 refs.c: extract function search_for_subdir()mhagger@alum.mit.edu, Apr 24, 2012
  7. 06/30 get_ref_dir(): take the containing directory as argumentmhagger@alum.mit.edu, Apr 24, 2012
  8. 07/30 do_for_each_reflog(): return early on errormhagger@alum.mit.edu, Apr 24, 2012
  9. 08/30 do_for_each_reflog(): use a strbuf to hold logfile namemhagger@alum.mit.edu, Apr 24, 2012
  10. 09/30 do_for_each_reflog(): reuse strbuf across recursive function callsmhagger@alum.mit.edu, Apr 24, 2012
  11. 10/30 refs: wrap top-level ref_dirs in ref_entriesmhagger@alum.mit.edu, Apr 24, 2012
  12. Michael HaggertyApr 26, 2012
  13. 11/30 get_packed_refs(): return (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  14. 12/30 get_loose_refs(): return (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  15. 13/30 is_refname_available(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  16. 14/30 find_ref(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  17. 15/30 read_packed_refs(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  18. 16/30 add_ref(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  19. 17/30 find_containing_direntry(): use (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  20. 18/30 get_ref_dir(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  21. 19/30 get_ref_dir(): remove dirname argumentmhagger@alum.mit.edu, Apr 24, 2012
  22. 20/30 search_for_subdir(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  23. 21/30 search_ref_dir(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  24. 22/30 add_entry(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  25. 23/30 do_for_each_ref_in_dirs(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  26. 24/30 do_for_each_ref_in_dir(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  27. 25/30 sort_ref_dir(): take (ref_entry *) instead of (ref_dir *)mhagger@alum.mit.edu, Apr 24, 2012
  28. 26/30 struct ref_dir: store a reference to the enclosing ref_cachemhagger@alum.mit.edu, Apr 24, 2012
  29. 27/30 read_loose_refs(): rename function from get_ref_dir()mhagger@alum.mit.edu, Apr 24, 2012
  30. 28/30 read_loose_refs(): access ref_cache via the ref_dir fieldmhagger@alum.mit.edu, Apr 24, 2012
  31. 29/30 create_dir_entry(): allow the flag value to be passed as an argumentmhagger@alum.mit.edu, Apr 24, 2012
  32. Junio C HamanoApr 25, 2012
  33. Junio C HamanoApr 25, 2012
  34. Michael HaggertyApr 26, 2012
  35. 30/30 refs: read loose references lazilymhagger@alum.mit.edu, Apr 24, 2012
  36. Junio C HamanoApr 25, 2012
  37. Michael HaggertyApr 26, 2012

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.