Move vid/pid resolving to cross platform jni lib

Author: facchinm

arduino-core/src/cc/arduino/packages/discoverers/serial/SerialBoardsLister.java

@@ -47,7 +47,7 @@ public SerialBoardsLister(SerialDiscovery serialDiscovery) {
   }
 
   public void start(Timer timer) {
-    timer.schedule(this, 0, 3000);
+    timer.schedule(this, 0, 1000);
   }
 
   @Override
@@ -75,7 +75,7 @@ public void run() {
     }
 
     for (String port : ports) {
-      Map<String, Object> boardData = platform.resolveDeviceAttachedTo(port, BaseNoGui.packages, devicesListOutput);
+      Map<String, Object> boardData = platform.resolveDeviceByVendorIdProductId(port, BaseNoGui.packages, devicesListOutput);
 
       BoardPort boardPort = new BoardPort();
       boardPort.setAddress(port);

arduino-core/src/processing/app/Platform.java

@@ -144,15 +144,30 @@ public void openFolder(File file) throws Exception {
     }
   }
 
-  public Map<String, Object> resolveDeviceAttachedTo(String serial, Map<String, TargetPackage> packages, String devicesListOutput) {
-    return null;
+  static {
+    loadLib(new File(BaseNoGui.getContentFile("lib"), System.mapLibraryName("listSerialsj")));
+  };
+
+  private static void loadLib(File lib) {
+    try {
+      System.load(lib.getAbsolutePath());
+    } catch (UnsatisfiedLinkError e) {
+      e.printStackTrace();
+      System.out.println(e.getMessage());
+      System.out.println("Cannot load native library " + lib.getAbsolutePath());
+      System.out.println("The program has terminated!");
+      System.exit(1);
+    }
   }
 
+  public native String resolveDeviceAttachedToNative(String serial);
+
   public String preListAllCandidateDevices() {
     return null;
   }
 
-  protected Map<String, Object> resolveDeviceByVendorIdProductId(Map<String, TargetPackage> packages, String readVIDPID) {
+  public Map<String, Object> resolveDeviceByVendorIdProductId(String serial, Map<String, TargetPackage> packages, String devicesListOutput) {
+    String vid_pid_iSerial = resolveDeviceAttachedToNative(serial);
     for (TargetPackage targetPackage : packages.values()) {
       for (TargetPlatform targetPlatform : targetPackage.getPlatforms().values()) {
         for (TargetBoard board : targetPlatform.getBoards().values()) {
@@ -161,12 +176,12 @@ protected Map<String, Object> resolveDeviceByVendorIdProductId(Map<String, Targe
             List<String> pids = new LinkedList<String>(board.getPreferences().subTree("pid", 1).values());
             for (int i = 0; i < vids.size(); i++) {
               String vidPid = vids.get(i) + "_" + pids.get(i);
-              if (readVIDPID.contains(vidPid.toUpperCase())) {
+              if (vid_pid_iSerial.toUpperCase().contains(vidPid.toUpperCase())) {
                 Map<String, Object> boardData = new HashMap<String, Object>();
                 boardData.put("board", board);
                 boardData.put("vid", vids.get(i));
                 boardData.put("pid", pids.get(i));
-                boardData.put("iserial", readVIDPID.substring(vidPid.length()+1));
+                boardData.put("iserial", vid_pid_iSerial.substring(vidPid.length()+1));
                 return boardData;
               }
             }

arduino-core/src/processing/app/linux/Platform.java

@@ -120,30 +120,4 @@ public void openFolder(File file) throws Exception {
   public String getName() {
     return PConstants.platformNames[PConstants.LINUX];
   }
-
-  @Override
-  public Map<String, Object> resolveDeviceAttachedTo(String serial, Map<String, TargetPackage> packages, String devicesListOutput) {
-    assert packages != null;
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    Executor executor = new DefaultExecutor();
-    executor.setStreamHandler(new PumpStreamHandler(baos, null));
-
-    try {
-      CommandLine toDevicePath = CommandLine.parse("udevadm info -q path -n " + serial);
-      executor.execute(toDevicePath);
-      String devicePath = new String(baos.toByteArray());
-      baos.reset();
-      CommandLine commandLine = CommandLine.parse("udevadm info --query=property -p " + devicePath);
-      executor.execute(commandLine);
-      String vidPid = new UDevAdmParser().extractVIDAndPID(new String(baos.toByteArray()));
-
-      if (vidPid == null) {
-        return super.resolveDeviceAttachedTo(serial, packages, devicesListOutput);
-      }
-
-      return super.resolveDeviceByVendorIdProductId(packages, vidPid);
-    } catch (IOException e) {
-      return super.resolveDeviceAttachedTo(serial, packages, devicesListOutput);
-    }
-  }
 }

arduino-core/src/processing/app/macosx/Platform.java

@@ -164,41 +164,6 @@ public String getName() {
     return PConstants.platformNames[PConstants.MACOSX];
   }
 
-  @Override
-  public Map<String, Object> resolveDeviceAttachedTo(String serial, Map<String, TargetPackage> packages, String devicesListOutput) {
-    assert packages != null;
-    if (devicesListOutput == null) {
-      return super.resolveDeviceAttachedTo(serial, packages, null);
-    }
-
-    try {
-      String vidPid = new SystemProfilerParser().extractVIDAndPID(devicesListOutput, serial);
-
-      if (vidPid == null) {
-        return super.resolveDeviceAttachedTo(serial, packages, devicesListOutput);
-      }
-
-      return super.resolveDeviceByVendorIdProductId(packages, vidPid);
-    } catch (IOException e) {
-      return super.resolveDeviceAttachedTo(serial, packages, devicesListOutput);
-    }
-  }
-
-  @Override
-  public String preListAllCandidateDevices() {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    Executor executor = new DefaultExecutor();
-    executor.setStreamHandler(new PumpStreamHandler(baos, null));
-
-    try {
-      CommandLine toDevicePath = CommandLine.parse("/usr/sbin/system_profiler SPUSBDataType");
-      executor.execute(toDevicePath);
-      return new String(baos.toByteArray());
-    } catch (Throwable e) {
-      return super.preListAllCandidateDevices();
-    }
-  }
-
   @Override
   public java.util.List<BoardPort> filterPorts(java.util.List<BoardPort> ports, boolean showAll) {
     if (showAll) {

arduino-core/src/processing/app/windows/Platform.java

@@ -183,43 +183,6 @@ public String getName() {
     return PConstants.platformNames[PConstants.WINDOWS];
   }
 
-  @Override
-  public Map<String, Object> resolveDeviceAttachedTo(String serial, Map<String, TargetPackage> packages, String devicesListOutput) {
-    assert packages != null;
-    if (devicesListOutput == null) {
-      return super.resolveDeviceAttachedTo(serial, packages, devicesListOutput);
-    }
-
-    try {
-      String vidPid = new ListComPortsParser().extractVIDAndPID(devicesListOutput, serial);
-
-      if (vidPid == null) {
-        return super.resolveDeviceAttachedTo(serial, packages, devicesListOutput);
-      }
-
-      return super.resolveDeviceByVendorIdProductId(packages, vidPid);
-    } catch (IOException e) {
-      return super.resolveDeviceAttachedTo(serial, packages, devicesListOutput);
-    }
-  }
-
-  @Override
-  public String preListAllCandidateDevices() {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    Executor executor = new DefaultExecutor();
-    executor.setStreamHandler(new PumpStreamHandler(baos, null));
-
-    try {
-      String listComPorts = BaseNoGui.getContentFile("hardware/tools/listComPorts.exe").getCanonicalPath();
-
-      CommandLine toDevicePath = CommandLine.parse(listComPorts);
-      executor.execute(toDevicePath);
-      return new String(baos.toByteArray());
-    } catch (Throwable e) {
-      return super.preListAllCandidateDevices();
-    }
-  }
-
   @Override
   public void fixPrefsFilePermissions(File prefsFile) throws IOException {
     //noop

build/build.xml

@@ -393,6 +393,15 @@
     <copy file="macosx/libastylej-2.05.1/libastylej.jnilib" tofile="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
     <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
 
+    <antcall target="unzip">
+      <param name="archive_file" value="./liblistSerials-1.0.4.zip" />
+      <param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-1.0.4.zip" />
+      <param name="final_folder" value="${staging_folder}/liblistSerials-1.0.4" />
+      <param name="dest_folder" value="${staging_folder}" />
+    </antcall>
+    <copy file="macosx/liblistSerials-1.0.4/osx/liblistSerialsj.dylib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
+    <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/liblistSerialsj.dylib" />
+
     <delete dir="${staging_folder}/arduino-builder-macosx" includeemptydirs="true"/>
     <mkdir dir="${staging_folder}/arduino-builder-macosx"/>
     <antcall target="untar">
@@ -585,6 +594,16 @@
     <antcall target="portable-${portable}">
       <param name="parentdir" value="linux/work" />
     </antcall>
+
+    <antcall target="unzip">
+      <param name="archive_file" value="./liblistSerials-1.0.4.zip" />
+      <param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-1.0.4.zip" />
+      <param name="final_folder" value="${staging_folder}/liblistSerials-1.0.4" />
+      <param name="dest_folder" value="${staging_folder}" />
+    </antcall>
+    <copy file="linux/liblistSerials-1.0.4/linux${arch-bits}/liblistSerialsj.so" todir="linux/work/lib/" />
+    <chmod perm="755" file="linux/work/lib/liblistSerialsj.so" />
+
   </target>
 
   <target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
@@ -845,13 +864,14 @@
     <copy file="windows/msvcp100.dll" todir="windows/work" />
     <copy file="windows/msvcr100.dll" todir="windows/work" />
 
-    <!-- Copy listComPort.exe tool -->
-    <copy todir="windows/work/hardware/tools">
-      <fileset file="windows/listComPorts.exe" />
-    </copy>
-    <chmod perm="755">
-      <fileset file="windows/work/hardware/tools/listComPorts.exe" />
-    </chmod>
+    <antcall target="unzip">
+      <param name="archive_file" value="./liblistSerials-1.0.4.zip" />
+      <param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-1.0.4.zip" />
+      <param name="final_folder" value="${staging_folder}/liblistSerials-1.0.4" />
+      <param name="dest_folder" value="${staging_folder}" />
+    </antcall>
+    <copy file="windows/liblistSerials-1.0.4/windows/listSerialsj.dll" todir="windows/work/lib/" />
+    <chmod perm="755" file="windows/work/lib/listSerialsj.dll" />
 
     <delete dir="${staging_folder}/arduino-builder-windows" includeemptydirs="true"/>
     <mkdir dir="${staging_folder}/arduino-builder-windows"/>

build/liblistSerials-1.0.4.zip.sha

@@ -0,0 +1 @@
+4e8ef727d7dc3903c37002f38f8aba87796b787c