Pull up writeBufferFlipped flag

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1648897 13f79535-47bb-0310-9956-ffa450edef68
apache · Jan 1, 2015 · 205d787 · 205d787
1 parent eb2bd57
commit 205d787
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 40 deletions.
diff --git a/java/org/apache/coyote/http11/AbstractOutputBuffer.java b/java/org/apache/coyote/http11/AbstractOutputBuffer.java
@@ -101,6 +101,7 @@ public abstract class AbstractOutputBuffer<S> implements OutputBuffer {
     protected long byteCount = 0;
 
     protected ByteBuffer socketWriteBuffer;
+    protected volatile boolean writeBufferFlipped;
 
     /**
      * For "non-blocking" writes use an external set of buffers. Although the
@@ -314,6 +315,7 @@ public void recycle() {
         // Sub-classes may wish to do more than this.
         nextRequest();
         bufferedWrites.clear();
+        writeBufferFlipped = false;
     }
 
     /**

diff --git a/java/org/apache/coyote/http11/InternalAprOutputBuffer.java b/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
@@ -71,13 +71,6 @@ public InternalAprOutputBuffer(Response response, int headerBufferSize) {
     private SocketWrapperBase<Long> wrapper;
 
 
-    /**
-     * <code>false</code> if socketWriteBuffer is ready to be written to and
-     * <code>true</code> is ready to be read from.
-     */
-    private volatile boolean flipped = false;
-
-
     private AbstractEndpoint<Long> endpoint;
 
 
@@ -103,7 +96,6 @@ public void init(SocketWrapperBase<Long> socketWrapper,
     public void recycle() {
         super.recycle();
         socketWriteBuffer.clear();
-        flipped = false;
         socket = 0;
         wrapper = null;
     }
@@ -153,7 +145,7 @@ private synchronized void addToBB(byte[] buf, int offset, int length)
 
         // If bbuf is currently being used for writes, add this data to the
         // write buffer
-        if (flipped) {
+        if (writeBufferFlipped) {
             addToBuffers(buf, offset, length);
             return;
         }
@@ -264,8 +256,8 @@ private synchronized void writeToSocket(boolean block) throws IOException {
     }
 
     private synchronized void writeToSocket() throws IOException {
-        if (!flipped) {
+        if (!writeBufferFlipped) {
-            flipped = true;
+            writeBufferFlipped = true;
             socketWriteBuffer.flip();
         }
 
@@ -283,7 +275,7 @@ private synchronized void writeToSocket() throws IOException {
 
         if (socketWriteBuffer.remaining() == 0) {
             socketWriteBuffer.clear();
-            flipped = false;
+            writeBufferFlipped = false;
         }
         // If there is data left in the buffer the socket will be registered for
         // write further up the stack. This is to ensure the socket is only
@@ -305,8 +297,8 @@ private void transfer(ByteBuffer from, ByteBuffer to) {
 
     @Override
     protected synchronized boolean hasMoreDataToFlush() {
-        return (flipped && socketWriteBuffer.remaining() > 0) ||
+        return (writeBufferFlipped && socketWriteBuffer.remaining() > 0) ||
-                (!flipped && socketWriteBuffer.position() > 0);
+                (!writeBufferFlipped && socketWriteBuffer.position() > 0);
     }
 
 

diff --git a/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java b/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
@@ -66,11 +66,6 @@ public InternalNio2OutputBuffer(Response response, int headerBufferSize) {
      */
     protected volatile boolean interest = false;
 
-    /**
-     * Track if the byte buffer is flipped
-     */
-    protected volatile boolean flipped = false;
-
     /**
      * The completion handler used for asynchronous write operations
      */
@@ -226,7 +221,6 @@ public void recycle() {
         super.recycle();
         socket = null;
         e = null;
-        flipped = false;
         interest = false;
         if (writePending.availablePermits() != 1) {
             writePending.drainPermits();
@@ -239,8 +233,8 @@ public void recycle() {
     @Override
     public void nextRequest() {
         super.nextRequest();
-        flipped = false;
         interest = false;
+        writeBufferFlipped = false;
     }
 
     // ------------------------------------------------ HTTP/1.1 Output Methods
@@ -386,9 +380,9 @@ private boolean flushBufferInternal(boolean block, boolean hasPermit) throws IOE
                     }
                     bufferedWrites.clear();
                 }
-                if (!flipped) {
+                if (!writeBufferFlipped) {
                     socketWriteBuffer.flip();
-                    flipped = true;
+                    writeBufferFlipped = true;
                 }
                 while (socketWriteBuffer.hasRemaining()) {
                     if (socket.getSocket().write(socketWriteBuffer).get(socket.getTimeout(), TimeUnit.MILLISECONDS).intValue() < 0) {
@@ -407,14 +401,14 @@ private boolean flushBufferInternal(boolean block, boolean hasPermit) throws IOE
                 throw new SocketTimeoutException();
             }
             socketWriteBuffer.clear();
-            flipped = false;
+            writeBufferFlipped = false;
             return false;
         } else {
             synchronized (completionHandler) {
                 if (hasPermit || writePending.tryAcquire()) {
-                    if (!flipped) {
+                    if (!writeBufferFlipped) {
                         socketWriteBuffer.flip();
-                        flipped = true;
+                        writeBufferFlipped = true;
                     }
                     Nio2Endpoint.startInline();
                     if (bufferedWrites.size() > 0) {
@@ -443,7 +437,7 @@ private boolean flushBufferInternal(boolean block, boolean hasPermit) throws IOE
                     if (writePending.availablePermits() > 0) {
                         if (socketWriteBuffer.remaining() == 0) {
                             socketWriteBuffer.clear();
-                            flipped = false;
+                            writeBufferFlipped = false;
                         }
                     }
                 }
@@ -462,8 +456,8 @@ public boolean hasDataToWrite() {
 
     @Override
     protected boolean hasMoreDataToFlush() {
-        return (flipped && socketWriteBuffer.remaining() > 0) ||
+        return (writeBufferFlipped && socketWriteBuffer.remaining() > 0) ||
-                (!flipped && socketWriteBuffer.position() > 0);
+                (!writeBufferFlipped && socketWriteBuffer.position() > 0);
     }
 
     @Override

diff --git a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
@@ -63,11 +63,6 @@ public InternalNioOutputBuffer(Response response, int headerBufferSize) {
      */
     private NioSelectorPool pool;
 
-    /**
-     * Track if the byte buffer is flipped
-     */
-    protected volatile boolean flipped = false;
-
 
     // --------------------------------------------------------- Public Methods
 
@@ -89,7 +84,6 @@ public void init(SocketWrapperBase<NioChannel> socketWrapper,
     public void recycle() {
         super.recycle();
         socketWriteBuffer.clear();
-        flipped = false;
         socket = null;
     }
 
@@ -120,7 +114,7 @@ public void sendAck() throws IOException {
     private synchronized int writeToSocket(ByteBuffer bytebuffer, boolean block, boolean flip) throws IOException {
         if ( flip ) {
             bytebuffer.flip();
-            flipped = true;
+            writeBufferFlipped = true;
         }
 
         int written = 0;
@@ -146,7 +140,7 @@ private synchronized int writeToSocket(ByteBuffer bytebuffer, boolean block, boo
             //blocking writes must empty the buffer
             //and if remaining==0 then we did empty it
             bytebuffer.clear();
-            flipped = false;
+            writeBufferFlipped = false;
         }
         // If there is data left in the buffer the socket will be registered for
         // write further up the stack. This is to ensure the socket is only
@@ -238,7 +232,7 @@ protected boolean flushBuffer(boolean block) throws IOException {
 
         //write to the socket, if there is anything to write
         if (dataLeft) {
-            writeToSocket(socketWriteBuffer, block, !flipped);
+            writeToSocket(socketWriteBuffer, block, !writeBufferFlipped);
         }
 
         dataLeft = hasMoreDataToFlush();
@@ -265,8 +259,8 @@ protected boolean flushBuffer(boolean block) throws IOException {
 
     @Override
     protected boolean hasMoreDataToFlush() {
-        return (flipped && socketWriteBuffer.remaining() > 0) ||
+        return (writeBufferFlipped && socketWriteBuffer.remaining() > 0) ||
-        (!flipped && socketWriteBuffer.position() > 0);
+        (!writeBufferFlipped && socketWriteBuffer.position() > 0);
     }