Modified to support non-blocking connections. JM-687

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@3904 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/dom4j/io/XMPPPacketReader.java

@@ -9,18 +9,14 @@
 
 package org.dom4j.io;
 
-import java.io.*;
-import java.net.URL;
-import org.dom4j.Document;
-import org.dom4j.DocumentException;
-import org.dom4j.DocumentFactory;
-import org.dom4j.Element;
-import org.dom4j.ElementHandler;
-import org.dom4j.QName;
+import org.dom4j.*;
+import org.jivesoftware.wildfire.net.MXParser;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
-import org.jivesoftware.wildfire.net.MXParser;
+
+import java.io.*;
+import java.net.URL;
 
 /**
  * <p><code>XMPPPacketReader</code> is a Reader of DOM4J documents that
@@ -277,6 +273,23 @@ public class XMPPPacketReader {
         return lastActive > lastHeartbeat ? lastActive : lastHeartbeat;
     }
 
+    /*
+     * DANIELE: Add parse document by string
+     */
+    public Document parseDocument(String xml) throws DocumentException {
+        /*
+        // Long way with reuse of DocumentFactory.
+        DocumentFactory df = getDocumentFactory();
+        SAXReader reader = new SAXReader( df );
+        Document document = reader.read( new StringReader( xml );*/
+
+        // Simple way
+        // TODO Optimize. Do not create a sax reader for each parsing
+        Document document = DocumentHelper.parseText(xml);
+
+        return document;
+    }
+
     // Implementation methods
     //-------------------------------------------------------------------------
     public Document parseDocument() throws DocumentException, IOException, XmlPullParserException {

src/java/org/jivesoftware/wildfire/ConnectionManager.java

@@ -11,9 +11,11 @@
 
 package org.jivesoftware.wildfire;
 
+import org.jivesoftware.wildfire.net.SocketReader;
+
+import java.io.IOException;
 import java.net.Socket;
 import java.util.Iterator;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Coordinates connections (accept, read, termination) on the server.
@@ -31,15 +33,17 @@ public interface ConnectionManager {
     public Iterator<ServerPort> getPorts();
 
     /**
-     * Adds a socket to be managed by the connection manager.
+     * Creates a new socket reader for the new accepted socket to be managed
+     * by the connection manager.
      *
-     * @param socket the socket to add to this manager for management.
+     * @param socket the new accepted socket by this manager.
      * @param isSecure true if the connection is secure.
      * @param serverPort holds information about the port on which the server is listening for
      *        connections.
+     * @param useBlockingMode true means that the server will use a thread per connection.
      */
-    public void addSocket(Socket socket, boolean isSecure, ServerPort serverPort)
-            throws XmlPullParserException;
+    public SocketReader createSocketReader(Socket socket, boolean isSecure, ServerPort serverPort,
+            boolean useBlockingMode) throws IOException;
 
     /**
      * Sets if the port listener for unsecured clients will be available or not. When disabled

src/java/org/jivesoftware/wildfire/net/ClientSocketReader.java

@@ -12,10 +12,10 @@
 package org.jivesoftware.wildfire.net;
 
 import org.dom4j.Element;
+import org.jivesoftware.util.JiveGlobals;
 import org.jivesoftware.wildfire.ClientSession;
 import org.jivesoftware.wildfire.PacketRouter;
 import org.jivesoftware.wildfire.auth.UnauthorizedException;
-import org.jivesoftware.util.JiveGlobals;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.Message;
@@ -40,8 +40,8 @@ import java.net.Socket;
 public class ClientSocketReader extends SocketReader {
 
     public ClientSocketReader(PacketRouter router, String serverName, Socket socket,
-            SocketConnection connection) {
-        super(router, serverName, socket, connection);
+            SocketConnection connection, boolean useBlockingMode) {
+        super(router, serverName, socket, connection, useBlockingMode);
     }
 
     protected void processIQ(IQ packet) throws UnauthorizedException {
@@ -87,6 +87,10 @@ public class ClientSocketReader extends SocketReader {
         return "jabber:client";
     }
 
+    String getName() {
+        return "Client SR - " + hashCode();
+    }
+
     boolean validateHost() {
         return JiveGlobals.getBooleanProperty("xmpp.client.validate.host",false);
     }

src/java/org/jivesoftware/wildfire/net/ComponentSocketReader.java

@@ -33,8 +33,8 @@ import java.net.Socket;
 public class ComponentSocketReader extends SocketReader {
 
     public ComponentSocketReader(PacketRouter router, String serverName, Socket socket,
-            SocketConnection connection) {
-        super(router, serverName, socket, connection);
+            SocketConnection connection, boolean useBlockingMode) {
+        super(router, serverName, socket, connection, useBlockingMode);
     }
 
     /**
@@ -122,6 +122,10 @@ public class ComponentSocketReader extends SocketReader {
         return "jabber:component:accept";
     }
 
+    String getName() {
+        return "Component SR - " + hashCode();
+    }
+
     boolean validateHost() {
         return false;
     }

src/java/org/jivesoftware/wildfire/net/ConnectionMultiplexerSocketReader.java

@@ -69,8 +69,8 @@ public class ConnectionMultiplexerSocketReader extends SocketReader {
     private MultiplexerPacketHandler packetHandler;
 
     public ConnectionMultiplexerSocketReader(PacketRouter router, String serverName, Socket socket,
-            SocketConnection connection) {
-        super(router, serverName, socket, connection);
+            SocketConnection connection, boolean useBlockingMode) {
+        super(router, serverName, socket, connection, useBlockingMode);
         // Create a pool of threads that will process received packets. If more threads are
         // required then the command will be executed on the SocketReader process
         int coreThreads = JiveGlobals.getIntProperty("xmpp.multiplex.processing.core.threads", 10);
@@ -205,6 +205,10 @@ public class ConnectionMultiplexerSocketReader extends SocketReader {
         }
     }
 
+    String getName() {
+        return "ConnectionMultiplexer SR - " + hashCode();
+    }
+
     boolean validateHost() {
         return false;
     }

src/java/org/jivesoftware/wildfire/net/SSLSocketAcceptThread.java

@@ -26,7 +26,9 @@ import java.net.UnknownHostException;
 
 /**
  * Implements a network front end with a dedicated thread reading
- * each incoming socket.
+ * each incoming socket. The old SSL method always uses a blocking model.
+ *
+ * @author Gaston Dombiak
  */
 public class SSLSocketAcceptThread extends Thread {
 
@@ -139,7 +141,12 @@ public class SSLSocketAcceptThread extends Thread {
             try {
                 Socket sock = serverSocket.accept();
                 Log.debug("SSL Connect " + sock.toString());
-                connManager.addSocket(sock, true, serverPort);
+                SocketReader reader = connManager.createSocketReader(sock, true, serverPort, true);
+                // Create a new reading thread for each new connected client
+                Thread thread = new Thread(reader, reader.getName());
+                thread.setDaemon(true);
+                thread.setPriority(Thread.NORM_PRIORITY);
+                thread.start();
             }
             catch (SSLException se) {
                 long exceptionTime = System.currentTimeMillis();

src/java/org/jivesoftware/wildfire/net/ServerSocketReader.java

@@ -50,8 +50,8 @@ public class ServerSocketReader extends SocketReader {
     private ThreadPoolExecutor threadPool;
 
     public ServerSocketReader(PacketRouter router, String serverName, Socket socket,
-            SocketConnection connection) {
-        super(router, serverName, socket, connection);
+            SocketConnection connection, boolean useBlockingMode) {
+        super(router, serverName, socket, connection, useBlockingMode);
         // Create a pool of threads that will process received packets. If more threads are
         // required then the command will be executed on the SocketReader process
         int coreThreads = JiveGlobals.getIntProperty("xmpp.server.processing.core.threads", 2);
@@ -217,6 +217,10 @@ public class ServerSocketReader extends SocketReader {
         return "jabber:server";
     }
 
+    String getName() {
+        return "Server SR - " + hashCode();
+    }
+
     boolean validateHost() {
         return true;
     }

src/java/org/jivesoftware/wildfire/net/SocketAcceptThread.java

@@ -12,21 +12,20 @@
 package org.jivesoftware.wildfire.net;
 
 import org.jivesoftware.util.JiveGlobals;
-import org.jivesoftware.util.LocaleUtils;
-import org.jivesoftware.util.Log;
 import org.jivesoftware.wildfire.ConnectionManager;
 import org.jivesoftware.wildfire.ServerPort;
 
 import java.io.IOException;
 import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
 
 /**
  * Implements a network front end with a dedicated thread reading
- * each incoming socket.
+ * each incoming socket. Blocking and non-blocking modes are supported.
+ * By default blocking mode is used. Use the <i>xmpp.socket.blocking</i>
+ * system property to change the blocking mode. Restart the server after making
+ * changes to the system property.
  *
- * @author Iain Shigeoka
+ * @author Gaston Dombiak
  */
 public class SocketAcceptThread extends Thread {
 
@@ -55,22 +54,11 @@ public class SocketAcceptThread extends Thread {
      */
     private ServerPort serverPort;
 
-    /**
-     * True while this thread should continue running.
-     */
-    private boolean notTerminated = true;
-
-    /**
-     * socket that listens for connections.
-     */
-    ServerSocket serverSocket;
-
-    private ConnectionManager connManager;
+    private SocketAcceptingMode acceptingMode;
 
     public SocketAcceptThread(ConnectionManager connManager, ServerPort serverPort)
             throws IOException {
         super("Socket Listener at port " + serverPort.getPort());
-        this.connManager = connManager;
         this.serverPort = serverPort;
         // Listen on a specific network interface if it has been set.
         String interfaceName = JiveGlobals.getXMLProperty("network.interface");
@@ -80,7 +68,14 @@ public class SocketAcceptThread extends Thread {
                 bindInterface = InetAddress.getByName(interfaceName);
             }
         }
-        serverSocket = new ServerSocket(serverPort.getPort(), -1, bindInterface);
+        // Set the blocking reading mode to use
+        boolean useBlockingMode = JiveGlobals.getBooleanProperty("xmpp.socket.blocking", true);
+        if (useBlockingMode) {
+            acceptingMode = new BlockingAcceptingMode(connManager, serverPort, bindInterface);
+        }
+        else {
+            acceptingMode = new NonBlockingAcceptingMode(connManager, serverPort, bindInterface);
+        }
     }
 
     /**
@@ -105,19 +100,7 @@ public class SocketAcceptThread extends Thread {
      * Unblock the thread and force it to terminate.
      */
     public void shutdown() {
-        notTerminated = false;
-
-        try {
-            ServerSocket sSock = serverSocket;
-            serverSocket = null;
-            if (sSock != null) {
-                sSock.close();
-            }
-        }
-        catch (IOException e) {
-            // we don't care, no matter what, the socket should be dead
-        }
-
+        acceptingMode.shutdown();
     }
 
     /**
@@ -125,34 +108,8 @@ public class SocketAcceptThread extends Thread {
      * call getting sockets and handing them to the SocketManager.
      */
     public void run() {
-        while (notTerminated) {
-            try {
-                Socket sock = serverSocket.accept();
-                if (sock != null) {
-                    Log.debug("Connect " + sock.toString());
-                    connManager.addSocket(sock, false, serverPort);
-                }
-            }
-            catch (IOException ie) {
-                if (notTerminated) {
-                    Log.error(LocaleUtils.getLocalizedString("admin.error.accept"),
-                            ie);
-                }
-            }
-            catch (Throwable e) {
-                Log.error(LocaleUtils.getLocalizedString("admin.error.accept"), e);
-            }
-        }
-
-        try {
-            ServerSocket sSock = serverSocket;
-            serverSocket = null;
-            if (sSock != null) {
-                sSock.close();
-            }
-        }
-        catch (IOException e) {
-            // we don't care, no matter what, the socket should be dead
-        }
+        acceptingMode.run();
+        // We stopped accepting new connections so close the listener
+        shutdown();
     }
 }

src/java/org/jivesoftware/wildfire/net/SocketConnection.java

@@ -30,6 +30,7 @@ import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.net.InetAddress;
 import java.net.Socket;
+import java.nio.channels.Channels;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
@@ -122,7 +123,13 @@ public class SocketConnection implements Connection {
 
         this.secure = isSecure;
         this.socket = socket;
-        writer = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(), CHARSET));
+        // DANIELE: Modify socket to use channel
+        if (socket.getChannel() != null) {
+            writer = Channels.newWriter(socket.getChannel(), CHARSET);
+        }
+        else {
+            writer = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(), CHARSET));
+        }
         this.backupDeliverer = backupDeliverer;
         xmlSerializer = new XMLSocketWriter(writer, this);
 

src/java/org/jivesoftware/wildfire/net/TLSStreamHandler.java

@@ -177,8 +177,15 @@ public class TLSStreamHandler {
         reader = new TLSStreamReader(wrapper, socket);
         writer = new TLSStreamWriter(wrapper, socket);
 
-        rbc = Channels.newChannel(socket.getInputStream());
-        wbc = Channels.newChannel(socket.getOutputStream());
+        // DANIELE: Add code to use directly the socket-channel.
+        if (socket.getChannel() != null) {
+            rbc = socket.getChannel();
+            wbc = socket.getChannel();
+        }
+        else {
+            rbc = Channels.newChannel(socket.getInputStream());
+            wbc = Channels.newChannel(socket.getOutputStream());
+        }
         initialHSStatus = HandshakeStatus.NEED_UNWRAP;
         initialHSComplete = false;
 

src/java/org/jivesoftware/wildfire/net/TLSStreamReader.java

@@ -47,8 +47,14 @@ public class TLSStreamReader {
 
     public TLSStreamReader(TLSWrapper tlsWrapper, Socket socket) throws IOException {
 		wrapper = tlsWrapper;
-		rbc = Channels.newChannel(socket.getInputStream());
-		inNetBB = ByteBuffer.allocate(wrapper.getNetBuffSize());
+        // DANIELE: Add code to use directly the socket channel
+        if (socket.getChannel() != null) {
+            rbc = socket.getChannel();
+        }
+        else {
+            rbc = Channels.newChannel(socket.getInputStream());
+        }
+        inNetBB = ByteBuffer.allocate(wrapper.getNetBuffSize());
 		inAppBB = ByteBuffer.allocate(wrapper.getAppBuffSize());
 	}
 

src/java/org/jivesoftware/wildfire/net/TLSStreamWriter.java

@@ -38,8 +38,14 @@ public class TLSStreamWriter {
 
 	public TLSStreamWriter(TLSWrapper tlsWrapper, Socket socket) throws IOException {
 		wrapper = tlsWrapper;
-		wbc = Channels.newChannel(socket.getOutputStream());
-		outAppData = ByteBuffer.allocate(tlsWrapper.getAppBuffSize());
+        // DANIELE: Add code to use directly the socket channel
+        if (socket.getChannel() != null) {
+            wbc = socket.getChannel();
+        }
+        else {
+            wbc = Channels.newChannel(socket.getOutputStream());
+        }
+        outAppData = ByteBuffer.allocate(tlsWrapper.getAppBuffSize());
 	}
 
 	private void doWrite(ByteBuffer buff) throws IOException {

src/java/org/jivesoftware/wildfire/spi/ConnectionManagerImpl.java

@@ -256,42 +256,28 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
         return ports.iterator();
     }
 
-    public void addSocket(Socket sock, boolean isSecure, ServerPort serverPort)  {
-        try {
-            // the order of these calls is critical (stupid huh?)
-            SocketReader reader;
-            String threadName;
-            if (serverPort.isClientPort()) {
-                SocketConnection conn = new SocketConnection(deliverer, sock, isSecure);
-                reader = new ClientSocketReader(router, serverName, sock, conn);
-                threadName = "Client SR - " + reader.hashCode();
-            }
-            else if (serverPort.isComponentPort()) {
-                SocketConnection conn = new SocketConnection(deliverer, sock, isSecure);
-                reader = new ComponentSocketReader(router, serverName, sock, conn);
-                threadName = "Component SR - " + reader.hashCode();
-            }
-            else if (serverPort.isServerPort()) {
-                SocketConnection conn = new SocketConnection(deliverer, sock, isSecure);
-                reader = new ServerSocketReader(router, serverName, sock, conn);
-                threadName = "Server SR - " + reader.hashCode();
-            }
-            else {
-                // Use the appropriate packeet deliverer for connection managers. The packet
-                // deliverer will be configured with the domain of the connection manager once
-                // the connection manager has finished the handshake.
-                SocketConnection conn =
-                        new SocketConnection(new MultiplexerPacketDeliverer(), sock, isSecure);
-                reader = new ConnectionMultiplexerSocketReader(router, serverName, sock, conn);
-                threadName = "ConnectionMultiplexer SR - " + reader.hashCode();
-            }
-            Thread thread = new Thread(reader, threadName);
-            thread.setDaemon(true);
-            thread.setPriority(Thread.NORM_PRIORITY);
-            thread.start();
+    public SocketReader createSocketReader(Socket sock, boolean isSecure, ServerPort serverPort,
+            boolean useBlockingMode) throws IOException {
+        if (serverPort.isClientPort()) {
+            SocketConnection conn = new SocketConnection(deliverer, sock, isSecure);
+            return new ClientSocketReader(router, serverName, sock, conn, useBlockingMode);
+        }
+        else if (serverPort.isComponentPort()) {
+            SocketConnection conn = new SocketConnection(deliverer, sock, isSecure);
+            return new ComponentSocketReader(router, serverName, sock, conn, useBlockingMode);
         }
-        catch (IOException e) {
-            Log.error(LocaleUtils.getLocalizedString("admin.error"), e);
+        else if (serverPort.isServerPort()) {
+            SocketConnection conn = new SocketConnection(deliverer, sock, isSecure);
+            return new ServerSocketReader(router, serverName, sock, conn, useBlockingMode);
+        }
+        else {
+            // Use the appropriate packeet deliverer for connection managers. The packet
+            // deliverer will be configured with the domain of the connection manager once
+            // the connection manager has finished the handshake.
+            SocketConnection conn =
+                    new SocketConnection(new MultiplexerPacketDeliverer(), sock, isSecure);
+            return new ConnectionMultiplexerSocketReader(router, serverName, sock, conn,
+                    useBlockingMode);
         }
     }