jarno
/
enervent-ctrl
1
0
Fork 0
Code Issues 4 Pull Requests Releases 1 Wiki Activity

gh-24Rework of the locking mechanisms. The bug causinga deadlock was probably caused by locking bebefore calling another function that also tries to acquire the lock...

This commit is contained in:
Jarno Rankinen 2023-03-09 22:05:46 +02:00
parent c79f172f32
commit afcbe06581
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
enervent-ctrl-go/pingvinKL/pingvinKL.go
View File

@ -175,7 +175,9 @@ func (p *PingvinKL) Quit() {
// Update all coil values
func (p *PingvinKL) updateCoils() {
p.buslock.Lock()
results, err := p.modbusclient.ReadCoils(0, uint16(len(p.Coils)))
p.buslock.Unlock()
if err != nil {
log.Fatal("updateCoils: client.ReadCoils: ", err)
}
@ -201,7 +203,9 @@ func (p *PingvinKL) updateCoils() {
// Read a single holding register, stores value in p.Registers
// Returns integer value of register
func (p *PingvinKL) ReadRegister(addr uint16) (int, error) {
p.buslock.Lock()
results, err := p.modbusclient.ReadHoldingRegisters(addr, 1)
p.buslock.Unlock()
if err != nil {
log.Println("ERROR: ReadRegister:", err)
return 0, err
@ -218,7 +222,9 @@ func (p *PingvinKL) ReadRegister(addr uint16) (int, error) {
// Update a single holding register
func (p *PingvinKL) WriteRegister(addr uint16, value uint16) (uint16, error) {
p.buslock.Lock()
_, err := p.modbusclient.WriteSingleRegister(addr, value)
p.buslock.Unlock()
if err != nil {
log.Println("ERROR: WriteRegister:", err)
return 0, err
@ -249,7 +255,9 @@ func (p *PingvinKL) updateRegisters() {
results := []byte{}
for retries := 0; retries < 5; retries++ {
p.Debug.Println("Reading registers, attempt", retries, "k:", k)
p.buslock.Lock()
results, err = p.modbusclient.ReadHoldingRegisters(uint16(k), uint16(r))
p.buslock.Unlock()
if len(results) > 0 {
break
} else if retries == 4 {