Commit8c9f60b

committed

fix: use context cancellation for quick stop

1 parentc18f3ff commit8c9f60bCopy full SHA for 8c9f60b

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package goanalysis`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+"context"`
`4`	`5`	`"fmt"`
`5`	`6`	`"runtime/debug"`
`6`	`7`
`@@ -28,11 +29,12 @@ func (actAlloc actionAllocator) alloc() action {`
`28`	`29`	`returnact`
`29`	`30`	`}`
`30`	`31`
`31`		`-func (act*action)waitUntilDependingAnalyzersWorked(stopChanchanstruct{}) {`
	`32`	`+func (act*action)waitUntilDependingAnalyzersWorked(ctx context.Context,stopChanchanstruct{}) {`
`32`	`33`	`for_,dep:=rangeact.Deps {`
`33`	`34`	`ifdep.Package==act.Package {`
`34`	`35`	`select {`
`35`	`36`	`case<-stopChan:`
	`37`	`+case<-ctx.Done():`
`36`	`38`	`return`
`37`	`39`	`case<-dep.analysisDoneCh:`
`38`	`40`	`}`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package goanalysis`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+"context"`
`4`	`5`	`"errors"`
`5`	`6`	`"fmt"`
`6`	`7`	`"go/ast"`
`@@ -84,15 +85,17 @@ func (lp *loadingPackage) analyze(stopChan chan struct{}, loadMode LoadMode, loa`
`84`	`85`	`return`
`85`	`86`	`}`
`86`	`87`
`87`		`-varactsWgerrgroup.Group`
	`88`	`+actsWg,ctx:=errgroup.WithContext(context.Background())`
`88`	`89`
`89`	`90`	`for_,act:=rangelp.actions {`
`90`	`91`	`actsWg.Go(func()error {`
`91`		`-act.waitUntilDependingAnalyzersWorked(stopChan)`
	`92`	`+act.waitUntilDependingAnalyzersWorked(ctx,stopChan)`
`92`	`93`
`93`	`94`	`select {`
`94`	`95`	`case<-stopChan:`
`95`	`96`	`returnnil`
	`97`	`+case<-ctx.Done():`
	`98`	`+returnnil`
`96`	`99`	`default:`
`97`	`100`	`}`
`98`	`101`

Comments

(0)