WIP

Author: gartens

src/main/java/org/polypheny/control/control/PolyphenyDbProcess.java

@@ -17,13 +17,9 @@
 package org.polypheny.control.control;
 
 
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.concurrent.TimeUnit;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
@@ -110,13 +106,13 @@ private static final class WindowsPolyphenyDbProcess extends PolyphenyDbProcess
         private final WinProcess winProcess;
 
 
-        protected WindowsPolyphenyDbProcess( final int pid ) {
+        private WindowsPolyphenyDbProcess( final int pid ) {
             super( null );
             winProcess = new WinProcess( pid );
         }
 
 
-        protected WindowsPolyphenyDbProcess( final Process process ) {
+        private WindowsPolyphenyDbProcess( final Process process ) {
             super( process );
             winProcess = new WinProcess( process );
         }
@@ -171,6 +167,7 @@ public void killForcibly() {
                 super.process.destroyForcibly();
             }
         }
+
     }
 
 
@@ -181,39 +178,22 @@ private static final class UnixPolyphenyDbProcess extends PolyphenyDbProcess {
 
         private final int pid;
 
+        private final ProcessHandle handle;
+
 
-        protected UnixPolyphenyDbProcess( final int pid ) {
+        private UnixPolyphenyDbProcess( final int pid ) {
             super( null );
             this.pid = pid;
+            this.handle = ProcessHandle.of( pid ).get();
         }
 
 
-        protected UnixPolyphenyDbProcess( final Process process ) {
+        private UnixPolyphenyDbProcess( final Process process ) {
             super( process );
 
-            long pid = -1;
-
-            try {
-                val pidField = process.getClass().getDeclaredField( "pid" );
-
-                AccessController.doPrivileged( (PrivilegedAction<Void>) () -> {
-                    pidField.setAccessible( true );
-                    return null;
-                } );
-
-                pid = pidField.getLong( process );
-
-                AccessController.doPrivileged( (PrivilegedAction<Void>) () -> {
-                    pidField.setAccessible( false );
-                    return null;
-                } );
-
-            } catch ( NoSuchFieldException | IllegalAccessException e ) {
-                log.error( "Exception while extracting the PID from java.lang.Process.", e );
-                pid = -1;
-            } finally {
-                this.pid = (int) pid;
-            }
+            log.info( "New process.pid() code" );
+            this.pid = (int) process.pid();
+            this.handle = process.toHandle();
         }
 
 
@@ -225,71 +205,21 @@ public int getPid() {
 
         @Override
         public boolean isAlive() {
-            if ( super.process == null ) {
-                // "PID Mode"
-                try {
-                    val process = Runtime.getRuntime().exec( "ps -p " + pid );
-                    try ( val input = new BufferedReader( new InputStreamReader( process.getInputStream() ) ) ) {
-                        String line;
-                        while ( (line = input.readLine()) != null ) {
-                            if ( line.contains( " " + pid + " " ) ) {
-                                return true;
-                            }
-                        }
-                    }
-                    return false;
-                } catch ( IOException e ) {
-                    log.warn( "IOException while checking if {} is still alive.", pid, e );
-                    return false;
-                }
-            } else {
-                return super.process.isAlive();
-            }
+            return handle.isAlive();
         }
 
 
         @Override
         public void kill() {
-            // "PID Mode"
-            try {
-                val kill = Runtime.getRuntime().exec( "kill -15 " + pid ); // SIGTERM -- CTRL + C
-                if ( kill.waitFor( 1, TimeUnit.MINUTES ) ) {
-                    // terminated within the time
-                    if ( kill.exitValue() == 0 ) {
-                        return;
-                    }
-                }
-                killForcibly();
-            } catch ( IOException e ) {
-                log.error( "Exception while trying to kill <<me:{}>> via PID on Unix.", pid, e );
-            } catch ( InterruptedException e ) {
-                log.warn( "Interrupted while waiting for kill to finish." );
-            }
+            handle.destroy();
         }
 
 
         @Override
         public void killForcibly() {
-            if ( super.process == null ) {
-                // "PID Mode"
-                try {
-                    val kill = Runtime.getRuntime().exec( "kill -9 " + pid ); // SIGKILL
-                    if ( kill.waitFor( 1, TimeUnit.SECONDS ) ) {
-                        // terminated within the time
-                        if ( kill.exitValue() == 0 ) {
-                            return;
-                        }
-                    }
-                    log.warn( "Could not kill {}", pid );
-                } catch ( IOException e ) {
-                    log.error( "Exception while trying to kill <<me:{}>> via PID on Unix.", pid, e );
-                } catch ( InterruptedException e ) {
-                    log.warn( "Interrupted while waiting for kill to finish." );
-                }
-
-            } else {
-                super.process.destroyForcibly();
-            }
+            handle.destroyForcibly();
         }
+
     }
+
 }