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

[PATCH 13/28] attr: convert git_check_attrs() callers to use the new API

From
Stefan Beller <sbeller@google.com>
Date
Oct 11, 2016, 00:21 UTC
Message-ID
<20161011002115.23312-14-sbeller@google.com>
In-Reply-To
<20161011002115.23312-1-sbeller@google.com>
From: Junio C Hamano <gitster@pobox.com>

The remaining callers are all simple "I have N attributes I am interested in. I'll ask about them with various paths one by one".

After this step, no caller to git_check_attrs() remains. After removing it, we can extend "struct git_attr_check" struct with data that can be used in optimizing the query for the specific N attributes it contains.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
 builtin/pack-objects.c | 19 +++++--------------
 convert.c              | 18 +++++++-----------
 ll-merge.c             | 33 ++++++++++++++-------------------
 userdiff.c             | 19 ++++++++-----------
 ws.c                   | 19 ++++++-------------
 5 files changed, 40 insertions(+), 68 deletions(-)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 9df2b08..df4e6b6 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -895,24 +895,15 @@ static void write_pack_file(void)
 			written, nr_result);
 }
 
-static void setup_delta_attr_check(struct git_attr_check_elem *check)
-{
-	static struct git_attr *attr_delta;
-
-	if (!attr_delta)
-		attr_delta = git_attr("delta");
-
-	check[0].attr = attr_delta;
-}
-
 static int no_try_delta(const char *path)
 {
-	struct git_attr_check_elem check[1];
+	static struct git_attr_check *check;
 
-	setup_delta_attr_check(check);
-	if (git_check_attrs(path, ARRAY_SIZE(check), check))
+	if (!check)
+		check = git_attr_check_initl("delta", NULL);
+	if (git_check_attr(path, check))
 		return 0;
-	if (ATTR_FALSE(check->value))
+	if (ATTR_FALSE(check->check[0].value))
 		return 1;
 	return 0;
 }
diff --git a/convert.c b/convert.c
index c95ae71..bb2435a 100644
--- a/convert.c
+++ b/convert.c
@@ -775,24 +775,20 @@ struct conv_attrs {
 	int ident;
 };
 
-static const char *conv_attr_name[] = {
-	"crlf", "ident", "filter", "eol", "text",
-};
-#define NUM_CONV_ATTRS ARRAY_SIZE(conv_attr_name)
-
 static void convert_attrs(struct conv_attrs *ca, const char *path)
 {
-	int i;
-	static struct git_attr_check_elem ccheck[NUM_CONV_ATTRS];
+	static struct git_attr_check *check;
 
-	if (!ccheck[0].attr) {
-		for (i = 0; i < NUM_CONV_ATTRS; i++)
-			ccheck[i].attr = git_attr(conv_attr_name[i]);
+	if (!check) {
+		check = git_attr_check_initl("crlf", "ident",
+					     "filter", "eol", "text",
+					     NULL);
 		user_convert_tail = &user_convert;
 		git_config(read_convert_config, NULL);
 	}
 
-	if (!git_check_attrs(path, NUM_CONV_ATTRS, ccheck)) {
+	if (!git_check_attr(path, check)) {
+		struct git_attr_check_elem *ccheck = check->check;
 		ca->crlf_action = git_path_check_crlf(ccheck + 4);
 		if (ca->crlf_action == CRLF_UNDEFINED)
 			ca->crlf_action = git_path_check_crlf(ccheck + 0);
diff --git a/ll-merge.c b/ll-merge.c
index eb2c37e..bc6479c 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -336,15 +336,6 @@ static const struct ll_merge_driver *find_ll_merge_driver(const char *merge_attr
 	return &ll_merge_drv[LL_TEXT_MERGE];
 }
 
-static int git_path_check_merge(const char *path, struct git_attr_check_elem check[2])
-{
-	if (!check[0].attr) {
-		check[0].attr = git_attr("merge");
-		check[1].attr = git_attr("conflict-marker-size");
-	}
-	return git_check_attrs(path, 2, check);
-}
-
 static void normalize_file(mmfile_t *mm, const char *path)
 {
 	struct strbuf strbuf = STRBUF_INIT;
@@ -362,7 +353,7 @@ int ll_merge(mmbuffer_t *result_buf,
 	     mmfile_t *theirs, const char *their_label,
 	     const struct ll_merge_options *opts)
 {
-	static struct git_attr_check_elem check[2];
+	static struct git_attr_check *check;
 	static const struct ll_merge_options default_opts;
 	const char *ll_driver_name = NULL;
 	int marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
@@ -376,10 +367,14 @@ int ll_merge(mmbuffer_t *result_buf,
 		normalize_file(ours, path);
 		normalize_file(theirs, path);
 	}
-	if (!git_path_check_merge(path, check)) {
-		ll_driver_name = check[0].value;
-		if (check[1].value) {
-			marker_size = atoi(check[1].value);
+
+	if (!check)
+		check = git_attr_check_initl("merge", "conflict-marker-size", NULL);
+
+	if (!git_check_attr(path, check)) {
+		ll_driver_name = check->check[0].value;
+		if (check->check[1].value) {
+			marker_size = atoi(check->check[1].value);
 			if (marker_size <= 0)
 				marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
 		}
@@ -398,13 +393,13 @@ int ll_merge(mmbuffer_t *result_buf,
 
 int ll_merge_marker_size(const char *path)
 {
-	static struct git_attr_check_elem check;
+	static struct git_attr_check *check;
 	int marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
 
-	if (!check.attr)
-		check.attr = git_attr("conflict-marker-size");
-	if (!git_check_attrs(path, 1, &check) && check.value) {
-		marker_size = atoi(check.value);
+	if (!check)
+		check = git_attr_check_initl("conflict-marker-size", NULL);
+	if (!git_check_attr(path, check) && check->check[0].value) {
+		marker_size = atoi(check->check[0].value);
 		if (marker_size <= 0)
 			marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
 	}
diff --git a/userdiff.c b/userdiff.c
index 4de3289..46dfd32 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -262,25 +262,22 @@ struct userdiff_driver *userdiff_find_by_name(const char *name) {
 
 struct userdiff_driver *userdiff_find_by_path(const char *path)
 {
-	static struct git_attr *attr;
-	struct git_attr_check_elem check;
-
-	if (!attr)
-		attr = git_attr("diff");
-	check.attr = attr;
+	static struct git_attr_check *check;
 
+	if (!check)
+		check = git_attr_check_initl("diff", NULL);
 	if (!path)
 		return NULL;
-	if (git_check_attrs(path, 1, &check))
+	if (git_check_attr(path, check))
 		return NULL;
 
-	if (ATTR_TRUE(check.value))
+	if (ATTR_TRUE(check->check[0].value))
 		return &driver_true;
-	if (ATTR_FALSE(check.value))
+	if (ATTR_FALSE(check->check[0].value))
 		return &driver_false;
-	if (ATTR_UNSET(check.value))
+	if (ATTR_UNSET(check->check[0].value))
 		return NULL;
-	return userdiff_find_by_name(check.value);
+	return userdiff_find_by_name(check->check[0].value);
 }
 
 struct userdiff_driver *userdiff_get_textconv(struct userdiff_driver *driver)
diff --git a/ws.c b/ws.c
index 7350905..bb3270c 100644
--- a/ws.c
+++ b/ws.c
@@ -71,24 +71,17 @@ unsigned parse_whitespace_rule(const char *string)
 	return rule;
 }
 
-static void setup_whitespace_attr_check(struct git_attr_check_elem *check)
-{
-	static struct git_attr *attr_whitespace;
-
-	if (!attr_whitespace)
-		attr_whitespace = git_attr("whitespace");
-	check[0].attr = attr_whitespace;
-}
-
 unsigned whitespace_rule(const char *pathname)
 {
-	struct git_attr_check_elem attr_whitespace_rule;
+	static struct git_attr_check *attr_whitespace_rule;
+
+	if (!attr_whitespace_rule)
+		attr_whitespace_rule = git_attr_check_initl("whitespace", NULL);
 
-	setup_whitespace_attr_check(&attr_whitespace_rule);
-	if (!git_check_attrs(pathname, 1, &attr_whitespace_rule)) {
+	if (!git_check_attr(pathname, attr_whitespace_rule)) {
 		const char *value;
 
-		value = attr_whitespace_rule.value;
+		value = attr_whitespace_rule->check[0].value;
 		if (ATTR_TRUE(value)) {
 			/* true (whitespace) */
 			unsigned all_rule = ws_tab_width(whitespace_rule_cfg);

-- 
2.10.1.382.ga23ca1b.dirty
Previous: Stefan BellerNext: Stefan Beller
Message 13 of 44 in “Revamping the attr subsystem!”
  1. 00/28 Revamping the attr subsystem!Stefan Beller, Oct 11, 2016
  2. 01/28 commit.c: use strchrnul() to scan for one lineStefan Beller, Oct 11, 2016
  3. 02/28 attr.c: use strchrnul() to scan for one lineStefan Beller, Oct 11, 2016
  4. 03/28 attr.c: update a stale comment on "struct match_attr"Stefan Beller, Oct 11, 2016
  5. 07/28 attr.c: simplify macroexpand_one()Stefan Beller, Oct 11, 2016
  6. 05/28 attr.c: complete a sentence in a commentStefan Beller, Oct 11, 2016
  7. 04/28 attr.c: explain the lack of attr-name syntax check in parse_attr()Stefan Beller, Oct 11, 2016
  8. 06/28 attr.c: mark where #if DEBUG ends more clearlyStefan Beller, Oct 11, 2016
  9. 09/28 attr.c: plug small leak in parse_attr_line()Stefan Beller, Oct 11, 2016
  10. 08/28 attr.c: tighten constness around "git_attr" structureStefan Beller, Oct 11, 2016
  11. 10/28 attr: rename function and struct related to checking attributesStefan Beller, Oct 11, 2016
  12. 14/28 attr: retire git_check_attrs() APIStefan Beller, Oct 11, 2016
  13. 13/28 attr: convert git_check_attrs() callers to use the new APIStefan Beller, Oct 11, 2016
  14. 16/28 attr: add counted string version of git_attr()Stefan Beller, Oct 11, 2016
  15. 17/28 attr: expose validity check for attribute namesStefan Beller, Oct 11, 2016
  16. Brandon WilliamsOct 11, 2016
  17. Stefan BellerOct 11, 2016
  18. Brandon WilliamsOct 11, 2016
  19. Stefan BellerOct 11, 2016
  20. Brandon WilliamsOct 11, 2016
  21. 15/28 attr: add counted string version of git_check_attr()Stefan Beller, Oct 11, 2016
  22. 19/28 attr.c: add push_stack() helperStefan Beller, Oct 11, 2016
  23. 18/28 attr: support quoting pathname patterns in C styleStefan Beller, Oct 11, 2016
  24. 21/28 attr.c: rename a local variable checkStefan Beller, Oct 11, 2016
  25. 25/28 attr.c: outline the future plans by heavily commentingStefan Beller, Oct 11, 2016
  26. 20/28 attr.c: pass struct git_attr_check down the callchainStefan Beller, Oct 11, 2016
  27. 26/28 attr: make git_attr_counted staticStefan Beller, Oct 11, 2016
  28. Brandon WilliamsOct 11, 2016
  29. Stefan BellerOct 11, 2016
  30. 27/28 attr: make git_check_attr_counted staticStefan Beller, Oct 11, 2016
  31. 23/28 attr.c: introduce empty_attr_check_elems()Stefan Beller, Oct 11, 2016
  32. 28/28 attr: convert to new threadsafe APIStefan Beller, Oct 11, 2016
  33. Brandon WilliamsOct 11, 2016
  34. Junio C HamanoOct 11, 2016
  35. Stefan BellerOct 11, 2016
  36. Junio C HamanoOct 11, 2016
  37. Stefan BellerOct 11, 2016
  38. Junio C HamanoOct 11, 2016
  39. 24/28 attr.c: always pass check[] to collect_some_attrs()Stefan Beller, Oct 11, 2016
  40. 22/28 attr.c: correct ugly hack for git_all_attrs()Stefan Beller, Oct 11, 2016
  41. 11/28 attr: (re)introduce git_check_attr() and struct git_attr_checkStefan Beller, Oct 11, 2016
  42. Brandon WilliamsOct 11, 2016
  43. Junio C HamanoOct 11, 2016
  44. 12/28 attr: convert git_all_attrs() to use "struct git_attr_check"Stefan Beller, Oct 11, 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.