Skip to content

optimize linters scheduling: run slow linters first #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/commands/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ func buildLintCtx(ctx context.Context, linters []pkg.Linter, cfg *config.Config)
}, nil
}

func (e *Executor) runAnalysis(ctx context.Context, args []string) (chan result.Issue, error) {
func (e *Executor) runAnalysis(ctx context.Context, args []string) (<-chan result.Issue, error) {
e.cfg.Run.Args = args

linters, err := pkg.GetEnabledLinters(e.cfg)
Expand Down
53 changes: 30 additions & 23 deletions pkg/enabled_linters.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ type LinterConfig struct {
DoesFullImport bool
NeedsSSARepr bool
InPresets []string
Speed int // more value means faster execution of linter
}

func (lc LinterConfig) WithFullImport() LinterConfig {
Expand All @@ -56,6 +57,11 @@ func (lc LinterConfig) WithPresets(presets ...string) LinterConfig {
return lc
}

func (lc LinterConfig) WithSpeed(speed int) LinterConfig {
lc.Speed = speed
return lc
}

func newLinterConfig(linter Linter) LinterConfig {
return LinterConfig{
Linter: linter,
Expand Down Expand Up @@ -93,30 +99,31 @@ func enableLinterConfigs(lcs []LinterConfig, isEnabled func(lc *LinterConfig) bo

func GetAllSupportedLinterConfigs() []LinterConfig {
lcs := []LinterConfig{
newLinterConfig(golinters.Govet{}).WithPresets(PresetBugs),
newLinterConfig(golinters.Errcheck{}).WithFullImport().WithPresets(PresetBugs),
newLinterConfig(golinters.Golint{}).WithPresets(PresetStyle),

newLinterConfig(golinters.Megacheck{StaticcheckEnabled: true}).WithSSA().WithPresets(PresetBugs),
newLinterConfig(golinters.Megacheck{UnusedEnabled: true}).WithSSA().WithPresets(PresetUnused),
newLinterConfig(golinters.Megacheck{GosimpleEnabled: true}).WithSSA().WithPresets(PresetStyle),

newLinterConfig(golinters.Gas{}).WithFullImport().WithPresets(PresetBugs),
newLinterConfig(golinters.Structcheck{}).WithFullImport().WithPresets(PresetUnused),
newLinterConfig(golinters.Varcheck{}).WithFullImport().WithPresets(PresetUnused),
newLinterConfig(golinters.Interfacer{}).WithSSA().WithPresets(PresetStyle),
newLinterConfig(golinters.Unconvert{}).WithFullImport().WithPresets(PresetStyle),
newLinterConfig(golinters.Ineffassign{}).WithPresets(PresetUnused),
newLinterConfig(golinters.Dupl{}).WithPresets(PresetStyle),
newLinterConfig(golinters.Goconst{}).WithPresets(PresetStyle),
newLinterConfig(golinters.Deadcode{}).WithFullImport().WithPresets(PresetUnused),
newLinterConfig(golinters.Gocyclo{}).WithPresets(PresetComplexity),

newLinterConfig(golinters.Gofmt{}).WithPresets(PresetFormatting),
newLinterConfig(golinters.Gofmt{UseGoimports: true}).WithPresets(PresetFormatting),
newLinterConfig(golinters.Maligned{}).WithFullImport().WithPresets(PresetPerformance),
newLinterConfig(golinters.Govet{}).WithPresets(PresetBugs).WithSpeed(4),
newLinterConfig(golinters.Errcheck{}).WithFullImport().WithPresets(PresetBugs).WithSpeed(10),
newLinterConfig(golinters.Golint{}).WithPresets(PresetStyle).WithSpeed(3),

newLinterConfig(golinters.Megacheck{StaticcheckEnabled: true}).WithSSA().
WithPresets(PresetBugs).WithSpeed(2),
newLinterConfig(golinters.Megacheck{UnusedEnabled: true}).WithSSA().WithPresets(PresetUnused).WithSpeed(5),
newLinterConfig(golinters.Megacheck{GosimpleEnabled: true}).WithSSA().WithPresets(PresetStyle).WithSpeed(5),

newLinterConfig(golinters.Gas{}).WithFullImport().WithPresets(PresetBugs).WithSpeed(8),
newLinterConfig(golinters.Structcheck{}).WithFullImport().WithPresets(PresetUnused).WithSpeed(10),
newLinterConfig(golinters.Varcheck{}).WithFullImport().WithPresets(PresetUnused).WithSpeed(10),
newLinterConfig(golinters.Interfacer{}).WithSSA().WithPresets(PresetStyle).WithSpeed(6),
newLinterConfig(golinters.Unconvert{}).WithFullImport().WithPresets(PresetStyle).WithSpeed(10),
newLinterConfig(golinters.Ineffassign{}).WithPresets(PresetUnused).WithSpeed(9),
newLinterConfig(golinters.Dupl{}).WithPresets(PresetStyle).WithSpeed(7),
newLinterConfig(golinters.Goconst{}).WithPresets(PresetStyle).WithSpeed(9),
newLinterConfig(golinters.Deadcode{}).WithFullImport().WithPresets(PresetUnused).WithSpeed(10),
newLinterConfig(golinters.Gocyclo{}).WithPresets(PresetComplexity).WithSpeed(8),

newLinterConfig(golinters.Gofmt{}).WithPresets(PresetFormatting).WithSpeed(7),
newLinterConfig(golinters.Gofmt{UseGoimports: true}).WithPresets(PresetFormatting).WithSpeed(5),
newLinterConfig(golinters.Maligned{}).WithFullImport().WithPresets(PresetPerformance).WithSpeed(10),
newLinterConfig(golinters.Megacheck{GosimpleEnabled: true, UnusedEnabled: true, StaticcheckEnabled: true}).
WithSSA().WithPresets(PresetStyle, PresetBugs, PresetUnused),
WithSSA().WithPresets(PresetStyle, PresetBugs, PresetUnused).WithSpeed(1),
}

if os.Getenv("GOLANGCI_COM_RUN") == "1" {
Expand Down
2 changes: 1 addition & 1 deletion pkg/printers/json.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func NewJSON() *JSON {
return &JSON{}
}

func (JSON) Print(issues chan result.Issue) (bool, error) {
func (JSON) Print(issues <-chan result.Issue) (bool, error) {
var allIssues []result.Issue
for i := range issues {
allIssues = append(allIssues, i)
Expand Down
2 changes: 1 addition & 1 deletion pkg/printers/printer.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ package printers
import "github.com/golangci/golangci-lint/pkg/result"

type Printer interface {
Print(issues chan result.Issue) (bool, error)
Print(issues <-chan result.Issue) (bool, error)
}
2 changes: 1 addition & 1 deletion pkg/printers/text.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func (p *Text) getFileLinesForIssue(i *result.Issue) (linesCache, error) {
return fc, nil
}

func (p *Text) Print(issues chan result.Issue) (bool, error) {
func (p *Text) Print(issues <-chan result.Issue) (bool, error) {
var issuedLineExtractingDuration time.Duration
defer func() {
logrus.Infof("Extracting issued lines took %s", issuedLineExtractingDuration)
Expand Down
Loading