WebSVN - OpenConcerto - Diff - Rev 132 and 180 - /trunk/OpenConcerto/src/org/openconcerto/utils/Platform.java

  */
  package org.openconcerto.utils;
 import static org.openconcerto.utils.DesktopEnvironment.cmdSubstitution;
 import org.openconcerto.utils.cc.ITransformer;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.math.BigDecimal;
 import java.net.InetAddress;
 import java.net.SocketException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
     public static final Platform getInstance() {
         final OSFamily os = OSFamily.getInstance();
         if (os == OSFamily.Windows) {
             return CYGWIN;
-        } else if (os == OSFamily.FreeBSD || os == OSFamily.Mac) {
+        } else if (os == OSFamily.FreeBSD) {
             return FREEBSD;
+        } else if (os == OSFamily.Mac) {
+            return MACOS;
         } else {
             return LINUX;
+        }
+    }
     public abstract boolean isRunning(final int pid) throws IOException;
     public abstract String getPath(final File f);
     public final String getPID() throws IOException {
-        final Process p = this.eval("echo -n $PPID");
+        // TODO remove reflection and getPreJava9PID() once on java 11
-        final BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
         try {
+            final Class<?> phClass = Class.forName("java.lang.ProcessHandle");
+            final Object ph = phClass.getMethod("current").invoke(null);
+            return ((Number) phClass.getMethod("pid").invoke(ph)).toString();
+        } catch (ClassNotFoundException e) {
+            // fall back
+        } catch (Exception e) {
+            throw new IOException("Couldn't get PID", e);
+        }
+        return getPreJava9PID();
+    }
+    protected String getPreJava9PID() throws IOException {
+        final Process p = this.eval("echo -n $PPID");
+        try (final BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()))) {
             return reader.readLine();
-        } finally {
-            reader.close();
+        }
+    }
     public final String tail(final File f, final int n) throws IOException {
         final Process p = Runtime.getRuntime().exec(new String[] { "tail", "-n" + n, this.getPath(f) });
         return exitStatus(Runtime.getRuntime().exec(new String[] { "test", "-e", f.getAbsolutePath() })) == 0;
+    }
     public final void append(File f1, File f2) throws IOException {
         final String c = "cat '" + f1.getAbsolutePath() + "' >> '" + f2.getAbsolutePath() + "'";
-        try {
-            this.eval(c).waitFor();
+        this.waitForSuccess(this.eval(c), "append");
-        } catch (InterruptedException e) {
-            throw new IllegalStateException(e);
-        }
+    }
     public Process cp_l(File src, File dest) throws IOException {
         return Runtime.getRuntime().exec(new String[] { "cp", "-prl", src.getAbsolutePath(), dest.getAbsolutePath() });
+    }
     protected abstract BigDecimal parsePingAverageRT(String statsLine);
     protected final PingResult ping(final String command, final int totalCount, int requiredCount) throws IOException {
         if (requiredCount <= 0)
             requiredCount = totalCount;
+        // Keep errors out of cmdSubstitution() (e.g. "ping: sendto: Message too long" when
+        // setDontFragment(true))
+        final Process proc = evalPB(command).redirectErrorStream(false).start();
+        final String output = cmdSubstitution(proc);
+        try {
+            this.waitForSuccess(proc, "ping");
-        final List<String> countAndLastLine = StringUtils.splitIntoLines(cmdSubstitution(eval(command)));
+            final List<String> countAndLastLine = StringUtils.splitIntoLines(output);
-        if (countAndLastLine.size() != 2)
+            if (countAndLastLine.size() != 2)
-            throw new IllegalStateException("Not 2 lines in " + countAndLastLine);
+                throw new IllegalStateException("Not 2 lines in " + countAndLastLine);
-        final int replied = Integer.parseInt(countAndLastLine.get(0));
+            final int replied = Integer.parseInt(countAndLastLine.get(0));
-        assert replied <= totalCount;
+            assert replied <= totalCount;
-        final PingResult res = new PingResult(totalCount, replied, requiredCount, replied == 0 ? null : parsePingAverageRT(countAndLastLine.get(1).trim()));
+            final BigDecimal averageRTT = replied == 0 ? null : parsePingAverageRT(countAndLastLine.get(1).trim());
+            return new PingResult(totalCount, replied, requiredCount, averageRTT);
+        } catch (Exception e) {
+            throw new IllegalStateException("Couldn't use output :<<<\n" + output + "\n<<<", e);
-        return res;
+        }
+    }
     /**
      * Eval the passed string with bash.
+     *
      * @param s a bash script.
      * @return the created process.
      * @throws IOException If an I/O error occurs.
      */
     public final Process eval(String s) throws IOException {
+        return evalPB(s).start();
+    }
+    public final ProcessBuilder evalPB(String s) throws IOException {
-        return Runtime.getRuntime().exec(new String[] { this.getBash(), "-c", s });
+        return new ProcessBuilder(this.getBash(), "-c", s);
+    }
     public final int exitStatus(Process p) {
+        return this.exitStatus(p, null);
+    }
+    public final int exitStatus(Process p, final String name) {
         try {
             return p.waitFor();
         } catch (InterruptedException e) {
-            throw new IllegalStateException(e);
+            throw new RTInterruptedException("Interrupted while waiting for" + (name == null ? "" : " '" + name + "'") + " process", e);
+        }
+    }
+    public final void waitForSuccess(final Process p, final String name) {
+        final int exitStatus = exitStatus(p, name);
+        if (exitStatus != 0)
+            throw new IllegalStateException(name + " unsuccessful : " + exitStatus);
+    }
     public abstract boolean isAdmin() throws IOException;
     private static abstract class UnixPlatform extends Platform {
         @Override
         public boolean supportsPID() {
             return true;
+        }
+        @Override
+        public final String getPreJava9PID() throws IOException {
+            final String symlink = getSelfProcessSymlink();
+            if (symlink == null)
+                return super.getPreJava9PID();
+            // readSymbolicLink() seems to faster than getCanonicalFile() or toRealPath().
+            // Another way is using reflection for
+            // ManagementFactory.getRuntimeMXBean().jvm.getProcessId()
+            return Files.readSymbolicLink(Paths.get(symlink)).getFileName().toString();
+        }
+        protected abstract String getSelfProcessSymlink();
         public final boolean isRunning(final int pid) throws IOException {
             // --pid only works on Linux, -p also on Nexenta
             final Process p = Runtime.getRuntime().exec(new String[] { "ps", "-p", String.valueOf(pid) });
             return this.exitStatus(p) == 0;
+        }
         @Override
         protected BigDecimal parsePingAverageRT(String statsLine) {
             final Matcher m = PING_STATS_PATTERN.matcher(statsLine);
             if (!m.matches())
-                throw new IllegalArgumentException("Not matching " + PING_STATS_PATTERN + " : " + statsLine);
+                throw new IllegalArgumentException("Not matching " + PING_STATS_PATTERN + " :\n" + statsLine);
             return new BigDecimal(m.group(2));
+        }
         @Override
         public boolean isAdmin() throws IOException {
             return cmdSubstitution(this.eval("id -u")).trim().equals("0");
+        }
+    }
     private static final Platform LINUX = new UnixPlatform() {
+        @Override
+        protected String getSelfProcessSymlink() {
+            return "/proc/self";
+        }
         @Override
         public PingResult ping(final InetAddress host, final PingBuilder pingBuilder, final int routingTableIndex) throws IOException {
             if (routingTableIndex > 0)
                 throw new UnsupportedOperationException("On Linux, choosing a different routing table requires changing the system policy");
             final List<String> command = new ArrayList<String>(16);
             return ping("out=$(" + CollectionUtils.join(command, " ") + ") ; grep -c ttl= <<< \"$out\" ; tail -n1 <<< \"$out\"", totalCount, pingBuilder.getRequiredReplies());
+        }
     };
     private static final Platform FREEBSD = new UnixPlatform() {
+        @Override
+        protected String getSelfProcessSymlink() {
+            return "/proc/curproc";
+        }
         @Override
         public PingResult ping(final InetAddress host, final PingBuilder pingBuilder, final int routingTableIndex) throws IOException {
             final List<String> command = new ArrayList<String>(16);
             command.add("setfib");
             command.add(String.valueOf(routingTableIndex));
             return ping("out=$(" + CollectionUtils.join(command, " ") + ") ; grep -c ttl= <<< \"$out\" ; tail -n1 <<< \"$out\"", totalCount, pingBuilder.getRequiredReplies());
+        }
     };
+    private static final Platform MACOS = new UnixPlatform() {
+        @Override
+        protected String getSelfProcessSymlink() {
+            return null;
+        }
+        @Override
+        protected PingResult ping(InetAddress host, PingBuilder pingBuilder, int routingTableIndex) throws IOException {
+            return FREEBSD.ping(host, pingBuilder, routingTableIndex);
+        }
+    };
     private static final class CygwinPlatform extends Platform {
         @Override
         public boolean supportsPID() {
             return false;
         @Override
         public boolean ping(InetAddress host, final int timeout) throws IOException {
             // windows implem of isReachable() is buggy
             // see http://bordet.blogspot.com/2006/07/icmp-and-inetaddressisreachable.html
-            try {
-                final int exit = Runtime.getRuntime().exec("ping -n 1 -w " + timeout + " " + host.getHostAddress()).waitFor();
+            final int exit = this.exitStatus(Runtime.getRuntime().exec("ping -n 1 -w " + timeout + " " + host.getHostAddress()), "ping");
-                return exit == 0;
+            return exit == 0;
-            } catch (InterruptedException e) {
-                throw new IllegalStateException(e);
-            }
+        }
         @Override
         public PingResult ping(final InetAddress host, final PingBuilder pingBuilder, final int routingTableIndex) throws IOException {
             if (routingTableIndex > 0)

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/utils/Platform.java - Rev 132 → 180