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-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, 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 3F59A1FB05 for ; Thu, 20 May 2021 08:19:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231215AbhETIUp (ORCPT ); Thu, 20 May 2021 04:20:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231160AbhETIUk (ORCPT ); Thu, 20 May 2021 04:20:40 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40377C06175F for ; Thu, 20 May 2021 01:19:18 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id d11so16634654wrw.8 for ; Thu, 20 May 2021 01:19:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M4faH6RYNlO/pm7Bw4L8i9QvqiyCzYWNSdjahLmtu5Q=; b=RXVwJmTDDl/8byXD5KcZEEoN+cQONdgJCbfplXdbT8wdgC8g46UZymKa6r7Qv7CSJ2 0i9mDyGaQT2ta9KC/xwam3sUaZvxfvwdhadwJDKZwPXZ9j35zqGLaAKRmgTs1KA82bET 0VflilLm9XI+5zwcLdk6lYYmn9hkg+atLjTDZvTbbSE37L2K+A3M76wr3hDfQ2Zde6EZ 2trXFxeEjsrVbbA9OzeqeBNv5X1gMZiq7UGfSddKJeH1XC20WBG9Nw0pqk6Sl5/40bW4 eOr5GzpvpmnHeFTDEMJ7t7U4jZfCNVOu1tZmZ88e2mvrjRxiWBGaN5lAQzGVj+mtyrKv pdxA== 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:mime-version:content-transfer-encoding; bh=M4faH6RYNlO/pm7Bw4L8i9QvqiyCzYWNSdjahLmtu5Q=; b=IkU0cREGk49kwbwvw9o2s+os1fC8ZyXm3/fB46t877IQzZHHdARnmQNNp2X/oCpg33 +GJXwsM3M9Hib4R0YEVtpvI8pfI8eDoXnecikL6jLX0U36IaV/Ph1fgNBx4Wr2C1ArKq QObFf85KX5phkxK62so4Q88UHPAkC7U/AvqY5zLRRMma5Pg/WUiupIW6lNgX8+N2UyD2 Esk9DFnjmyMuG/XSLVwvQJSQ5o9wjbmffDwHj87j5HDCcD7Qo5p+/0uRKwukenwm+wPx GgVCTxQBa9aRwl0uKYyop2+y98RIhuLyh+psKtKqbEaxsXwx92s3XUlTcJgZDcOxNXDm E4hQ== X-Gm-Message-State: AOAM5318Tt0TO0i1XvUd6Hx8tGAy8zT6MzqXfPcexUdfc3NvZlvJDgtO M18rsTb79gE8PbHECNQPWFMY67KsdMfTlA== X-Google-Smtp-Source: ABdhPJxJhQc7chkKElkwnuYxYMeJk51mzik2AZlGYUC7QCOlaxCGkdgxqxqh3xBADiPRw2bnlkC6jA== X-Received: by 2002:adf:ea0d:: with SMTP id q13mr3022298wrm.161.1621498756526; Thu, 20 May 2021 01:19:16 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id y20sm8900004wmi.0.2021.05.20.01.19.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 01:19:15 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Gregory Anders , =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= , Jeff King , Eric Sunshine , Eric Wong , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v2 04/10] send-email: lazily shell out to "git var" Date: Thu, 20 May 2021 10:19:01 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.rc0.405.g5d387561bb3 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Optimize git-send-email by only shelling out to "git var" if we need to. This is easily done by re-inventing our own small version of perl's Memoize module. I suppose I could just use Memoize itself, but in a subsequent patch I'll be micro-optimizing send-email's use of dependencies. Using Memoize is a measly extra 5-10 milliseconds, but as we'll see that'll end up mattering for us in the end. This brings the runtime of a plain "send-email" from around ~160-170ms to ~140m-150ms. The runtime of the tests is around the same, or around ~20s. Signed-off-by: Ævar Arnfjörð Bjarmason --- git-send-email.perl | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 5b0b7c33ec6..9ff315f775c 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -560,8 +560,18 @@ sub read_config { } my ($repoauthor, $repocommitter); -($repoauthor) = Git::ident_person(@repo, 'author'); -($repocommitter) = Git::ident_person(@repo, 'committer'); +{ + my %cache; + my ($author, $committer); + my $common = sub { + my ($what) = @_; + return $cache{$what} if exists $cache{$what}; + ($cache{$what}) = Git::ident_person(@repo, $what); + return $cache{$what}; + }; + $repoauthor = sub { $common->('author') }; + $repocommitter = sub { $common->('committer') }; +} sub parse_address_line { return map { $_->format } Mail::Address->parse($_[0]); @@ -749,7 +759,7 @@ sub get_patch_subject { or die sprintf(__("Failed to open for writing %s: %s"), $compose_filename, $!); - my $tpl_sender = $sender || $repoauthor || $repocommitter || ''; + my $tpl_sender = $sender || $repoauthor->() || $repocommitter->() || ''; my $tpl_subject = $initial_subject || ''; my $tpl_in_reply_to = $initial_in_reply_to || ''; my $tpl_reply_to = $reply_to || ''; @@ -955,7 +965,7 @@ sub file_declares_8bit_cte { $sender =~ s/^\s+|\s+$//g; ($sender) = expand_aliases($sender); } else { - $sender = $repoauthor || $repocommitter || ''; + $sender = $repoauthor->() || $repocommitter->() || ''; } # $sender could be an already sanitized address @@ -1104,7 +1114,7 @@ sub make_message_id { $uniq = "$message_id_stamp-$message_id_serial"; my $du_part; - for ($sender, $repocommitter, $repoauthor) { + for ($sender, $repocommitter->(), $repoauthor->()) { $du_part = extract_valid_address(sanitize_address($_)); last if (defined $du_part and $du_part ne ''); } -- 2.32.0.rc0.405.g5d387561bb3