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=-3.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD shortcircuit=no autolearn=ham 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 7D7851F404 for ; Fri, 16 Feb 2018 17:46:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758978AbeBPRqn (ORCPT ); Fri, 16 Feb 2018 12:46:43 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:42423 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756565AbeBPRqg (ORCPT ); Fri, 16 Feb 2018 12:46:36 -0500 Received: by mail-pg0-f65.google.com with SMTP id y8so2949865pgr.9 for ; Fri, 16 Feb 2018 09:46:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tUpM9sEMTfDM7RcmrFDu0iD1UNCcmvDpnRKOvPtvpWw=; b=TYfTKkh8cko+M/WqGSSJIg6lcyHo9zKHePgbNkt61v314SAWNQ7UIk4xY2uk34bCjw 3CJWwzWeCTTXEmsG9KnLwSZrtSj9oWIRtCF08X+yJagrLVxyOmnM6hg1PoC5IjwI7CY0 kwuyQ1SA3sM1eYDXZWlHzXE1RSwfBvK4zAe3gLj9U9nxLZuYxhaplibqbXIH8KueoXht vtgjnsbximOw5DkrKUF9edIOPIv+0fe2kS5uMQ46M70EeEwojIbFO+NWUvMJyhR/5a9C hMdVN6hnBk/c6VWIluLPWIP3dGX0ehxTX85Dg14UYw4w3eTMKlgMoNyxuC9BPh4g7lOw corg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tUpM9sEMTfDM7RcmrFDu0iD1UNCcmvDpnRKOvPtvpWw=; b=PKkjh9OFL30Ccy+phK9Uk8SNQsOKlmEdDkitq12Rv8Eh3952r187gCowE1xVGfkHJe YIkVQXhwYCmWFJMuhIlcy84XlwetYKx8anloxonsx6ocp43wW2zRPqZXjKR/hQtUA8uv ynDxox8oWuFLJTAc9zu+NmhozGX1nJ+IWTnXVhzaVBvhe5o0Cy++P1JJ4rqsFbXIaGy8 BqpAhRZtF11Vtf+MNbQuuDGHNf/poUtpMF3McNPfYnqqiMfEWAGxn7gP46kcGR2RajnA lyag3kCdPFdaMIZ7PtcZHD2+Enxc8KuTv/gG/kruYw80E5G9BbuI9Vgbvlq5FO18HvNl rjIA== X-Gm-Message-State: APf1xPCSdQxa3GFPBNA08OknAQ+lxEYHBdPgkvUo3pQHjoWZb1CPpJw5 o6pImor7SWE168WCeIJlYGsLsQ== X-Google-Smtp-Source: AH8x2249mXaNX53w65VcmCkI3LMr8QZImcav2fhDGRGfLBhMJ2qgyioihgUK6TeoV2RqVnAY1MnC+A== X-Received: by 10.101.76.13 with SMTP id u13mr5597561pgq.287.1518803195990; Fri, 16 Feb 2018 09:46:35 -0800 (PST) Received: from localhost ([2620:0:100e:422:2d12:5719:3437:fdb7]) by smtp.gmail.com with ESMTPSA id m9sm44703758pff.59.2018.02.16.09.46.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 16 Feb 2018 09:46:35 -0800 (PST) From: Stefan Beller To: gitster@pobox.com Cc: git@vger.kernel.org, jonathantanmy@google.com, pclouds@gmail.com, sbeller@google.com, sunshine@sunshineco.com, Jonathan Nieder Subject: [PATCH 02/16] object-store: move alt_odb_list and alt_odb_tail to object store Date: Fri, 16 Feb 2018 09:46:12 -0800 Message-Id: <20180216174626.24677-3-sbeller@google.com> X-Mailer: git-send-email 2.16.1.291.g4437f3f132-goog In-Reply-To: <20180216174626.24677-1-sbeller@google.com> References: <20180216174626.24677-1-sbeller@google.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In a process with multiple repositories open, alternates should be associated to a single repository and not shared globally. Move alt_odb_list and alt_odb_tail into the_repository and adjust callers to reflect this. Now that the alternative object data base is per repository, we're leaking its memory upon freeing a repository. The next patch plugs this hole. No functional change intended. Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- builtin/fsck.c | 4 +++- cache.h | 4 ++-- object-store.h | 7 ++++++- packfile.c | 3 ++- sha1_file.c | 25 ++++++++++++------------- sha1_name.c | 3 ++- 6 files changed, 27 insertions(+), 19 deletions(-) diff --git a/builtin/fsck.c b/builtin/fsck.c index 7a8a679d4f..908e4f092a 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -1,5 +1,6 @@ #include "builtin.h" #include "cache.h" +#include "repository.h" #include "config.h" #include "commit.h" #include "tree.h" @@ -716,7 +717,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) fsck_object_dir(get_object_directory()); prepare_alt_odb(); - for (alt = alt_odb_list; alt; alt = alt->next) + for (alt = the_repository->objects.alt_odb_list; + alt; alt = alt->next) fsck_object_dir(alt->path); if (check_full) { diff --git a/cache.h b/cache.h index 9cac7bb518..f373c30e25 100644 --- a/cache.h +++ b/cache.h @@ -1576,7 +1576,7 @@ extern int has_dirs_only_path(const char *name, int len, int prefix_len); extern void schedule_dir_for_removal(const char *name, int len); extern void remove_scheduled_dirs(void); -extern struct alternate_object_database { +struct alternate_object_database { struct alternate_object_database *next; /* see alt_scratch_buf() */ @@ -1594,7 +1594,7 @@ extern struct alternate_object_database { struct oid_array loose_objects_cache; char path[FLEX_ARRAY]; -} *alt_odb_list; +}; extern void prepare_alt_odb(void); extern char *compute_alternate_path(const char *path, struct strbuf *err); typedef int alt_odb_fn(struct alternate_object_database *, void *); diff --git a/object-store.h b/object-store.h index 5959d990fc..a3f0d6ac15 100644 --- a/object-store.h +++ b/object-store.h @@ -1,6 +1,8 @@ #ifndef OBJECT_STORE_H #define OBJECT_STORE_H +#include "cache.h" + struct raw_object_store { /* * Path to the repository's object store. @@ -8,9 +10,12 @@ struct raw_object_store { */ char *objectdir; + struct alternate_object_database *alt_odb_list; + struct alternate_object_database **alt_odb_tail; + unsigned ignore_env : 1; }; -#define RAW_OBJECT_STORE_INIT { NULL, 0 } +#define RAW_OBJECT_STORE_INIT { NULL, NULL, NULL, 0 } void raw_object_store_clear(struct raw_object_store *o); diff --git a/packfile.c b/packfile.c index 7dbe8739d1..216ea836ee 100644 --- a/packfile.c +++ b/packfile.c @@ -1,6 +1,7 @@ #include "cache.h" #include "list.h" #include "pack.h" +#include "repository.h" #include "dir.h" #include "mergesort.h" #include "packfile.h" @@ -891,7 +892,7 @@ void prepare_packed_git(void) return; prepare_packed_git_one(get_object_directory(), 1); prepare_alt_odb(); - for (alt = alt_odb_list; alt; alt = alt->next) + for (alt = the_repository->objects.alt_odb_list; alt; alt = alt->next) prepare_packed_git_one(alt->path, 0); rearrange_packed_git(); prepare_packed_git_mru(); diff --git a/sha1_file.c b/sha1_file.c index 831d9e7343..1348dce68f 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -22,6 +22,7 @@ #include "pack-revindex.h" #include "sha1-lookup.h" #include "bulk-checkin.h" +#include "repository.h" #include "streaming.h" #include "dir.h" #include "list.h" @@ -342,9 +343,6 @@ static const char *alt_sha1_path(struct alternate_object_database *alt, return buf->buf; } -struct alternate_object_database *alt_odb_list; -static struct alternate_object_database **alt_odb_tail; - /* * Return non-zero iff the path is usable as an alternate object database. */ @@ -364,7 +362,7 @@ static int alt_odb_usable(struct strbuf *path, const char *normalized_objdir) * Prevent the common mistake of listing the same * thing twice, or object directory itself. */ - for (alt = alt_odb_list; alt; alt = alt->next) { + for (alt = the_repository->objects.alt_odb_list; alt; alt = alt->next) { if (!fspathcmp(path->buf, alt->path)) return 0; } @@ -424,8 +422,8 @@ static int link_alt_odb_entry(const char *entry, const char *relative_base, ent = alloc_alt_odb(pathbuf.buf); /* add the alternate entry */ - *alt_odb_tail = ent; - alt_odb_tail = &(ent->next); + *the_repository->objects.alt_odb_tail = ent; + the_repository->objects.alt_odb_tail = &(ent->next); ent->next = NULL; /* recursively add alternates */ @@ -559,7 +557,7 @@ void add_to_alternates_file(const char *reference) fprintf_or_die(out, "%s\n", reference); if (commit_lock_file(&lock)) die_errno("unable to move new alternates file into place"); - if (alt_odb_tail) + if (the_repository->objects.alt_odb_tail) link_alt_odb_entries(reference, '\n', NULL, 0); } free(alts); @@ -657,7 +655,7 @@ int foreach_alt_odb(alt_odb_fn fn, void *cb) int r = 0; prepare_alt_odb(); - for (ent = alt_odb_list; ent; ent = ent->next) { + for (ent = the_repository->objects.alt_odb_list; ent; ent = ent->next) { r = fn(ent, cb); if (r) break; @@ -669,12 +667,13 @@ void prepare_alt_odb(void) { const char *alt; - if (alt_odb_tail) + if (the_repository->objects.alt_odb_tail) return; alt = getenv(ALTERNATE_DB_ENVIRONMENT); - alt_odb_tail = &alt_odb_list; + the_repository->objects.alt_odb_tail = + &the_repository->objects.alt_odb_list; link_alt_odb_entries(alt, PATH_SEP, NULL, 0); read_info_alternates(get_object_directory(), 0); @@ -718,7 +717,7 @@ static int check_and_freshen_nonlocal(const unsigned char *sha1, int freshen) { struct alternate_object_database *alt; prepare_alt_odb(); - for (alt = alt_odb_list; alt; alt = alt->next) { + for (alt = the_repository->objects.alt_odb_list; alt; alt = alt->next) { const char *path = alt_sha1_path(alt, sha1); if (check_and_freshen_file(path, freshen)) return 1; @@ -878,7 +877,7 @@ static int stat_sha1_file(const unsigned char *sha1, struct stat *st, prepare_alt_odb(); errno = ENOENT; - for (alt = alt_odb_list; alt; alt = alt->next) { + for (alt = the_repository->objects.alt_odb_list; alt; alt = alt->next) { *path = alt_sha1_path(alt, sha1); if (!lstat(*path, st)) return 0; @@ -908,7 +907,7 @@ static int open_sha1_file(const unsigned char *sha1, const char **path) most_interesting_errno = errno; prepare_alt_odb(); - for (alt = alt_odb_list; alt; alt = alt->next) { + for (alt = the_repository->objects.alt_odb_list; alt; alt = alt->next) { *path = alt_sha1_path(alt, sha1); fd = git_open(*path); if (fd >= 0) diff --git a/sha1_name.c b/sha1_name.c index 611c7d24dd..957ce25680 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -10,6 +10,7 @@ #include "dir.h" #include "sha1-array.h" #include "packfile.h" +#include "repository.h" static int get_oid_oneline(const char *, struct object_id *, struct commit_list *); @@ -104,7 +105,7 @@ static void find_short_object_filename(struct disambiguate_state *ds) */ fakeent = alloc_alt_odb(get_object_directory()); } - fakeent->next = alt_odb_list; + fakeent->next = the_repository->objects.alt_odb_list; for (alt = fakeent; alt && !ds->ambiguous; alt = alt->next) { int pos; -- 2.16.1.291.g4437f3f132-goog