From a4a4500104d2e5013015de30ae560145a614d22e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sat, 15 Aug 2020 00:06:48 +0200
Subject: [PATCH] reuse the first call to 'go env'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We need to call 'go env GOPRIVATE' instead of just using os.Getenv so
that we pick up the value from the new ${CONFIG}/go/env file, written by
'go env -w'.

However, we were calling 'go env' at every process start, including the
often tens or hundreds of compiler calls to build all the dependencies.

Instead, do that only once on the first 'garble build' process, and use
os.Setenv to pass that along to future garble sub-processes.

	name     old time/op       new time/op       delta
	Build-8        1.81s ± 0%        1.74s ± 4%   -3.78%  (p=0.030 n=5+6)

	name     old sys-time/op   new sys-time/op   delta
	Build-8        1.45s ± 2%        1.22s ± 1%  -16.07%  (p=0.002 n=6+6)

	name     old user-time/op  new user-time/op  delta
	Build-8        10.9s ± 1%        10.6s ± 1%   -2.82%  (p=0.004 n=6+5)
---
 main.go | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/main.go b/main.go
index 4301ffc..32449a8 100644
--- a/main.go
+++ b/main.go
@@ -95,12 +95,13 @@ var (
 		return os.Open(buildInfo.imports[path].packagefile)
 	}).(types.ImporterFrom)
 
+	envGoPrivate = os.Getenv("GOPRIVATE") // complemented by 'go env' later
+
 	envGarbleDir      = os.Getenv("GARBLE_DIR")
 	envGarbleLiterals = os.Getenv("GARBLE_LITERALS") == "true"
 	envGarbleTiny     = os.Getenv("GARBLE_TINY") == "true"
 	envGarbleDebugDir = os.Getenv("GARBLE_DEBUGDIR")
 	envGarbleSeed     = os.Getenv("GARBLE_SEED")
-	envGoPrivate      string // filled via 'go env' below to support 'go env -w'
 	envGarbleListPkgs = os.Getenv("GARBLE_LISTPKGS")
 
 	seed []byte
@@ -225,14 +226,6 @@ func main1() int {
 }
 
 func mainErr(args []string) error {
-	// TODO(mvdan): only run this once at the very beginning, then set the
-	// GOPRIVATE env var.
-	out, err := exec.Command("go", "env", "GOPRIVATE").CombinedOutput()
-	if err != nil {
-		return fmt.Errorf("%v: %s", err, out)
-	}
-	envGoPrivate = string(bytes.TrimSpace(out))
-
 	// If we recognise an argument, we're not running within -toolexec.
 	switch cmd := args[0]; cmd {
 	case "help":
@@ -285,15 +278,26 @@ func mainErr(args []string) error {
 
 		os.Setenv("GARBLE_DEBUGDIR", flagDebugDir)
 
+		if envGoPrivate == "" {
+			// Try 'go env' too, to query ${CONFIG}/go/env as well.
+			out, err := exec.Command("go", "env", "GOPRIVATE").CombinedOutput()
+			if err != nil {
+				return fmt.Errorf("%v: %s", err, out)
+			}
+			envGoPrivate = string(bytes.TrimSpace(out))
+		}
 		// If GOPRIVATE isn't set and we're in a module, use its module
 		// path as a GOPRIVATE default. Include a _test variant too.
 		if envGoPrivate == "" {
 			modpath, err := exec.Command("go", "list", "-m").Output()
 			if err == nil {
 				path := string(bytes.TrimSpace(modpath))
-				os.Setenv("GOPRIVATE", path+","+path+"_test")
+				envGoPrivate = path+","+path+"_test"
 			}
 		}
+		// Explicitly set GOPRIVATE, since future garble processes won't
+		// query 'go env' again.
+		os.Setenv("GOPRIVATE", envGoPrivate)
 
 		f, err := ioutil.TempFile("", "garble-list-deps")
 		if err != nil {