entry: add checkout_entry_ca() taking preloaded conv_attrs

matheustavares · gitster · commit ae22751f9b4b · 2021-03-23T10:34:05.000-07:00
The parallel checkout machinery will call checkout_entry() for entries
that could not be written in parallel due to path collisions. At this
point, we will already be holding the conversion attributes for each
entry, and it would be wasteful to let checkout_entry() load these
again. Instead, let's add the checkout_entry_ca() variant, which
optionally takes a preloaded conv_attrs struct.

Signed-off-by: Matheus Tavares &lt;matheus.bernardino@usp.br&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/entry.c b/entry.c
@@ -440,12 +440,13 @@ static void mark_colliding_entries(const struct checkout *state,
 	}
 }
 
-int checkout_entry(struct cache_entry *ce, const struct checkout *state,
-		   char *topath, int *nr_checkouts)
+int checkout_entry_ca(struct cache_entry *ce, struct conv_attrs *ca,
+		      const struct checkout *state, char *topath,
+		      int *nr_checkouts)
 {
 	static struct strbuf path = STRBUF_INIT;
 	struct stat st;
-	struct conv_attrs ca_buf, *ca = NULL;
+	struct conv_attrs ca_buf;
 
 	if (ce->ce_flags & CE_WT_REMOVE) {
 		if (topath)
@@ -459,7 +460,7 @@ int checkout_entry(struct cache_entry *ce, const struct checkout *state,
 	}
 
 	if (topath) {
-		if (S_ISREG(ce->ce_mode)) {
+		if (S_ISREG(ce->ce_mode) && !ca) {
 			convert_attrs(state->istate, &ca_buf, ce->name);
 			ca = &ca_buf;
 		}
@@ -530,7 +531,7 @@ int checkout_entry(struct cache_entry *ce, const struct checkout *state,
 	if (nr_checkouts)
 		(*nr_checkouts)++;
 
-	if (S_ISREG(ce->ce_mode)) {
+	if (S_ISREG(ce->ce_mode) && !ca) {
 		convert_attrs(state->istate, &ca_buf, ce->name);
 		ca = &ca_buf;
 	}
diff --git a/entry.h b/entry.h
@@ -26,9 +26,21 @@ struct checkout {
  * file named by ce, a temporary file is created by this function and
  * its name is returned in topath[], which must be able to hold at
  * least TEMPORARY_FILENAME_LENGTH bytes long.
+ *
+ * With checkout_entry_ca(), callers can optionally pass a preloaded
+ * conv_attrs struct (to avoid reloading it), when ce refers to a
+ * regular file. If ca is NULL, the attributes will be loaded
+ * internally when (and if) needed.
  */
-int checkout_entry(struct cache_entry *ce, const struct checkout *state,
-		   char *topath, int *nr_checkouts);
+int checkout_entry_ca(struct cache_entry *ce, struct conv_attrs *ca,
+		      const struct checkout *state, char *topath,
+		      int *nr_checkouts);
+static inline int checkout_entry(struct cache_entry *ce,
+				 const struct checkout *state, char *topath,
+				 int *nr_checkouts)
+{
+	return checkout_entry_ca(ce, NULL, state, topath, nr_checkouts);
+}
 
 void enable_delayed_checkout(struct checkout *state);
 int finish_delayed_checkout(struct checkout *state, int *nr_checkouts);

Original file line number	Diff line number	Diff line change
`@@ -440,12 +440,13 @@ static void mark_colliding_entries(const struct checkout *state,`
`440`	`440`	`}`
`441`	`441`	`}`
`442`	`442`
`443`		`-int checkout_entry(struct cache_entry ce, const struct checkout state,`
`444`		`- char topath, int nr_checkouts)`
	`443`	`+int checkout_entry_ca(struct cache_entry ce, struct conv_attrs ca,`
	`444`	`+ const struct checkout state, char topath,`
	`445`	`+ int *nr_checkouts)`
`445`	`446`	`{`
`446`	`447`	`static struct strbuf path = STRBUF_INIT;`
`447`	`448`	`struct stat st;`
`448`		`- struct conv_attrs ca_buf, *ca = NULL;`
	`449`	`+ struct conv_attrs ca_buf;`
`449`	`450`
`450`	`451`	`if (ce->ce_flags & CE_WT_REMOVE) {`
`451`	`452`	`if (topath)`
`@@ -459,7 +460,7 @@ int checkout_entry(struct cache_entry ce, const struct checkout state,`
`459`	`460`	`}`
`460`	`461`
`461`	`462`	`if (topath) {`
`462`		`- if (S_ISREG(ce->ce_mode)) {`
	`463`	`+ if (S_ISREG(ce->ce_mode) && !ca) {`
`463`	`464`	`convert_attrs(state->istate, &ca_buf, ce->name);`
`464`	`465`	`ca = &ca_buf;`
`465`	`466`	`}`
`@@ -530,7 +531,7 @@ int checkout_entry(struct cache_entry ce, const struct checkout state,`
`530`	`531`	`if (nr_checkouts)`
`531`	`532`	`(*nr_checkouts)++;`
`532`	`533`
`533`		`- if (S_ISREG(ce->ce_mode)) {`
	`534`	`+ if (S_ISREG(ce->ce_mode) && !ca) {`
`534`	`535`	`convert_attrs(state->istate, &ca_buf, ce->name);`
`535`	`536`	`ca = &ca_buf;`
`536`	`537`	`}`