Merge pull request TooTallNate#1407 from TooTallNate/receive-buffer-size

Author: marci4

src/main/java/org/java_websocket/AbstractWebSocket.java

@@ -102,6 +102,18 @@ public abstract class AbstractWebSocket extends WebSocketAdapter{
  */
 privatefinalObjectsyncConnectionLost = newObject();
 
+/**
+ * TCP receive buffer size that will be used for sockets (zero means use system default)
+ *
+ * @since 1.5.7
+ */
+privateintreceiveBufferSize = 0;
+
+/**
+ * Used for internal buffer allocations when the socket buffer size is not specified.
+ */
+protectedstaticintDEFAULT_READ_BUFFER_SIZE = 65536;
+
 /**
  * Get the interval checking for lost connections Default is 60 seconds
  *
@@ -336,4 +348,29 @@ public boolean isDaemon(){
 publicvoidsetDaemon(booleandaemon){
 this.daemon = daemon;
  }
+
+/**
+ * Returns the TCP receive buffer size that will be used for sockets (or zero, if not explicitly set).
+ * @see java.net.Socket#setReceiveBufferSize(int)
+ *
+ * @since 1.5.7
+ */
+publicintgetReceiveBufferSize(){
+returnreceiveBufferSize;
+ }
+
+/**
+ * Sets the TCP receive buffer size that will be used for sockets.
+ * If this is not explicitly set (or set to zero), the system default is used.
+ * @see java.net.Socket#setReceiveBufferSize(int)
+ *
+ * @since 1.5.7
+ */
+publicvoidsetReceiveBufferSize(intreceiveBufferSize){
+if (receiveBufferSize < 0){
+thrownewIllegalArgumentException("buffer size < 0");
+ }
+this.receiveBufferSize = receiveBufferSize;
+ }
+
 }

src/main/java/org/java_websocket/WebSocketImpl.java

@@ -85,11 +85,6 @@ public class WebSocketImpl implements WebSocket{
  */
 publicstaticfinalintDEFAULT_WSS_PORT = 443;
 
-/**
- * Initial buffer size
- */
-publicstaticfinalintRCVBUF = 16384;
-
 /**
  * Logger instance
  *

src/main/java/org/java_websocket/client/WebSocketClient.java

@@ -481,6 +481,10 @@ public void run(){
 
 socket.setTcpNoDelay(isTcpNoDelay());
 socket.setReuseAddress(isReuseAddr());
+intreceiveBufferSize = getReceiveBufferSize();
+if (receiveBufferSize > 0){
+socket.setReceiveBufferSize(receiveBufferSize);
+ }
 
 if (!socket.isConnected()){
 InetSocketAddressaddr = dnsResolver == null ? InetSocketAddress.createUnresolved(uri.getHost(), getPort()) : newInetSocketAddress(dnsResolver.resolve(uri), this.getPort());
@@ -531,7 +535,8 @@ public void run(){
 writeThread.setDaemon(isDaemon());
 writeThread.start();
 
-byte[] rawbuffer = newbyte[WebSocketImpl.RCVBUF];
+intreceiveBufferSize = getReceiveBufferSize();
+byte[] rawbuffer = newbyte[receiveBufferSize > 0 ? receiveBufferSize : DEFAULT_READ_BUFFER_SIZE];
 intreadBytes;
 
 try{

src/main/java/org/java_websocket/server/WebSocketServer.java

@@ -578,7 +578,10 @@ private boolean doSetupSelectorAndServerThread(){
 server = ServerSocketChannel.open();
 server.configureBlocking(false);
 ServerSocketsocket = server.socket();
-socket.setReceiveBufferSize(WebSocketImpl.RCVBUF);
+intreceiveBufferSize = getReceiveBufferSize();
+if (receiveBufferSize > 0){
+socket.setReceiveBufferSize(receiveBufferSize);
+ }
 socket.setReuseAddress(isReuseAddr());
 socket.bind(address, getMaxPendingConnections());
 selector = Selector.open();
@@ -655,7 +658,8 @@ protected void releaseBuffers(WebSocket c) throws InterruptedException{
  }
 
 publicByteBuffercreateBuffer(){
-returnByteBuffer.allocate(WebSocketImpl.RCVBUF);
+intreceiveBufferSize = getReceiveBufferSize();
+returnByteBuffer.allocate(receiveBufferSize > 0 ? receiveBufferSize : DEFAULT_READ_BUFFER_SIZE);
  }
 
 protectedvoidqueue(WebSocketImplws) throwsInterruptedException{