Skip to content

Sync board list to avoid race conditions #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 29, 2019
Merged

Sync board list to avoid race conditions #308

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92b0c4b
sync board list to avoid race conditions
masci Jul 24, 2019
f26c453
properly unlock mutex
masci Jul 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions arduino/discovery/discovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"io"
"os/exec"
"strings"
"sync"
"time"

"github.com/arduino/arduino-cli/arduino/cores"
Expand All @@ -33,6 +34,7 @@ import (

// Discovery is an instance of a discovery tool
type Discovery struct {
sync.Mutex
ID string
in io.WriteCloser
out io.ReadCloser
Expand Down Expand Up @@ -88,6 +90,11 @@ func (d *Discovery) Start() error {

// List retrieve the port list from this discovery
func (d *Discovery) List() ([]*BoardPort, error) {
// ensure the connection to the discoverer is unique to avoid messing up
// the messages exchanged
d.Lock()
defer d.Unlock()

if _, err := d.in.Write([]byte("LIST\n")); err != nil {
return nil, fmt.Errorf("sending LIST command to discovery: %s", err)
}
Expand Down