You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/01/01 18:13:49 UTC
svn commit: r1648897 - in /tomcat/trunk/java/org/apache/coyote/http11:
AbstractOutputBuffer.java InternalAprOutputBuffer.java
InternalNio2OutputBuffer.java InternalNioOutputBuffer.java
Author: markt
Date: Thu Jan 1 17:13:49 2015
New Revision: 1648897
URL: http://svn.apache.org/r1648897
Log:
Pull up writeBufferFlipped flag
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1648897&r1=1648896&r2=1648897&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Thu Jan 1 17:13:49 2015
@@ -101,6 +101,7 @@ public abstract class AbstractOutputBuff
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 abstract class AbstractOutputBuff
// Sub-classes may wish to do more than this.
nextRequest();
bufferedWrites.clear();
+ writeBufferFlipped = false;
}
/**
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=1648897&r1=1648896&r2=1648897&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Thu Jan 1 17:13:49 2015
@@ -71,13 +71,6 @@ public class InternalAprOutputBuffer ext
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 class InternalAprOutputBuffer ext
public void recycle() {
super.recycle();
socketWriteBuffer.clear();
- flipped = false;
socket = 0;
wrapper = null;
}
@@ -153,7 +145,7 @@ public class InternalAprOutputBuffer ext
// 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 @@ public class InternalAprOutputBuffer ext
}
private synchronized void writeToSocket() throws IOException {
- if (!flipped) {
- flipped = true;
+ if (!writeBufferFlipped) {
+ writeBufferFlipped = true;
socketWriteBuffer.flip();
}
@@ -283,7 +275,7 @@ public class InternalAprOutputBuffer ext
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 @@ public class InternalAprOutputBuffer ext
@Override
protected synchronized boolean hasMoreDataToFlush() {
- return (flipped && socketWriteBuffer.remaining() > 0) ||
- (!flipped && socketWriteBuffer.position() > 0);
+ return (writeBufferFlipped && socketWriteBuffer.remaining() > 0) ||
+ (!writeBufferFlipped && socketWriteBuffer.position() > 0);
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java?rev=1648897&r1=1648896&r2=1648897&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java Thu Jan 1 17:13:49 2015
@@ -67,11 +67,6 @@ public class InternalNio2OutputBuffer ex
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
*/
protected CompletionHandler<Integer, ByteBuffer> completionHandler;
@@ -226,7 +221,6 @@ public class InternalNio2OutputBuffer ex
super.recycle();
socket = null;
e = null;
- flipped = false;
interest = false;
if (writePending.availablePermits() != 1) {
writePending.drainPermits();
@@ -239,8 +233,8 @@ public class InternalNio2OutputBuffer ex
@Override
public void nextRequest() {
super.nextRequest();
- flipped = false;
interest = false;
+ writeBufferFlipped = false;
}
// ------------------------------------------------ HTTP/1.1 Output Methods
@@ -386,9 +380,9 @@ public class InternalNio2OutputBuffer ex
}
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 @@ public class InternalNio2OutputBuffer ex
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 @@ public class InternalNio2OutputBuffer ex
if (writePending.availablePermits() > 0) {
if (socketWriteBuffer.remaining() == 0) {
socketWriteBuffer.clear();
- flipped = false;
+ writeBufferFlipped = false;
}
}
}
@@ -462,8 +456,8 @@ public class InternalNio2OutputBuffer ex
@Override
protected boolean hasMoreDataToFlush() {
- return (flipped && socketWriteBuffer.remaining() > 0) ||
- (!flipped && socketWriteBuffer.position() > 0);
+ return (writeBufferFlipped && socketWriteBuffer.remaining() > 0) ||
+ (!writeBufferFlipped && socketWriteBuffer.position() > 0);
}
@Override
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=1648897&r1=1648896&r2=1648897&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Thu Jan 1 17:13:49 2015
@@ -63,11 +63,6 @@ public class InternalNioOutputBuffer ext
*/
private NioSelectorPool pool;
- /**
- * Track if the byte buffer is flipped
- */
- protected volatile boolean flipped = false;
-
// --------------------------------------------------------- Public Methods
@@ -89,7 +84,6 @@ public class InternalNioOutputBuffer ext
public void recycle() {
super.recycle();
socketWriteBuffer.clear();
- flipped = false;
socket = null;
}
@@ -120,7 +114,7 @@ public class InternalNioOutputBuffer ext
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 @@ public class InternalNioOutputBuffer ext
//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 @@ public class InternalNioOutputBuffer ext
//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 @@ public class InternalNioOutputBuffer ext
@Override
protected boolean hasMoreDataToFlush() {
- return (flipped && socketWriteBuffer.remaining() > 0) ||
- (!flipped && socketWriteBuffer.position() > 0);
+ return (writeBufferFlipped && socketWriteBuffer.remaining() > 0) ||
+ (!writeBufferFlipped && socketWriteBuffer.position() > 0);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org