From patchwork Tue Dec 8 00:05:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taylor Blau X-Patchwork-Id: 11957149 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=-13.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 0D24EC1B0E3 for ; Tue, 8 Dec 2020 00:05:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CCDB423A22 for ; Tue, 8 Dec 2020 00:05:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728561AbgLHAFt (ORCPT ); Mon, 7 Dec 2020 19:05:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727744AbgLHAFs (ORCPT ); Mon, 7 Dec 2020 19:05:48 -0500 Received: from mail-oi1-x243.google.com (mail-oi1-x243.google.com [IPv6:2607:f8b0:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E844C06179C for ; Mon, 7 Dec 2020 16:05:08 -0800 (PST) Received: by mail-oi1-x243.google.com with SMTP id s75so14468190oih.1 for ; Mon, 07 Dec 2020 16:05:08 -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; bh=69NZYdya+y3fH6tvgWnX9Me1m2KxucJctZMIwxwOhUo=; b=YsbIXYOgrsrI0GQySj02mUhpd6BB8LG17Km4hqcb6vC9IHH2rAqRmF72ior2DKoULs /sgL8Ema1F43alkBDlzel/Ob14qPoTYB55ilN9tpPaAQptLuWISPkHUwTTkY0eDok4nK TgfdT0UiTZK2yNgrUgEkoOy/yVUcfo25u+kctdrWr8UJovlGG8sfgNVcs2XXill/ClRC fqbj82EswHSSISKO2SYTp7FsXq6FdrVDkTHHN0wlaEtOJChfEHJ6w52DVpHSjW7IP0ka pitPgZI4Bof27UmHNT4D2TzyXtKOEX/zvsGHNBn9ARlAmgKKkjoN004Gy3WzJVuMjqw0 Notg== 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; bh=69NZYdya+y3fH6tvgWnX9Me1m2KxucJctZMIwxwOhUo=; b=Bxp5LHjv6P6aSQpHGYnWXRhxnx1lyuInmY8Bg3r/+FhUyCQ5vLgupcAqINKvGf+L/x SemnExrmsMCpTBJNovAr6GMsyPUC/3sLuvM0LZ2rrgo93BZCTCmOEIJ7t0oIOAqwElH5 dqJ0WWRujdvp+wsWnn3I7ZRnFb9VTVlYGz7Ao0X2AI9T+2ro2dHjr2EDyvkUCQvrC8vG XR1tyDMP/KILPblSygeRTIrV9ONLY3eoY+VQ0/UREBMYPnVfji+eW0UXB2P+vNgrUahm DKr3VnN6E2YJa4vbY6rILXSURSBZlxElm6qOGjK/xxNxhs53I08pT1fDA2/Q/VIvB+wX pKzg== X-Gm-Message-State: AOAM533DrzUgtU5WuaFJAHs12UmcJznbwve2dMBYv8ymDWq8Hgq5sv53 VLNIiMMsrbSxBgD7CL4jpxAdR1X6PoyCGS8I X-Google-Smtp-Source: ABdhPJzc8+auc140TZAR6/k4AzFGIyDUZkJU4ysrM/vjjttOshUwP+oXFOrOvELEGd+VBGVgoMivjw== X-Received: by 2002:a05:6808:7de:: with SMTP id f30mr972804oij.148.1607385907550; Mon, 07 Dec 2020 16:05:07 -0800 (PST) Received: from localhost ([8.44.146.30]) by smtp.gmail.com with ESMTPSA id s206sm1923954oie.24.2020.12.07.16.05.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 16:05:07 -0800 (PST) Date: Mon, 7 Dec 2020 19:05:05 -0500 From: Taylor Blau To: git@vger.kernel.org Cc: peff@peff.net, jonathantanmy@google.com, dstolee@microsoft.com, gitster@pobox.com Subject: [PATCH v3 12/24] pack-bitmap-write: fill bitmap with commit history Message-ID: <93fc437a3c1b4ac3bdf1c241b2178281348ba561.1607385833.git.me@ttaylorr.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee The current implementation of bitmap_writer_build() creates a reachability bitmap for every walked commit. After computing a bitmap for a commit, those bits are pushed to an in-progress bitmap for its children. fill_bitmap_commit() assumes the bits corresponding to objects reachable from the parents of a commit are already set. This means that when visiting a new commit, we only have to walk the objects reachable between it and any of its parents. A future change to bitmap_writer_build() will relax this condition so not all parents have their bits set. Prepare for that by having 'fill_bitmap_commit()' walk parents until reaching commits whose bits are already set. Then, walk the trees for these commits as well. This has no functional change with the current implementation of bitmap_writer_build(). Signed-off-by: Derrick Stolee Signed-off-by: Taylor Blau --- pack-bitmap-write.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c index 1eb9615df8..957639241e 100644 --- a/pack-bitmap-write.c +++ b/pack-bitmap-write.c @@ -12,6 +12,7 @@ #include "sha1-lookup.h" #include "pack-objects.h" #include "commit-reach.h" +#include "prio-queue.h" struct bitmapped_commit { struct commit *commit; @@ -279,17 +280,30 @@ static void fill_bitmap_tree(struct bitmap *bitmap, } static void fill_bitmap_commit(struct bb_commit *ent, - struct commit *commit) + struct commit *commit, + struct prio_queue *queue) { if (!ent->bitmap) ent->bitmap = bitmap_new(); - /* - * mark ourselves, but do not bother with parents; their values - * will already have been propagated to us - */ bitmap_set(ent->bitmap, find_object_pos(&commit->object.oid)); - fill_bitmap_tree(ent->bitmap, get_commit_tree(commit)); + prio_queue_put(queue, commit); + + while (queue->nr) { + struct commit_list *p; + struct commit *c = prio_queue_get(queue); + + bitmap_set(ent->bitmap, find_object_pos(&c->object.oid)); + fill_bitmap_tree(ent->bitmap, get_commit_tree(c)); + + for (p = c->parents; p; p = p->next) { + int pos = find_object_pos(&p->item->object.oid); + if (!bitmap_get(ent->bitmap, pos)) { + bitmap_set(ent->bitmap, pos); + prio_queue_put(queue, p->item); + } + } + } } static void store_selected(struct bb_commit *ent, struct commit *commit) @@ -319,6 +333,7 @@ void bitmap_writer_build(struct packing_data *to_pack) struct bitmap_builder bb; size_t i; int nr_stored = 0; /* for progress */ + struct prio_queue queue = { compare_commits_by_gen_then_commit_date }; writer.bitmaps = kh_init_oid_map(); writer.to_pack = to_pack; @@ -335,7 +350,7 @@ void bitmap_writer_build(struct packing_data *to_pack) struct commit *child; int reused = 0; - fill_bitmap_commit(ent, commit); + fill_bitmap_commit(ent, commit, &queue); if (ent->selected) { store_selected(ent, commit); @@ -360,6 +375,7 @@ void bitmap_writer_build(struct packing_data *to_pack) bitmap_free(ent->bitmap); ent->bitmap = NULL; } + clear_prio_queue(&queue); bitmap_builder_clear(&bb); trace2_region_leave("pack-bitmap-write", "building_bitmaps_total",