OrgGo/hybridgroup.gobot
1
0
Fork 0
mirror of https://github.com/hybridgroup/gobot.git synced 2025-05-11 19:29:20 +08:00
Code Issues Projects Releases Wiki Activity

edison: protect against pin map races

Browse Source 
Signed-off-by: deadprogram <ron@hybridgroup.com>
This commit is contained in:
deadprogram 2017-05-06 15:11:46 +02:00
parent 0e97c6cd1f
commit 16bb422d14
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
platforms/intel-iot/edison/edison_adaptor.go
View File

@ -5,6 +5,7 @@ import (
"fmt" "fmt"
"os" "os"
"strconv" "strconv"
"sync"
multierror "github.com/hashicorp/go-multierror" multierror "github.com/hashicorp/go-multierror"
"gobot.io/x/gobot" "gobot.io/x/gobot"
@ -37,6 +38,7 @@ type Adaptor struct {
connect func(e *Adaptor) (err error) connect func(e *Adaptor) (err error)
writeFile func(path string, data []byte) (i int, err error) writeFile func(path string, data []byte) (i int, err error)
readFile func(path string) ([]byte, error) readFile func(path string) ([]byte, error)
mutex *sync.Mutex
} }
// NewAdaptor returns a new Edison Adaptor // NewAdaptor returns a new Edison Adaptor
@ -46,6 +48,7 @@ func NewAdaptor() *Adaptor {
pinmap: arduinoPinMap, pinmap: arduinoPinMap,
writeFile: writeFile, writeFile: writeFile,
readFile: readFile, readFile: readFile,
mutex: &sync.Mutex{},
} }
} }
@ -91,6 +94,9 @@ func (e *Adaptor) Connect() (err error) {
// Finalize releases all i2c devices and exported analog, digital, pwm pins. // Finalize releases all i2c devices and exported analog, digital, pwm pins.
func (e *Adaptor) Finalize() (err error) { func (e *Adaptor) Finalize() (err error) {
// e.mutex.Lock()
// defer e.mutex.Unlock()
if errs := e.tristate.Unexport(); errs != nil { if errs := e.tristate.Unexport(); errs != nil {
err = multierror.Append(err, errs) err = multierror.Append(err, errs)
} }
@ -168,6 +174,9 @@ func (e *Adaptor) AnalogRead(pin string) (val int, err error) {
// GetConnection returns an i2c connection to a device on a specified bus. // GetConnection returns an i2c connection to a device on a specified bus.
// Valid bus numbers are 1 and 6 (arduino). // Valid bus numbers are 1 and 6 (arduino).
func (e *Adaptor) GetConnection(address int, bus int) (connection i2c.Connection, err error) { func (e *Adaptor) GetConnection(address int, bus int) (connection i2c.Connection, err error) {
e.mutex.Lock()
defer e.mutex.Unlock()
if !(bus == e.GetDefaultBus()) { if !(bus == e.GetDefaultBus()) {
return nil, errors.New("Unsupported I2C bus") return nil, errors.New("Unsupported I2C bus")
} }
@ -192,6 +201,9 @@ func (e *Adaptor) GetDefaultBus() int {
// DigitalPin returns matched sysfs.DigitalPin for specified values // DigitalPin returns matched sysfs.DigitalPin for specified values
func (e *Adaptor) DigitalPin(pin string, dir string) (sysfsPin sysfs.DigitalPinner, err error) { func (e *Adaptor) DigitalPin(pin string, dir string) (sysfsPin sysfs.DigitalPinner, err error) {
e.mutex.Lock()
defer e.mutex.Unlock()
i := e.pinmap[pin] i := e.pinmap[pin]
if e.digitalPins[i.pin] == nil { if e.digitalPins[i.pin] == nil {
e.digitalPins[i.pin], err = e.newExportedPin(i.pin) e.digitalPins[i.pin], err = e.newExportedPin(i.pin)
@ -278,6 +290,9 @@ func (e *Adaptor) PWMPin(pin string) (sysfsPin sysfs.PWMPinner, err error) {
if err = changePinMode(e, strconv.Itoa(int(sysPin.pin)), "1"); err != nil { if err = changePinMode(e, strconv.Itoa(int(sysPin.pin)), "1"); err != nil {
return return
} }
e.mutex.Lock()
defer e.mutex.Unlock()
e.pwmPins[sysPin.pwmPin] = sysfs.NewPWMPin(sysPin.pwmPin) e.pwmPins[sysPin.pwmPin] = sysfs.NewPWMPin(sysPin.pwmPin)
if err = e.pwmPins[sysPin.pwmPin].Export(); err != nil { if err = e.pwmPins[sysPin.pwmPin].Export(); err != nil {
return return