Merge pull request #34 from arduino/fix_unix_sync

Fixed LIBUSB_ERROR_ACCESS on Linux

Author: cmaglie

main.go

@@ -39,9 +39,11 @@ int libusbHandleEvents();
 import "C"
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"os"
+	"time"
 
 	"github.com/arduino/go-properties-orderedmap"
 	discovery "github.com/arduino/pluggable-discovery-protocol-handler/v2"
@@ -96,27 +98,62 @@ func (d *DFUDiscovery) libusbSync(eventCB discovery.EventCallback, errorCB disco
 		return errors.New(C.GoString(err))
 	}
 
-	closeChan := make(chan struct{})
+	ctx, cancel := context.WithCancel(context.Background())
+	eventChan := d.runUpdateSender(ctx, eventCB, errorCB)
+
 	go func() {
-		d.sendUpdates(eventCB, errorCB)
 		for {
 			if C.libusbHandleEvents() != 0 {
-				d.sendUpdates(eventCB, errorCB)
+				select {
+				case eventChan <- true:
+				default:
+				}
 			}
 			select {
-			case <-closeChan:
+			case <-ctx.Done():
 				C.libusbHotplugDeregisterCallback()
 				return
 			default:
 			}
 		}
 	}()
-	d.close = func() {
-		close(closeChan)
-	}
+	d.close = cancel
 	return nil
 }
 
+func (d *DFUDiscovery) runUpdateSender(ctx context.Context, eventCB discovery.EventCallback, errorCB discovery.ErrorCallback) chan<- bool {
+	deviceEventChan := make(chan bool)
+	go func() {
+		d.sendUpdates(eventCB, errorCB)
+
+		for {
+			select {
+			case <-ctx.Done():
+				return
+			case <-deviceEventChan:
+			}
+
+		again:
+			d.sendUpdates(eventCB, errorCB)
+
+			// Trigger another update after 500ms because the PLUG-IN signal may come
+			// way earlier before the port becomes actually READY.
+			// We experienced problems like:
+			// - the port not yet visibile
+			// - the port not accessible (because permissions haven't been set yet)
+			select {
+			case <-ctx.Done():
+				return
+			case <-deviceEventChan:
+				goto again
+			case <-time.After(time.Millisecond * 500):
+			}
+			d.sendUpdates(eventCB, errorCB)
+		}
+	}()
+	return deviceEventChan
+}
+
 func (d *DFUDiscovery) sendUpdates(eventCB discovery.EventCallback, errorCB discovery.ErrorCallback) {
 	C.dfuProbeDevices()
 

sync_windows.go

@@ -19,17 +19,14 @@ package main
 
 import (
 	"context"
-	"time"
 
 	"github.com/arduino/go-win32-utils/devicenotification"
 	discovery "github.com/arduino/pluggable-discovery-protocol-handler/v2"
 )
 
 func (d *DFUDiscovery) sync(eventCB discovery.EventCallback, errorCB discovery.ErrorCallback) error {
 	ctx, cancel := context.WithCancel(context.Background())
-	d.close = cancel
-
-	deviceEventChan := make(chan bool, 1)
+	deviceEventChan := d.runUpdateSender(ctx, eventCB, errorCB)
 	go func() {
 		err := devicenotification.Start(ctx, func() {
 			select {
@@ -42,30 +39,6 @@ func (d *DFUDiscovery) sync(eventCB discovery.EventCallback, errorCB discovery.E
 		}
 	}()
 
-	go func() {
-		d.sendUpdates(eventCB, errorCB)
-
-		for {
-			select {
-			case <-ctx.Done():
-				return
-			case <-deviceEventChan:
-			}
-
-		again:
-			d.sendUpdates(eventCB, errorCB)
-
-			// Trigger another update after 500ms because Windows might signal a
-			// new port much before it becomes actually available.
-			select {
-			case <-ctx.Done():
-				return
-			case <-deviceEventChan:
-				goto again
-			case <-time.After(time.Millisecond * 500):
-			}
-			d.sendUpdates(eventCB, errorCB)
-		}
-	}()
+	d.close = cancel
 	return nil
 }