From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id CDFDF1F66E for ; Mon, 24 Aug 2020 21:11:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727926AbgHXVLP (ORCPT ); Mon, 24 Aug 2020 17:11:15 -0400 Received: from pb-smtp21.pobox.com ([173.228.157.53]:59303 "EHLO pb-smtp21.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726138AbgHXVLP (ORCPT ); Mon, 24 Aug 2020 17:11:15 -0400 Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 2D5A9DAD80; Mon, 24 Aug 2020 17:11:13 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=Sdcb7GImlHMRHQlF9YaGvnPv/7g=; b=Tl8bvv SKorkmWOgEoTT3xbD/XjTtBNlq7EHmkHO4wi0kKb1svyxi+CbfnzNyZkczHEcyvU ee7DAs5gbLT2p/fQhdlU9U4Ru8XHedZUDK7OV+eU5Ag10dkR5W+lon2rxrqDdXO/ +YOe5QOmlhhheG+Vofq72L6yi63yxnUmyDKOY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=umeAcs3KoXwgkvEOIvh1a6T8d85iFDMf pg4J2BB10z1c7xTpkm12txz2uoDRvz247JxOgWFVTFdtj2CbseixX+mZoIATM1Or cCaVIYxe+dMQcYnc3GFW3LSu3Hd08IFSA35oNThWdhhMGcHYhN9+YK3r26g9KdKi 3Q8qhwXGrfE= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 25A75DAD7F; Mon, 24 Aug 2020 17:11:13 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.75.7.245]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id 0CB08DAD7D; Mon, 24 Aug 2020 17:11:07 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: Jonathan Tan Cc: git@vger.kernel.org, peff@peff.net, steadmon@google.com Subject: Re: [PATCH 3/7] index-pack: unify threaded and unthreaded code References: <2e7baaabf0ad9d724f5a81495213f4626b8c04ab.1598296530.git.jonathantanmy@google.com> Date: Mon, 24 Aug 2020 14:11:06 -0700 In-Reply-To: <2e7baaabf0ad9d724f5a81495213f4626b8c04ab.1598296530.git.jonathantanmy@google.com> (Jonathan Tan's message of "Mon, 24 Aug 2020 12:16:34 -0700") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 54143C3A-E64E-11EA-A055-843F439F7C89-77302942!pb-smtp21.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Jonathan Tan writes: > Signed-off-by: Jonathan Tan > --- > builtin/index-pack.c | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) > > diff --git a/builtin/index-pack.c b/builtin/index-pack.c > index a8444d550b..357e03b5aa 100644 > --- a/builtin/index-pack.c > +++ b/builtin/index-pack.c > @@ -1211,15 +1211,7 @@ static void resolve_deltas(void) > cleanup_thread(); > return; > } > - > - for (i = 0; i < nr_objects; i++) { > - struct object_entry *obj = &objects[i]; > - > - if (is_delta_type(obj->type)) > - continue; > - resolve_base(obj); > - display_progress(progress, nr_resolved_deltas); > - } > + threaded_second_pass(¬hread_data); > } The threaded_second_pass() function has a lot more noise than the above simple and easy-to-grok loop, managing the locks, but those all turn into no-op unless init_thread() is called, which happens only when this code is not reached. So OK, this looks essentially a no-op clean-up. Thanks.