andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '3' into jdk_epoll_bug_workaround

Browse Source 
Conflicts:
	src/main/java/org/jboss/netty/channel/socket/nio/SelectorUtil.java
This commit is contained in:
Norman Maurer 2012-08-29 07:48:59 +02:00
commit eddca7583e
9 changed files with 120 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java
View File

@ -226,11 +226,12 @@ class NioServerSocketPipelineSink extends AbstractNioChannelSink {
try {
for (;;) {
try {
if (selector.select(1000) > 0) {
// There was something selected if we reach this point, so clear
// the selected keys
selector.selectedKeys().clear();
}
// Just do a blocking select without any timeout
// as this thread does not execute anything else.
selector.select();
// There was something selected if we reach this point, so clear
// the selected keys
selector.selectedKeys().clear();
// accept connections in a for loop until no new connection is ready
for (;;) {

17
src/main/java/org/jboss/netty/channel/socket/nio/SelectorUtil.java
View File

@ -22,15 +22,16 @@ import java.util.concurrent.TimeUnit;
import org.jboss.netty.logging.InternalLogger;
import org.jboss.netty.logging.InternalLoggerFactory;
import org.jboss.netty.util.internal.SystemPropertyUtil;
final class SelectorUtil {
private static final InternalLogger logger =
InternalLoggerFactory.getInstance(SelectorUtil.class);
static final int DEFAULT_IO_THREADS = Runtime.getRuntime().availableProcessors() * 2;
static final long SELECT_TIMEOUT = 10;
static final long SELECT_TIMEOUT_NANOS = TimeUnit.MILLISECONDS.toNanos(SELECT_TIMEOUT);
static final long DEFAULT_SELECT_TIMEOUT = 10;
static final long SELECT_TIMEOUT;
static final long SELECT_TIMEOUT_NANOS;
// Workaround for JDK NIO bug.
//
@ -49,6 +50,16 @@ final class SelectorUtil {
logger.debug("Unable to get/set System Property '" + key + "'", e);
}
}
long selectTimeout;
try {
selectTimeout = Long.parseLong(SystemPropertyUtil.get("org.jboss.netty.selectTimeout",
String.valueOf(DEFAULT_SELECT_TIMEOUT)));
} catch (NumberFormatException e) {
selectTimeout = DEFAULT_SELECT_TIMEOUT;
}
SELECT_TIMEOUT = selectTimeout;
SELECT_TIMEOUT_NANOS = TimeUnit.MILLISECONDS.toMicros(SELECT_TIMEOUT);
logger.debug("Using select timeout of " + SELECT_TIMEOUT);
}
static int select(Selector selector) throws IOException {

4
src/main/java/org/jboss/netty/handler/codec/compression/JdkZlibEncoder.java
View File

@ -29,7 +29,7 @@ import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.Channels;
import org.jboss.netty.channel.LifeCycleAwareChannelHandler;
import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
import org.jboss.netty.handler.codec.oneone.OneToOneStrictEncoder;
/**
@ -37,7 +37,7 @@ import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
* @apiviz.landmark
* @apiviz.has org.jboss.netty.handler.codec.compression.ZlibWrapper
*/
public class JdkZlibEncoder extends OneToOneEncoder implements LifeCycleAwareChannelHandler {
public class JdkZlibEncoder extends OneToOneStrictEncoder implements LifeCycleAwareChannelHandler {
private final byte[] out = new byte[8192];
private final Deflater deflater;

4
src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java
View File

@ -27,7 +27,7 @@ import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.Channels;
import org.jboss.netty.channel.LifeCycleAwareChannelHandler;
import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
import org.jboss.netty.handler.codec.oneone.OneToOneStrictEncoder;
import org.jboss.netty.util.internal.jzlib.JZlib;
import org.jboss.netty.util.internal.jzlib.ZStream;
@ -37,7 +37,7 @@ import org.jboss.netty.util.internal.jzlib.ZStream;
* @apiviz.landmark
* @apiviz.has org.jboss.netty.handler.codec.compression.ZlibWrapper
*/
public class ZlibEncoder extends OneToOneEncoder implements LifeCycleAwareChannelHandler {
public class ZlibEncoder extends OneToOneStrictEncoder implements LifeCycleAwareChannelHandler {
private static final byte[] EMPTY_ARRAY = new byte[0];

19
src/main/java/org/jboss/netty/handler/codec/http/multipart/HttpPostBodyUtil.java
View File

@ -130,13 +130,10 @@ final class HttpPostBodyUtil {
*/
static class SeekAheadOptimize {
byte[] bytes;
int readerIndex;
int pos;
int origPos;
int limit;
ChannelBuffer buffer;
/**
@ -148,7 +145,8 @@ final class HttpPostBodyUtil {
}
this.buffer = buffer;
bytes = buffer.array();
pos = readerIndex = buffer.arrayOffset() + buffer.readerIndex();
readerIndex = buffer.readerIndex();
origPos = pos = buffer.arrayOffset() + readerIndex;
limit = buffer.arrayOffset() + buffer.writerIndex();
}
@ -159,10 +157,19 @@ final class HttpPostBodyUtil {
*/
void setReadPosition(int minus) {
pos -= minus;
readerIndex = pos;
readerIndex = getReadPosition(pos);
buffer.readerIndex(readerIndex);
}
/**
*
* @param index raw index of the array (pos in general)
* @return the value equivalent of raw index to be used in readerIndex(value)
*/
int getReadPosition(int index) {
return index - origPos + readerIndex;
}
void clear() {
buffer = null;
bytes = null;

92
src/main/java/org/jboss/netty/handler/codec/http/multipart/HttpPostRequestDecoder.java
View File

@ -849,13 +849,18 @@ public class HttpPostRequestDecoder {
/**
* Skip control Characters
* @throws NotEnoughDataDecoderException
*/
void skipControlCharacters() {
void skipControlCharacters() throws NotEnoughDataDecoderException {
SeekAheadOptimize sao = null;
try {
sao = new SeekAheadOptimize(undecodedChunk);
} catch (SeekAheadNoBackArrayException e) {
skipControlCharactersStandard(undecodedChunk);
try {
skipControlCharactersStandard();
} catch (IndexOutOfBoundsException e1) {
throw new NotEnoughDataDecoderException(e1);
}
return;
}
@ -866,13 +871,13 @@ public class HttpPostRequestDecoder {
return;
}
}
sao.setReadPosition(0);
throw new NotEnoughDataDecoderException("Access out of bounds");
}
static void skipControlCharactersStandard(ChannelBuffer buffer) {
void skipControlCharactersStandard() {
for (;;) {
char c = (char) buffer.readUnsignedByte();
char c = (char) undecodedChunk.readUnsignedByte();
if (!Character.isISOControl(c) && !Character.isWhitespace(c)) {
buffer.readerIndex(buffer.readerIndex() - 1);
undecodedChunk.readerIndex(undecodedChunk.readerIndex() - 1);
break;
}
}
@ -892,7 +897,12 @@ public class HttpPostRequestDecoder {
throws ErrorDataDecoderException {
// --AaB03x or --AaB03x--
int readerIndex = undecodedChunk.readerIndex();
skipControlCharacters();
try {
skipControlCharacters();
} catch (NotEnoughDataDecoderException e1) {
undecodedChunk.readerIndex(readerIndex);
return null;
}
skipOneLine();
String newline;
try {
@ -933,9 +943,9 @@ public class HttpPostRequestDecoder {
}
// read many lines until empty line with newline found! Store all data
while (!skipOneLine()) {
skipControlCharacters();
String newline;
try {
skipControlCharacters();
newline = readLine();
} catch (NotEnoughDataDecoderException e) {
undecodedChunk.readerIndex(readerIndex);
@ -1594,8 +1604,8 @@ public class HttpPostRequestDecoder {
// found the decoder limit
boolean newLine = true;
int index = 0;
int lastrealpos = sao.pos;
int lastPosition = undecodedChunk.readerIndex();
int setReadPosition = -1;
boolean found = false;
while (sao.pos < sao.limit) {
@ -1606,7 +1616,6 @@ public class HttpPostRequestDecoder {
index ++;
if (delimiter.length() == index) {
found = true;
sao.setReadPosition(0);
break;
}
continue;
@ -1620,23 +1629,16 @@ public class HttpPostRequestDecoder {
if (nextByte == HttpConstants.LF) {
newLine = true;
index = 0;
setReadPosition = sao.pos;
lastPosition = sao.pos - 2;
lastrealpos = sao.pos - 2;
}
} else {
// save last valid position
setReadPosition = sao.pos;
lastPosition = sao.pos;
}
} else if (nextByte == HttpConstants.LF) {
newLine = true;
index = 0;
setReadPosition = sao.pos;
lastPosition = sao.pos - 1;
lastrealpos = sao.pos - 1;
} else {
// save last valid position
setReadPosition = sao.pos;
lastPosition = sao.pos;
lastrealpos = sao.pos;
}
}
} else {
@ -1647,30 +1649,20 @@ public class HttpPostRequestDecoder {
if (nextByte == HttpConstants.LF) {
newLine = true;
index = 0;
setReadPosition = sao.pos;
lastPosition = sao.pos - 2;
lastrealpos = sao.pos - 2;
}
} else {
// save last valid position
setReadPosition = sao.pos;
lastPosition = sao.pos;
}
} else if (nextByte == HttpConstants.LF) {
newLine = true;
index = 0;
setReadPosition = sao.pos;
lastPosition = sao.pos - 1;
lastrealpos = sao.pos - 1;
} else {
// save last valid position
setReadPosition = sao.pos;
lastPosition = sao.pos;
lastrealpos = sao.pos;
}
}
}
if (setReadPosition > 0) {
sao.pos = setReadPosition;
sao.setReadPosition(0);
}
lastPosition = sao.getReadPosition(lastrealpos);
ChannelBuffer buffer = undecodedChunk.slice(readerIndex, lastPosition - readerIndex);
if (found) {
// found so lastPosition is correct and final
@ -1809,7 +1801,7 @@ public class HttpPostRequestDecoder {
boolean newLine = true;
int index = 0;
int lastPosition = undecodedChunk.readerIndex();
int setReadPosition = -1;
int lastrealpos = sao.pos;
boolean found = false;
while (sao.pos < sao.limit) {
@ -1820,7 +1812,6 @@ public class HttpPostRequestDecoder {
index ++;
if (delimiter.length() == index) {
found = true;
sao.setReadPosition(0);
break;
}
continue;
@ -1834,21 +1825,15 @@ public class HttpPostRequestDecoder {
if (nextByte == HttpConstants.LF) {
newLine = true;
index = 0;
lastPosition = sao.pos - 2;
setReadPosition = sao.pos;
lastrealpos = sao.pos - 2;
}
} else {
lastPosition = sao.pos;
setReadPosition = sao.pos;
}
} else if (nextByte == HttpConstants.LF) {
newLine = true;
index = 0;
lastPosition = sao.pos - 1;
setReadPosition = sao.pos;
lastrealpos = sao.pos - 1;
} else {
lastPosition = sao.pos;
setReadPosition = sao.pos;
lastrealpos = sao.pos;
}
}
} else {
@ -1859,28 +1844,19 @@ public class HttpPostRequestDecoder {
if (nextByte == HttpConstants.LF) {
newLine = true;
index = 0;
lastPosition = sao.pos - 2;
setReadPosition = sao.pos;
lastrealpos = sao.pos - 2;
}
} else {
lastPosition = sao.pos;
setReadPosition = sao.pos;
}
} else if (nextByte == HttpConstants.LF) {
newLine = true;
index = 0;
lastPosition = sao.pos - 1;
setReadPosition = sao.pos;
lastrealpos = sao.pos - 1;
} else {
lastPosition = sao.pos;
setReadPosition = sao.pos;
lastrealpos = sao.pos;
}
}
}
if (setReadPosition > 0) {
sao.pos = setReadPosition;
sao.setReadPosition(0);
}
lastPosition = sao.getReadPosition(lastrealpos);
if (found) {
// found so lastPosition is correct
// but position is just after the delimiter (either close delimiter or simple one)

9
src/main/java/org/jboss/netty/handler/codec/oneone/OneToOneEncoder.java
View File

@ -57,13 +57,20 @@ public abstract class OneToOneEncoder implements ChannelDownstreamHandler {
}
MessageEvent e = (MessageEvent) evt;
if (!doEncode(ctx, e)) {
ctx.sendDownstream(e);
}
}
protected boolean doEncode(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
Object originalMessage = e.getMessage();
Object encodedMessage = encode(ctx, e.getChannel(), originalMessage);
if (originalMessage == encodedMessage) {
ctx.sendDownstream(evt);
return false;
} else if (encodedMessage != null) {
write(ctx, e.getFuture(), encodedMessage, e.getRemoteAddress());
}
return true;
}
/**

38
src/main/java/org/jboss/netty/handler/codec/oneone/OneToOneStrictEncoder.java Normal file
View File

@ -0,0 +1,38 @@
/*
* Copyright 2012 The Netty Project
*
* The Netty Project licenses this file to you under the Apache License,
* version 2.0 (the "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*/
package org.jboss.netty.handler.codec.oneone;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.MessageEvent;
/**
* Special {@link OneToOneEncoder} which enforce strict ordering of encoding and writing. This
* class should get extend by implementations that needs this enforcement to guaranteer no corruption.
* Basically all "message" based {@link OneToOneEncoder} mostly don't need this, where "stream" based
* are often in need of it.
*
*/
public abstract class OneToOneStrictEncoder extends OneToOneEncoder {
@Override
protected boolean doEncode(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
// Synchronize on the channel to guaranteer the strict ordering
synchronized (ctx.getChannel()) {
return super.doEncode(ctx, e);
}
}
}

18
src/main/java/org/jboss/netty/handler/codec/spdy/SpdyFrameEncoder.java
View File

@ -159,11 +159,7 @@ public class SpdyFrameEncoder implements ChannelDownstreamHandler {
}
// Writes of compressed data must occur in order
final ChannelBuffer buffer = ChannelBuffers.wrappedBuffer(frame, data);
e.getChannel().getPipeline().execute(new Runnable() {
public void run() {
Channels.write(ctx, e.getFuture(), buffer, e.getRemoteAddress());
}
});
Channels.write(ctx, e.getFuture(), buffer, e.getRemoteAddress());
}
return;
@ -197,11 +193,7 @@ public class SpdyFrameEncoder implements ChannelDownstreamHandler {
}
// Writes of compressed data must occur in order
final ChannelBuffer buffer = ChannelBuffers.wrappedBuffer(frame, data);
e.getChannel().getPipeline().execute(new Runnable() {
public void run() {
Channels.write(ctx, e.getFuture(), buffer, e.getRemoteAddress());
}
});
Channels.write(ctx, e.getFuture(), buffer, e.getRemoteAddress());
}
return;
@ -323,11 +315,7 @@ public class SpdyFrameEncoder implements ChannelDownstreamHandler {
}
// Writes of compressed data must occur in order
final ChannelBuffer buffer = ChannelBuffers.wrappedBuffer(frame, data);
e.getChannel().getPipeline().execute(new Runnable() {
public void run() {
Channels.write(ctx, e.getFuture(), buffer, e.getRemoteAddress());
}
});
Channels.write(ctx, e.getFuture(), buffer, e.getRemoteAddress());
}
return;