Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SMA: fix race condition (#1206)

Browse source
This commit is contained in:
Benjamin Böhmke 2021-07-11 20:58:56 +02:00 • committed by GitHub
parent 8c982615cc
commit 7fcadcf458
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -66,7 +66,7 @@ require (
github.com/thoas/go-funk v0.8.0
github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c
github.com/volkszaehler/mbmd v0.0.0-20210526131012-e1fec7232ed7
gitlab.com/bboehmke/sunny v0.13.2
gitlab.com/bboehmke/sunny v0.14.0
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
golang.org/x/net v0.0.0-20210614182718-04defd469f4e
golang.org/x/oauth2 v0.0.0-20210615190721-d04028783cf1

4
go.sum
View file

@ -660,8 +660,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
gitlab.com/bboehmke/sunny v0.13.2 h1:blQPB2hcqX11/a9L1AiiEVSqxH+s9/I7JZ2M1TiS9bY=
gitlab.com/bboehmke/sunny v0.13.2/go.mod h1:F5AIuL7kYteSJFR5E+YEocxIdpyCXmtDciFmMQVjP88=
gitlab.com/bboehmke/sunny v0.14.0 h1:y7BSXRiyM3uJwnVes++JvuhdxDZKVhbHQlF+0/kwlgw=
gitlab.com/bboehmke/sunny v0.14.0/go.mod h1:F5AIuL7kYteSJFR5E+YEocxIdpyCXmtDciFmMQVjP88=
go.coder.com/go-tools v0.0.0-20190317003359-0c6a35b74a16/go.mod h1:iKV5yK9t+J5nG9O3uF6KYdPEz3dyfMyB15MN1rbQ8Qw=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=

9
meter/sma.go
View file

@ -145,15 +145,6 @@ func (sm *SMA) Diagnose() {
fmt.Fprintf(w, " EnergyMeter:\t%v\n", sm.device.IsEnergyMeter())
fmt.Fprintln(w)
if name, err := sm.device.GetDeviceName(); err == nil {
fmt.Fprintf(w, " Name:\t%s\n", name)
}
if devClass, err := sm.device.GetDeviceClass(); err == nil {
fmt.Fprintf(w, " Device Class:\t0x%X\n", devClass)
}
fmt.Fprintln(w)
if values, err := sm.device.Values(); err == nil {
ids := make([]sunny.ValueID, 0, len(values))
for k := range values {

9
provider/sma/device.go
View file

@ -25,7 +25,7 @@ func (d *Device) StartUpdateLoop() {
d.once.Do(func() {
go func() {
d.updateValues()
for range time.NewTicker(time.Second).C {
for range time.NewTicker(time.Second * 5).C {
d.updateValues()
}
}()
@ -58,7 +58,12 @@ func (d *Device) Values() (map[sunny.ValueID]interface{}, error) {
return nil, fmt.Errorf("update timeout: %v", elapsed.Truncate(time.Second))
}
return d.values, nil
// return a copy of the map to avoid race conditions
values := make(map[sunny.ValueID]interface{}, len(d.values))
for key, value := range d.values {
values[key] = value
}
return values, nil
}
func AsFloat(value interface{}) float64 {

2
provider/sma/discover.go
View file

@ -76,6 +76,8 @@ func (d *Discoverer) addDevice(device *sunny.Device) {
if _, ok := d.devices[device.SerialNumber()]; !ok {
d.devices[device.SerialNumber()] = d.createDevice(device)
} else {
device.Close()
}
}