Merge 2030a8b into bf4dec8

Author: Henry Wong

go/packages/golist.go

@@ -98,19 +98,28 @@ func determineEnv(cfg *Config) goEnv {
 	return env
 }
 
+var (
+	sizes           types.Sizes
+	sizeserr        error
+	runGetSizesOnce sync.Once
+)
+
 // goListDriver uses the go list command to interpret the patterns and produce
 // the build system package structure.
 // See driver for more details.
 func goListDriver(cfg *Config, patterns ...string) (*driverResponse, error) {
-	var sizes types.Sizes
-	var sizeserr error
+	//var sizes types.Sizes
+	//var sizeserr error
 	var sizeswg sync.WaitGroup
 	if cfg.Mode&NeedTypesSizes != 0 || cfg.Mode&NeedTypes != 0 {
-		sizeswg.Add(1)
-		go func() {
+		//sizeswg.Add(1)
+		//go func() {
+		//	sizes, sizeserr = getSizes(cfg)
+		//	sizeswg.Done()
+		//}()
+		runGetSizesOnce.Do(func() {
 			sizes, sizeserr = getSizes(cfg)
-			sizeswg.Done()
-		}()
+		})
 	}
 
 	// start fetching rootDirs