Commit1b94ccc

authored

fix(serialport): data race on theisClosing bool status of the serial port (#1009)

* fix: use atomic boolean for thread-safe isClosing flag

1 parentf1ca3c9 commit1b94cccCopy full SHA for 1b94ccc

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import (`
`20`	`20`	`"encoding/base64"`
`21`	`21`	`"io"`
`22`	`22`	`"strconv"`
	`23`	`+"sync/atomic"`
`23`	`24`	`"time"`
`24`	`25`	`"unicode/utf8"`
`25`	`26`
`@@ -43,7 +44,7 @@ type serport struct {`
`43`	`44`
`44`	`45`	`// Keep track of whether we're being actively closed`
`45`	`46`	`// just so we don't show scary error messages`
`46`		`-isClosingbool`
	`47`	`+isClosingatomic.Bool`
`47`	`48`
`48`	`49`	`isClosingDueToErrorbool`
`49`	`50`
`@@ -85,7 +86,7 @@ func (p *serport) reader(buftype string) {`
`85`	`86`	`bufferPart:=serialBuffer[:n]`
`86`	`87`
`87`	`88`	`//if we detect that port is closing, break out of this for{} loop.`
`88`		`-ifp.isClosing {`
	`89`	`+ifp.isClosing.Load() {`
`89`	`90`	`strmsg:="Shutting down reader on "+p.portConf.Name`
`90`	`91`	`log.Println(strmsg)`
`91`	`92`	`h.broadcastSys<- []byte(strmsg)`
`@@ -348,7 +349,8 @@ func spHandlerOpen(portname string, baud int, buftype string) {`
`348`	`349`	`}`
`349`	`350`
`350`	`351`	`func (p*serport)Close() {`
`351`		`-p.isClosing=true`
	`352`	`+p.isClosing.Store(true)`
	`353`	`+`
`352`	`354`	`p.bufferwatcher.Close()`
`353`	`355`	`p.portIo.Close()`
`354`	`356`	`serialPorts.MarkPortAsClosed(p.portName)`

Comments

(0)