Unplug test

Author: manuelbl

java-does-usb/jextract/macos/gen_macos.sh

@@ -39,6 +39,7 @@ $JEXTRACT --source --output ../../src/main/java \
   --include-constant kIOUSBDeviceClassName \
   --include-constant kIOFirstMatchNotification \
   --include-constant kIOTerminatedNotification \
+  --include-constant kIOReturnExclusiveAccess \
   --include-var kCFRunLoopDefaultMode \
   --include-struct IOCFPlugInInterfaceStruct \
   --include-typedef IOCFPlugInInterface \

java-does-usb/src/main/java/net/codecrete/usb/macos/MacosUSBDevice.java

@@ -55,8 +55,11 @@ public class MacosUSBDevice extends USBDeviceImpl {
     // Details about endpoints of current alternate settings (for claimed interfaces)
     private Map<Byte, EndpointInfo> endpoints;
 
+    private final long discoveryTime;
+
     MacosUSBDevice(MemorySegment device, Object id, int vendorId, int productId) {
         super(id, vendorId, productId);
+        discoveryTime = System.currentTimeMillis();
         asyncTask = MacosAsyncTask.instance();
 
         loadDescription(device);
@@ -75,13 +78,27 @@ public synchronized void open() {
         if (isOpen())
             throwException("the device is already open");
 
-        // open device
-        int ret = IoKitUSB.USBDeviceOpenSeize(device);
+        // open device (several retries if device has just been connected/discovered)
+        long duration = System.currentTimeMillis() - discoveryTime;
+        int numTries = duration < 1000 ? 4 : 1;
+        int ret = 0;
+        while (numTries > 0) {
+            numTries -= 1;
+            ret = IoKitUSB.USBDeviceOpenSeize(device);
+            if (ret != IOKit.kIOReturnExclusiveAccess())
+                break;
+
+            // sleep and retry
+            try {
+                Thread.sleep(90);
+            } catch (InterruptedException e) {
+                // ignore
+            }
+        }
         if (ret != 0)
             throwException(ret, "unable to open USB device");
 
         claimedInterfaces = new ArrayList<>();
-
         addDeviceEventSource();
 
         // set configuration
@@ -541,15 +558,15 @@ public void clearHalt(USBDirection direction, int endpointNumber) {
     }
 
     @Override
-    public InputStream openInputStream(int endpointNumber, int bufferSize) {
+    public synchronized InputStream openInputStream(int endpointNumber, int bufferSize) {
         // check that endpoint number is valid
         getEndpointInfo(endpointNumber, USBDirection.IN, USBTransferType.BULK, null);
 
         return new MacosEndpointInputStream(this, endpointNumber, bufferSize);
     }
 
     @Override
-    public OutputStream openOutputStream(int endpointNumber, int bufferSize) {
+    public synchronized OutputStream openOutputStream(int endpointNumber, int bufferSize) {
         // check that endpoint number is valid
         getEndpointInfo(endpointNumber, USBDirection.OUT, USBTransferType.BULK, null);
 

java-does-usb/src/main/java/net/codecrete/usb/macos/gen/iokit/IOKit.java

@@ -224,6 +224,14 @@ public static int IOCreatePlugInInterfaceForService(int service, MemorySegment p
             throw new AssertionError("should not reach here", ex$);
         }
     }
+    /**
+     * {@snippet :
+     * #define kIOReturnExclusiveAccess -536870203
+     * }
+     */
+    public static int kIOReturnExclusiveAccess() {
+        return (int)-536870203L;
+    }
     /**
      * {@snippet :
      * #define kIOReturnAborted -536870165

…decrete/usb/sample/EnumerateDevices.java …ecrete/usb/special/EnumerateDevices.javajava-does-usb/src/test/java/net/codecrete/usb/sample/EnumerateDevices.java renamed to java-does-usb/src/test/java/net/codecrete/usb/special/EnumerateDevices.java java-does-usb/src/test/java/net/codecrete/usb/sample/EnumerateDevices.java renamed to java-does-usb/src/test/java/net/codecrete/usb/special/EnumerateDevices.java

@@ -5,7 +5,7 @@
 // https://opensource.org/licenses/MIT
 //
 
-package net.codecrete.usb.sample;
+package net.codecrete.usb.special;
 
 import net.codecrete.usb.USB;
 

…/codecrete/usb/sample/LogicAnalyzer.java …codecrete/usb/special/LogicAnalyzer.javajava-does-usb/src/test/java/net/codecrete/usb/sample/LogicAnalyzer.java renamed to java-does-usb/src/test/java/net/codecrete/usb/special/LogicAnalyzer.java java-does-usb/src/test/java/net/codecrete/usb/sample/LogicAnalyzer.java renamed to java-does-usb/src/test/java/net/codecrete/usb/special/LogicAnalyzer.java

@@ -8,7 +8,7 @@
 // and licensed under GNU GPL (version 2, or later).
 //
 
-package net.codecrete.usb.sample;
+package net.codecrete.usb.special;
 
 import net.codecrete.usb.*;
 

…codecrete/usb/sample/MonitorDevices.java …odecrete/usb/special/MonitorDevices.javajava-does-usb/src/test/java/net/codecrete/usb/sample/MonitorDevices.java renamed to java-does-usb/src/test/java/net/codecrete/usb/special/MonitorDevices.java java-does-usb/src/test/java/net/codecrete/usb/sample/MonitorDevices.java renamed to java-does-usb/src/test/java/net/codecrete/usb/special/MonitorDevices.java

@@ -5,7 +5,7 @@
 // https://opensource.org/licenses/MIT
 //
 
-package net.codecrete.usb.sample;
+package net.codecrete.usb.special;
 
 import net.codecrete.usb.USB;
 

…/codecrete/usb/sample/USBSerialTest.java …codecrete/usb/special/USBSerialTest.javajava-does-usb/src/test/java/net/codecrete/usb/sample/USBSerialTest.java renamed to java-does-usb/src/test/java/net/codecrete/usb/special/USBSerialTest.java java-does-usb/src/test/java/net/codecrete/usb/sample/USBSerialTest.java renamed to java-does-usb/src/test/java/net/codecrete/usb/special/USBSerialTest.java

@@ -5,7 +5,7 @@
 // https://opensource.org/licenses/MIT
 //
 
-package net.codecrete.usb.sample;
+package net.codecrete.usb.special;
 
 import net.codecrete.usb.*;