From af3d792c7844b682cec53d0ef60c14bea2306409 Mon Sep 17 00:00:00 2001
From: krakjoe <joe.watkins@live.co.uk>
Date: Sat, 30 Nov 2013 00:16:24 +0000
Subject: [PATCH] improvements to jui, use nonblocking i/o in stdout thread

---
 tutorials/java/dist/phpdbg-ui.jar             | Bin 37486 -> 37975 bytes
 tutorials/java/src/phpdbg/ui/DebugSocket.java | 133 ++++++++++++------
 2 files changed, 87 insertions(+), 46 deletions(-)

diff --git a/tutorials/java/dist/phpdbg-ui.jar b/tutorials/java/dist/phpdbg-ui.jar
index bc4c39cc6cd299f453eea24068e7ff1ef11eac99..b98dace3e2381ea5e2c855cccd8e12ac878fc19d 100644
GIT binary patch
delta 4147
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
IYf}RM13xwKuK)l5

delta 3653
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

diff --git a/tutorials/java/src/phpdbg/ui/DebugSocket.java b/tutorials/java/src/phpdbg/ui/DebugSocket.java
index 05db2077c36..bbd7d34a44e 100644
--- a/tutorials/java/src/phpdbg/ui/DebugSocket.java
+++ b/tutorials/java/src/phpdbg/ui/DebugSocket.java
@@ -4,7 +4,17 @@ package phpdbg.ui;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.nio.ByteBuffer;
+import java.nio.channels.SelectionKey;
+import static java.nio.channels.SelectionKey.OP_READ;
+import java.nio.channels.Selector;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+import java.nio.channels.spi.SelectorProvider;
+import java.util.Iterator;
+import java.util.Set;
 import phpdbg.ui.JConsole.MessageType;
 
 /*
@@ -17,7 +27,9 @@ import phpdbg.ui.JConsole.MessageType;
  * Manage input and output data
  * @author krakjoe
  */
-public class DebugSocket extends Socket implements Runnable {
+public class DebugSocket implements Runnable {
+    private final String host;
+    private final Integer port;
     private final Boolean reader;
     private final JConsole main;
     private final Thread thread;
@@ -26,8 +38,8 @@ public class DebugSocket extends Socket implements Runnable {
     private volatile Boolean started;
     
     public DebugSocket(final String host, final Integer port, final JConsole main, Boolean reader) throws IOException {
-        super(host, port);
-        
+        this.host = host;
+        this.port = port;
         this.main = main;
         this.reader = reader;
         this.quit = false;
@@ -38,6 +50,7 @@ public class DebugSocket extends Socket implements Runnable {
     public void start() {
         synchronized(this) {
             if (!started) {
+               quit = false;
                started = true;
                thread.start(); 
             }
@@ -60,59 +73,87 @@ public class DebugSocket extends Socket implements Runnable {
                 }
             }
             
-            synchronized(this) {
-                do {
-                    if (reader) {
+            if (reader) {
+                /* The reader thread part will wait() until there is input */
+                Socket socket = new Socket(this.host, this.port);
+                try {
+                    do {
                         String command;
-                        OutputStream output = getOutputStream();
-                        
-                        wait();
-                        
-                        command = main.getInputField().getText();
-                        /* send command to stdin socket */
-                        if (command != null) {
-                            if (main.isEchoing()) {
-                                main.getOutputField().appendANSI("remote> ");
-                                main.getOutputField().appendANSI(command);
-                                main.getOutputField().appendANSI("\n");
+                        OutputStream output = socket.getOutputStream();
+
+                        synchronized(this) {
+                            wait();
+
+                            if (!quit) {
+                                command = main.getInputField().getText();
+                                /* send command to stdin socket */
+                                if (command != null) {
+                                    if (main.isEchoing()) {
+                                        main.getOutputField().appendANSI("remote> ");
+                                        main.getOutputField().appendANSI(command);
+                                        main.getOutputField().appendANSI("\n");
+                                    }
+                                    output.write(
+                                       command.getBytes());
+                                    output.write("\n".getBytes());
+                                    output.flush();
+                                }
+                                main.getInputField().setText(null);
                             }
-                            output.write(
-                               command.getBytes());
-                            output.write("\n".getBytes());
-                            output.flush();
                         }
-                        main.getInputField().setText(null);
-                    } else {
-                        InputStream input = getInputStream();
-                        /* get data from stdout socket */
-                        byte[] bytes = new byte[1];
-                        do {
-                            if (input.available() == 0) {
-                                wait(400);
-                                continue;
-                            }
-                            
-                            if (input.read(bytes, 0, 1) > -1) {
-                                main.getOutputField()
-                                        .appendANSI(new String(bytes));
-                            }
-                        } while (!quit);
+                    } while (!quit);
+                } catch (IOException ex) {
+                    if (!quit) {
+                        main.messageBox(ex.getMessage(), MessageType.ERROR);
                     }
-                } while(!quit);
+                }
+            } else {
+                /*
+                * The writer thread will use non-blocking i/o consuming
+                * resources only when there is data to read
+                */
+                Selector selector = Selector.open();
+                SocketChannel channel = SocketChannel.open();
+                
+                channel.connect(
+                        new InetSocketAddress(this.host, this.port));
+                channel.configureBlocking(false);
+                channel.register(selector, OP_READ);
+
+                while (!quit) {
+                    selector.select();
+
+                    Iterator<SelectionKey> iter = selector.selectedKeys().iterator();
+
+                    while (iter.hasNext()) {
+                        if (!quit) {
+                            SocketChannel ready = (SocketChannel) (iter.next().channel());
+                            ByteBuffer bytes = ByteBuffer.allocate(128);
+                            
+                            if (ready != null) {
+                                if (ready.read(bytes) != -1) {
+                                    bytes.flip();
+                                    
+                                    main.getOutputField()
+                                        .appendANSI(new String(bytes.array()));
+                                    
+                                }
+                            }
+
+                            iter.remove();
+                        }
+                    }
+                }
             }
         } catch (IOException | InterruptedException ex) {
             if (!quit) {
                 main.messageBox(ex.getMessage(), MessageType.ERROR);
             }
         } finally {
-            try {
-                close();
-            } catch (IOException ex) { /* naughty me */ } finally {
-               synchronized(main) {
-                   if (main.isConnected()) {
-                       main.setConnected(false);
-                   }
-               } 
+            synchronized(main) {
+                if (main.isConnected()) {
+                    main.setConnected(false);
+                }
             }
         }
     }