Skip to content

Fixed a couple of (very rare) race conditions #2112

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
Mar 16, 2023
Merged

Fixed a couple of (very rare) race conditions #2112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c92e004
Fixed concurrent write to variables `err` and `n`
cmaglie Mar 15, 2023
2285176
Fix concurrent access to p.cmd.Process
cmaglie Mar 15, 2023
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
4 changes: 2 additions & 2 deletions arduino/monitor/monitor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ func TestDummyMonitor(t *testing.T) {
go func() {
buff := [1024]byte{}
// Receive "TEST" echoed back
n, err = rw.Read(buff[:])
_, err := rw.Read(buff[:])
require.NoError(t, err)
require.Equal(t, 4, n)
require.Equal(t, "TEST", string(buff[:4]))

// Block on read until the port is closed
n, err = rw.Read(buff[:])
_, err = rw.Read(buff[:])
require.ErrorIs(t, err, io.EOF)
atomic.StoreInt32(&completed, 1) // notify completion
}()
Expand Down
6 changes: 4 additions & 2 deletions executils/process.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@ func (p *Process) SetEnvironment(values []string) {
// RunWithinContext starts the specified command and waits for it to complete. If the given context
// is canceled before the normal process termination, the process is killed.
func (p *Process) RunWithinContext(ctx context.Context) error {
if err := p.Start(); err != nil {
return err
}
completed := make(chan struct{})
defer close(completed)
go func() {
Expand All @@ -169,6 +172,5 @@ func (p *Process) RunWithinContext(ctx context.Context) error {
case <-completed:
}
}()
res := p.cmd.Run()
return res
return p.Wait()
}