Skip to content

Commit

Permalink
cmd/go: parallelize fmt
Browse files Browse the repository at this point in the history
Currently go fmt formats all files sequentially.
That's a shame. Parallelize it over files.

Reduces time of go fmt ./... in std lib
from ~6.1s to ~0.9s.

Reduces time of go fmt github.com/google/syzkaller/...
from ~5.2s to ~1.8s.

Change-Id: I3d27fc25326106b2a4781e13506a25c12d5bcdc5
Reviewed-on: https://go-review.googlesource.com/45491
Run-TryBot: Dmitry Vyukov <dvyukov@google.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
  • Loading branch information
dvyukov authored and ianlancetaylor committed Aug 14, 2017
1 parent 8b2f843 commit 1f631a2
Showing 1 changed file with 19 additions and 1 deletion.
20 changes: 19 additions & 1 deletion src/cmd/go/internal/fmtcmd/fmt.go
Expand Up @@ -8,6 +8,8 @@ package fmtcmd
import (
"os"
"path/filepath"
"runtime"
"sync"

"cmd/go/internal/base"
"cmd/go/internal/cfg"
Expand Down Expand Up @@ -41,13 +43,29 @@ See also: go fix, go vet.

func runFmt(cmd *base.Command, args []string) {
gofmt := gofmtPath()
procs := runtime.GOMAXPROCS(0)
var wg sync.WaitGroup
wg.Add(procs)
fileC := make(chan string, 2*procs)
for i := 0; i < procs; i++ {
go func() {
defer wg.Done()
for file := range fileC {
base.Run(str.StringList(gofmt, "-l", "-w", file))
}
}()
}
for _, pkg := range load.Packages(args) {
// Use pkg.gofiles instead of pkg.Dir so that
// the command only applies to this package,
// not to packages in subdirectories.
files := base.FilterDotUnderscoreFiles(base.RelPaths(pkg.Internal.AllGoFiles))
base.Run(str.StringList(gofmt, "-l", "-w", files))
for _, file := range files {
fileC <- file
}
}
close(fileC)
wg.Wait()
}

func gofmtPath() string {
Expand Down

0 comments on commit 1f631a2

Please sign in to comment.