From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-1.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FSL_HELO_FAKE,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 47B1C1F404 for ; Wed, 21 Mar 2018 22:42:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753817AbeCUWmo (ORCPT ); Wed, 21 Mar 2018 18:42:44 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33159 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753731AbeCUWmn (ORCPT ); Wed, 21 Mar 2018 18:42:43 -0400 Received: by mail-pf0-f196.google.com with SMTP id 123so2580387pfe.0 for ; Wed, 21 Mar 2018 15:42:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=o8nh931U6ZMDuVyKVOyMm3Cdtf08Ki32TJaVDFUKjXM=; b=YIjwjEVouNBCgO2B362muYd7s8cNrHzQB+7y5KxZTU8QExfKv6/aHi4bNtoGhaTdRa V+4uoqBN6h7Kl8d5kGG0tEdohUkBtJPSdRIGDHDJ9OcbqE5Oi/Mg99gE56VHyP23YQih b97nMLC3EhFy+AflepRn1vhJIEmY3hnRGHC8arvCU6j+3S6Lc+niqvMJhfTPS8jq5Oit Sy89awqaAJ35YpJj1peP+eky7FZkjv6fPBA3Xao6Y5OBNgv2vceTv2Ic7Fzu53Gfisae 0RN/zrZUehW6RYpcTodUvrS+3MkIrbyelZE82pKo+4vKBV4RZolp01BsmCrsfTpoRPwH RwWA== 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:content-transfer-encoding :in-reply-to:user-agent; bh=o8nh931U6ZMDuVyKVOyMm3Cdtf08Ki32TJaVDFUKjXM=; b=H3mtzQk/vYA/+t3UJpiGo3qp6BnS7uCFHItpqSgXvWz5X3D9+TwpfVmeZIi/Tc02F7 tsUERow5zSg7g2+y+C5Y0s2m4fS+iwJKlhU6A9efV5IH+IsR/JQ/4fK8wQBlWbeL6GJF /i3OYJy14wZhp032/SYLjR03ufYigS7NIJooL4JExVcGISYR7uYTjPBZjj2hzphJUVbA SiRkydt9FRzoedtlldFMhg0eMH9o2b52DsJdsVjiEY1j3TdmVnPF8iJNMPHOom6UhrQo vWSVRgsP7cuUT3CC/gZ4yf+6nLF9JtbTwnottLx68ugnH+cu038DonEtgSI1hxN614mb yfpg== X-Gm-Message-State: AElRT7EGBQX7Ys87PcmmKNP2Xl97umHoNJkUdiBJ0ioi6DAvrUC7TYlr rMf6DLPML+Dr/crBg5LRVV4bJA== X-Google-Smtp-Source: AG47ELunS3tMHPdMwEiSHk9MbpAeY2ZYr28oOwcNym8ruLQtN+jLYD1a1irA5Sw2ciQ4NWr7OSH6rw== X-Received: by 10.99.97.203 with SMTP id v194mr16043824pgb.373.1521672162810; Wed, 21 Mar 2018 15:42:42 -0700 (PDT) Received: from google.com ([2620:0:100e:422:ff43:9291:7eda:b712]) by smtp.gmail.com with ESMTPSA id v14sm10860679pfi.8.2018.03.21.15.42.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Mar 2018 15:42:42 -0700 (PDT) Date: Wed, 21 Mar 2018 15:42:41 -0700 From: Brandon Williams To: =?utf-8?B?Tmd1eeG7hW4gVGjDoWkgTmfhu41j?= Duy Cc: git@vger.kernel.org, Junio C Hamano , Stefan Beller Subject: Re: [PATCH 44/44] packfile: keep prepare_packed_git() private Message-ID: <20180321224241.GC202156@google.com> References: <20180303113637.26518-1-pclouds@gmail.com> <20180303113637.26518-45-pclouds@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20180303113637.26518-45-pclouds@gmail.com> User-Agent: Mutt/1.9.2 (2017-12-15) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 03/03, Nguyễn Thái Ngọc Duy wrote: > The reason callers have to call this is to make sure either packed_git > or packed_git_mru pointers are initialized since we don't do that by > default. Sometimes it's hard to see this connection between where the > function is called and where packed_git pointer is used (sometimes in > separate functions). > > Keep this dependency internal because now all access to packed_git and > packed_git_mru must go through get_xxx() wrappers. Ahh now I understand the rational for trying to make it "private". > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > builtin/count-objects.c | 3 +-- > builtin/fsck.c | 2 -- > builtin/gc.c | 1 - > builtin/pack-objects.c | 1 - > builtin/pack-redundant.c | 2 -- > fast-import.c | 1 - > http-backend.c | 1 - > pack-bitmap.c | 1 - > packfile.c | 5 ++++- > packfile.h | 1 - > server-info.c | 1 - > sha1_name.c | 2 -- > 12 files changed, 5 insertions(+), 16 deletions(-) > > diff --git a/builtin/count-objects.c b/builtin/count-objects.c > index 2793c98ed3..ee6ae35244 100644 > --- a/builtin/count-objects.c > +++ b/builtin/count-objects.c > @@ -121,8 +121,7 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix) > struct strbuf loose_buf = STRBUF_INIT; > struct strbuf pack_buf = STRBUF_INIT; > struct strbuf garbage_buf = STRBUF_INIT; > - if (!get_packed_git(the_repository)) > - prepare_packed_git(the_repository); > + > for (p = get_packed_git(the_repository); p; p = p->next) { > if (!p->pack_local) > continue; > diff --git a/builtin/fsck.c b/builtin/fsck.c > index 7a3e323e9e..9911c52bc8 100644 > --- a/builtin/fsck.c > +++ b/builtin/fsck.c > @@ -726,8 +726,6 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) > uint32_t total = 0, count = 0; > struct progress *progress = NULL; > > - prepare_packed_git(the_repository); > - > if (show_progress) { > for (p = get_packed_git(the_repository); p; > p = p->next) { > diff --git a/builtin/gc.c b/builtin/gc.c > index 560d58daec..be63bec09c 100644 > --- a/builtin/gc.c > +++ b/builtin/gc.c > @@ -173,7 +173,6 @@ static int too_many_packs(void) > if (gc_auto_pack_limit <= 0) > return 0; > > - prepare_packed_git(the_repository); > for (cnt = 0, p = get_packed_git(the_repository); p; p = p->next) { > if (!p->pack_local) > continue; > diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c > index 6020a7e230..435f091a69 100644 > --- a/builtin/pack-objects.c > +++ b/builtin/pack-objects.c > @@ -3151,7 +3151,6 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) > if (progress && all_progress_implied) > progress = 2; > > - prepare_packed_git(the_repository); > if (ignore_packed_keep) { > struct packed_git *p; > for (p = get_packed_git(the_repository); p; p = p->next) > diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c > index bf42e164eb..02b5f0becc 100644 > --- a/builtin/pack-redundant.c > +++ b/builtin/pack-redundant.c > @@ -630,8 +630,6 @@ int cmd_pack_redundant(int argc, const char **argv, const char *prefix) > break; > } > > - prepare_packed_git(the_repository); > - > if (load_all_packs) > load_all(); > else > diff --git a/fast-import.c b/fast-import.c > index 985eb2eccc..2298bfcdfd 100644 > --- a/fast-import.c > +++ b/fast-import.c > @@ -3472,7 +3472,6 @@ int cmd_main(int argc, const char **argv) > rc_free[i].next = &rc_free[i + 1]; > rc_free[cmd_save - 1].next = NULL; > > - prepare_packed_git(the_repository); > start_packfile(); > set_die_routine(die_nicely); > set_checkpoint_signal(); > diff --git a/http-backend.c b/http-backend.c > index 659ddfb5f1..22d2e1668e 100644 > --- a/http-backend.c > +++ b/http-backend.c > @@ -518,7 +518,6 @@ static void get_info_packs(struct strbuf *hdr, char *arg) > size_t cnt = 0; > > select_getanyfile(hdr); > - prepare_packed_git(the_repository); > for (p = get_packed_git(the_repository); p; p = p->next) { > if (p->pack_local) > cnt++; > diff --git a/pack-bitmap.c b/pack-bitmap.c > index 01c9cd1642..2a007b5539 100644 > --- a/pack-bitmap.c > +++ b/pack-bitmap.c > @@ -335,7 +335,6 @@ static int open_pack_bitmap(void) > > assert(!bitmap_git.map && !bitmap_git.loaded); > > - prepare_packed_git(the_repository); > for (p = get_packed_git(the_repository); p; p = p->next) { > if (open_pack_bitmap_1(p) == 0) > ret = 0; > diff --git a/packfile.c b/packfile.c > index bafe81544d..773cd99a13 100644 > --- a/packfile.c > +++ b/packfile.c > @@ -802,6 +802,7 @@ static void prepare_packed_git_one(struct repository *r, char *objdir, int local > strbuf_release(&path); > } > > +static void prepare_packed_git(struct repository *r); > /* > * Give a fast, rough count of the number of objects in the repository. This > * ignores loose objects completely. If you have a lot of them, then either > @@ -882,7 +883,7 @@ static void prepare_packed_git_mru(struct repository *r) > list_add_tail(&p->mru, &r->objects.packed_git_mru); > } > > -void prepare_packed_git(struct repository *r) > +static void prepare_packed_git(struct repository *r) > { > struct alternate_object_database *alt; > > @@ -906,11 +907,13 @@ void reprepare_packed_git(struct repository *r) > > struct packed_git *get_packed_git(struct repository *r) > { > + prepare_packed_git(r); > return r->objects.packed_git; > } > > struct list_head *get_packed_git_mru(struct repository *r) > { > + prepare_packed_git(r); > return &r->objects.packed_git_mru; > } > > diff --git a/packfile.h b/packfile.h > index fe1a6380e6..efda10329c 100644 > --- a/packfile.h > +++ b/packfile.h > @@ -34,7 +34,6 @@ extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_ > #define PACKDIR_FILE_GARBAGE 4 > extern void (*report_garbage)(unsigned seen_bits, const char *path); > > -extern void prepare_packed_git(struct repository *r); > extern void reprepare_packed_git(struct repository *r); > extern void install_packed_git(struct repository *r, struct packed_git *pack); > > diff --git a/server-info.c b/server-info.c > index 9604772522..af737acd24 100644 > --- a/server-info.c > +++ b/server-info.c > @@ -200,7 +200,6 @@ static void init_pack_info(const char *infofile, int force) > objdir = get_object_directory(); > objdirlen = strlen(objdir); > > - prepare_packed_git(the_repository); > for (p = get_packed_git(the_repository); p; p = p->next) { > /* we ignore things on alternate path since they are > * not available to the pullers in general. > diff --git a/sha1_name.c b/sha1_name.c > index cb42e398b2..f25a0970ca 100644 > --- a/sha1_name.c > +++ b/sha1_name.c > @@ -195,7 +195,6 @@ static void find_short_packed_object(struct disambiguate_state *ds) > { > struct packed_git *p; > > - prepare_packed_git(the_repository); > for (p = get_packed_git(the_repository); p && !ds->ambiguous; > p = p->next) > unique_in_pack(p, ds); > @@ -566,7 +565,6 @@ static void find_abbrev_len_packed(struct min_abbrev_data *mad) > { > struct packed_git *p; > > - prepare_packed_git(the_repository); > for (p = get_packed_git(the_repository); p; p = p->next) > find_abbrev_len_for_pack(p, mad); > } > -- > 2.16.1.435.g8f24da2e1a > -- Brandon Williams