Re: [PATCH v2 13/14] merge: use commit-slab in merge remote desc instead of commit->util

[Ramsay Jones]

On 18/05/18 03:16, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy   writes:
> 
>> diff --git a/commit.c b/commit.c
>> index 57049118a5..8202067cd5 100644
>> --- a/commit.c
>> +++ b/commit.c
>> @@ -1574,13 +1574,21 @@ int commit_tree_extended(const char *msg, size_t 
>> msg_len,
>>  return result;
>>  }
>>  
>> +define_commit_slab(merge_desc_slab, struct merge_remote_desc *);
>> +struct merge_desc_slab merge_desc_slab = COMMIT_SLAB_INIT(1, 
>> merge_desc_slab);
> 
> s/^/static /; otherwise sparse would complain?

Indeed, it already did (see [1]). ;-)

Your fixup, commit dc2172daed, on the 'nd/commit-util-to-slab'
branch has indeed fixed it up.

Thanks!

[1] 
https://public-inbox.org/git/e2c4276f-bcfd-faaa-f9ee-cb50e99da...@ramsayjones.plus.com/

ATB,
Ramsay Jones

Re: [PATCH v2 13/14] merge: use commit-slab in merge remote desc instead of commit->util

[Junio C Hamano]

Nguyễn Thái Ngọc Duy   writes:

> diff --git a/commit.c b/commit.c
> index 57049118a5..8202067cd5 100644
> --- a/commit.c
> +++ b/commit.c
> @@ -1574,13 +1574,21 @@ int commit_tree_extended(const char *msg, size_t 
> msg_len,
>   return result;
>  }
>  
> +define_commit_slab(merge_desc_slab, struct merge_remote_desc *);
> +struct merge_desc_slab merge_desc_slab = COMMIT_SLAB_INIT(1, 
> merge_desc_slab);

s/^/static /; otherwise sparse would complain?

[PATCH v2 13/14] merge: use commit-slab in merge remote desc instead of commit->util

[Nguyễn Thái Ngọc Duy]

It's done so that commit->util can be removed. See more explanation in
the commit that removes commit->util.

Signed-off-by: Nguyễn Thái Ngọc Duy 
---
 builtin/merge.c   | 25 +
 commit.c  | 12 ++--
 commit.h  |  2 +-
 merge-recursive.c |  8 +---
 4 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/builtin/merge.c b/builtin/merge.c
index 9db5a2cf16..fc55bc264b 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -443,6 +443,7 @@ static void merge_name(const char *remote, struct strbuf 
*msg)
struct object_id branch_head;
struct strbuf buf = STRBUF_INIT;
struct strbuf bname = STRBUF_INIT;
+   struct merge_remote_desc *desc;
const char *ptr;
char *found_ref;
int len, early;
@@ -515,16 +516,13 @@ static void merge_name(const char *remote, struct strbuf 
*msg)
strbuf_release();
}
 
-   if (remote_head->util) {
-   struct merge_remote_desc *desc;
-   desc = merge_remote_util(remote_head);
-   if (desc && desc->obj && desc->obj->type == OBJ_TAG) {
-   strbuf_addf(msg, "%s\t\t%s '%s'\n",
-   oid_to_hex(>obj->oid),
-   type_name(desc->obj->type),
-   remote);
-   goto cleanup;
-   }
+   desc = merge_remote_util(remote_head);
+   if (desc && desc->obj && desc->obj->type == OBJ_TAG) {
+   strbuf_addf(msg, "%s\t\t%s '%s'\n",
+   oid_to_hex(>obj->oid),
+   type_name(desc->obj->type),
+   remote);
+   goto cleanup;
}
 
strbuf_addf(msg, "%s\t\tcommit '%s'\n",
@@ -932,8 +930,11 @@ static void write_merge_heads(struct commit_list 
*remoteheads)
for (j = remoteheads; j; j = j->next) {
struct object_id *oid;
struct commit *c = j->item;
-   if (c->util && merge_remote_util(c)->obj) {
-   oid = _remote_util(c)->obj->oid;
+   struct merge_remote_desc *desc;
+
+   desc = merge_remote_util(c);
+   if (desc && desc->obj) {
+   oid = >obj->oid;
} else {
oid = >object.oid;
}
diff --git a/commit.c b/commit.c
index 57049118a5..8202067cd5 100644
--- a/commit.c
+++ b/commit.c
@@ -1574,13 +1574,21 @@ int commit_tree_extended(const char *msg, size_t 
msg_len,
return result;
 }
 
+define_commit_slab(merge_desc_slab, struct merge_remote_desc *);
+struct merge_desc_slab merge_desc_slab = COMMIT_SLAB_INIT(1, merge_desc_slab);
+
+struct merge_remote_desc *merge_remote_util(struct commit *commit)
+{
+   return *merge_desc_slab_at(_desc_slab, commit);
+}
+
 void set_merge_remote_desc(struct commit *commit,
   const char *name, struct object *obj)
 {
struct merge_remote_desc *desc;
FLEX_ALLOC_STR(desc, name, name);
desc->obj = obj;
-   commit->util = desc;
+   *merge_desc_slab_at(_desc_slab, commit) = desc;
 }
 
 struct commit *get_merge_parent(const char *name)
@@ -1592,7 +1600,7 @@ struct commit *get_merge_parent(const char *name)
return NULL;
obj = parse_object();
commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
-   if (commit && !commit->util)
+   if (commit && !merge_remote_util(commit))
set_merge_remote_desc(commit, name, obj);
return commit;
 }
diff --git a/commit.h b/commit.h
index e57ae4b583..838f6a6b26 100644
--- a/commit.h
+++ b/commit.h
@@ -303,7 +303,7 @@ struct merge_remote_desc {
struct object *obj; /* the named object, could be a tag */
char name[FLEX_ARRAY];
 };
-#define merge_remote_util(commit) ((struct merge_remote_desc 
*)((commit)->util))
+extern struct merge_remote_desc *merge_remote_util(struct commit *);
 extern void set_merge_remote_desc(struct commit *commit,
  const char *name, struct object *obj);
 
diff --git a/merge-recursive.c b/merge-recursive.c
index 0c0d48624d..5537f01f8e 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -223,10 +223,12 @@ static void output(struct merge_options *o, int v, const 
char *fmt, ...)
 
 static void output_commit_title(struct merge_options *o, struct commit *commit)
 {
+   struct merge_remote_desc *desc;
+
strbuf_addchars(>obuf, ' ', o->call_depth * 2);
-   if (commit->util)
-   strbuf_addf(>obuf, "virtual %s\n",
-   merge_remote_util(commit)->name);
+   desc = merge_remote_util(commit);
+   if (desc)
+   strbuf_addf(>obuf, "virtual %s\n", desc->name);
else {
strbuf_add_unique_abbrev(>obuf, >object.oid,