Commitb217a15

committed

keyring tests: data races eliminated

1 parent1a96091 commitb217a15Copy full SHA for b217a15

File tree

+11

-0

lines changed

+11

-0

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,14 +69,19 @@ func NewThreadKeyring(ctx context.Context, keyring Keyring) (ThreadKeyring, er`
`69`	`69`	`tk.removekey=make(chan*removekeyMsg)`
`70`	`70`	`tk.readkey=make(chan*readkeyMsg)`
`71`	`71`
	`72`	`+// Channel for initialization to prevent Data Race`
	`73`	`+errCh:=make(chanerror,1)`
	`74`	`+`
`72`	`75`	`tk.wg.Add(1)`
`73`	`76`	`gofunc() {`
`74`	`77`	`varak*Keyring`
`75`	`78`	`runtime.LockOSThread()`
`76`	`79`	`ak,err=keyring.CreateKeyring()`
`77`	`80`	`iferr!=nil {`
	`81`	`+errCh<-err`
`78`	`82`	`return`
`79`	`83`	`}`
	`84`	`+errCh<-nil`
`80`	`85`	`for {`
`81`	`86`	`select {`
`82`	`87`	`casemsg:=<-tk.addkey:`
`@@ -91,5 +96,11 @@ func NewThreadKeyring(ctx context.Context, keyring Keyring) (ThreadKeyring, er`
`91`	`96`	`}`
`92`	`97`	`}`
`93`	`98`	`}()`
	`99`	`+`
	`100`	`+// Wait for initialization to complete`
	`101`	`+iferr:=<-errCh;err!=nil {`
	`102`	`+returnnil,err`
	`103`	`+}`
	`104`	`+`
`94`	`105`	`return&tk,err`
`95`	`106`	`}`

Comments

(0)