From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BC12C352A4 for ; Wed, 12 Feb 2020 20:22:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2EB4C21739 for ; Wed, 12 Feb 2020 20:22:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ttaylorr-com.20150623.gappssmtp.com header.i=@ttaylorr-com.20150623.gappssmtp.com header.b="NOZOL/Fx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729129AbgBLUWO (ORCPT ); Wed, 12 Feb 2020 15:22:14 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:38611 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727439AbgBLUWN (ORCPT ); Wed, 12 Feb 2020 15:22:13 -0500 Received: by mail-pg1-f194.google.com with SMTP id d6so1795258pgn.5 for ; Wed, 12 Feb 2020 12:22:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ttaylorr-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=mVi1QPrfhFfNKQ/lJZJIILVSXUhsjUqEoKJLS7lNet8=; b=NOZOL/FxrC7Nx8pZcnTdukaAuT6s7//Hk/w8SLrdJSMujy5tE92r+xBAtgZxAtWoFa +yL0E6iq3dU3QxcZq5LYjcIb5vOv2O7b02T1dwDa1LTb0zFW37xwc6WYIRkGMhFykQjU JO7RS3bAHY7zejEgxd663lVMncvpEqEXLjOrgahU13OZXa+sjBheyjugeq9YJ5gtDCWh ClypP7AEicpjmCpVKaHwNWnK3ik0X9obbzxZqFxMqPDBwyXAZVOwWzwoXxKHpDRkRNri HZakPfs7frE/uahp8jE48hXrklD8t9/96LtXWhxcTb6boc3mWtnkumUE4KJmU5ZE9vh2 DRWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=mVi1QPrfhFfNKQ/lJZJIILVSXUhsjUqEoKJLS7lNet8=; b=T2M42oV2XP50bAnsJ+SzqiOCQEpWio5oyQecD4VXNzDc8KG4X38Y0WeOovDctsy74V cKf2MlMIDi+/1J8/2ojsdITWb+zH/htvkPy2J+uOQB3dk1VsG1xwIvvtNm10VAo6IaQp DgqsVWFX2S0L1a0tivX5nXCipHDI1XG4jafK/2azyHFjXIAg1fJDGYZ1v/rAy4yhX0LS cXyhYlK40Zge+UilDELRW39QF84XykjUINbQ7Y1hZXSkCbd2ZViaQv/xG+hjUm8CZxwm vK+dsl8Fz7VXeC/67/MOGqqKTQCjbCbM8A7Vd8jyisOoRdQsPgZWHHyLotj2xs9IicLN xhbQ== X-Gm-Message-State: APjAAAVXB9k8eYP6kLRSobGaU6pevVSZINYLru3jETQGbBiupXc2y/jD 8+db1SvnwWrECeobgdP6/F+DmA== X-Google-Smtp-Source: APXvYqwTfVEXoAFIEdRphPWivaTuNWkSyeHCE/yFYytotz83bCmoQg0essjhIHjmqh3ZekfGkeTTzQ== X-Received: by 2002:a63:3004:: with SMTP id w4mr14309078pgw.164.1581538931776; Wed, 12 Feb 2020 12:22:11 -0800 (PST) Received: from localhost ([205.175.106.8]) by smtp.gmail.com with ESMTPSA id l10sm111167pjy.5.2020.02.12.12.22.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2020 12:22:11 -0800 (PST) Date: Wed, 12 Feb 2020 12:22:10 -0800 From: Taylor Blau To: Parth Gala via GitGitGadget Cc: git@vger.kernel.org, Parth Gala Subject: Re: [PATCH 1/5] object.c: get_max_object_index and get_indexed_object accept 'r' parameter Message-ID: <20200212202210.GC4364@syl.local> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.4 (2019-03-13) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Wed, Feb 12, 2020 at 07:19:07PM +0000, Parth Gala via GitGitGadget wrote: > From: Parth Gala > > Currently the two functions use global variable 'the_repository' to access > the values stored in it. This makes 'the_repository' to be existent even > when not required. Nit: please wrap your commit messages at 72 characters instead of 80. > This commit replaces it with 'r' which is passed as a parameter to those > functions Makes sense. > Signed-off-by: Parth Gala > --- > builtin/fsck.c | 5 +++-- > builtin/index-pack.c | 5 +++-- > builtin/name-rev.c | 5 +++-- > object.c | 8 ++++---- > object.h | 4 ++-- > shallow.c | 10 ++++++---- > upload-pack.c | 10 ++++++---- > 7 files changed, 27 insertions(+), 20 deletions(-) > > diff --git a/builtin/fsck.c b/builtin/fsck.c > index 8d13794b14..d2b4336f7e 100644 > --- a/builtin/fsck.c > +++ b/builtin/fsck.c > @@ -375,6 +375,7 @@ static void check_object(struct object *obj) > static void check_connectivity(void) > { > int i, max; > + struct repository *r = the_repository; Is there a reason that you assign use/assign 'r' here? I can find a few other such instances of it in: $ git grep -l 'struct repository \*r = ' builtin/merge-tree.c builtin/sparse-checkout.c builtin/update-index.c fetch-pack.c read-cache.c t/helper/test-reach.c tree.c but I'm not sure that it's necessary here. Could you instead pass 'the_repository' directly to the functions that now require it? > /* Traverse the pending reachable objects */ > traverse_reachable(); > @@ -400,12 +401,12 @@ static void check_connectivity(void) > } > > /* Look up all the requirements, warn about missing objects.. */ > - max = get_max_object_index(); > + max = get_max_object_index(r); For example, changing this line to: max = get_max_object_index(the_repository); > if (verbose) > fprintf_ln(stderr, _("Checking connectivity (%d objects)"), max); > > for (i = 0; i < max; i++) { > - struct object *obj = get_indexed_object(i); > + struct object *obj = get_indexed_object(r, i); > > if (obj) > check_object(obj); > diff --git a/builtin/index-pack.c b/builtin/index-pack.c > index 60a5591039..d2115535bc 100644 > --- a/builtin/index-pack.c > +++ b/builtin/index-pack.c > @@ -218,14 +218,15 @@ static unsigned check_object(struct object *obj) > static unsigned check_objects(void) > { > unsigned i, max, foreign_nr = 0; > + struct repository *r = the_repository; > > - max = get_max_object_index(); > + max = get_max_object_index(r); > > if (verbose) > progress = start_delayed_progress(_("Checking objects"), max); > > for (i = 0; i < max; i++) { > - foreign_nr += check_object(get_indexed_object(i)); > + foreign_nr += check_object(get_indexed_object(r, i)); > display_progress(progress, i + 1); > } > > diff --git a/builtin/name-rev.c b/builtin/name-rev.c > index 6b9e8c850b..afe9f6df01 100644 > --- a/builtin/name-rev.c > +++ b/builtin/name-rev.c > @@ -456,6 +456,7 @@ static void name_rev_line(char *p, struct name_ref_data *data) > int cmd_name_rev(int argc, const char **argv, const char *prefix) > { > struct object_array revs = OBJECT_ARRAY_INIT; > + struct repository *r = the_repository; > int all = 0, transform_stdin = 0, allow_undefined = 1, always = 0, peel_tag = 0; > struct name_ref_data data = { 0, 0, STRING_LIST_INIT_NODUP, STRING_LIST_INIT_NODUP }; > struct option opts[] = { > @@ -553,9 +554,9 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix) > } else if (all) { > int i, max; > > - max = get_max_object_index(); > + max = get_max_object_index(r); > for (i = 0; i < max; i++) { > - struct object *obj = get_indexed_object(i); > + struct object *obj = get_indexed_object(r, i); > if (!obj || obj->type != OBJ_COMMIT) > continue; > show_name(obj, NULL, > diff --git a/object.c b/object.c > index 142ef69399..549fbe69ca 100644 > --- a/object.c > +++ b/object.c > @@ -10,14 +10,14 @@ > #include "packfile.h" > #include "commit-graph.h" > > -unsigned int get_max_object_index(void) > +unsigned int get_max_object_index(struct repository *r) > { > - return the_repository->parsed_objects->obj_hash_size; > + return r->parsed_objects->obj_hash_size; > } > > -struct object *get_indexed_object(unsigned int idx) > +struct object *get_indexed_object(struct repository *r, unsigned int idx) > { > - return the_repository->parsed_objects->obj_hash[idx]; > + return r->parsed_objects->obj_hash[idx]; > } > > static const char *object_type_strings[] = { > diff --git a/object.h b/object.h > index 25f5ab3d54..5a8ae274ee 100644 > --- a/object.h > +++ b/object.h > @@ -98,12 +98,12 @@ int type_from_string_gently(const char *str, ssize_t, int gentle); > /* > * Return the current number of buckets in the object hashmap. > */ > -unsigned int get_max_object_index(void); > +unsigned int get_max_object_index(struct repository *); > > /* > * Return the object from the specified bucket in the object hashmap. > */ > -struct object *get_indexed_object(unsigned int); > +struct object *get_indexed_object(struct repository *, unsigned int); > > /* > * This can be used to see if we have heard of the object before, but > diff --git a/shallow.c b/shallow.c > index 7fd04afed1..4537d98482 100644 > --- a/shallow.c > +++ b/shallow.c > @@ -510,6 +510,7 @@ static void paint_down(struct paint_info *info, const struct object_id *oid, > unsigned int id) > { > unsigned int i, nr; > + struct repository *r = the_repository; > struct commit_list *head = NULL; > int bitmap_nr = DIV_ROUND_UP(info->nr_bits, 32); > size_t bitmap_size = st_mult(sizeof(uint32_t), bitmap_nr); > @@ -563,9 +564,9 @@ static void paint_down(struct paint_info *info, const struct object_id *oid, > } > } > > - nr = get_max_object_index(); > + nr = get_max_object_index(r); > for (i = 0; i < nr; i++) { > - struct object *o = get_indexed_object(i); > + struct object *o = get_indexed_object(r, i); > if (o && o->type == OBJ_COMMIT) > o->flags &= ~SEEN; > } > @@ -608,6 +609,7 @@ void assign_shallow_commits_to_refs(struct shallow_info *info, > struct object_id *oid = info->shallow->oid; > struct oid_array *ref = info->ref; > unsigned int i, nr; > + struct repository *r = the_repository; > int *shallow, nr_shallow = 0; > struct paint_info pi; > > @@ -622,9 +624,9 @@ void assign_shallow_commits_to_refs(struct shallow_info *info, > * Prepare the commit graph to track what refs can reach what > * (new) shallow commits. > */ > - nr = get_max_object_index(); > + nr = get_max_object_index(r); > for (i = 0; i < nr; i++) { > - struct object *o = get_indexed_object(i); > + struct object *o = get_indexed_object(r, i); > if (!o || o->type != OBJ_COMMIT) > continue; > > diff --git a/upload-pack.c b/upload-pack.c > index a00d7ece6b..cb7312268f 100644 > --- a/upload-pack.c > +++ b/upload-pack.c > @@ -450,6 +450,7 @@ static int do_reachable_revlist(struct child_process *cmd, > "rev-list", "--stdin", NULL, > }; > struct object *o; > + struct repository *r = the_repository; > char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */ > int i; > const unsigned hexsz = the_hash_algo->hexsz; > @@ -472,8 +473,8 @@ static int do_reachable_revlist(struct child_process *cmd, > > namebuf[0] = '^'; > namebuf[hexsz + 1] = '\n'; > - for (i = get_max_object_index(); 0 < i; ) { > - o = get_indexed_object(--i); > + for (i = get_max_object_index(r); 0 < i; ) { > + o = get_indexed_object(r, --i); > if (!o) > continue; > if (reachable && o->type == OBJ_COMMIT) > @@ -520,6 +521,7 @@ static int get_reachable_list(struct object_array *src, > struct child_process cmd = CHILD_PROCESS_INIT; > int i; > struct object *o; > + struct repository *r = the_repository; > char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */ > const unsigned hexsz = the_hash_algo->hexsz; > > @@ -538,8 +540,8 @@ static int get_reachable_list(struct object_array *src, > o->flags &= ~TMP_MARK; > } > } > - for (i = get_max_object_index(); 0 < i; i--) { > - o = get_indexed_object(i - 1); > + for (i = get_max_object_index(r); 0 < i; i--) { > + o = get_indexed_object(r, i - 1); > if (o && o->type == OBJ_COMMIT && > (o->flags & TMP_MARK)) { > add_object_array(o, NULL, reachable); > -- > gitgitgadget Otherwise this looks pretty good. Thanks, Taylor