Nabble - Netty Commit Logs

r1872 - in branches/httpPost/src/main/java/org/jboss/netty: channel and 13 other directories.

2009-11-07T02:00:41Z

Author: fredbregier
Date: 2009-11-07 05:00:41 -0500 (Sat, 07 Nov 2009)
New Revision: 1872

Added:
branches/httpPost/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictorFactory.java
branches/httpPost/src/main/java/org/jboss/netty/channel/FixedReceiveBufferSizePredictorFactory.java
branches/httpPost/src/main/java/org/jboss/netty/channel/ReceiveBufferSizePredictorFactory.java
branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java
branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java
branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java
Modified:
branches/httpPost/src/main/java/org/jboss/netty/buffer/ChannelBuffers.java
branches/httpPost/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java
branches/httpPost/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictor.java
branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelDownstreamHandler.java
branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelEvent.java
branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelHandlerContext.java
branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelPipeline.java
branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelState.java
branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelUpstreamHandler.java
branches/httpPost/src/main/java/org/jboss/netty/channel/SimpleChannelHandler.java
branches/httpPost/src/main/java/org/jboss/netty/channel/SimpleChannelUpstreamHandler.java
branches/httpPost/src/main/java/org/jboss/netty/channel/socket/DatagramChannelConfig.java
branches/httpPost/src/main/java/org/jboss/netty/channel/socket/DefaultDatagramChannelConfig.java
branches/httpPost/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingServlet.java
branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java
branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelConfig.java
branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java
branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java
branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
branches/httpPost/src/main/java/org/jboss/netty/channel/xnio/DefaultXnioChannelConfig.java
branches/httpPost/src/main/java/org/jboss/netty/channel/xnio/XnioChannelConfig.java
branches/httpPost/src/main/java/org/jboss/netty/example/http/snoop/HttpClientPipelineFactory.java
branches/httpPost/src/main/java/org/jboss/netty/example/http/snoop/HttpServerPipelineFactory.java
branches/httpPost/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java
branches/httpPost/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClient.java
branches/httpPost/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServer.java
branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/CompressionException.java
branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/ZlibDecoder.java
branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java
branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java
branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/ZlibWrapper.java
branches/httpPost/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java
branches/httpPost/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedder.java
branches/httpPost/src/main/java/org/jboss/netty/handler/codec/embedder/DecoderEmbedder.java
branches/httpPost/src/main/java/org/jboss/netty/handler/codec/embedder/EncoderEmbedder.java
branches/httpPost/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java
branches/httpPost/src/main/java/org/jboss/netty/util/HashedWheelTimer.java
branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java
branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java
branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java
branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java
branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java
Log:
Update to last version of trunk, notably HTTP codec and snoop example

Modified: branches/httpPost/src/main/java/org/jboss/netty/buffer/ChannelBuffers.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/buffer/ChannelBuffers.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/buffer/ChannelBuffers.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -19,6 +19,8 @@
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.charset.UnsupportedCharsetException;
+import java.util.ArrayList;
+import java.util.List;

/**
@@ -338,16 +340,34 @@
}
break;
default:
- ChannelBuffer[] wrappedBuffers = new ChannelBuffer[arrays.length];
- for (int i = 0; i < arrays.length; i ++) {
- wrappedBuffers[i] = wrappedBuffer(endianness, arrays[i]);
+ // Get the list of the component, while guessing the byte order.
+ final List<ChannelBuffer> components = new ArrayList<ChannelBuffer>(arrays.length);
+ for (byte[] a: arrays) {
+ if (a == null) {
+ break;
+ }
+ if (a.length > 0) {
+ components.add(wrappedBuffer(endianness, a));
+ }
}
- return wrappedBuffer(wrappedBuffers);
+ return compositeBuffer(endianness, components);
}

return EMPTY_BUFFER;
}

+ private static ChannelBuffer compositeBuffer(
+ ByteOrder endianness, List<ChannelBuffer> components) {
+ switch (components.size()) {
+ case 0:
+ return EMPTY_BUFFER;
+ case 1:
+ return components.get(0);
+ default:
+ return new CompositeChannelBuffer(endianness, components);
+ }
+ }
+
/**
* Creates a new composite buffer which wraps the readable bytes of the
* specified buffers without copying them. A modification on the content
@@ -367,11 +387,33 @@
}
break;
default:
- for (ChannelBuffer b: buffers) {
- if (b.readable()) {
- return new CompositeChannelBuffer(buffers);
+ ByteOrder order = null;
+ final List<ChannelBuffer> components = new ArrayList<ChannelBuffer>(buffers.length);
+ for (ChannelBuffer c: buffers) {
+ if (c == null) {
+ break;
}
+ if (c.readable()) {
+ if (order != null) {
+ if (!order.equals(c.order())) {
+ throw new IllegalArgumentException(
+ "inconsistent byte order");
+ }
+ } else {
+ order = c.order();
+ }
+ if (c instanceof CompositeChannelBuffer) {
+ // Expand nested composition.
+ components.addAll(
+ ((CompositeChannelBuffer) c).decompose(
+ c.readerIndex(), c.readableBytes()));
+ } else {
+ // An ordinary buffer (non-composite)
+ components.add(c.slice());
+ }
+ }
}
+ return compositeBuffer(order, components);
}
return EMPTY_BUFFER;
}
@@ -395,11 +437,25 @@
}
break;
default:
- ChannelBuffer[] wrappedBuffers = new ChannelBuffer[buffers.length];
- for (int i = 0; i < buffers.length; i ++) {
- wrappedBuffers[i] = wrappedBuffer(buffers[i]);
+ ByteOrder order = null;
+ final List<ChannelBuffer> components = new ArrayList<ChannelBuffer>(buffers.length);
+ for (ByteBuffer b: buffers) {
+ if (b == null) {
+ break;
+ }
+ if (b.hasRemaining()) {
+ if (order != null) {
+ if (!order.equals(b.order())) {
+ throw new IllegalArgumentException(
+ "inconsistent byte order");
+ }
+ } else {
+ order = b.order();
+ }
+ components.add(wrappedBuffer(b));
+ }
}
- return wrappedBuffer(wrappedBuffers);
+ return compositeBuffer(order, components);
}

return EMPTY_BUFFER;

Modified: branches/httpPost/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -48,44 +48,15 @@
private int[] indices;
private int lastAccessedComponentId;

- public CompositeChannelBuffer(ChannelBuffer... buffers) {
- if (buffers.length == 0) {
- throw new IllegalArgumentException("buffers should not be empty.");
- }
-
- // Get the list of the component, while guessing the byte order.
- ByteOrder expectedEndianness = null;
- final List<ChannelBuffer> newComponents = new ArrayList<ChannelBuffer>(buffers.length);
- for (ChannelBuffer c: buffers) {
- if (c.readableBytes() > 0) {
- expectedEndianness = c.order();
- if (c instanceof CompositeChannelBuffer) {
- // Expand nested composition.
- newComponents.addAll(
- ((CompositeChannelBuffer) c).slice0(
- c.readerIndex(), c.readableBytes()));
- } else {
- // An ordinary buffer (non-composite)
- newComponents.add(c.slice());
- }
- } else if (c.capacity() != 0) {
- expectedEndianness = c.order();
- }
- }
-
- if (expectedEndianness == null) {
- throw new IllegalArgumentException(
- "buffers have only empty buffers.");
- }
-
- order = expectedEndianness;
- setComponents(newComponents);
+ public CompositeChannelBuffer(ByteOrder endianness, List<ChannelBuffer> buffers) {
+ order = endianness;
+ setComponents(buffers);
}

/**
* Same with {@link #slice(int, int)} except that this method returns a list.
*/
- private List<ChannelBuffer> slice0(int index, int length) {
+ public List<ChannelBuffer> decompose(int index, int length) {
if (length == 0) {
return Collections.emptyList();
}
@@ -556,9 +527,15 @@
return ChannelBuffers.EMPTY_BUFFER;
}

- List<ChannelBuffer> listBuffer = slice0(index, length);
- ChannelBuffer[] buffers = listBuffer.toArray(new ChannelBuffer[listBuffer.size()]);
- return new CompositeChannelBuffer(buffers);
+ List<ChannelBuffer> components = decompose(index, length);
+ switch (components.size()) {
+ case 0:
+ return ChannelBuffers.EMPTY_BUFFER;
+ case 1:
+ return components.get(0);
+ default:
+ return new CompositeChannelBuffer(order(), components);
+ }
}

public ByteBuffer toByteBuffer(int index, int length) {
@@ -667,7 +644,7 @@
int localWriterIndex = this.writerIndex();

final int bytesToMove = capacity() - localReaderIndex;
- List<ChannelBuffer> list = slice0(localReaderIndex, bytesToMove);
+ List<ChannelBuffer> list = decompose(localReaderIndex, bytesToMove);

// Add a new buffer so that the capacity of this composite buffer does
// not decrease due to the discarded components.

Modified: branches/httpPost/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictor.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictor.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictor.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -37,6 +37,10 @@
public class AdaptiveReceiveBufferSizePredictor implements
ReceiveBufferSizePredictor {

+ static final int DEFAULT_MINIMUM = 64;
+ static final int DEFAULT_INITIAL = 1024;
+ static final int DEFAULT_MAXIMUM = 65536;
+
private static final int INDEX_INCREMENT = 4;
private static final int INDEX_DECREMENT = 1;

@@ -94,10 +98,6 @@
throw new Error("shouldn't reach here; please file a bug report.");
}

- private static final int DEFAULT_MINIMUM = 64;
- private static final int DEFAULT_INITIAL = 1024;
- private static final int DEFAULT_MAXIMUM = 65536;
-
private final int minIndex;
private final int maxIndex;
private int index;

Added: branches/httpPost/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictorFactory.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictorFactory.java (rev 0)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictorFactory.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat 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.channel;
+
+
+/**
+ * The {@link ReceiveBufferSizePredictorFactory} that creates a new
+ * {@link AdaptiveReceiveBufferSizePredictor}.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Trustin Lee ([hidden email])
+ *
+ * @version $Rev$, $Date$
+ */
+public class AdaptiveReceiveBufferSizePredictorFactory implements
+ ReceiveBufferSizePredictorFactory {
+
+ private final int minimum;
+ private final int initial;
+ private final int maximum;
+
+ /**
+ * Creates a new factory with the default parameters. With the default
+ * parameters, the expected buffer size starts from {@code 1024}, does not
+ * go down below {@code 64}, and does not go up above {@code 65536}.
+ */
+ public AdaptiveReceiveBufferSizePredictorFactory() {
+ this(AdaptiveReceiveBufferSizePredictor.DEFAULT_MINIMUM,
+ AdaptiveReceiveBufferSizePredictor.DEFAULT_INITIAL,
+ AdaptiveReceiveBufferSizePredictor.DEFAULT_MAXIMUM);
+ }
+
+ /**
+ * Creates a new factory with the specified parameters.
+ *
+ * @param minimum the inclusive lower bound of the expected buffer size
+ * @param initial the initial buffer size when no feed back was received
+ * @param maximum the inclusive upper bound of the expected buffer size
+ */
+ public AdaptiveReceiveBufferSizePredictorFactory(int minimum, int initial, int maximum) {
+ if (minimum <= 0) {
+ throw new IllegalArgumentException("minimum: " + minimum);
+ }
+ if (initial < minimum) {
+ throw new IllegalArgumentException("initial: " + initial);
+ }
+ if (maximum < initial) {
+ throw new IllegalArgumentException("maximum: " + maximum);
+ }
+
+ this.minimum = minimum;
+ this.initial = initial;
+ this.maximum = maximum;
+ }
+
+ public ReceiveBufferSizePredictor getPredictor() throws Exception {
+ return new AdaptiveReceiveBufferSizePredictor(minimum, initial, maximum);
+ }
+}

Property changes on: branches/httpPost/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictorFactory.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Modified: branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelDownstreamHandler.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelDownstreamHandler.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelDownstreamHandler.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -15,72 +15,21 @@
*/
package org.jboss.netty.channel;

-import java.net.SocketAddress;
-
-
/**
* Handles or intercepts a downstream {@link ChannelEvent}, and sends a
* {@link ChannelEvent} to the next handler in a {@link ChannelPipeline}.
- *
- * <h3>Downstream events</h3>
* <p>
- * A downstream event is an event which is supposed to be processed by
- * a series of downstream handlers in the {@link ChannelPipeline}. It is often
- * an I/O request made by a user application.
- * <p>
* The most common use case of this interface is to intercept an I/O request
- * such as {@link Channel#write(Object)} and {@link Channel#close()}. The
- * received {@link ChannelEvent} object is interpreted as described in the
- * following table:
+ * such as {@link Channel#write(Object)} and {@link Channel#close()}.
*
- * <table border="1" cellspacing="0" cellpadding="6">
- * <tr>
- * <th>Event name</th><th>Event type and condition</th><th>Meaning</th>
- * </tr>
- * <tr>
- * <td>{@code "write"}</td>
- * <td>{@link MessageEvent}</td><td>Send a message to the {@link Channel}.</td>
- * </tr>
- * <tr>
- * <td>{@code "bind"}</td>
- * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#BOUND BOUND}, value = {@link SocketAddress})</td>
- * <td>Bind the {@link Channel} to the specified local address.</td>
- * </tr>
- * <tr>
- * <td>{@code "unbind"}</td>
- * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#BOUND BOUND}, value = {@code null})</td>
- * <td>Unbind the {@link Channel} from the current local address.</td>
- * </tr>
- * <tr>
- * <td>{@code "connect"}</td>
- * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#CONNECTED CONNECTED}, value = {@link SocketAddress})</td>
- * <td>Connect the {@link Channel} to the specified remote address.</td>
- * </tr>
- * <tr>
- * <td>{@code "disconnect"}</td>
- * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#CONNECTED CONNECTED}, value = {@code null})</td>
- * <td>Disconnect the {@link Channel} from the current remote address.</td>
- * </tr>
- * <tr>
- * <td>{@code "close"}</td>
- * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#OPEN OPEN}, value = {@code false})</td>
- * <td>Close the {@link Channel}.</td>
- * </tr>
- * </table>
+ * <h3>{@link SimpleChannelDownstreamHandler}</h3>
* <p>
- * Other event types and conditions which were not addressed here will be
- * ignored and discarded. Please note that there's no {@code "open"} in the
- * table. It is because a {@link Channel} is always open when it is created
- * by a {@link ChannelFactory}.
+ * In most cases, you will get to use a {@link SimpleChannelDownstreamHandler}
+ * to implement a downstream handler because it provides an individual handler
+ * method for each event type. You might want to implement this interface
+ * directly though if you want to handle various types of events in more
+ * generic way.
*
- * <h4>Additional resources worth reading</h4>
- * <p>
- * You might want to refer to {@link ChannelUpstreamHandler} to see how a
- * {@link ChannelEvent} is interpreted when going upstream. Also, please refer
- * to the {@link ChannelEvent} and {@link ChannelPipeline} documentation to find
- * out what an upstream event and a downstream event are, what fundamental
- * differences they have, and how they flow in a pipeline.
- *
* <h3>Firing an event to the next handler</h3>
* <p>
* You can forward the received event downstream or upstream. In most cases,

Modified: branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelEvent.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelEvent.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelEvent.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -15,13 +15,19 @@
*/
package org.jboss.netty.channel;

+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.net.SocketAddress;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.socket.ServerSocketChannel;
+
/**
* An I/O event or I/O request associated with a {@link Channel}.
* <p>
- * A {@link ChannelEvent} is supposed to be handled by the
- * {@link ChannelPipeline} which is attached to the {@link Channel} that
- * the event belongs to. Once an event is sent to a {@link ChannelPipeline},
- * it is handled by a list of {@link ChannelHandler}s.
+ * A {@link ChannelEvent} is handled by a series of {@link ChannelHandler}s in
+ * a {@link ChannelPipeline}.
*
* <h3>Upstream events and downstream events, and their interpretation</h3>
* <p>
@@ -33,23 +39,143 @@
* downstream event and say <strong>"an event goes downstream."</strong>
* (Please refer to the diagram in {@link ChannelPipeline} for more explanation.)
* <p>
- * A {@link ChannelEvent} is interpreted differently by a {@link ChannelHandler}
- * depending on whether the event is an upstream event or a downstream event.
- * An upstream event represents the notification of what happened in the past.
- * By contrast, a downstream event represents the request of what should happen
- * in the future. For example, a {@link MessageEvent} represents the
- * notification of a received message when it goes upstream, while it
- * represents the request of writing a message when it goes downstream.
+ * When your server receives a message from a client, the event associated with
+ * the received message is an upstream event. When your server sends a message
+ * or reply to the client, the event associated with the write request is a
+ * downstream event. The same rule applies for the client side. If your client
+ * sent a request to the server, it means your client triggered a downstream
+ * event. If your client received a response from the server, it means
+ * your client will be notified with an upstream event. Upstream events are
+ * often the result of inbound operations such as {@link InputStream#read(byte[])},
+ * and downstream events are the request for outbound operations such as
+ * {@link OutputStream#write(byte[])}, {@link Socket#connect(SocketAddress)},
+ * and {@link Socket#close()}.
*
- * <h4>Additional resources worth reading</h4>
+ * <h4>Upstream events</h4>
+ *
+ * <table border="1" cellspacing="0" cellpadding="6">
+ * <tr>
+ * <th>Event name</th></th><th>Event type and condition</th><th>Meaning</th>
+ * </tr>
+ * <tr>
+ * <td>{@code "messageReceived"}</td>
+ * <td>{@link MessageEvent}</td>
+ * <td>a message object (e.g. {@link ChannelBuffer}) was received from a remote peer</td>
+ * </tr>
+ * <tr>
+ * <td>{@code "exceptionCaught"}</td>
+ * <td>{@link ExceptionEvent}</td>
+ * <td>an exception was raised by an I/O thread or a {@link ChannelHandler}</td>
+ * </tr>
+ * <tr>
+ * <td>{@code "channelOpen"}</td>
+ * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#OPEN OPEN}, value = {@code true})</td>
+ * <td>a {@link Channel} is open, but not bound nor connected</td>
+ * </tr>
+ * <tr>
+ * <td>{@code "channelClosed"}</td>
+ * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#OPEN OPEN}, value = {@code false})</td>
+ * <td>a {@link Channel} was closed and all its related resources were released</td>
+ * </tr>
+ * <tr>
+ * <td>{@code "channelBound"}</td>
+ * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#BOUND BOUND}, value = {@link SocketAddress})</td>
+ * <td>a {@link Channel} is open and bound to a local address, but not connected</td>
+ * </tr>
+ * <tr>
+ * <td>{@code "channelUnbound"}</td>
+ * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#BOUND BOUND}, value = {@code null})</td>
+ * <td>a {@link Channel} was unbound from the current local address</td>
+ * </tr>
+ * <tr>
+ * <td>{@code "channelConnected"}</td>
+ * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#CONNECTED CONNECTED}, value = {@link SocketAddress})</td>
+ * <td>a {@link Channel} is open, bound to a local address, and connected to a remote address</td>
+ * </tr>
+ * <tr>
+ * <td>{@code "writeComplete"}</td>
+ * <td>{@link WriteCompletionEvent}</td>
+ * <td>something has been written to a remote peer</td>
+ * </tr>
+ * <tr>
+ * <td>{@code "channelDisconnected"}</td>
+ * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#CONNECTED CONNECTED}, value = {@code null})</td>
+ * <td>a {@link Channel} was disconnected from its remote peer</td>
+ * </tr>
+ * <tr>
+ * <td>{@code "channelInterestChanged"}</td>
+ * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#INTEREST_OPS INTEREST_OPS}, no value)</td>
+ * <td>a {@link Channel}'s {@link Channel#getInterestOps() interestOps} was changed</td>
+ * </tr>
+ * </table>
* <p>
- * Please refer to the documentation of {@link ChannelHandler} and its sub-types
- * ({@link ChannelUpstreamHandler} for upstream events and
- * {@link ChannelDownstreamHandler} for downstream events) to find out how
- * a {@link ChannelEvent} is interpreted depending on the type of the handler
- * more in detail. Also, please refer to the {@link ChannelPipeline}
- * documentation to find out how an event flows in a pipeline.
+ * These two additional event types are used only for a parent channel which
+ * can have a child channel (e.g. {@link ServerSocketChannel}).
+ * <p>
+ * <table border="1" cellspacing="0" cellpadding="6">
+ * <tr>
+ * <th>Event name</th><th>Event type and condition</th><th>Meaning</th>
+ * </tr>
+ * <tr>
+ * <td>{@code "childChannelOpen"}</td>
+ * <td>{@link ChildChannelStateEvent}<br/>({@code childChannel.isOpen() = true})</td>
+ * <td>a child {@link Channel} was open (e.g. a server channel accepted a connection.)</td>
+ * </tr>
+ * <tr>
+ * <td>{@code "childChannelClosed"}</td>
+ * <td>{@link ChildChannelStateEvent}<br/>({@code childChannel.isOpen() = false})</td>
+ * <td>a child {@link Channel} was closed (e.g. the accepted connection was closed.)</td>
+ * </tr>
+ * </table>
*
+ * <h4>Downstream events</h4>
+ *
+ * <table border="1" cellspacing="0" cellpadding="6">
+ * <tr>
+ * <th>Event name</th><th>Event type and condition</th><th>Meaning</th>
+ * </tr>
+ * <tr>
+ * <td>{@code "write"}</td>
+ * <td>{@link MessageEvent}</td><td>Send a message to the {@link Channel}.</td>
+ * </tr>
+ * <tr>
+ * <td>{@code "bind"}</td>
+ * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#BOUND BOUND}, value = {@link SocketAddress})</td>
+ * <td>Bind the {@link Channel} to the specified local address.</td>
+ * </tr>
+ * <tr>
+ * <td>{@code "unbind"}</td>
+ * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#BOUND BOUND}, value = {@code null})</td>
+ * <td>Unbind the {@link Channel} from the current local address.</td>
+ * </tr>
+ * <tr>
+ * <td>{@code "connect"}</td>
+ * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#CONNECTED CONNECTED}, value = {@link SocketAddress})</td>
+ * <td>Connect the {@link Channel} to the specified remote address.</td>
+ * </tr>
+ * <tr>
+ * <td>{@code "disconnect"}</td>
+ * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#CONNECTED CONNECTED}, value = {@code null})</td>
+ * <td>Disconnect the {@link Channel} from the current remote address.</td>
+ * </tr>
+ * <tr>
+ * <td>{@code "close"}</td>
+ * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#OPEN OPEN}, value = {@code false})</td>
+ * <td>Close the {@link Channel}.</td>
+ * </tr>
+ * </table>
+ * <p>
+ * Other event types and conditions which were not addressed here will be
+ * ignored and discarded. Please note that there's no {@code "open"} in the
+ * table. It is because a {@link Channel} is always open when it is created
+ * by a {@link ChannelFactory}.
+ *
+ * <h3>Additional resources worth reading</h3>
+ * <p>
+ * Please refer to the {@link ChannelHandler} and {@link ChannelPipeline}
+ * documentation to find out how an event flows in a pipeline and how to handle
+ * the event in your application.
+ *
* @author The Netty Project ([hidden email])
* @author Trustin Lee ([hidden email])
*

Modified: branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelHandlerContext.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelHandlerContext.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelHandlerContext.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -81,8 +81,8 @@
* <p>
* Please refer to the {@link ChannelHandler}, {@link ChannelEvent}, and
* {@link ChannelPipeline} to find out what a upstream event and a downstream
- * event are, what fundamental differences they have, and how they flow in a
- * pipeline.
+ * event are, what fundamental differences they have, how they flow in a
+ * pipeline, and how to handle the event in your application.
*
* @author The Netty Project ([hidden email])
* @author Trustin Lee ([hidden email])

Modified: branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelPipeline.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelPipeline.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelPipeline.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -15,6 +15,8 @@
*/
package org.jboss.netty.channel;

+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.Map;
import java.util.NoSuchElementException;

@@ -87,20 +89,26 @@
* +-------------+--------------------------+---------------+
* | \|/
* +-------------+--------------------------+---------------+
+ * | | | |
+ * | [ Socket.read() ] [ Socket.write() ] |
+ * | |
* | Netty Internal I/O Threads (Transport Implementation) |
* +--------------------------------------------------------+
* </pre>
* An upstream event is handled by the upstream handlers in the bottom-up
* direction as shown on the left side of the diagram. An upstream handler
- * usually handles the inbound data received from the I/O thread on the bottom
- * of the diagram. If an upstream event goes beyond the top upstream handler,
- * it is discarded silently.
+ * usually handles the inbound data generated by the I/O thread on the bottom
+ * of the diagram. The inbound data is often read from a remote peer via the
+ * actual input operation such as {@link InputStream#read(byte[])}.
+ * If an upstream event goes beyond the top upstream handler, it is discarded
+ * silently.
* <p>
* A downstream event is handled by the downstream handler in the top-down
* direction as shown on the right side of the diagram. A downstream handler
* usually generates or transforms the outbound traffic such as write requests.
* If a downstream event goes beyond the bottom downstream handler, it is
- * handled by an I/O thread associated with the {@link Channel}.
+ * handled by an I/O thread associated with the {@link Channel}. The I/O thread
+ * often performs the actual output operation such as {@link OutputStream#write(byte[])}.
* <p>
* For example, let us assume that we created the following pipeline:
* <pre>

Modified: branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelState.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelState.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelState.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -72,10 +72,8 @@
* </tr>
* </table>
* <p>
- * To see how a {@link ChannelEvent} is interpreted further, please refer to
- * {@link ChannelUpstreamHandler} and {@link ChannelDownstreamHandler}.
+ * To see how an event is interpreted further, please refer to {@link ChannelEvent}.
*
- *
* @author The Netty Project ([hidden email])
* @author Trustin Lee ([hidden email])
*

Modified: branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelUpstreamHandler.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelUpstreamHandler.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/ChannelUpstreamHandler.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -15,11 +15,8 @@
*/
package org.jboss.netty.channel;

-import java.net.SocketAddress;
import java.util.concurrent.Executor;

-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.socket.ServerSocketChannel;
import org.jboss.netty.handler.execution.ExecutionHandler;
import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;

@@ -27,100 +24,14 @@
/**
* Handles or intercepts an upstream {@link ChannelEvent}, and sends a
* {@link ChannelEvent} to the next handler in a {@link ChannelPipeline}.
- *
- * <h3>Upstream events</h3>
* <p>
- * An upstream event is an event which is supposed to be processed by
- * a series of upstream handlers in the the {@link ChannelPipeline}.
- * The upstream events are generated by an I/O thread, and they have the
- * following meaning:
- * <p>
- * <table border="1" cellspacing="0" cellpadding="6">
- * <tr>
- * <th>Event name</th></th><th>Event type and condition</th><th>Meaning</th>
- * </tr>
- * <tr>
- * <td>{@code "messageReceived"}</td>
- * <td>{@link MessageEvent}</td>
- * <td>a message object (e.g. {@link ChannelBuffer}) was received from a remote peer</td>
- * </tr>
- * <tr>
- * <td>{@code "exceptionCaught"}</td>
- * <td>{@link ExceptionEvent}</td>
- * <td>an exception was raised by an I/O thread or a {@link ChannelHandler}</td>
- * </tr>
- * <tr>
- * <td>{@code "channelOpen"}</td>
- * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#OPEN OPEN}, value = {@code true})</td>
- * <td>a {@link Channel} is open, but not bound nor connected</td>
- * </tr>
- * <tr>
- * <td>{@code "channelClosed"}</td>
- * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#OPEN OPEN}, value = {@code false})</td>
- * <td>a {@link Channel} was closed and all its related resources were released</td>
- * </tr>
- * <tr>
- * <td>{@code "channelBound"}</td>
- * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#BOUND BOUND}, value = {@link SocketAddress})</td>
- * <td>a {@link Channel} is open and bound to a local address, but not connected</td>
- * </tr>
- * <tr>
- * <td>{@code "channelUnbound"}</td>
- * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#BOUND BOUND}, value = {@code null})</td>
- * <td>a {@link Channel} was unbound from the current local address</td>
- * </tr>
- * <tr>
- * <td>{@code "channelConnected"}</td>
- * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#CONNECTED CONNECTED}, value = {@link SocketAddress})</td>
- * <td>a {@link Channel} is open, bound to a local address, and connected to a remote address</td>
- * </tr>
- * <tr>
- * <td>{@code "writeComplete"}</td>
- * <td>{@link WriteCompletionEvent}</td>
- * <td>something has been written to a remote peer</td>
- * </tr>
- * <tr>
- * <td>{@code "channelDisconnected"}</td>
- * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#CONNECTED CONNECTED}, value = {@code null})</td>
- * <td>a {@link Channel} was disconnected from its remote peer</td>
- * </tr>
- * <tr>
- * <td>{@code "channelInterestChanged"}</td>
- * <td>{@link ChannelStateEvent}<br/>(state = {@link ChannelState#INTEREST_OPS INTEREST_OPS}, no value)</td>
- * <td>a {@link Channel}'s {@link Channel#getInterestOps() interestOps} was changed</td>
- * </tr>
- * </table>
- * <p>
- * These two additional event types are used only for a parent channel which
- * can have a child channel (e.g. {@link ServerSocketChannel}).
- * <p>
- * <table border="1" cellspacing="0" cellpadding="6">
- * <tr>
- * <th>Event name</th><th>Event type and condition</th><th>Meaning</th>
- * </tr>
- * <tr>
- * <td>{@code "childChannelOpen"}</td>
- * <td>{@link ChildChannelStateEvent}<br/>({@code childChannel.isOpen() = true})</td>
- * <td>a child {@link Channel} was open (e.g. a server channel accepted a connection.)</td>
- * </tr>
- * <tr>
- * <td>{@code "childChannelClosed"}</td>
- * <td>{@link ChildChannelStateEvent}<br/>({@code childChannel.isOpen() = false})</td>
- * <td>a child {@link Channel} was closed (e.g. the accepted connection was closed.)</td>
- * </tr>
- * </table>
+ * The most common use case of this interface is to intercept an I/O event
+ * generated by I/O workers to transform the received messages or execute
+ * the relevant business logic.
*
- * <h4>Additional resources worth reading</h4>
+ * <h3>{@link SimpleChannelUpstreamHandler}</h3>
* <p>
- * You might want to refer to {@link ChannelDownstreamHandler} to see how a
- * {@link ChannelEvent} is interpreted when going downstream. Also, please
- * refer to the {@link ChannelEvent} and {@link ChannelPipeline} documentation
- * to find out what an upstream event and a downstream event are, what
- * fundamental differences they have, and how they flow in a pipeline.
- *
- * <h3>{@link SimpleChannelHandler}</h3>
- * <p>
- * In most cases, you will get to use a {@link SimpleChannelHandler} to
+ * In most cases, you will get to use a {@link SimpleChannelUpstreamHandler} to
* implement an upstream handler because it provides an individual handler
* method for each event type. You might want to implement this interface
* directly though if you want to handle various types of events in more

Added: branches/httpPost/src/main/java/org/jboss/netty/channel/FixedReceiveBufferSizePredictorFactory.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/FixedReceiveBufferSizePredictorFactory.java (rev 0)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/FixedReceiveBufferSizePredictorFactory.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat 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.channel;
+
+
+/**
+ * The {@link ReceiveBufferSizePredictorFactory} that returns a
+ * {@link FixedReceiveBufferSizePredictor} with the pre-defined configuration.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Trustin Lee ([hidden email])
+ *
+ * @version $Rev$, $Date$
+ */
+public class FixedReceiveBufferSizePredictorFactory implements
+ ReceiveBufferSizePredictorFactory {
+
+ private final ReceiveBufferSizePredictor predictor;
+
+ /**
+ * Creates a new factory that returns a {@link FixedReceiveBufferSizePredictor}
+ * which always returns the same prediction of the specified buffer size.
+ */
+ public FixedReceiveBufferSizePredictorFactory(int bufferSize) {
+ predictor = new FixedReceiveBufferSizePredictor(bufferSize);
+ }
+
+ public ReceiveBufferSizePredictor getPredictor() throws Exception {
+ return predictor;
+ }
+}

Property changes on: branches/httpPost/src/main/java/org/jboss/netty/channel/FixedReceiveBufferSizePredictorFactory.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Added: branches/httpPost/src/main/java/org/jboss/netty/channel/ReceiveBufferSizePredictorFactory.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/ReceiveBufferSizePredictorFactory.java (rev 0)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/ReceiveBufferSizePredictorFactory.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat 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.channel;
+
+/**
+ * Creates a new {@link ReceiveBufferSizePredictor}.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Trustin Lee ([hidden email])
+ *
+ * @version $Rev$, $Date$
+ */
+public interface ReceiveBufferSizePredictorFactory {
+
+ /**
+ * Returns a newly created {@link ReceiveBufferSizePredictor}.
+ */
+ ReceiveBufferSizePredictor getPredictor() throws Exception;
+}

Property changes on: branches/httpPost/src/main/java/org/jboss/netty/channel/ReceiveBufferSizePredictorFactory.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Modified: branches/httpPost/src/main/java/org/jboss/netty/channel/SimpleChannelHandler.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/SimpleChannelHandler.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/SimpleChannelHandler.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -28,7 +28,7 @@
* or downstream event into more meaningful sub-type event and calls an
* appropriate handler method with the down-cast event. For an upstream
* event, the names of the methods are identical to the upstream event names,
- * as introduced in the {@link ChannelUpstreamHandler} documentation. For a
+ * as introduced in the {@link ChannelEvent} documentation. For a
* downstream event, the names of the methods starts with the name of the
* operation and ends with {@code "Requested"}
* (e.g. {@link #writeRequested(ChannelHandlerContext, MessageEvent) writeRequested}.)

Modified: branches/httpPost/src/main/java/org/jboss/netty/channel/SimpleChannelUpstreamHandler.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/SimpleChannelUpstreamHandler.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/SimpleChannelUpstreamHandler.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -25,8 +25,7 @@
* for each event type. This handler down-casts the received upstream event
* into more meaningful sub-type event and calls an appropriate handler method
* with the down-cast event. The names of the methods are identical to the
- * upstream event names, as introduced in the {@link ChannelUpstreamHandler}
- * documentation.
+ * upstream event names, as introduced in the {@link ChannelEvent} documentation.
* <p>
* Please use {@link SimpleChannelHandler} if you need to implement both
* {@link ChannelUpstreamHandler} and {@link ChannelDownstreamHandler}.

Modified: branches/httpPost/src/main/java/org/jboss/netty/channel/socket/DatagramChannelConfig.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/socket/DatagramChannelConfig.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/socket/DatagramChannelConfig.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -21,7 +21,9 @@

import org.jboss.netty.channel.ChannelConfig;
import org.jboss.netty.channel.FixedReceiveBufferSizePredictor;
+import org.jboss.netty.channel.FixedReceiveBufferSizePredictorFactory;
import org.jboss.netty.channel.ReceiveBufferSizePredictor;
+import org.jboss.netty.channel.ReceiveBufferSizePredictorFactory;

/**
* A {@link ChannelConfig} for a {@link DatagramChannel}.
@@ -49,6 +51,8 @@
* </tr><tr>
* <td>{@code "receiveBufferSizePredictor"}</td><td>{@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}</td>
* </tr><tr>
+ * <td>{@code "receiveBufferSizePredictorFactory"}</td><td>{@link #setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory)}</td>
+ * </tr><tr>
* <td>{@code "sendBufferSize"}</td><td>{@link #setSendBufferSize(int)}</td>
* </tr><tr>
* <td>{@code "timeToLive"}</td><td>{@link #setTimeToLive(int)}</td>
@@ -176,4 +180,24 @@
* predictor is <tt>{@link FixedReceiveBufferSizePredictor}(768)</tt>.
*/
void setReceiveBufferSizePredictor(ReceiveBufferSizePredictor predictor);
+
+ /**
+ * Returns the {@link ReceiveBufferSizePredictorFactory} which creates a new
+ * {@link ReceiveBufferSizePredictor} when a new channel is created and
+ * no {@link ReceiveBufferSizePredictor} was set. If no predictor was set
+ * for the channel, {@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}
+ * will be called with the new predictor. The default factory is
+ * <tt>{@link FixedReceiveBufferSizePredictorFactory}(768)</tt>.
+ */
+ ReceiveBufferSizePredictorFactory getReceiveBufferSizePredictorFactory();
+
+ /**
+ * Sets the {@link ReceiveBufferSizePredictor} which creates a new
+ * {@link ReceiveBufferSizePredictor} when a new channel is created and
+ * no {@link ReceiveBufferSizePredictor} was set. If no predictor was set
+ * for the channel, {@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}
+ * will be called with the new predictor. The default factory is
+ * <tt>{@link FixedReceiveBufferSizePredictorFactory}(768)</tt>.
+ */
+ void setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory predictorFactory);
}

Modified: branches/httpPost/src/main/java/org/jboss/netty/channel/socket/DefaultDatagramChannelConfig.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/socket/DefaultDatagramChannelConfig.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/socket/DefaultDatagramChannelConfig.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -24,8 +24,9 @@

import org.jboss.netty.channel.ChannelException;
import org.jboss.netty.channel.DefaultChannelConfig;
-import org.jboss.netty.channel.FixedReceiveBufferSizePredictor;
+import org.jboss.netty.channel.FixedReceiveBufferSizePredictorFactory;
import org.jboss.netty.channel.ReceiveBufferSizePredictor;
+import org.jboss.netty.channel.ReceiveBufferSizePredictorFactory;
import org.jboss.netty.util.internal.ConversionUtil;

/**
@@ -40,9 +41,12 @@
public class DefaultDatagramChannelConfig extends DefaultChannelConfig
implements DatagramChannelConfig {

+ private static final ReceiveBufferSizePredictorFactory DEFAULT_PREDICTOR_FACTORY =
+ new FixedReceiveBufferSizePredictorFactory(768);
+
private final DatagramSocket socket;
- private volatile ReceiveBufferSizePredictor predictor =
- new FixedReceiveBufferSizePredictor(768);
+ private volatile ReceiveBufferSizePredictor predictor;
+ private volatile ReceiveBufferSizePredictorFactory predictorFactory = DEFAULT_PREDICTOR_FACTORY;

/**
* Creates a new instance.
@@ -263,13 +267,36 @@
}

public ReceiveBufferSizePredictor getReceiveBufferSizePredictor() {
+ ReceiveBufferSizePredictor predictor = this.predictor;
+ if (predictor == null) {
+ try {
+ this.predictor = predictor = getReceiveBufferSizePredictorFactory().getPredictor();
+ } catch (Exception e) {
+ throw new ChannelException(
+ "Failed to create a new " +
+ ReceiveBufferSizePredictor.class.getSimpleName() + '.',
+ e);
+ }
+ }
return predictor;
}

- public void setReceiveBufferSizePredictor(ReceiveBufferSizePredictor predictor) {
+ public void setReceiveBufferSizePredictor(
+ ReceiveBufferSizePredictor predictor) {
if (predictor == null) {
throw new NullPointerException("predictor");
}
this.predictor = predictor;
}
+
+ public ReceiveBufferSizePredictorFactory getReceiveBufferSizePredictorFactory() {
+ return predictorFactory;
+ }
+
+ public void setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory predictorFactory) {
+ if (predictorFactory == null) {
+ throw new NullPointerException("predictorFactory");
+ }
+ this.predictorFactory = predictorFactory;
+ }
}

Modified: branches/httpPost/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingServlet.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingServlet.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingServlet.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -222,7 +222,7 @@
}

@ChannelPipelineCoverage("one")
- private final class OutboundConnectionHandler extends SimpleChannelUpstreamHandler {
+ private static final class OutboundConnectionHandler extends SimpleChannelUpstreamHandler {

private final ServletOutputStream out;

Modified: branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -18,8 +18,10 @@
import java.net.Socket;
import java.util.Map;

-import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictor;
+import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictorFactory;
+import org.jboss.netty.channel.ChannelException;
import org.jboss.netty.channel.ReceiveBufferSizePredictor;
+import org.jboss.netty.channel.ReceiveBufferSizePredictorFactory;
import org.jboss.netty.channel.socket.DefaultSocketChannelConfig;
import org.jboss.netty.logging.InternalLogger;
import org.jboss.netty.logging.InternalLoggerFactory;
@@ -40,10 +42,13 @@
private static final InternalLogger logger =
InternalLoggerFactory.getInstance(DefaultNioSocketChannelConfig.class);

+ private static final ReceiveBufferSizePredictorFactory DEFAULT_PREDICTOR_FACTORY =
+ new AdaptiveReceiveBufferSizePredictorFactory();
+
private volatile int writeBufferHighWaterMark = 64 * 1024;
private volatile int writeBufferLowWaterMark = 32 * 1024;
- private volatile ReceiveBufferSizePredictor predictor =
- new AdaptiveReceiveBufferSizePredictor();
+ private volatile ReceiveBufferSizePredictor predictor;
+ private volatile ReceiveBufferSizePredictorFactory predictorFactory = DEFAULT_PREDICTOR_FACTORY;
private volatile int writeSpinCount = 16;

DefaultNioSocketChannelConfig(Socket socket) {
@@ -143,6 +148,17 @@
}

public ReceiveBufferSizePredictor getReceiveBufferSizePredictor() {
+ ReceiveBufferSizePredictor predictor = this.predictor;
+ if (predictor == null) {
+ try {
+ this.predictor = predictor = getReceiveBufferSizePredictorFactory().getPredictor();
+ } catch (Exception e) {
+ throw new ChannelException(
+ "Failed to create a new " +
+ ReceiveBufferSizePredictor.class.getSimpleName() + '.',
+ e);
+ }
+ }
return predictor;
}

@@ -154,6 +170,17 @@
this.predictor = predictor;
}

+ public ReceiveBufferSizePredictorFactory getReceiveBufferSizePredictorFactory() {
+ return predictorFactory;
+ }
+
+ public void setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory predictorFactory) {
+ if (predictorFactory == null) {
+ throw new NullPointerException("predictorFactory");
+ }
+ this.predictorFactory = predictorFactory;
+ }
+
public boolean isReadWriteFair() {
logger.warn(
"Detected an access to a deprecated configuration parameter: " +

Modified: branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelConfig.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelConfig.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelConfig.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -18,10 +18,8 @@
import java.nio.ByteBuffer;
import java.nio.channels.WritableByteChannel;

-import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictor;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelConfig;
-import org.jboss.netty.channel.ReceiveBufferSizePredictor;
import org.jboss.netty.channel.socket.DatagramChannel;
import org.jboss.netty.channel.socket.DatagramChannelConfig;

@@ -44,8 +42,6 @@
* </tr><tr>
* <td>{@code "writeSpinCount"}</td><td>{@link #setWriteSpinCount(int)}</td>
* </tr><tr>
- * <td>{@code "receiveBufferSizePredictor"}</td><td>{@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}</td>
- * </tr><tr>
* </table>
*
* @author The Netty Project ([hidden email])
@@ -108,18 +104,4 @@
* if the specified value is {@code 0} or less than {@code 0}
*/
void setWriteSpinCount(int writeSpinCount);
-
- /**
- * Returns the {@link ReceiveBufferSizePredictor} which predicts the
- * number of readable bytes in the socket receive buffer. The default
- * predictor is {@link AdaptiveReceiveBufferSizePredictor}.
- */
- ReceiveBufferSizePredictor getReceiveBufferSizePredictor();
-
- /**
- * Sets the {@link ReceiveBufferSizePredictor} which predicts the
- * number of readable bytes in the socket receive buffer. The default
- * predictor is {@link AdaptiveReceiveBufferSizePredictor}.
- */
- void setReceiveBufferSizePredictor(ReceiveBufferSizePredictor predictor);
}

Modified: branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -125,6 +125,8 @@
*/
private final Queue<Runnable> writeTaskQueue = new LinkedTransferQueue<Runnable>();

+ private volatile int cancelledKeys; // should use AtomicInteger but we just need approximation
+
/**
* Sole constructor.
*
@@ -216,7 +218,7 @@
}

try {
- int selectedKeyCount = selector.select(500);
+ selector.select(500);

// 'wakenUp.compareAndSet(false, true)' is always evaluated
// before calling 'selector.wakeup()' to reduce the wake-up
@@ -250,13 +252,11 @@
selector.wakeup();
}

+ cancelledKeys = 0;
processRegisterTaskQueue();
processWriteTaskQueue();
+ processSelectedKeys(selector.selectedKeys());

- if (selectedKeyCount > 0) {
- processSelectedKeys(selector.selectedKeys());
- }
-
// Exit the loop when there's nothing to handle (the registered
// key set is empty.
// The shutdown flag is used to delay the shutdown of this
@@ -308,7 +308,7 @@
* Will go through all the {@link ChannelRegistionTask}s in the
* task queue and run them (registering them).
*/
- private void processRegisterTaskQueue() {
+ private void processRegisterTaskQueue() throws IOException {
for (;;) {
final Runnable task = registerTaskQueue.poll();
if (task == null) {
@@ -316,13 +316,14 @@
}

task.run();
+ cleanUpCancelledKeys();
}
}

/**
* Will go through all the WriteTasks and run them.
*/
- private void processWriteTaskQueue() {
+ private void processWriteTaskQueue() throws IOException {
for (;;) {
final Runnable task = writeTaskQueue.poll();
if (task == null) {
@@ -330,16 +331,17 @@
}

task.run();
+ cleanUpCancelledKeys();
}
}

- private static void processSelectedKeys(final Set<SelectionKey> selectedKeys) {
+ private void processSelectedKeys(final Set<SelectionKey> selectedKeys) throws IOException {
for (Iterator<SelectionKey> i = selectedKeys.iterator(); i.hasNext();) {
SelectionKey k = i.next();
i.remove();
try {
int readyOps = k.readyOps();
- if ((readyOps & SelectionKey.OP_READ) != 0) {
+ if ((readyOps & SelectionKey.OP_READ) != 0 || readyOps == 0) {
if (!read(k)) {
// Connection already closed - no need to handle write.
continue;
@@ -351,9 +353,22 @@
} catch (CancelledKeyException e) {
close(k);
}
+
+ if (cleanUpCancelledKeys()) {
+ break; // Break the loop to avoid ConcurrentModificationException
+ }
}
}

+ private boolean cleanUpCancelledKeys() throws IOException {
+ if (cancelledKeys >= NioWorker.CLEANUP_INTERVAL) {
+ cancelledKeys = 0;
+ selector.selectNow();
+ return true;
+ }
+ return false;
+ }
+
private static void write(SelectionKey k) {
write((NioDatagramChannel) k.attachment(), false);
}
@@ -654,6 +669,7 @@
SelectionKey key = channel.getDatagramChannel().keyFor(selector);
if (key != null) {
key.cancel();
+ worker.cancelledKeys ++;
}
channel.getDatagramChannel().close();
}

Modified: branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -19,9 +19,11 @@
import java.nio.channels.WritableByteChannel;

import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictor;
+import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictorFactory;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelConfig;
import org.jboss.netty.channel.ReceiveBufferSizePredictor;
+import org.jboss.netty.channel.ReceiveBufferSizePredictorFactory;
import org.jboss.netty.channel.socket.SocketChannel;
import org.jboss.netty.channel.socket.SocketChannelConfig;

@@ -46,6 +48,8 @@
* </tr><tr>
* <td>{@code "receiveBufferSizePredictor"}</td><td>{@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}</td>
* </tr><tr>
+ * <td>{@code "receiveBufferSizePredictorFactory"}</td><td>{@link #setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory)}</td>
+ * </tr><tr>
* <td>{@code "readWriteFair"}</td><td>{@link #setReadWriteFair(boolean)}</td>
* </tr>
* </table>
@@ -113,18 +117,38 @@
/**
* Returns the {@link ReceiveBufferSizePredictor} which predicts the
* number of readable bytes in the socket receive buffer. The default
- * predictor is {@link AdaptiveReceiveBufferSizePredictor}.
+ * predictor is <tt>{@link AdaptiveReceiveBufferSizePredictor}(64, 1024, 65536)</tt>.
*/
ReceiveBufferSizePredictor getReceiveBufferSizePredictor();

/**
* Sets the {@link ReceiveBufferSizePredictor} which predicts the
* number of readable bytes in the socket receive buffer. The default
- * predictor is {@link AdaptiveReceiveBufferSizePredictor}.
+ * predictor is <tt>{@link AdaptiveReceiveBufferSizePredictor}(64, 1024, 65536)</tt>.
*/
void setReceiveBufferSizePredictor(ReceiveBufferSizePredictor predictor);

/**
+ * Returns the {@link ReceiveBufferSizePredictorFactory} which creates a new
+ * {@link ReceiveBufferSizePredictor} when a new channel is created and
+ * no {@link ReceiveBufferSizePredictor} was set. If no predictor was set
+ * for the channel, {@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}
+ * will be called with the new predictor. The default factory is
+ * <tt>{@link AdaptiveReceiveBufferSizePredictorFactory}(64, 1024, 65536)</tt>.
+ */
+ ReceiveBufferSizePredictorFactory getReceiveBufferSizePredictorFactory();
+
+ /**
+ * Sets the {@link ReceiveBufferSizePredictor} which creates a new
+ * {@link ReceiveBufferSizePredictor} when a new channel is created and
+ * no {@link ReceiveBufferSizePredictor} was set. If no predictor was set
+ * for the channel, {@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}
+ * will be called with the new predictor. The default factory is
+ * <tt>{@link AdaptiveReceiveBufferSizePredictorFactory}(64, 1024, 65536)</tt>.
+ */
+ void setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory predictorFactory);
+
+ /**
* @deprecated This property has been replaced by the
* {@code writeBufferHighWaterMark} and {@code writeBufferLowWaterMark}.
*

Modified: branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -65,6 +65,8 @@

private static final int CONSTRAINT_LEVEL = NioProviderMetadata.CONSTRAINT_LEVEL;

+ static final int CLEANUP_INTERVAL = 256; // XXX Hard-coded value, but won't need customization.
+
private final int bossId;
private final int id;
private final Executor executor;
@@ -76,6 +78,7 @@
private final Object startStopLock = new Object();
private final Queue<Runnable> registerTaskQueue = new LinkedTransferQueue<Runnable>();
private final Queue<Runnable> writeTaskQueue = new LinkedTransferQueue<Runnable>();
+ private volatile int cancelledKeys; // should use AtomicInteger but we just need approximation

NioWorker(int bossId, int id, Executor executor) {
this.bossId = bossId;
@@ -155,7 +158,7 @@
}

try {
- int selectedKeyCount = selector.select(500);
+ selector.select(500);

// 'wakenUp.compareAndSet(false, true)' is always evaluated
// before calling 'selector.wakeup()' to reduce the wake-up
@@ -189,13 +192,11 @@
selector.wakeup();
}

+ cancelledKeys = 0;
processRegisterTaskQueue();
processWriteTaskQueue();
+ processSelectedKeys(selector.selectedKeys());

- if (selectedKeyCount > 0) {
- processSelectedKeys(selector.selectedKeys());
- }
-
// Exit the loop when there's nothing to handle.
// The shutdown flag is used to delay the shutdown of this
// loop to avoid excessive Selector creation when
@@ -243,7 +244,7 @@
}
}

- private void processRegisterTaskQueue() {
+ private void processRegisterTaskQueue() throws IOException {
for (;;) {
final Runnable task = registerTaskQueue.poll();
if (task == null) {
@@ -251,10 +252,11 @@
}

task.run();
+ cleanUpCancelledKeys();
}
}

- private void processWriteTaskQueue() {
+ private void processWriteTaskQueue() throws IOException {
for (;;) {
final Runnable task = writeTaskQueue.poll();
if (task == null) {
@@ -262,16 +264,17 @@
}

task.run();
+ cleanUpCancelledKeys();
}
}

- private static void processSelectedKeys(Set<SelectionKey> selectedKeys) {
+ private void processSelectedKeys(Set<SelectionKey> selectedKeys) throws IOException {
for (Iterator<SelectionKey> i = selectedKeys.iterator(); i.hasNext();) {
SelectionKey k = i.next();
i.remove();
try {
int readyOps = k.readyOps();
- if ((readyOps & SelectionKey.OP_READ) != 0) {
+ if ((readyOps & SelectionKey.OP_READ) != 0 || readyOps == 0) {
if (!read(k)) {
// Connection already closed - no need to handle write.
continue;
@@ -283,9 +286,22 @@
} catch (CancelledKeyException e) {
close(k);
}
+
+ if (cleanUpCancelledKeys()) {
+ break; // break the loop to avoid ConcurrentModificationException
+ }
}
}

+ private boolean cleanUpCancelledKeys() throws IOException {
+ if (cancelledKeys >= CLEANUP_INTERVAL) {
+ cancelledKeys = 0;
+ selector.selectNow();
+ return true;
+ }
+ return false;
+ }
+
private static boolean read(SelectionKey k) {
ScatteringByteChannel ch = (ScatteringByteChannel) k.channel();
NioSocketChannel channel = (NioSocketChannel) k.attachment();
@@ -362,7 +378,7 @@
final NioWorker worker = channel.worker;
final Thread currentThread = Thread.currentThread();
final Thread workerThread = worker.thread;
- if (workerThread == null || currentThread != workerThread) {
+ if (currentThread != workerThread) {
if (channel.writeTaskInTaskQueue.compareAndSet(false, true)) {
boolean offered = worker.writeTaskQueue.offer(channel.writeTask);
assert offered;
@@ -573,6 +589,7 @@
SelectionKey key = channel.socket.keyFor(selector);
if (key != null) {
key.cancel();
+ worker.cancelledKeys ++;
}
channel.socket.close();
}

Modified: branches/httpPost/src/main/java/org/jboss/netty/channel/xnio/DefaultXnioChannelConfig.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/xnio/DefaultXnioChannelConfig.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/xnio/DefaultXnioChannelConfig.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -20,9 +20,11 @@

import org.jboss.netty.buffer.ChannelBufferFactory;
import org.jboss.netty.buffer.HeapChannelBufferFactory;
-import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictor;
+import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictorFactory;
+import org.jboss.netty.channel.ChannelException;
import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.channel.ReceiveBufferSizePredictor;
+import org.jboss.netty.channel.ReceiveBufferSizePredictorFactory;
import org.jboss.netty.logging.InternalLogger;
import org.jboss.netty.logging.InternalLoggerFactory;
import org.jboss.netty.util.internal.ConversionUtil;
@@ -41,12 +43,15 @@
private static final InternalLogger logger =
InternalLoggerFactory.getInstance(DefaultXnioChannelConfig.class);

+ private static final ReceiveBufferSizePredictorFactory DEFAULT_PREDICTOR_FACTORY =
+ new AdaptiveReceiveBufferSizePredictorFactory();
+
private volatile ChannelBufferFactory bufferFactory = HeapChannelBufferFactory.getInstance();
private volatile ChannelPipelineFactory pipelineFactory;
private volatile int writeBufferHighWaterMark = 64 * 1024;
private volatile int writeBufferLowWaterMark = 32 * 1024;
- private volatile ReceiveBufferSizePredictor predictor =
- new AdaptiveReceiveBufferSizePredictor();
+ private volatile ReceiveBufferSizePredictor predictor;
+ private volatile ReceiveBufferSizePredictorFactory predictorFactory = DEFAULT_PREDICTOR_FACTORY;
private volatile int writeSpinCount = 16;

DefaultXnioChannelConfig() {
@@ -145,6 +150,17 @@
}

public ReceiveBufferSizePredictor getReceiveBufferSizePredictor() {
+ ReceiveBufferSizePredictor predictor = this.predictor;
+ if (predictor == null) {
+ try {
+ this.predictor = predictor = getReceiveBufferSizePredictorFactory().getPredictor();
+ } catch (Exception e) {
+ throw new ChannelException(
+ "Failed to create a new " +
+ ReceiveBufferSizePredictor.class.getSimpleName() + '.',
+ e);
+ }
+ }
return predictor;
}

@@ -156,6 +172,17 @@
this.predictor = predictor;
}

+ public ReceiveBufferSizePredictorFactory getReceiveBufferSizePredictorFactory() {
+ return predictorFactory;
+ }
+
+ public void setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory predictorFactory) {
+ if (predictorFactory == null) {
+ throw new NullPointerException("predictorFactory");
+ }
+ this.predictorFactory = predictorFactory;
+ }
+
public ChannelPipelineFactory getPipelineFactory() {
return pipelineFactory;
}

Modified: branches/httpPost/src/main/java/org/jboss/netty/channel/xnio/XnioChannelConfig.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/channel/xnio/XnioChannelConfig.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/channel/xnio/XnioChannelConfig.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -19,8 +19,10 @@
import java.nio.channels.WritableByteChannel;

import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictor;
+import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictorFactory;
import org.jboss.netty.channel.ChannelConfig;
import org.jboss.netty.channel.ReceiveBufferSizePredictor;
+import org.jboss.netty.channel.ReceiveBufferSizePredictorFactory;
import org.jboss.netty.channel.socket.SocketChannelConfig;

/**
@@ -39,6 +41,8 @@
* <td>{@code "writeSpinCount"}</td><td>{@link #setWriteSpinCount(int)}</td>
* </tr><tr>
* <td>{@code "receiveBufferSizePredictor"}</td><td>{@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}</td>
+ * </tr><tr>
+ * <td>{@code "receiveBufferSizePredictorFactory"}</td><td>{@link #setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory)}</td>
* </tr>
* </table>
*
@@ -79,14 +83,34 @@
/**
* Returns the {@link ReceiveBufferSizePredictor} which predicts the
* number of readable bytes in the socket receive buffer. The default
- * predictor is {@link AdaptiveReceiveBufferSizePredictor}.
+ * predictor is <tt>{@link AdaptiveReceiveBufferSizePredictor}(64, 1024, 65536)</tt>.
*/
ReceiveBufferSizePredictor getReceiveBufferSizePredictor();

/**
* Sets the {@link ReceiveBufferSizePredictor} which predicts the
* number of readable bytes in the socket receive buffer. The default
- * predictor is {@link AdaptiveReceiveBufferSizePredictor}.
+ * predictor is <tt>{@link AdaptiveReceiveBufferSizePredictor}(64, 1024, 65536)</tt>.
*/
void setReceiveBufferSizePredictor(ReceiveBufferSizePredictor predictor);
+
+ /**
+ * Returns the {@link ReceiveBufferSizePredictorFactory} which creates a new
+ * {@link ReceiveBufferSizePredictor} when a new channel is created and
+ * no {@link ReceiveBufferSizePredictor} was set. If no predictor was set
+ * for the channel, {@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}
+ * will be called with the new predictor. The default factory is
+ * <tt>{@link AdaptiveReceiveBufferSizePredictorFactory}(64, 1024, 65536)</tt>.
+ */
+ ReceiveBufferSizePredictorFactory getReceiveBufferSizePredictorFactory();
+
+ /**
+ * Sets the {@link ReceiveBufferSizePredictor} which creates a new
+ * {@link ReceiveBufferSizePredictor} when a new channel is created and
+ * no {@link ReceiveBufferSizePredictor} was set. If no predictor was set
+ * for the channel, {@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}
+ * will be called with the new predictor. The default factory is
+ * <tt>{@link AdaptiveReceiveBufferSizePredictorFactory}(64, 1024, 65536)</tt>.
+ */
+ void setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory predictorFactory);
}

Modified: branches/httpPost/src/main/java/org/jboss/netty/example/http/snoop/HttpClientPipelineFactory.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/example/http/snoop/HttpClientPipelineFactory.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/example/http/snoop/HttpClientPipelineFactory.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -26,6 +26,7 @@

import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.handler.codec.http.HttpContentDecompressor;
import org.jboss.netty.handler.codec.http.HttpRequestEncoder;
import org.jboss.netty.handler.codec.http.HttpResponseDecoder;
import org.jboss.netty.handler.stream.ChunkedWriteHandler;
@@ -33,7 +34,7 @@
/**
* @author The Netty Project ([hidden email])
* @author Andy Taylor ([hidden email])
- * @author Trustin Lee ([hidden email])
+ * @author Trustin Lee ([hidden email])
*
* @version $Rev$, $Date$
*/
@@ -42,6 +43,8 @@
// Create a default pipeline implementation.
ChannelPipeline pipeline = pipeline();
pipeline.addLast("decoder", new HttpResponseDecoder());
+ // Remove the following line if you don't want automatic content decompression.
+ pipeline.addLast("inflater", new HttpContentDecompressor());
// Uncomment the following line if you don't want to handle HttpChunks.
//pipeline.addLast("aggregator", new HttpChunkAggregator(1048576));
pipeline.addLast("encoder", new HttpRequestEncoder());

Modified: branches/httpPost/src/main/java/org/jboss/netty/example/http/snoop/HttpServerPipelineFactory.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/example/http/snoop/HttpServerPipelineFactory.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/example/http/snoop/HttpServerPipelineFactory.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -26,13 +26,14 @@

import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.handler.codec.http.HttpContentCompressor;
import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
import org.jboss.netty.handler.codec.http.HttpResponseEncoder;

/**
* @author The Netty Project ([hidden email])
* @author Andy Taylor ([hidden email])
- * @author Trustin Lee ([hidden email])
+ * @author Trustin Lee ([hidden email])
*
* @version $Rev$, $Date$
*/
@@ -50,6 +51,8 @@
// Uncomment the following line if you don't want to handle HttpChunks.
//pipeline.addLast("aggregator", new HttpChunkAggregator(1048576));
pipeline.addLast("encoder", new HttpResponseEncoder());
+ // Remove the following line if you don't want automatic content compression.
+ pipeline.addLast("deflater", new HttpContentCompressor());
pipeline.addLast("handler", new HttpRequestHandler());
return pipeline;
}

Modified: branches/httpPost/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -103,7 +103,7 @@
}

@ChannelPipelineCoverage("one")
- private class OutboundHandler extends SimpleChannelUpstreamHandler {
+ private static class OutboundHandler extends SimpleChannelUpstreamHandler {

private final Channel inboundChannel;

Modified: branches/httpPost/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClient.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClient.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClient.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -20,6 +20,7 @@

import org.jboss.netty.bootstrap.ConnectionlessBootstrap;
import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.FixedReceiveBufferSizePredictorFactory;
import org.jboss.netty.channel.socket.DatagramChannel;
import org.jboss.netty.channel.socket.DatagramChannelFactory;
import org.jboss.netty.channel.socket.oio.OioDatagramChannelFactory;
@@ -43,12 +44,23 @@
new OioDatagramChannelFactory(Executors.newCachedThreadPool());

ConnectionlessBootstrap b = new ConnectionlessBootstrap(f);
+
+ // Configure the pipeline.
ChannelPipeline p = b.getPipeline();
p.addLast("encoder", new StringEncoder("UTF-8"));
p.addLast("decoder", new StringDecoder("UTF-8"));
p.addLast("handler", new QuoteOfTheMomentClientHandler());

+ // Enable broadcast
b.setOption("broadcast", "true");
+
+ // Allow packets as large as up to 1024 bytes (default is 768).
+ // You could increase or decrease this value to avoid truncated packets
+ // or to improve memory footprint respectively.
+ b.setOption(
+ "receiveBufferSizePredictorFactory",
+ new FixedReceiveBufferSizePredictorFactory(1024));
+
DatagramChannel c = (DatagramChannel) b.bind(new InetSocketAddress(0));

// Broadcast the QOTM request to port 8080.

Modified: branches/httpPost/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServer.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServer.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServer.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -20,6 +20,7 @@

import org.jboss.netty.bootstrap.ConnectionlessBootstrap;
import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.FixedReceiveBufferSizePredictorFactory;
import org.jboss.netty.channel.socket.DatagramChannelFactory;
import org.jboss.netty.channel.socket.oio.OioDatagramChannelFactory;
import org.jboss.netty.handler.codec.string.StringDecoder;
@@ -42,12 +43,24 @@
new OioDatagramChannelFactory(Executors.newCachedThreadPool());

ConnectionlessBootstrap b = new ConnectionlessBootstrap(f);
+
+ // Configure the pipeline.
ChannelPipeline p = b.getPipeline();
p.addLast("encoder", new StringEncoder("UTF-8"));
p.addLast("decoder", new StringDecoder("UTF-8"));
p.addLast("handler", new QuoteOfTheMomentServerHandler());

+ // Enable broadcast
b.setOption("broadcast", "false");
+
+ // Allow packets as large as up to 1024 bytes (default is 768).
+ // You could increase or decrease this value to avoid truncated packets
+ // or to improve memory footprint respectively.
+ b.setOption(
+ "receiveBufferSizePredictorFactory",
+ new FixedReceiveBufferSizePredictorFactory(1024));
+
+ // Bind to the port and start the service.
b.bind(new InetSocketAddress(8080));
}
}

Modified: branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/CompressionException.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/CompressionException.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/CompressionException.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -22,7 +22,7 @@
* failed.
*
* @author The Netty Project ([hidden email])
- * @author Trustin Lee ([hidden email])
+ * @author Trustin Lee ([hidden email])
* @version $Rev$, $Date$
*/
public class CompressionException extends RuntimeException {

Modified: branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/ZlibDecoder.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/ZlibDecoder.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/ZlibDecoder.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -29,7 +29,7 @@
* Decompresses a {@link ChannelBuffer} using the deflate algorithm.
*
* @author The Netty Project ([hidden email])
- * @author Trustin Lee ([hidden email])
+ * @author Trustin Lee ([hidden email])
* @version $Rev$, $Date$
*/
@ChannelPipelineCoverage("one")

Modified: branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -36,7 +36,7 @@
* Compresses a {@link ChannelBuffer} using the deflate algorithm.
*
* @author The Netty Project ([hidden email])
- * @author Trustin Lee ([hidden email])
+ * @author Trustin Lee ([hidden email])
* @version $Rev$, $Date$
*/
@ChannelPipelineCoverage("one")
@@ -69,7 +69,7 @@
* @throws CompressionException if failed to initialize zlib
*/
public ZlibEncoder(int compressionLevel) {
- this(compressionLevel, ZlibWrapper.ZLIB);
+ this(ZlibWrapper.ZLIB, compressionLevel);
}

/**
@@ -79,13 +79,12 @@
* @throws CompressionException if failed to initialize zlib
*/
public ZlibEncoder(ZlibWrapper wrapper) {
- this(6, wrapper);
+ this(wrapper, 6);
}

/**
* Creates a new zlib encoder with the specified {@code compressionLevel}
* and the specified wrapper.
- *
* @param compressionLevel
* {@code 1} yields the fastest compression and {@code 9} yields the
* best compression. {@code 0} means no compression. The default
@@ -93,7 +92,7 @@
*
* @throws CompressionException if failed to initialize zlib
*/
- public ZlibEncoder(int compressionLevel, ZlibWrapper wrapper) {
+ public ZlibEncoder(ZlibWrapper wrapper, int compressionLevel) {
if (compressionLevel < 0 || compressionLevel > 9) {
throw new IllegalArgumentException(
"compressionLevel: " + compressionLevel +
@@ -242,7 +241,7 @@
if (evt != null) {
ctx.sendDownstream(evt);
}
- return Channels.succeededFuture(evt.getChannel());
+ return Channels.succeededFuture(ctx.getChannel());
}

ChannelBuffer footer;

Modified: branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -22,7 +22,7 @@
* Utility methods used by {@link ZlibEncoder} and {@link ZlibDecoder}.
*
* @author The Netty Project ([hidden email])
- * @author Trustin Lee ([hidden email])
+ * @author Trustin Lee ([hidden email])
* @version $Rev$, $Date$
*/
final class ZlibUtil {

Modified: branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/ZlibWrapper.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/ZlibWrapper.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/handler/codec/compression/ZlibWrapper.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -20,7 +20,7 @@
* algorithm.
*
* @author The Netty Project ([hidden email])
- * @author Trustin Lee ([hidden email])
+ * @author Trustin Lee ([hidden email])
* @version $Rev$, $Date$
*/
public enum ZlibWrapper {

Modified: branches/httpPost/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -17,6 +17,8 @@

import static org.jboss.netty.channel.Channels.*;

+import java.lang.reflect.Array;
+import java.util.ConcurrentModificationException;
import java.util.LinkedList;
import java.util.Queue;

@@ -41,7 +43,7 @@
* @author Trustin Lee ([hidden email])
* @version $Rev$, $Date$
*/
-abstract class AbstractCodecEmbedder<T> implements CodecEmbedder<T> {
+abstract class AbstractCodecEmbedder<E> implements CodecEmbedder<E> {

private final Channel channel;
private final ChannelPipeline pipeline;
@@ -124,15 +126,61 @@
}

@SuppressWarnings("unchecked")
- public final T poll() {
- return (T) productQueue.poll();
+ public final E poll() {
+ return (E) productQueue.poll();
}

@SuppressWarnings("unchecked")
- public final T peek() {
- return (T) productQueue.peek();
+ public final E peek() {
+ return (E) productQueue.peek();
}

+ public final Object[] pollAll() {
+ final int size = size();
+ Object[] a = new Object[size];
+ for (int i = 0; i < size; i ++) {
+ E product = poll();
+ if (product == null) {
+ throw new ConcurrentModificationException();
+ }
+ a[i] = product;
+ }
+ return a;
+ }
+
+ @SuppressWarnings("unchecked")
+ public final <T> T[] pollAll(T[] a) {
+ if (a == null) {
+ throw new NullPointerException("a");
+ }
+
+ final int size = size();
+
+ // Create a new array if the specified one is too small.
+ if (a.length < size) {
+ a = (T[]) Array.newInstance(a.getClass().getComponentType(), size);
+ }
+
+ for (int i = 0;; i ++) {
+ T product = (T) poll();
+ if (product == null) {
+ break;
+ }
+ a[i] = product;
+ }
+
+ // Put the terminator if necessary.
+ if (a.length > size) {
+ a[size] = null;
+ }
+
+ return a;
+ }
+
+ public final int size() {
+ return productQueue.size();
+ }
+
@ChannelPipelineCoverage("all")
private final class EmbeddedChannelSink implements ChannelSink, ChannelUpstreamHandler {
EmbeddedChannelSink() {

Modified: branches/httpPost/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedder.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedder.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedder.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -15,6 +15,8 @@
*/
package org.jboss.netty.handler.codec.embedder;

+import java.util.Collection;
+
/**
* A helper that wraps an encoder or a decoder (codec) so that they can be used
* without doing actual I/O in unit tests or higher level codecs. Please refer
@@ -24,7 +26,7 @@
* @author Trustin Lee ([hidden email])
* @version $Rev$, $Date$
*/
-public interface CodecEmbedder<T> {
+public interface CodecEmbedder<E> {
/**
* Offers an input object to the pipeline of this embedder.
*
@@ -50,7 +52,7 @@
* {@code null} if and only if there is no output object left in the
* product queue.
*/
- T poll();
+ E poll();

/**
* Reads an encoded or decoded output from the head of the product queue.
@@ -61,5 +63,34 @@
* {@code null} if and only if there is no output object left in the
* product queue.
*/
- T peek();
+ E peek();
+
+ /**
+ * Consumes all encoded or decoded output from the product queue. The
+ * output object is generated by the offered input objects. The behavior
+ * of this method is identical with {@link Collection#toArray()} except that
+ * the product queue is cleared.
+ *
+ * @return an array of all encoded or decoded objects.
+ * An empty array is returned if and only if there is no output
+ * object left in the product queue.
+ */
+ Object[] pollAll();
+
+ /**
+ * Consumes all encoded or decoded output from the product queue. The
+ * output object is generated by the offered input objects. The behavior
+ * of this method is identical with {@link Collection#toArray(Object[])}
+ * except that the product queue is cleared.
+ *
+ * @return an array of all encoded or decoded objects.
+ * An empty array is returned if and only if there is no output
+ * object left in the product queue.
+ */
+ <T> T[] pollAll(T[] a);
+
+ /**
+ * Returns the number of encoded or decoded output in the product queue.
+ */
+ int size();
}

Modified: branches/httpPost/src/main/java/org/jboss/netty/handler/codec/embedder/DecoderEmbedder.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/handler/codec/embedder/DecoderEmbedder.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/handler/codec/embedder/DecoderEmbedder.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -49,7 +49,7 @@
* @apiviz.landmark
* @see EncoderEmbedder
*/
-public class DecoderEmbedder<T> extends AbstractCodecEmbedder<T> {
+public class DecoderEmbedder<E> extends AbstractCodecEmbedder<E> {

/**
* Creates a new embedder whose pipeline is composed of the specified

Modified: branches/httpPost/src/main/java/org/jboss/netty/handler/codec/embedder/EncoderEmbedder.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/handler/codec/embedder/EncoderEmbedder.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/handler/codec/embedder/EncoderEmbedder.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -49,7 +49,7 @@
* @apiviz.landmark
* @see DecoderEmbedder
*/
-public class EncoderEmbedder<T> extends AbstractCodecEmbedder<T> {
+public class EncoderEmbedder<E> extends AbstractCodecEmbedder<E> {

/**
* Creates a new embedder whose pipeline is composed of the specified

Copied: branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java (from rev 1871, trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java)
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java (rev 0)
+++ branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat 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.http;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.handler.codec.compression.ZlibEncoder;
+import org.jboss.netty.handler.codec.compression.ZlibWrapper;
+import org.jboss.netty.handler.codec.embedder.EncoderEmbedder;
+
+/**
+ * Compresses an {@link HttpMessage} and an {@link HttpChunk} in {@code gzip} or
+ * {@code deflate} encoding while respecting the {@code "Accept-Encoding"} header.
+ * If there is no matching encoding, no compression is done. For more
+ * information on how this handler modifies the message, please refer to
+ * {@link HttpContentEncoder}.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Trustin Lee ([hidden email])
+ * @version $Rev$, $Date$
+ */
+@ChannelPipelineCoverage("one")
+public class HttpContentCompressor extends HttpContentEncoder {
+
+ private final int compressionLevel;
+
+ /**
+ * Creates a new handler with the default compression level (<tt>6</tt>).
+ */
+ public HttpContentCompressor() {
+ this(6);
+ }
+
+ /**
+ * Creates a new handler with the specified compression level.
+ *
+ * @param compressionLevel
+ * {@code 1} yields the fastest compression and {@code 9} yields the
+ * best compression. {@code 0} means no compression. The default
+ * compression level is {@code 6}.
+ */
+ public HttpContentCompressor(int compressionLevel) {
+ if (compressionLevel < 0 || compressionLevel > 9) {
+ throw new IllegalArgumentException(
+ "compressionLevel: " + compressionLevel +
+ " (expected: 0-9)");
+ }
+ this.compressionLevel = compressionLevel;
+ }
+
+ @Override
+ protected EncoderEmbedder<ChannelBuffer> newContentEncoder(String acceptEncoding) throws Exception {
+ ZlibWrapper wrapper = determineWrapper(acceptEncoding);
+ if (wrapper == null) {
+ return null;
+ }
+
+ return new EncoderEmbedder<ChannelBuffer>(new ZlibEncoder(wrapper, compressionLevel));
+ }
+
+ @Override
+ protected String getTargetContentEncoding(String acceptEncoding) throws Exception {
+ ZlibWrapper wrapper = determineWrapper(acceptEncoding);
+ if (wrapper == null) {
+ return null;
+ }
+
+ switch (wrapper) {
+ case GZIP:
+ return "gzip";
+ case ZLIB:
+ return "deflate";
+ default:
+ throw new Error();
+ }
+ }
+
+ private ZlibWrapper determineWrapper(String acceptEncoding) {
+ // FIXME: Use the Q value.
+ if (acceptEncoding.indexOf("gzip") >= 0) {
+ return ZlibWrapper.GZIP;
+ }
+ if (acceptEncoding.indexOf("deflate") >= 0) {
+ return ZlibWrapper.ZLIB;
+ }
+ return null;
+ }
+}

Copied: branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java (from rev 1871, trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java)
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java (rev 0)
+++ branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat 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.http;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.jboss.netty.handler.codec.embedder.DecoderEmbedder;
+
+/**
+ * Decodes the content of the received {@link HttpRequest} and {@link HttpChunk}.
+ * The original content is replaced with the new content decoded by the
+ * {@link DecoderEmbedder}, which is created by {@link #newContentDecoder(String)}.
+ * Once decoding is finished, the value of the <tt>'Content-Encoding'</tt>
+ * header is set to the target content encoding, as returned by {@link #getTargetContentEncoding(String)}.
+ * Also, the <tt>'Content-Length'</tt> header is updated to the length of the
+ * decoded content. If the content encoding of the original is not supported
+ * by the decoder, {@link #newContentDecoder(String)} should return {@code null}
+ * so that no decoding occurs (i.e. pass-through).
+ * <p>
+ * Please note that this is an abstract class. You have to extend this class
+ * and implement {@link #newContentDecoder(String)} properly to make this class
+ * functional. For example, refer to the source code of {@link HttpContentDecompressor}.
+ * <p>
+ * This handler must be placed after {@link HttpMessageDecoder} in the pipeline
+ * so that this handler can intercept HTTP requests after {@link HttpMessageDecoder}
+ * converts {@link ChannelBuffer}s into HTTP requests.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Trustin Lee ([hidden email])
+ * @version $Rev$, $Date$
+ */
+@ChannelPipelineCoverage("one")
+public abstract class HttpContentDecoder extends SimpleChannelUpstreamHandler {
+
+ private volatile DecoderEmbedder<ChannelBuffer> decoder;
+
+ /**
+ * Creates a new instance.
+ */
+ protected HttpContentDecoder() {
+ super();
+ }
+
+ @Override
+ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
+ Object msg = e.getMessage();
+ if (msg instanceof HttpMessage) {
+ HttpMessage m = (HttpMessage) msg;
+
+ decoder = null;
+
+ // Determine the content encoding.
+ String contentEncoding = m.getHeader(HttpHeaders.Names.CONTENT_ENCODING);
+ if (contentEncoding != null) {
+ contentEncoding = contentEncoding.trim();
+ } else {
+ contentEncoding = HttpHeaders.Values.IDENTITY;
+ }
+
+ if ((decoder = newContentDecoder(contentEncoding)) != null) {
+ // Decode the content and remove or replace the existing headers
+ // so that the message looks like a decoded message.
+ m.setHeader(
+ HttpHeaders.Names.CONTENT_ENCODING,
+ getTargetContentEncoding(contentEncoding));
+
+ if (!m.isChunked()) {
+ ChannelBuffer content = m.getContent();
+ // Decode the content
+ content = ChannelBuffers.wrappedBuffer(
+ decode(content), finishDecode());
+
+ // Replace the content.
+ m.setContent(content);
+ if (m.containsHeader(HttpHeaders.Names.CONTENT_LENGTH)) {
+ m.setHeader(
+ HttpHeaders.Names.CONTENT_LENGTH,
+ Integer.toString(content.readableBytes()));
+ }
+ }
+ }
+
+ // Because HttpMessage is a mutable object, we can simply forward the received event.
+ ctx.sendUpstream(e);
+ } else if (msg instanceof HttpChunk) {
+ HttpChunk c = (HttpChunk) msg;
+ ChannelBuffer content = c.getContent();
+
+ // Decode the chunk if necessary.
+ if (decoder != null) {
+ if (!c.isLast()) {
+ content = decode(content);
+ if (content.readable()) {
+ // Note that HttpChunk is immutable unlike HttpMessage.
+ // XXX API inconsistency? I can live with it though.
+ Channels.fireMessageReceived(
+ ctx, new DefaultHttpChunk(content), e.getRemoteAddress());
+ }
+ } else {
+ ChannelBuffer lastProduct = finishDecode();
+
+ // Generate an additional chunk if the decoder produced
+ // the last product on closure,
+ if (lastProduct.readable()) {
+ Channels.fireMessageReceived(
+ ctx, new DefaultHttpChunk(lastProduct), e.getRemoteAddress());
+ }
+
+ // Emit the last chunk.
+ ctx.sendUpstream(e);
+ }
+ } else {
+ ctx.sendUpstream(e);
+ }
+ } else {
+ ctx.sendUpstream(e);
+ }
+ }
+
+ /**
+ * Returns a new {@link DecoderEmbedder} that decodes the HTTP message
+ * content encoded in the specified <tt>contentEncoding</tt>.
+ *
+ * @param contentEncoding the value of the {@code "Content-Encoding"} header
+ * @return a new {@link DecoderEmbedder} if the specified encoding is supported.
+ * {@code null} otherwise (alternatively, you can throw an exception
+ * to block unknown encoding).
+ */
+ protected abstract DecoderEmbedder<ChannelBuffer> newContentDecoder(String contentEncoding) throws Exception;
+
+ /**
+ * Returns the expected content encoding of the decoded content.
+ * This method returns {@code "identity"} by default, which is the case for
+ * most decoders.
+ *
+ * @param contentEncoding the value of the {@code "Content-Encoding"} header
+ * @return the expected content encoding of the new content
+ */
+ protected String getTargetContentEncoding(String contentEncoding) throws Exception {
+ return HttpHeaders.Values.IDENTITY;
+ }
+
+ private ChannelBuffer decode(ChannelBuffer buf) {
+ decoder.offer(buf);
+ return ChannelBuffers.wrappedBuffer(decoder.pollAll(new ChannelBuffer[decoder.size()]));
+ }
+
+ private ChannelBuffer finishDecode() {
+ ChannelBuffer result;
+ if (decoder.finish()) {
+ result = ChannelBuffers.wrappedBuffer(decoder.pollAll(new ChannelBuffer[decoder.size()]));
+ } else {
+ result = ChannelBuffers.EMPTY_BUFFER;
+ }
+ decoder = null;
+ return result;
+ }
+}

Copied: branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java (from rev 1871, trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java)
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java (rev 0)
+++ branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat 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.http;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.handler.codec.compression.ZlibDecoder;
+import org.jboss.netty.handler.codec.compression.ZlibWrapper;
+import org.jboss.netty.handler.codec.embedder.DecoderEmbedder;
+
+/**
+ * Decompresses an {@link HttpMessage} and an {@link HttpChunk} compressed in
+ * {@code gzip} or {@code deflate} encoding. For more information on how this
+ * handler modifies the message, please refer to {@link HttpContentDecoder}.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Trustin Lee ([hidden email])
+ * @version $Rev$, $Date$
+ */
+@ChannelPipelineCoverage("one")
+public class HttpContentDecompressor extends HttpContentDecoder {
+ @Override
+ protected DecoderEmbedder<ChannelBuffer> newContentDecoder(String contentEncoding) throws Exception {
+ if ("gzip".equalsIgnoreCase(contentEncoding) || "x-gzip".equalsIgnoreCase(contentEncoding)) {
+ return new DecoderEmbedder<ChannelBuffer>(new ZlibDecoder(ZlibWrapper.GZIP));
+ } else if ("deflate".equalsIgnoreCase(contentEncoding) || "x-deflate".equalsIgnoreCase(contentEncoding)) {
+ return new DecoderEmbedder<ChannelBuffer>(new ZlibDecoder(ZlibWrapper.ZLIB));
+ }
+
+ // 'identity' or unsupported
+ return null;
+ }
+}

Copied: branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java (from rev 1871, trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java)
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java (rev 0)
+++ branches/httpPost/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat 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.http;
+
+import java.util.Queue;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.handler.codec.embedder.EncoderEmbedder;
+import org.jboss.netty.util.internal.LinkedTransferQueue;
+
+/**
+ * Encodes the content of the outbound {@link HttpResponse} and {@link HttpChunk}.
+ * The original content is replaced with the new content encoded by the
+ * {@link EncoderEmbedder}, which is created by {@link #newContentEncoder(String)}.
+ * Once encoding is finished, the value of the <tt>'Content-Encoding'</tt> header
+ * is set to the target content encoding, as returned by {@link #getTargetContentEncoding(String)}.
+ * Also, the <tt>'Content-Length'</tt> header is updated to the length of the
+ * encoded content. If there is no supported encoding in the
+ * corresponding {@link HttpRequest}'s {@code "Accept-Encoding"} header,
+ * {@link #newContentEncoder(String)} should return {@code null} so that no
+ * encoding occurs (i.e. pass-through).
+ * <p>
+ * Please note that this is an abstract class. You have to extend this class
+ * and implement {@link #newContentEncoder(String)} and {@link #getTargetContentEncoding(String)}
+ * properly to make this class functional. For example, refer to the source
+ * code of {@link HttpContentCompressor}.
+ * <p>
+ * This handler must be placed after {@link HttpMessageEncoder} in the pipeline
+ * so that this handler can intercept HTTP responses before {@link HttpMessageEncoder}
+ * converts them into {@link ChannelBuffer}s.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Trustin Lee ([hidden email])
+ * @version $Rev$, $Date$
+ */
+public abstract class HttpContentEncoder extends SimpleChannelHandler {
+
+ private final Queue<String> acceptEncodingQueue = new LinkedTransferQueue<String>();
+ private volatile EncoderEmbedder<ChannelBuffer> encoder;
+
+ /**
+ * Creates a new instance.
+ */
+ protected HttpContentEncoder() {
+ super();
+ }
+
+ @Override
+ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e)
+ throws Exception {
+ Object msg = e.getMessage();
+ if (!(msg instanceof HttpMessage)) {
+ ctx.sendUpstream(e);
+ return;
+ }
+
+ HttpMessage m = (HttpMessage) msg;
+ String acceptedEncoding = m.getHeader(HttpHeaders.Names.ACCEPT_ENCODING);
+ if (acceptedEncoding == null) {
+ acceptedEncoding = HttpHeaders.Values.IDENTITY;
+ }
+ boolean offered = acceptEncodingQueue.offer(acceptedEncoding);
+ assert offered;
+
+ ctx.sendUpstream(e);
+ }
+
+ @Override
+ public void writeRequested(ChannelHandlerContext ctx, MessageEvent e)
+ throws Exception {
+
+ Object msg = e.getMessage();
+ if (msg instanceof HttpMessage) {
+ HttpMessage m = (HttpMessage) msg;
+
+ encoder = null;
+
+ // Determine the content encoding.
+ String acceptEncoding = acceptEncodingQueue.poll();
+ if (acceptEncoding == null) {
+ throw new IllegalStateException("cannot send more responses than requests");
+ }
+
+ if ((encoder = newContentEncoder(acceptEncoding)) != null) {
+ // Encode the content and remove or replace the existing headers
+ // so that the message looks like a decoded message.
+ m.setHeader(
+ HttpHeaders.Names.CONTENT_ENCODING,
+ getTargetContentEncoding(acceptEncoding));
+
+ if (!m.isChunked()) {
+ ChannelBuffer content = m.getContent();
+ // Encode the content.
+ content = ChannelBuffers.wrappedBuffer(
+ encode(content), finishEncode());
+
+ // Replace the content.
+ m.setContent(content);
+ if (m.containsHeader(HttpHeaders.Names.CONTENT_LENGTH)) {
+ m.setHeader(
+ HttpHeaders.Names.CONTENT_LENGTH,
+ Integer.toString(content.readableBytes()));
+ }
+ }
+ }
+
+ // Because HttpMessage is a mutable object, we can simply forward the write request.
+ ctx.sendDownstream(e);
+ } else if (msg instanceof HttpChunk) {
+ HttpChunk c = (HttpChunk) msg;
+ ChannelBuffer content = c.getContent();
+
+ // Encode the chunk if necessary.
+ if (encoder != null) {
+ if (!c.isLast()) {
+ content = encode(content);
+ if (content.readable()) {
+ // Note that HttpChunk is immutable unlike HttpMessage.
+ // XXX API inconsistency? I can live with it though.
+ Channels.write(
+ ctx, e.getFuture(), new DefaultHttpChunk(content), e.getRemoteAddress());
+ }
+ } else {
+ ChannelBuffer lastProduct = finishEncode();
+
+ // Generate an additional chunk if the decoder produced
+ // the last product on closure,
+ if (lastProduct.readable()) {
+ Channels.write(
+ ctx, Channels.succeededFuture(e.getChannel()), new DefaultHttpChunk(lastProduct), e.getRemoteAddress());
+ }
+
+ // Emit the last chunk.
+ ctx.sendDownstream(e);
+ }
+ } else {
+ ctx.sendDownstream(e);
+ }
+ } else {
+ ctx.sendDownstream(e);
+ }
+ }
+
+ /**
+ * Returns a new {@link EncoderEmbedder} that encodes the HTTP message
+ * content.
+ *
+ * @param acceptEncoding
+ * the value of the {@code "Accept-Encoding"} header
+ *
+ * @return a new {@link EncoderEmbedder} if there is a supported encoding
+ * in {@code acceptEncoding}. {@code null} otherwise.
+ */
+ protected abstract EncoderEmbedder<ChannelBuffer> newContentEncoder(String acceptEncoding) throws Exception;
+
+ /**
+ * Returns the expected content encoding of the encoded content.
+ *
+ * @param acceptEncoding the value of the {@code "Accept-Encoding"} header
+ * @return the expected content encoding of the new content
+ */
+ protected abstract String getTargetContentEncoding(String acceptEncoding) throws Exception;
+
+ private ChannelBuffer encode(ChannelBuffer buf) {
+ encoder.offer(buf);
+ return ChannelBuffers.wrappedBuffer(encoder.pollAll(new ChannelBuffer[encoder.size()]));
+ }
+
+ private ChannelBuffer finishEncode() {
+ ChannelBuffer result;
+ if (encoder.finish()) {
+ result = ChannelBuffers.wrappedBuffer(encoder.pollAll(new ChannelBuffer[encoder.size()]));
+ } else {
+ result = ChannelBuffers.EMPTY_BUFFER;
+ }
+ encoder = null;
+ return result;
+ }
+}

Modified: branches/httpPost/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -91,7 +91,9 @@
return;
}

- queue.offer((MessageEvent) e);
+ boolean offered = queue.offer((MessageEvent) e);
+ assert offered;
+
if (ctx.getChannel().isWritable()) {
flush(ctx);
}

Modified: branches/httpPost/src/main/java/org/jboss/netty/util/HashedWheelTimer.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/util/HashedWheelTimer.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/util/HashedWheelTimer.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -61,9 +61,9 @@
* <h3>Implementation Details</h3>
*
* {@link HashedWheelTimer} is based on
- * <a href="http://cseweb.ucsd.edu/users/varghese/>George Varghese</a> and
+ * <a href="http://cseweb.ucsd.edu/users/varghese/">George Varghese</a> and
* Tony Lauck's paper,
- * <a href="http://www-cse.ucsd.edu/users/varghese/PAPERS/twheel.ps.Z">'Hashed
+ * <a href="http://cseweb.ucsd.edu/users/varghese/PAPERS/twheel.ps.Z">'Hashed
* and Hierarchical Timing Wheels: data structures to efficiently implement a
* timer facility'</a>. More comprehensive slides are located
* <a href="http://www.cse.wustl.edu/~cdgill/courses/cs6874/TimingWheels.ppt">here</a>.

Modified: branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -138,7 +138,6 @@
WrapperType wrapperType;
private boolean wroteTrailer;
byte data_type; // UNKNOWN, BINARY or ASCII
- byte method; // STORED (for zip only) or DEFLATED
int last_flush; // value of flush param for previous deflate call
int w_size; // LZ77 window size (32K by default)
int w_bits; // log2(w_size) (8..16)
@@ -1196,7 +1195,7 @@
}

if (match_available != 0) {
- bflush = _tr_tally(0, window[strstart - 1] & 0xff);
+ _tr_tally(0, window[strstart - 1] & 0xff);
match_available = 0;
}
flush_block_only(flush == JZlib.Z_FINISH);
@@ -1363,7 +1362,6 @@
//System.out.println("level="+level);

this.strategy = strategy;
- this.method = (byte) method;

return deflateReset(strm);
}
@@ -1371,7 +1369,6 @@
private int deflateReset(ZStream strm) {
strm.total_in = strm.total_out = 0;
strm.msg = null; //
- strm.data_type = Z_UNKNOWN;

pending = 0;
pending_out = 0;

Modified: branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -566,7 +566,6 @@
write = q;
r = inflate_flush(z, r);
q = write;
- m = q < read? read - q - 1 : end - q;
if (read != write) {
bitb = b;
bitk = k;

Modified: branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -409,7 +409,6 @@
s.write = q;
r = s.inflate_flush(z, r);
q = s.write;
- m = q < s.read? s.read - q - 1 : s.end - q;

if (s.read != s.write) {
s.bitb = b;

Modified: branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -252,7 +252,6 @@
if (z.avail_in == 0) {
return r;
}
- r = f;

z.avail_in --;
z.total_in ++;

Modified: branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java
===================================================================
--- branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java 2009-11-03 07:44:06 UTC (rev 1871)
+++ branches/httpPost/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java 2009-11-07 10:00:41 UTC (rev 1872)
@@ -63,7 +63,6 @@
public String msg;
Deflate dstate;
Inflate istate;
- int data_type; // best guess about the data type: ascii or binary
long adler;
int crc32;

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1871 - in trunk/src/main/java/org/jboss/netty: example/proxy and 4 other directories.

2009-11-02T23:44:06Z

Author: trustin
Date: 2009-11-03 02:44:06 -0500 (Tue, 03 Nov 2009)
New Revision: 1871

Modified:
trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingServlet.java
trunk/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java
trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java
trunk/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java
trunk/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java
trunk/src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java
trunk/src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java
trunk/src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java
trunk/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java
Log:
Fixed some non-sense code as advised by FindBugs

Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingServlet.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingServlet.java 2009-11-03 07:11:52 UTC (rev 1870)
+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingServlet.java 2009-11-03 07:44:06 UTC (rev 1871)
@@ -222,7 +222,7 @@
}

@ChannelPipelineCoverage("one")
- private final class OutboundConnectionHandler extends SimpleChannelUpstreamHandler {
+ private static final class OutboundConnectionHandler extends SimpleChannelUpstreamHandler {

private final ServletOutputStream out;

Modified: trunk/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java 2009-11-03 07:11:52 UTC (rev 1870)
+++ trunk/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java 2009-11-03 07:44:06 UTC (rev 1871)
@@ -103,7 +103,7 @@
}

@ChannelPipelineCoverage("one")
- private class OutboundHandler extends SimpleChannelUpstreamHandler {
+ private static class OutboundHandler extends SimpleChannelUpstreamHandler {

private final Channel inboundChannel;

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java 2009-11-03 07:11:52 UTC (rev 1870)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java 2009-11-03 07:44:06 UTC (rev 1871)
@@ -241,7 +241,7 @@
if (evt != null) {
ctx.sendDownstream(evt);
}
- return Channels.succeededFuture(evt.getChannel());
+ return Channels.succeededFuture(ctx.getChannel());
}

ChannelBuffer footer;

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java 2009-11-03 07:11:52 UTC (rev 1870)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java 2009-11-03 07:44:06 UTC (rev 1871)
@@ -77,7 +77,8 @@
if (acceptedEncoding == null) {
acceptedEncoding = HttpHeaders.Values.IDENTITY;
}
- acceptEncodingQueue.offer(acceptedEncoding);
+ boolean offered = acceptEncodingQueue.offer(acceptedEncoding);
+ assert offered;

ctx.sendUpstream(e);
}

Modified: trunk/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java 2009-11-03 07:11:52 UTC (rev 1870)
+++ trunk/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java 2009-11-03 07:44:06 UTC (rev 1871)
@@ -91,7 +91,9 @@
return;
}

- queue.offer((MessageEvent) e);
+ boolean offered = queue.offer((MessageEvent) e);
+ assert offered;
+
if (ctx.getChannel().isWritable()) {
flush(ctx);
}

Modified: trunk/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java 2009-11-03 07:11:52 UTC (rev 1870)
+++ trunk/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java 2009-11-03 07:44:06 UTC (rev 1871)
@@ -138,7 +138,6 @@
WrapperType wrapperType;
private boolean wroteTrailer;
byte data_type; // UNKNOWN, BINARY or ASCII
- byte method; // STORED (for zip only) or DEFLATED
int last_flush; // value of flush param for previous deflate call
int w_size; // LZ77 window size (32K by default)
int w_bits; // log2(w_size) (8..16)
@@ -1196,7 +1195,7 @@
}

if (match_available != 0) {
- bflush = _tr_tally(0, window[strstart - 1] & 0xff);
+ _tr_tally(0, window[strstart - 1] & 0xff);
match_available = 0;
}
flush_block_only(flush == JZlib.Z_FINISH);
@@ -1363,7 +1362,6 @@
//System.out.println("level="+level);

this.strategy = strategy;
- this.method = (byte) method;

return deflateReset(strm);
}
@@ -1371,7 +1369,6 @@
private int deflateReset(ZStream strm) {
strm.total_in = strm.total_out = 0;
strm.msg = null; //
- strm.data_type = Z_UNKNOWN;

pending = 0;
pending_out = 0;

Modified: trunk/src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java 2009-11-03 07:11:52 UTC (rev 1870)
+++ trunk/src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java 2009-11-03 07:44:06 UTC (rev 1871)
@@ -566,7 +566,6 @@
write = q;
r = inflate_flush(z, r);
q = write;
- m = q < read? read - q - 1 : end - q;
if (read != write) {
bitb = b;
bitk = k;

Modified: trunk/src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java 2009-11-03 07:11:52 UTC (rev 1870)
+++ trunk/src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java 2009-11-03 07:44:06 UTC (rev 1871)
@@ -409,7 +409,6 @@
s.write = q;
r = s.inflate_flush(z, r);
q = s.write;
- m = q < s.read? s.read - q - 1 : s.end - q;

if (s.read != s.write) {
s.bitb = b;

Modified: trunk/src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java 2009-11-03 07:11:52 UTC (rev 1870)
+++ trunk/src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java 2009-11-03 07:44:06 UTC (rev 1871)
@@ -252,7 +252,6 @@
if (z.avail_in == 0) {
return r;
}
- r = f;

z.avail_in --;
z.total_in ++;

Modified: trunk/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java 2009-11-03 07:11:52 UTC (rev 1870)
+++ trunk/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java 2009-11-03 07:44:06 UTC (rev 1871)
@@ -63,7 +63,6 @@
public String msg;
Deflate dstate;
Inflate istate;
- int data_type; // best guess about the data type: ascii or binary
long adler;
int crc32;

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1870 - trunk/src/main/java/org/jboss/netty/handler/codec/http.

2009-11-02T23:11:52Z

Author: trustin
Date: 2009-11-03 02:11:52 -0500 (Tue, 03 Nov 2009)
New Revision: 1870

Modified:
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java
Log:
Improved Javadoc

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java 2009-11-03 06:49:47 UTC (rev 1869)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java 2009-11-03 07:11:52 UTC (rev 1870)
@@ -16,25 +16,17 @@
package org.jboss.netty.handler.codec.http;

import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.handler.codec.compression.ZlibEncoder;
import org.jboss.netty.handler.codec.compression.ZlibWrapper;
import org.jboss.netty.handler.codec.embedder.EncoderEmbedder;

/**
- * Decompresses an {@link HttpMessage} and an {@link HttpChunk} compressed in
- * {@code gzip} or {@code deflate} encoding. Insert this handler after
- * {@link HttpMessageDecoder} in the {@link ChannelPipeline}:
- * <pre>
- * ChannelPipeline p = ...;
- * ...
- * p.addLast("decoder", new HttpRequestDecoder());
- * p.addLast("inflater", <b>new HttpContentDecomperssor()</b>);
- * ...
- * p.addLast("encoder", new HttpResponseEncoder());
- * p.addLast("handler", new HttpRequestHandler());
- * </pre>
+ * Compresses an {@link HttpMessage} and an {@link HttpChunk} in {@code gzip} or
+ * {@code deflate} encoding while respecting the {@code "Accept-Encoding"} header.
+ * If there is no matching encoding, no compression is done. For more
+ * information on how this handler modifies the message, please refer to
+ * {@link HttpContentEncoder}.
*
* @author The Netty Project ([hidden email])
* @author Trustin Lee ([hidden email])
@@ -45,10 +37,21 @@

private final int compressionLevel;

+ /**
+ * Creates a new handler with the default compression level (<tt>6</tt>).
+ */
public HttpContentCompressor() {
this(6);
}

+ /**
+ * Creates a new handler with the specified compression level.
+ *
+ * @param compressionLevel
+ * {@code 1} yields the fastest compression and {@code 9} yields the
+ * best compression. {@code 0} means no compression. The default
+ * compression level is {@code 6}.
+ */
public HttpContentCompressor(int compressionLevel) {
if (compressionLevel < 0 || compressionLevel > 9) {
throw new IllegalArgumentException(

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java 2009-11-03 06:49:47 UTC (rev 1869)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java 2009-11-03 07:11:52 UTC (rev 1870)
@@ -25,19 +25,23 @@
import org.jboss.netty.handler.codec.embedder.DecoderEmbedder;

/**
- * Decodes the content of the received {@link HttpMessage} and {@link HttpChunk}.
- * The original content ({@link HttpMessage#getContent()} or {@link HttpChunk#getContent()})
- * is replaced with the new content decoded by the {@link DecoderEmbedder},
- * which is created by {@link #newContentDecoder(String)}. Once decoding is finished,
- * the value of the <tt>'Content-Encoding'</tt> header is set to <tt>'identity'</tt>
- * and the <tt>'Content-Length'</tt> header is updated to the length of the
+ * Decodes the content of the received {@link HttpRequest} and {@link HttpChunk}.
+ * The original content is replaced with the new content decoded by the
+ * {@link DecoderEmbedder}, which is created by {@link #newContentDecoder(String)}.
+ * Once decoding is finished, the value of the <tt>'Content-Encoding'</tt>
+ * header is set to the target content encoding, as returned by {@link #getTargetContentEncoding(String)}.
+ * Also, the <tt>'Content-Length'</tt> header is updated to the length of the
* decoded content. If the content encoding of the original is not supported
- * by the decoder, {@link #newContentDecoder(String)} returns {@code null} and no
- * decoding occurs (i.e. pass-through).
+ * by the decoder, {@link #newContentDecoder(String)} should return {@code null}
+ * so that no decoding occurs (i.e. pass-through).
* <p>
* Please note that this is an abstract class. You have to extend this class
* and implement {@link #newContentDecoder(String)} properly to make this class
* functional. For example, refer to the source code of {@link HttpContentDecompressor}.
+ * <p>
+ * This handler must be placed after {@link HttpMessageDecoder} in the pipeline
+ * so that this handler can intercept HTTP requests after {@link HttpMessageDecoder}
+ * converts {@link ChannelBuffer}s into HTTP requests.
*
* @author The Netty Project ([hidden email])
* @author Trustin Lee ([hidden email])
@@ -147,7 +151,7 @@
* This method returns {@code "identity"} by default, which is the case for
* most decoders.
*
- * @param contentEncoding the content encoding of the original content
+ * @param contentEncoding the value of the {@code "Content-Encoding"} header
* @return the expected content encoding of the new content
*/
protected String getTargetContentEncoding(String contentEncoding) throws Exception {

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java 2009-11-03 06:49:47 UTC (rev 1869)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java 2009-11-03 07:11:52 UTC (rev 1870)
@@ -16,7 +16,6 @@
package org.jboss.netty.handler.codec.http;

import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.handler.codec.compression.ZlibDecoder;
import org.jboss.netty.handler.codec.compression.ZlibWrapper;
@@ -24,17 +23,8 @@

/**
* Decompresses an {@link HttpMessage} and an {@link HttpChunk} compressed in
- * {@code gzip} or {@code deflate} encoding. Insert this handler after
- * {@link HttpMessageDecoder} in the {@link ChannelPipeline}:
- * <pre>
- * ChannelPipeline p = ...;
- * ...
- * p.addLast("decoder", new HttpRequestDecoder());
- * p.addLast("inflater", <b>new HttpContentDecomperssor()</b>);
- * ...
- * p.addLast("encoder", new HttpResponseEncoder());
- * p.addLast("handler", new HttpRequestHandler());
- * </pre>
+ * {@code gzip} or {@code deflate} encoding. For more information on how this
+ * handler modifies the message, please refer to {@link HttpContentDecoder}.
*
* @author The Netty Project ([hidden email])
* @author Trustin Lee ([hidden email])

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java 2009-11-03 06:49:47 UTC (rev 1869)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java 2009-11-03 07:11:52 UTC (rev 1870)
@@ -23,11 +23,29 @@
import org.jboss.netty.channel.Channels;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelHandler;
-import org.jboss.netty.handler.codec.embedder.DecoderEmbedder;
import org.jboss.netty.handler.codec.embedder.EncoderEmbedder;
import org.jboss.netty.util.internal.LinkedTransferQueue;

/**
+ * Encodes the content of the outbound {@link HttpResponse} and {@link HttpChunk}.
+ * The original content is replaced with the new content encoded by the
+ * {@link EncoderEmbedder}, which is created by {@link #newContentEncoder(String)}.
+ * Once encoding is finished, the value of the <tt>'Content-Encoding'</tt> header
+ * is set to the target content encoding, as returned by {@link #getTargetContentEncoding(String)}.
+ * Also, the <tt>'Content-Length'</tt> header is updated to the length of the
+ * encoded content. If there is no supported encoding in the
+ * corresponding {@link HttpRequest}'s {@code "Accept-Encoding"} header,
+ * {@link #newContentEncoder(String)} should return {@code null} so that no
+ * encoding occurs (i.e. pass-through).
+ * <p>
+ * Please note that this is an abstract class. You have to extend this class
+ * and implement {@link #newContentEncoder(String)} and {@link #getTargetContentEncoding(String)}
+ * properly to make this class functional. For example, refer to the source
+ * code of {@link HttpContentCompressor}.
+ * <p>
+ * This handler must be placed after {@link HttpMessageEncoder} in the pipeline
+ * so that this handler can intercept HTTP responses before {@link HttpMessageEncoder}
+ * converts them into {@link ChannelBuffer}s.
*
* @author The Netty Project ([hidden email])
* @author Trustin Lee ([hidden email])
@@ -145,18 +163,17 @@
* content.
*
* @param acceptEncoding
- * the value of the {@code "Accept-Encoding"} header.
+ * the value of the {@code "Accept-Encoding"} header
*
- * @return a new {@link DecoderEmbedder} if the specified encoding is supported.
- * {@code null} otherwise (alternatively, you can throw an exception
- * to block unknown encoding).
+ * @return a new {@link EncoderEmbedder} if there is a supported encoding
+ * in {@code acceptEncoding}. {@code null} otherwise.
*/
protected abstract EncoderEmbedder<ChannelBuffer> newContentEncoder(String acceptEncoding) throws Exception;

/**
* Returns the expected content encoding of the encoded content.
*
- * @param contentEncoding the content encoding of the original content
+ * @param acceptEncoding the value of the {@code "Accept-Encoding"} header
* @return the expected content encoding of the new content
*/
protected abstract String getTargetContentEncoding(String acceptEncoding) throws Exception;

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1869 - in trunk/src/main/java/org/jboss/netty/handler/codec: http and 1 other directory.

2009-11-02T22:49:47Z

Author: trustin
Date: 2009-11-03 01:49:47 -0500 (Tue, 03 Nov 2009)
New Revision: 1869

Modified:
trunk/src/main/java/org/jboss/netty/handler/codec/compression/CompressionException.java
trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibDecoder.java
trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java
trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java
trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibWrapper.java
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java
Log:
[hidden email] -> [hidden email]

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/compression/CompressionException.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/compression/CompressionException.java 2009-11-03 06:48:39 UTC (rev 1868)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/compression/CompressionException.java 2009-11-03 06:49:47 UTC (rev 1869)
@@ -22,7 +22,7 @@
* failed.
*
* @author The Netty Project ([hidden email])
- * @author Trustin Lee ([hidden email])
+ * @author Trustin Lee ([hidden email])
* @version $Rev$, $Date$
*/
public class CompressionException extends RuntimeException {

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibDecoder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibDecoder.java 2009-11-03 06:48:39 UTC (rev 1868)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibDecoder.java 2009-11-03 06:49:47 UTC (rev 1869)
@@ -29,7 +29,7 @@
* Decompresses a {@link ChannelBuffer} using the deflate algorithm.
*
* @author The Netty Project ([hidden email])
- * @author Trustin Lee ([hidden email])
+ * @author Trustin Lee ([hidden email])
* @version $Rev$, $Date$
*/
@ChannelPipelineCoverage("one")

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java 2009-11-03 06:48:39 UTC (rev 1868)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java 2009-11-03 06:49:47 UTC (rev 1869)
@@ -36,7 +36,7 @@
* Compresses a {@link ChannelBuffer} using the deflate algorithm.
*
* @author The Netty Project ([hidden email])
- * @author Trustin Lee ([hidden email])
+ * @author Trustin Lee ([hidden email])
* @version $Rev$, $Date$
*/
@ChannelPipelineCoverage("one")

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java 2009-11-03 06:48:39 UTC (rev 1868)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java 2009-11-03 06:49:47 UTC (rev 1869)
@@ -22,7 +22,7 @@
* Utility methods used by {@link ZlibEncoder} and {@link ZlibDecoder}.
*
* @author The Netty Project ([hidden email])
- * @author Trustin Lee ([hidden email])
+ * @author Trustin Lee ([hidden email])
* @version $Rev$, $Date$
*/
final class ZlibUtil {

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibWrapper.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibWrapper.java 2009-11-03 06:48:39 UTC (rev 1868)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibWrapper.java 2009-11-03 06:49:47 UTC (rev 1869)
@@ -20,7 +20,7 @@
* algorithm.
*
* @author The Netty Project ([hidden email])
- * @author Trustin Lee ([hidden email])
+ * @author Trustin Lee ([hidden email])
* @version $Rev$, $Date$
*/
public enum ZlibWrapper {

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java 2009-11-03 06:48:39 UTC (rev 1868)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java 2009-11-03 06:49:47 UTC (rev 1869)
@@ -37,7 +37,7 @@
* </pre>
*
* @author The Netty Project ([hidden email])
- * @author Trustin Lee ([hidden email])
+ * @author Trustin Lee ([hidden email])
* @version $Rev$, $Date$
*/
@ChannelPipelineCoverage("one")

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java 2009-11-03 06:48:39 UTC (rev 1868)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java 2009-11-03 06:49:47 UTC (rev 1869)
@@ -40,7 +40,7 @@
* functional. For example, refer to the source code of {@link HttpContentDecompressor}.
*
* @author The Netty Project ([hidden email])
- * @author Trustin Lee ([hidden email])
+ * @author Trustin Lee ([hidden email])
* @version $Rev$, $Date$
*/
@ChannelPipelineCoverage("one")

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java 2009-11-03 06:48:39 UTC (rev 1868)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java 2009-11-03 06:49:47 UTC (rev 1869)
@@ -37,7 +37,7 @@
* </pre>
*
* @author The Netty Project ([hidden email])
- * @author Trustin Lee ([hidden email])
+ * @author Trustin Lee ([hidden email])
* @version $Rev$, $Date$
*/
@ChannelPipelineCoverage("one")

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java 2009-11-03 06:48:39 UTC (rev 1868)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java 2009-11-03 06:49:47 UTC (rev 1869)
@@ -30,7 +30,7 @@
/**
*
* @author The Netty Project ([hidden email])
- * @author Trustin Lee ([hidden email])
+ * @author Trustin Lee ([hidden email])
* @version $Rev$, $Date$
*/
public abstract class HttpContentEncoder extends SimpleChannelHandler {

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1868 - trunk/src/main/java/org/jboss/netty/example/http/snoop.

2009-11-02T22:48:40Z

Author: trustin
Date: 2009-11-03 01:48:39 -0500 (Tue, 03 Nov 2009)
New Revision: 1868

Modified:
trunk/src/main/java/org/jboss/netty/example/http/snoop/HttpServerPipelineFactory.java
Log:
Updated the HTTP snoop example to fully utilize the compression handlers

Modified: trunk/src/main/java/org/jboss/netty/example/http/snoop/HttpServerPipelineFactory.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/example/http/snoop/HttpServerPipelineFactory.java 2009-11-03 06:47:30 UTC (rev 1867)
+++ trunk/src/main/java/org/jboss/netty/example/http/snoop/HttpServerPipelineFactory.java 2009-11-03 06:48:39 UTC (rev 1868)
@@ -19,6 +19,7 @@

import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.handler.codec.http.HttpContentCompressor;
import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
import org.jboss.netty.handler.codec.http.HttpResponseEncoder;

@@ -43,6 +44,8 @@
// Uncomment the following line if you don't want to handle HttpChunks.
//pipeline.addLast("aggregator", new HttpChunkAggregator(1048576));
pipeline.addLast("encoder", new HttpResponseEncoder());
+ // Remove the following line if you don't want automatic content compression.
+ pipeline.addLast("deflater", new HttpContentCompressor());
pipeline.addLast("handler", new HttpRequestHandler());
return pipeline;
}

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1867 - trunk/src/main/java/org/jboss/netty/handler/codec/http.

2009-11-02T22:47:30Z

Author: trustin
Date: 2009-11-03 01:47:30 -0500 (Tue, 03 Nov 2009)
New Revision: 1867

Added:
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java
Modified:
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java
Log:
* Better method naming
* Added HttpContentEncoder and HttpContentCompressor (needs javadoc update)

Added: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java (rev 0)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java 2009-11-03 06:47:30 UTC (rev 1867)
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat 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.http;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.handler.codec.compression.ZlibEncoder;
+import org.jboss.netty.handler.codec.compression.ZlibWrapper;
+import org.jboss.netty.handler.codec.embedder.EncoderEmbedder;
+
+/**
+ * Decompresses an {@link HttpMessage} and an {@link HttpChunk} compressed in
+ * {@code gzip} or {@code deflate} encoding. Insert this handler after
+ * {@link HttpMessageDecoder} in the {@link ChannelPipeline}:
+ * <pre>
+ * ChannelPipeline p = ...;
+ * ...
+ * p.addLast("decoder", new HttpRequestDecoder());
+ * p.addLast("inflater", <b>new HttpContentDecomperssor()</b>);
+ * ...
+ * p.addLast("encoder", new HttpResponseEncoder());
+ * p.addLast("handler", new HttpRequestHandler());
+ * </pre>
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Trustin Lee ([hidden email])
+ * @version $Rev$, $Date$
+ */
+@ChannelPipelineCoverage("one")
+public class HttpContentCompressor extends HttpContentEncoder {
+
+ private final int compressionLevel;
+
+ public HttpContentCompressor() {
+ this(6);
+ }
+
+ public HttpContentCompressor(int compressionLevel) {
+ if (compressionLevel < 0 || compressionLevel > 9) {
+ throw new IllegalArgumentException(
+ "compressionLevel: " + compressionLevel +
+ " (expected: 0-9)");
+ }
+ this.compressionLevel = compressionLevel;
+ }
+
+ @Override
+ protected EncoderEmbedder<ChannelBuffer> newContentEncoder(String acceptEncoding) throws Exception {
+ ZlibWrapper wrapper = determineWrapper(acceptEncoding);
+ if (wrapper == null) {
+ return null;
+ }
+
+ return new EncoderEmbedder<ChannelBuffer>(new ZlibEncoder(wrapper, compressionLevel));
+ }
+
+ @Override
+ protected String getTargetContentEncoding(String acceptEncoding) throws Exception {
+ ZlibWrapper wrapper = determineWrapper(acceptEncoding);
+ if (wrapper == null) {
+ return null;
+ }
+
+ switch (wrapper) {
+ case GZIP:
+ return "gzip";
+ case ZLIB:
+ return "deflate";
+ default:
+ throw new Error();
+ }
+ }
+
+ private ZlibWrapper determineWrapper(String acceptEncoding) {
+ // FIXME: Use the Q value.
+ if (acceptEncoding.indexOf("gzip") >= 0) {
+ return ZlibWrapper.GZIP;
+ }
+ if (acceptEncoding.indexOf("deflate") >= 0) {
+ return ZlibWrapper.ZLIB;
+ }
+ return null;
+ }
+}

Property changes on: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java 2009-11-03 06:46:30 UTC (rev 1866)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java 2009-11-03 06:47:30 UTC (rev 1867)
@@ -28,15 +28,15 @@
* Decodes the content of the received {@link HttpMessage} and {@link HttpChunk}.
* The original content ({@link HttpMessage#getContent()} or {@link HttpChunk#getContent()})
* is replaced with the new content decoded by the {@link DecoderEmbedder},
- * which is created by {@link #newDecoder(String)}. Once decoding is finished,
+ * which is created by {@link #newContentDecoder(String)}. Once decoding is finished,
* the value of the <tt>'Content-Encoding'</tt> header is set to <tt>'identity'</tt>
* and the <tt>'Content-Length'</tt> header is updated to the length of the
* decoded content. If the content encoding of the original is not supported
- * by the decoder, {@link #newDecoder(String)} returns {@code null} and no
+ * by the decoder, {@link #newContentDecoder(String)} returns {@code null} and no
* decoding occurs (i.e. pass-through).
* <p>
* Please note that this is an abstract class. You have to extend this class
- * and implement {@link #newDecoder(String)} properly to make this class
+ * and implement {@link #newContentDecoder(String)} properly to make this class
* functional. For example, refer to the source code of {@link HttpContentDecompressor}.
*
* @author The Netty Project ([hidden email])
@@ -46,7 +46,6 @@
@ChannelPipelineCoverage("one")
public abstract class HttpContentDecoder extends SimpleChannelUpstreamHandler {

- private volatile HttpMessage previous;
private volatile DecoderEmbedder<ChannelBuffer> decoder;

/**
@@ -63,11 +62,6 @@
HttpMessage m = (HttpMessage) msg;

decoder = null;
- if (m.isChunked()) {
- previous = m;
- } else {
- previous = null;
- }

// Determine the content encoding.
String contentEncoding = m.getHeader(HttpHeaders.Names.CONTENT_ENCODING);
@@ -77,29 +71,25 @@
contentEncoding = HttpHeaders.Values.IDENTITY;
}

- if ((decoder = newDecoder(contentEncoding)) != null) {
+ if ((decoder = newContentDecoder(contentEncoding)) != null) {
// Decode the content and remove or replace the existing headers
// so that the message looks like a decoded message.
m.setHeader(
HttpHeaders.Names.CONTENT_ENCODING,
- getTargetEncoding(contentEncoding));
+ getTargetContentEncoding(contentEncoding));

if (!m.isChunked()) {
ChannelBuffer content = m.getContent();
- if (content.readable()) {
- // Decode the content
- content = ChannelBuffers.wrappedBuffer(
- decode(content), finishDecode());
+ // Decode the content
+ content = ChannelBuffers.wrappedBuffer(
+ decode(content), finishDecode());

- // Replace the content if necessary.
- if (content != null) {
- m.setContent(content);
- if (m.containsHeader(HttpHeaders.Names.CONTENT_LENGTH)) {
- m.setHeader(
- HttpHeaders.Names.CONTENT_LENGTH,
- Integer.toString(content.readableBytes()));
- }
- }
+ // Replace the content.
+ m.setContent(content);
+ if (m.containsHeader(HttpHeaders.Names.CONTENT_LENGTH)) {
+ m.setHeader(
+ HttpHeaders.Names.CONTENT_LENGTH,
+ Integer.toString(content.readableBytes()));
}
}
}
@@ -107,8 +97,6 @@
// Because HttpMessage is a mutable object, we can simply forward the received event.
ctx.sendUpstream(e);
} else if (msg instanceof HttpChunk) {
- assert previous != null;
-
HttpChunk c = (HttpChunk) msg;
ChannelBuffer content = c.getContent();

@@ -124,8 +112,6 @@
}
} else {
ChannelBuffer lastProduct = finishDecode();
- previous = null;
- decoder = null;

// Generate an additional chunk if the decoder produced
// the last product on closure,
@@ -154,7 +140,7 @@
* {@code null} otherwise (alternatively, you can throw an exception
* to block unknown encoding).
*/
- protected abstract DecoderEmbedder<ChannelBuffer> newDecoder(String contentEncoding) throws Exception;
+ protected abstract DecoderEmbedder<ChannelBuffer> newContentDecoder(String contentEncoding) throws Exception;

/**
* Returns the expected content encoding of the decoded content.
@@ -164,7 +150,7 @@
* @param contentEncoding the content encoding of the original content
* @return the expected content encoding of the new content
*/
- protected String getTargetEncoding(String contentEncoding) throws Exception {
+ protected String getTargetContentEncoding(String contentEncoding) throws Exception {
return HttpHeaders.Values.IDENTITY;
}

@@ -174,10 +160,13 @@
}

private ChannelBuffer finishDecode() {
+ ChannelBuffer result;
if (decoder.finish()) {
- return ChannelBuffers.wrappedBuffer(decoder.pollAll(new ChannelBuffer[decoder.size()]));
+ result = ChannelBuffers.wrappedBuffer(decoder.pollAll(new ChannelBuffer[decoder.size()]));
} else {
- return ChannelBuffers.EMPTY_BUFFER;
+ result = ChannelBuffers.EMPTY_BUFFER;
}
+ decoder = null;
+ return result;
}
}

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java 2009-11-03 06:46:30 UTC (rev 1866)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java 2009-11-03 06:47:30 UTC (rev 1867)
@@ -43,7 +43,7 @@
@ChannelPipelineCoverage("one")
public class HttpContentDecompressor extends HttpContentDecoder {
@Override
- protected DecoderEmbedder<ChannelBuffer> newDecoder(String contentEncoding) throws Exception {
+ protected DecoderEmbedder<ChannelBuffer> newContentDecoder(String contentEncoding) throws Exception {
if ("gzip".equalsIgnoreCase(contentEncoding) || "x-gzip".equalsIgnoreCase(contentEncoding)) {
return new DecoderEmbedder<ChannelBuffer>(new ZlibDecoder(ZlibWrapper.GZIP));
} else if ("deflate".equalsIgnoreCase(contentEncoding) || "x-deflate".equalsIgnoreCase(contentEncoding)) {

Added: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java (rev 0)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java 2009-11-03 06:47:30 UTC (rev 1867)
@@ -0,0 +1,179 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat 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.http;
+
+import java.util.Queue;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.handler.codec.embedder.DecoderEmbedder;
+import org.jboss.netty.handler.codec.embedder.EncoderEmbedder;
+import org.jboss.netty.util.internal.LinkedTransferQueue;
+
+/**
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Trustin Lee ([hidden email])
+ * @version $Rev$, $Date$
+ */
+public abstract class HttpContentEncoder extends SimpleChannelHandler {
+
+ private final Queue<String> acceptEncodingQueue = new LinkedTransferQueue<String>();
+ private volatile EncoderEmbedder<ChannelBuffer> encoder;
+
+ /**
+ * Creates a new instance.
+ */
+ protected HttpContentEncoder() {
+ super();
+ }
+
+ @Override
+ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e)
+ throws Exception {
+ Object msg = e.getMessage();
+ if (!(msg instanceof HttpMessage)) {
+ ctx.sendUpstream(e);
+ return;
+ }
+
+ HttpMessage m = (HttpMessage) msg;
+ String acceptedEncoding = m.getHeader(HttpHeaders.Names.ACCEPT_ENCODING);
+ if (acceptedEncoding == null) {
+ acceptedEncoding = HttpHeaders.Values.IDENTITY;
+ }
+ acceptEncodingQueue.offer(acceptedEncoding);
+
+ ctx.sendUpstream(e);
+ }
+
+ @Override
+ public void writeRequested(ChannelHandlerContext ctx, MessageEvent e)
+ throws Exception {
+
+ Object msg = e.getMessage();
+ if (msg instanceof HttpMessage) {
+ HttpMessage m = (HttpMessage) msg;
+
+ encoder = null;
+
+ // Determine the content encoding.
+ String acceptEncoding = acceptEncodingQueue.poll();
+ if (acceptEncoding == null) {
+ throw new IllegalStateException("cannot send more responses than requests");
+ }
+
+ if ((encoder = newContentEncoder(acceptEncoding)) != null) {
+ // Encode the content and remove or replace the existing headers
+ // so that the message looks like a decoded message.
+ m.setHeader(
+ HttpHeaders.Names.CONTENT_ENCODING,
+ getTargetContentEncoding(acceptEncoding));
+
+ if (!m.isChunked()) {
+ ChannelBuffer content = m.getContent();
+ // Encode the content.
+ content = ChannelBuffers.wrappedBuffer(
+ encode(content), finishEncode());
+
+ // Replace the content.
+ m.setContent(content);
+ if (m.containsHeader(HttpHeaders.Names.CONTENT_LENGTH)) {
+ m.setHeader(
+ HttpHeaders.Names.CONTENT_LENGTH,
+ Integer.toString(content.readableBytes()));
+ }
+ }
+ }
+
+ // Because HttpMessage is a mutable object, we can simply forward the write request.
+ ctx.sendDownstream(e);
+ } else if (msg instanceof HttpChunk) {
+ HttpChunk c = (HttpChunk) msg;
+ ChannelBuffer content = c.getContent();
+
+ // Encode the chunk if necessary.
+ if (encoder != null) {
+ if (!c.isLast()) {
+ content = encode(content);
+ if (content.readable()) {
+ // Note that HttpChunk is immutable unlike HttpMessage.
+ // XXX API inconsistency? I can live with it though.
+ Channels.write(
+ ctx, e.getFuture(), new DefaultHttpChunk(content), e.getRemoteAddress());
+ }
+ } else {
+ ChannelBuffer lastProduct = finishEncode();
+
+ // Generate an additional chunk if the decoder produced
+ // the last product on closure,
+ if (lastProduct.readable()) {
+ Channels.write(
+ ctx, Channels.succeededFuture(e.getChannel()), new DefaultHttpChunk(lastProduct), e.getRemoteAddress());
+ }
+
+ // Emit the last chunk.
+ ctx.sendDownstream(e);
+ }
+ } else {
+ ctx.sendDownstream(e);
+ }
+ } else {
+ ctx.sendDownstream(e);
+ }
+ }
+
+ /**
+ * Returns a new {@link EncoderEmbedder} that encodes the HTTP message
+ * content.
+ *
+ * @param acceptEncoding
+ * the value of the {@code "Accept-Encoding"} header.
+ *
+ * @return a new {@link DecoderEmbedder} if the specified encoding is supported.
+ * {@code null} otherwise (alternatively, you can throw an exception
+ * to block unknown encoding).
+ */
+ protected abstract EncoderEmbedder<ChannelBuffer> newContentEncoder(String acceptEncoding) throws Exception;
+
+ /**
+ * Returns the expected content encoding of the encoded content.
+ *
+ * @param contentEncoding the content encoding of the original content
+ * @return the expected content encoding of the new content
+ */
+ protected abstract String getTargetContentEncoding(String acceptEncoding) throws Exception;
+
+ private ChannelBuffer encode(ChannelBuffer buf) {
+ encoder.offer(buf);
+ return ChannelBuffers.wrappedBuffer(encoder.pollAll(new ChannelBuffer[encoder.size()]));
+ }
+
+ private ChannelBuffer finishEncode() {
+ ChannelBuffer result;
+ if (encoder.finish()) {
+ result = ChannelBuffers.wrappedBuffer(encoder.pollAll(new ChannelBuffer[encoder.size()]));
+ } else {
+ result = ChannelBuffers.EMPTY_BUFFER;
+ }
+ encoder = null;
+ return result;
+ }
+}

Property changes on: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1866 - trunk/src/main/java/org/jboss/netty/handler/codec/compression.

2009-11-02T22:46:30Z

Author: trustin
Date: 2009-11-03 01:46:30 -0500 (Tue, 03 Nov 2009)
New Revision: 1866

Modified:
trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java
Log:
Changed constructor parameter order

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java 2009-11-03 02:59:18 UTC (rev 1865)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java 2009-11-03 06:46:30 UTC (rev 1866)
@@ -69,7 +69,7 @@
* @throws CompressionException if failed to initialize zlib
*/
public ZlibEncoder(int compressionLevel) {
- this(compressionLevel, ZlibWrapper.ZLIB);
+ this(ZlibWrapper.ZLIB, compressionLevel);
}

/**
@@ -79,13 +79,12 @@
* @throws CompressionException if failed to initialize zlib
*/
public ZlibEncoder(ZlibWrapper wrapper) {
- this(6, wrapper);
+ this(wrapper, 6);
}

/**
* Creates a new zlib encoder with the specified {@code compressionLevel}
* and the specified wrapper.
- *
* @param compressionLevel
* {@code 1} yields the fastest compression and {@code 9} yields the
* best compression. {@code 0} means no compression. The default
@@ -93,7 +92,7 @@
*
* @throws CompressionException if failed to initialize zlib
*/
- public ZlibEncoder(int compressionLevel, ZlibWrapper wrapper) {
+ public ZlibEncoder(ZlibWrapper wrapper, int compressionLevel) {
if (compressionLevel < 0 || compressionLevel > 9) {
throw new IllegalArgumentException(
"compressionLevel: " + compressionLevel +

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1865 - trunk/src/main/java/org/jboss/netty/handler/codec/http.

2009-11-02T18:59:18Z

Author: trustin
Date: 2009-11-02 21:59:18 -0500 (Mon, 02 Nov 2009)
New Revision: 1865

Modified:
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
Log:
Simplified HttpContentDecoder using the new methods in CodecEmbedder

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java 2009-11-03 02:34:54 UTC (rev 1864)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java 2009-11-03 02:59:18 UTC (rev 1865)
@@ -73,9 +73,11 @@
String contentEncoding = m.getHeader(HttpHeaders.Names.CONTENT_ENCODING);
if (contentEncoding != null) {
contentEncoding = contentEncoding.trim();
+ } else {
+ contentEncoding = HttpHeaders.Values.IDENTITY;
}

- if (contentEncoding != null && (decoder = newDecoder(contentEncoding)) != null) {
+ if ((decoder = newDecoder(contentEncoding)) != null) {
// Decode the content and remove or replace the existing headers
// so that the message looks like a decoded message.
m.setHeader(
@@ -85,22 +87,10 @@
if (!m.isChunked()) {
ChannelBuffer content = m.getContent();
if (content.readable()) {
- content = decode(content);
+ // Decode the content
+ content = ChannelBuffers.wrappedBuffer(
+ decode(content), finishDecode());

- // Finish decoding.
- ChannelBuffer lastProduct = finishDecode();
-
- // Merge the last product into the content.
- if (content == null) {
- if (lastProduct != null) {
- content = lastProduct;
- }
- } else {
- if (lastProduct != null) {
- content = ChannelBuffers.wrappedBuffer(content, lastProduct);
- }
- }
-
// Replace the content if necessary.
if (content != null) {
m.setContent(content);
@@ -126,10 +116,11 @@
if (decoder != null) {
if (!c.isLast()) {
content = decode(content);
- if (content != null) {
+ if (content.readable()) {
// Note that HttpChunk is immutable unlike HttpMessage.
// XXX API inconsistency? I can live with it though.
- Channels.fireMessageReceived(ctx, new DefaultHttpChunk(content), e.getRemoteAddress());
+ Channels.fireMessageReceived(
+ ctx, new DefaultHttpChunk(content), e.getRemoteAddress());
}
} else {
ChannelBuffer lastProduct = finishDecode();
@@ -138,11 +129,9 @@

// Generate an additional chunk if the decoder produced
// the last product on closure,
- if (lastProduct != null) {
+ if (lastProduct.readable()) {
Channels.fireMessageReceived(
- ctx,
- new DefaultHttpChunk(lastProduct),
- e.getRemoteAddress());
+ ctx, new DefaultHttpChunk(lastProduct), e.getRemoteAddress());
}

// Emit the last chunk.
@@ -181,33 +170,14 @@

private ChannelBuffer decode(ChannelBuffer buf) {
decoder.offer(buf);
- return pollDecodeResult();
+ return ChannelBuffers.wrappedBuffer(decoder.pollAll(new ChannelBuffer[decoder.size()]));
}

private ChannelBuffer finishDecode() {
if (decoder.finish()) {
- return pollDecodeResult();
+ return ChannelBuffers.wrappedBuffer(decoder.pollAll(new ChannelBuffer[decoder.size()]));
} else {
- return null;
+ return ChannelBuffers.EMPTY_BUFFER;
}
}
-
- private ChannelBuffer pollDecodeResult() {
- ChannelBuffer result = decoder.poll();
- if (result != null) {
- for (;;) {
- ChannelBuffer moreResult = decoder.poll();
- if (moreResult == null) {
- break;
- }
- result = ChannelBuffers.wrappedBuffer(result, moreResult);
- }
- }
-
- if (result.readable()) {
- return result;
- } else {
- return null;
- }
- }
}

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1864 - trunk/src/main/java/org/jboss/netty/buffer.

2009-11-02T18:34:54Z

Author: trustin
Date: 2009-11-02 21:34:54 -0500 (Mon, 02 Nov 2009)
New Revision: 1864

Modified:
trunk/src/main/java/org/jboss/netty/buffer/ChannelBuffers.java
trunk/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java
Log:
Optimized CompositeChannelBuffer creation

Modified: trunk/src/main/java/org/jboss/netty/buffer/ChannelBuffers.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/buffer/ChannelBuffers.java 2009-11-02 12:03:14 UTC (rev 1863)
+++ trunk/src/main/java/org/jboss/netty/buffer/ChannelBuffers.java 2009-11-03 02:34:54 UTC (rev 1864)
@@ -19,6 +19,8 @@
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.charset.UnsupportedCharsetException;
+import java.util.ArrayList;
+import java.util.List;

/**
@@ -338,16 +340,34 @@
}
break;
default:
- ChannelBuffer[] wrappedBuffers = new ChannelBuffer[arrays.length];
- for (int i = 0; i < arrays.length; i ++) {
- wrappedBuffers[i] = wrappedBuffer(endianness, arrays[i]);
+ // Get the list of the component, while guessing the byte order.
+ final List<ChannelBuffer> components = new ArrayList<ChannelBuffer>(arrays.length);
+ for (byte[] a: arrays) {
+ if (a == null) {
+ break;
+ }
+ if (a.length > 0) {
+ components.add(wrappedBuffer(endianness, a));
+ }
}
- return wrappedBuffer(wrappedBuffers);
+ return compositeBuffer(endianness, components);
}

return EMPTY_BUFFER;
}

+ private static ChannelBuffer compositeBuffer(
+ ByteOrder endianness, List<ChannelBuffer> components) {
+ switch (components.size()) {
+ case 0:
+ return EMPTY_BUFFER;
+ case 1:
+ return components.get(0);
+ default:
+ return new CompositeChannelBuffer(endianness, components);
+ }
+ }
+
/**
* Creates a new composite buffer which wraps the readable bytes of the
* specified buffers without copying them. A modification on the content
@@ -367,11 +387,33 @@
}
break;
default:
- for (ChannelBuffer b: buffers) {
- if (b.readable()) {
- return new CompositeChannelBuffer(buffers);
+ ByteOrder order = null;
+ final List<ChannelBuffer> components = new ArrayList<ChannelBuffer>(buffers.length);
+ for (ChannelBuffer c: buffers) {
+ if (c == null) {
+ break;
}
+ if (c.readable()) {
+ if (order != null) {
+ if (!order.equals(c.order())) {
+ throw new IllegalArgumentException(
+ "inconsistent byte order");
+ }
+ } else {
+ order = c.order();
+ }
+ if (c instanceof CompositeChannelBuffer) {
+ // Expand nested composition.
+ components.addAll(
+ ((CompositeChannelBuffer) c).decompose(
+ c.readerIndex(), c.readableBytes()));
+ } else {
+ // An ordinary buffer (non-composite)
+ components.add(c.slice());
+ }
+ }
}
+ return compositeBuffer(order, components);
}
return EMPTY_BUFFER;
}
@@ -395,11 +437,25 @@
}
break;
default:
- ChannelBuffer[] wrappedBuffers = new ChannelBuffer[buffers.length];
- for (int i = 0; i < buffers.length; i ++) {
- wrappedBuffers[i] = wrappedBuffer(buffers[i]);
+ ByteOrder order = null;
+ final List<ChannelBuffer> components = new ArrayList<ChannelBuffer>(buffers.length);
+ for (ByteBuffer b: buffers) {
+ if (b == null) {
+ break;
+ }
+ if (b.hasRemaining()) {
+ if (order != null) {
+ if (!order.equals(b.order())) {
+ throw new IllegalArgumentException(
+ "inconsistent byte order");
+ }
+ } else {
+ order = b.order();
+ }
+ components.add(wrappedBuffer(b));
+ }
}
- return wrappedBuffer(wrappedBuffers);
+ return compositeBuffer(order, components);
}

return EMPTY_BUFFER;

Modified: trunk/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java 2009-11-02 12:03:14 UTC (rev 1863)
+++ trunk/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java 2009-11-03 02:34:54 UTC (rev 1864)
@@ -48,44 +48,15 @@
private int[] indices;
private int lastAccessedComponentId;

- public CompositeChannelBuffer(ChannelBuffer... buffers) {
- if (buffers.length == 0) {
- throw new IllegalArgumentException("buffers should not be empty.");
- }
-
- // Get the list of the component, while guessing the byte order.
- ByteOrder expectedEndianness = null;
- final List<ChannelBuffer> newComponents = new ArrayList<ChannelBuffer>(buffers.length);
- for (ChannelBuffer c: buffers) {
- if (c.readableBytes() > 0) {
- expectedEndianness = c.order();
- if (c instanceof CompositeChannelBuffer) {
- // Expand nested composition.
- newComponents.addAll(
- ((CompositeChannelBuffer) c).slice0(
- c.readerIndex(), c.readableBytes()));
- } else {
- // An ordinary buffer (non-composite)
- newComponents.add(c.slice());
- }
- } else if (c.capacity() != 0) {
- expectedEndianness = c.order();
- }
- }
-
- if (expectedEndianness == null) {
- throw new IllegalArgumentException(
- "buffers have only empty buffers.");
- }
-
- order = expectedEndianness;
- setComponents(newComponents);
+ public CompositeChannelBuffer(ByteOrder endianness, List<ChannelBuffer> buffers) {
+ order = endianness;
+ setComponents(buffers);
}

/**
* Same with {@link #slice(int, int)} except that this method returns a list.
*/
- private List<ChannelBuffer> slice0(int index, int length) {
+ public List<ChannelBuffer> decompose(int index, int length) {
if (length == 0) {
return Collections.emptyList();
}
@@ -556,9 +527,15 @@
return ChannelBuffers.EMPTY_BUFFER;
}

- List<ChannelBuffer> listBuffer = slice0(index, length);
- ChannelBuffer[] buffers = listBuffer.toArray(new ChannelBuffer[listBuffer.size()]);
- return new CompositeChannelBuffer(buffers);
+ List<ChannelBuffer> components = decompose(index, length);
+ switch (components.size()) {
+ case 0:
+ return ChannelBuffers.EMPTY_BUFFER;
+ case 1:
+ return components.get(0);
+ default:
+ return new CompositeChannelBuffer(order(), components);
+ }
}

public ByteBuffer toByteBuffer(int index, int length) {
@@ -667,7 +644,7 @@
int localWriterIndex = this.writerIndex();

final int bytesToMove = capacity() - localReaderIndex;
- List<ChannelBuffer> list = slice0(localReaderIndex, bytesToMove);
+ List<ChannelBuffer> list = decompose(localReaderIndex, bytesToMove);

// Add a new buffer so that the capacity of this composite buffer does
// not decrease due to the discarded components.

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1863 - trunk/src/main/java/org/jboss/netty/handler/codec/embedder.

2009-11-02T04:03:15Z

Author: trustin
Date: 2009-11-02 07:03:14 -0500 (Mon, 02 Nov 2009)
New Revision: 1863

Modified:
trunk/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java
Log:
Better pollAll implementation

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java 2009-11-02 12:01:19 UTC (rev 1862)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java 2009-11-02 12:03:14 UTC (rev 1863)
@@ -18,6 +18,7 @@
import static org.jboss.netty.channel.Channels.*;

import java.lang.reflect.Array;
+import java.util.ConcurrentModificationException;
import java.util.LinkedList;
import java.util.Queue;

@@ -135,7 +136,16 @@
}

public final Object[] pollAll() {
- return pollAll(new Object[size()]);
+ final int size = size();
+ Object[] a = new Object[size];
+ for (int i = 0; i < size; i ++) {
+ E product = poll();
+ if (product == null) {
+ throw new ConcurrentModificationException();
+ }
+ a[i] = product;
+ }
+ return a;
}

@SuppressWarnings("unchecked")

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1862 - trunk/src/main/java/org/jboss/netty/handler/codec/embedder.

2009-11-02T04:01:19Z

Author: trustin
Date: 2009-11-02 07:01:19 -0500 (Mon, 02 Nov 2009)
New Revision: 1862

Modified:
trunk/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java
trunk/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedder.java
trunk/src/main/java/org/jboss/netty/handler/codec/embedder/DecoderEmbedder.java
trunk/src/main/java/org/jboss/netty/handler/codec/embedder/EncoderEmbedder.java
Log:
Resolved issue: NETTY-245 More convenience methods in CodecEmbedder
* Added CodecEmbedder.size()
* Added CodecEmbedder.pollAll()

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java 2009-11-02 09:58:30 UTC (rev 1861)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java 2009-11-02 12:01:19 UTC (rev 1862)
@@ -17,6 +17,7 @@

import static org.jboss.netty.channel.Channels.*;

+import java.lang.reflect.Array;
import java.util.LinkedList;
import java.util.Queue;

@@ -41,7 +42,7 @@
* @author Trustin Lee ([hidden email])
* @version $Rev$, $Date$
*/
-abstract class AbstractCodecEmbedder<T> implements CodecEmbedder<T> {
+abstract class AbstractCodecEmbedder<E> implements CodecEmbedder<E> {

private final Channel channel;
private final ChannelPipeline pipeline;
@@ -124,15 +125,52 @@
}

@SuppressWarnings("unchecked")
- public final T poll() {
- return (T) productQueue.poll();
+ public final E poll() {
+ return (E) productQueue.poll();
}

@SuppressWarnings("unchecked")
- public final T peek() {
- return (T) productQueue.peek();
+ public final E peek() {
+ return (E) productQueue.peek();
}

+ public final Object[] pollAll() {
+ return pollAll(new Object[size()]);
+ }
+
+ @SuppressWarnings("unchecked")
+ public final <T> T[] pollAll(T[] a) {
+ if (a == null) {
+ throw new NullPointerException("a");
+ }
+
+ final int size = size();
+
+ // Create a new array if the specified one is too small.
+ if (a.length < size) {
+ a = (T[]) Array.newInstance(a.getClass().getComponentType(), size);
+ }
+
+ for (int i = 0;; i ++) {
+ T product = (T) poll();
+ if (product == null) {
+ break;
+ }
+ a[i] = product;
+ }
+
+ // Put the terminator if necessary.
+ if (a.length > size) {
+ a[size] = null;
+ }
+
+ return a;
+ }
+
+ public final int size() {
+ return productQueue.size();
+ }
+
@ChannelPipelineCoverage("all")
private final class EmbeddedChannelSink implements ChannelSink, ChannelUpstreamHandler {
EmbeddedChannelSink() {

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedder.java 2009-11-02 09:58:30 UTC (rev 1861)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedder.java 2009-11-02 12:01:19 UTC (rev 1862)
@@ -15,6 +15,8 @@
*/
package org.jboss.netty.handler.codec.embedder;

+import java.util.Collection;
+
/**
* A helper that wraps an encoder or a decoder (codec) so that they can be used
* without doing actual I/O in unit tests or higher level codecs. Please refer
@@ -24,7 +26,7 @@
* @author Trustin Lee ([hidden email])
* @version $Rev$, $Date$
*/
-public interface CodecEmbedder<T> {
+public interface CodecEmbedder<E> {
/**
* Offers an input object to the pipeline of this embedder.
*
@@ -50,7 +52,7 @@
* {@code null} if and only if there is no output object left in the
* product queue.
*/
- T poll();
+ E poll();

/**
* Reads an encoded or decoded output from the head of the product queue.
@@ -61,5 +63,34 @@
* {@code null} if and only if there is no output object left in the
* product queue.
*/
- T peek();
+ E peek();
+
+ /**
+ * Consumes all encoded or decoded output from the product queue. The
+ * output object is generated by the offered input objects. The behavior
+ * of this method is identical with {@link Collection#toArray()} except that
+ * the product queue is cleared.
+ *
+ * @return an array of all encoded or decoded objects.
+ * An empty array is returned if and only if there is no output
+ * object left in the product queue.
+ */
+ Object[] pollAll();
+
+ /**
+ * Consumes all encoded or decoded output from the product queue. The
+ * output object is generated by the offered input objects. The behavior
+ * of this method is identical with {@link Collection#toArray(Object[])}
+ * except that the product queue is cleared.
+ *
+ * @return an array of all encoded or decoded objects.
+ * An empty array is returned if and only if there is no output
+ * object left in the product queue.
+ */
+ <T> T[] pollAll(T[] a);
+
+ /**
+ * Returns the number of encoded or decoded output in the product queue.
+ */
+ int size();
}

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/embedder/DecoderEmbedder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/embedder/DecoderEmbedder.java 2009-11-02 09:58:30 UTC (rev 1861)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/embedder/DecoderEmbedder.java 2009-11-02 12:01:19 UTC (rev 1862)
@@ -49,7 +49,7 @@
* @apiviz.landmark
* @see EncoderEmbedder
*/
-public class DecoderEmbedder<T> extends AbstractCodecEmbedder<T> {
+public class DecoderEmbedder<E> extends AbstractCodecEmbedder<E> {

/**
* Creates a new embedder whose pipeline is composed of the specified

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/embedder/EncoderEmbedder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/embedder/EncoderEmbedder.java 2009-11-02 09:58:30 UTC (rev 1861)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/embedder/EncoderEmbedder.java 2009-11-02 12:01:19 UTC (rev 1862)
@@ -49,7 +49,7 @@
* @apiviz.landmark
* @see DecoderEmbedder
*/
-public class EncoderEmbedder<T> extends AbstractCodecEmbedder<T> {
+public class EncoderEmbedder<E> extends AbstractCodecEmbedder<E> {

/**
* Creates a new embedder whose pipeline is composed of the specified

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1861 - trunk/src/main/java/org/jboss/netty/handler/codec/http.

2009-11-02T01:58:30Z

Author: trustin
Date: 2009-11-02 04:58:30 -0500 (Mon, 02 Nov 2009)
New Revision: 1861

Modified:
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
Log:
Added HttpContentDecoder.getTargetEncoding

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java 2009-11-02 09:35:33 UTC (rev 1860)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java 2009-11-02 09:58:30 UTC (rev 1861)
@@ -78,7 +78,9 @@
if (contentEncoding != null && (decoder = newDecoder(contentEncoding)) != null) {
// Decode the content and remove or replace the existing headers
// so that the message looks like a decoded message.
- m.setHeader(HttpHeaders.Names.CONTENT_ENCODING, HttpHeaders.Values.IDENTITY);
+ m.setHeader(
+ HttpHeaders.Names.CONTENT_ENCODING,
+ getTargetEncoding(contentEncoding));

if (!m.isChunked()) {
ChannelBuffer content = m.getContent();
@@ -165,6 +167,18 @@
*/
protected abstract DecoderEmbedder<ChannelBuffer> newDecoder(String contentEncoding) throws Exception;

+ /**
+ * Returns the expected content encoding of the decoded content.
+ * This method returns {@code "identity"} by default, which is the case for
+ * most decoders.
+ *
+ * @param contentEncoding the content encoding of the original content
+ * @return the expected content encoding of the new content
+ */
+ protected String getTargetEncoding(String contentEncoding) throws Exception {
+ return HttpHeaders.Values.IDENTITY;
+ }
+
private ChannelBuffer decode(ChannelBuffer buf) {
decoder.offer(buf);
return pollDecodeResult();

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1860 - trunk/src/main/java/org/jboss/netty/handler/codec/http.

2009-11-02T01:35:33Z

Author: trustin
Date: 2009-11-02 04:35:33 -0500 (Mon, 02 Nov 2009)
New Revision: 1860

Modified:
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java
Log:
Renamed beginDecode() to newDecoder()

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java 2009-11-02 09:21:41 UTC (rev 1859)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java 2009-11-02 09:35:33 UTC (rev 1860)
@@ -28,15 +28,15 @@
* Decodes the content of the received {@link HttpMessage} and {@link HttpChunk}.
* The original content ({@link HttpMessage#getContent()} or {@link HttpChunk#getContent()})
* is replaced with the new content decoded by the {@link DecoderEmbedder},
- * which is created by {@link #beginDecode(String)}. Once decoding is finished,
+ * which is created by {@link #newDecoder(String)}. Once decoding is finished,
* the value of the <tt>'Content-Encoding'</tt> header is set to <tt>'identity'</tt>
* and the <tt>'Content-Length'</tt> header is updated to the length of the
* decoded content. If the content encoding of the original is not supported
- * by the decoder, {@link #beginDecode(String)} returns {@code null} and no
+ * by the decoder, {@link #newDecoder(String)} returns {@code null} and no
* decoding occurs (i.e. pass-through).
* <p>
* Please note that this is an abstract class. You have to extend this class
- * and implement {@link #beginDecode(String)} properly to make this class
+ * and implement {@link #newDecoder(String)} properly to make this class
* functional. For example, refer to the source code of {@link HttpContentDecompressor}.
*
* @author The Netty Project ([hidden email])
@@ -75,7 +75,7 @@
contentEncoding = contentEncoding.trim();
}

- if (contentEncoding != null && (decoder = beginDecode(contentEncoding)) != null) {
+ if (contentEncoding != null && (decoder = newDecoder(contentEncoding)) != null) {
// Decode the content and remove or replace the existing headers
// so that the message looks like a decoded message.
m.setHeader(HttpHeaders.Names.CONTENT_ENCODING, HttpHeaders.Values.IDENTITY);
@@ -163,7 +163,7 @@
* {@code null} otherwise (alternatively, you can throw an exception
* to block unknown encoding).
*/
- protected abstract DecoderEmbedder<ChannelBuffer> beginDecode(String contentEncoding) throws Exception;
+ protected abstract DecoderEmbedder<ChannelBuffer> newDecoder(String contentEncoding) throws Exception;

private ChannelBuffer decode(ChannelBuffer buf) {
decoder.offer(buf);

Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java 2009-11-02 09:21:41 UTC (rev 1859)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java 2009-11-02 09:35:33 UTC (rev 1860)
@@ -43,7 +43,7 @@
@ChannelPipelineCoverage("one")
public class HttpContentDecompressor extends HttpContentDecoder {
@Override
- protected DecoderEmbedder<ChannelBuffer> beginDecode(String contentEncoding) throws Exception {
+ protected DecoderEmbedder<ChannelBuffer> newDecoder(String contentEncoding) throws Exception {
if ("gzip".equalsIgnoreCase(contentEncoding) || "x-gzip".equalsIgnoreCase(contentEncoding)) {
return new DecoderEmbedder<ChannelBuffer>(new ZlibDecoder(ZlibWrapper.GZIP));
} else if ("deflate".equalsIgnoreCase(contentEncoding) || "x-deflate".equalsIgnoreCase(contentEncoding)) {

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1859 - trunk/src/main/java/org/jboss/netty/channel/socket/nio.

2009-11-02T01:21:41Z

Author: trustin
Date: 2009-11-02 04:21:41 -0500 (Mon, 02 Nov 2009)
New Revision: 1859

Modified:
trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java
trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
Log:
* Slight code clean up
* Raised the default cancelled key clean up interval from 128 to 256

Modified: trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java 2009-11-02 09:21:13 UTC (rev 1858)
+++ trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java 2009-11-02 09:21:41 UTC (rev 1859)
@@ -361,7 +361,7 @@
}

private boolean cleanUpCancelledKeys() throws IOException {
- if (cancelledKeys >= 128) { // FIXME hardcoded value
+ if (cancelledKeys >= NioWorker.CLEANUP_INTERVAL) {
cancelledKeys = 0;
selector.selectNow();
return true;

Modified: trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java 2009-11-02 09:21:13 UTC (rev 1858)
+++ trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java 2009-11-02 09:21:41 UTC (rev 1859)
@@ -65,6 +65,8 @@

private static final int CONSTRAINT_LEVEL = NioProviderMetadata.CONSTRAINT_LEVEL;

+ static final int CLEANUP_INTERVAL = 256; // XXX Hard-coded value, but won't need customization.
+
private final int bossId;
private final int id;
private final Executor executor;
@@ -292,7 +294,7 @@
}

private boolean cleanUpCancelledKeys() throws IOException {
- if (cancelledKeys >= 128) { // FIXME hardcoded value
+ if (cancelledKeys >= CLEANUP_INTERVAL) {
cancelledKeys = 0;
selector.selectNow();
return true;

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1858 - in trunk/src/main/java/org/jboss/netty: handler/codec/http and 1 other directory.

2009-11-02T01:21:13Z

Author: trustin
Date: 2009-11-02 04:21:13 -0500 (Mon, 02 Nov 2009)
New Revision: 1858

Added:
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java
Removed:
trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpDecompressionHandler.java
Modified:
trunk/src/main/java/org/jboss/netty/example/http/snoop/HttpClientPipelineFactory.java
Log:
Split HttpDecompressionHandler into HttpContentDecoder and HttpContentDecompressor

Modified: trunk/src/main/java/org/jboss/netty/example/http/snoop/HttpClientPipelineFactory.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/example/http/snoop/HttpClientPipelineFactory.java 2009-11-02 06:38:53 UTC (rev 1857)
+++ trunk/src/main/java/org/jboss/netty/example/http/snoop/HttpClientPipelineFactory.java 2009-11-02 09:21:13 UTC (rev 1858)
@@ -19,7 +19,7 @@

import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.handler.codec.http.HttpDecompressionHandler;
+import org.jboss.netty.handler.codec.http.HttpContentDecompressor;
import org.jboss.netty.handler.codec.http.HttpRequestEncoder;
import org.jboss.netty.handler.codec.http.HttpResponseDecoder;

@@ -36,7 +36,7 @@
ChannelPipeline pipeline = pipeline();
pipeline.addLast("decoder", new HttpResponseDecoder());
// Remove the following line if you don't want automatic content decompression.
- pipeline.addLast("inflater", new HttpDecompressionHandler());
+ pipeline.addLast("inflater", new HttpContentDecompressor());
// Uncomment the following line if you don't want to handle HttpChunks.
//pipeline.addLast("aggregator", new HttpChunkAggregator(1048576));
pipeline.addLast("encoder", new HttpRequestEncoder());

Copied: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java (from rev 1854, trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpDecompressionHandler.java)
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java (rev 0)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java 2009-11-02 09:21:13 UTC (rev 1858)
@@ -0,0 +1,199 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat 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.http;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.jboss.netty.handler.codec.embedder.DecoderEmbedder;
+
+/**
+ * Decodes the content of the received {@link HttpMessage} and {@link HttpChunk}.
+ * The original content ({@link HttpMessage#getContent()} or {@link HttpChunk#getContent()})
+ * is replaced with the new content decoded by the {@link DecoderEmbedder},
+ * which is created by {@link #beginDecode(String)}. Once decoding is finished,
+ * the value of the <tt>'Content-Encoding'</tt> header is set to <tt>'identity'</tt>
+ * and the <tt>'Content-Length'</tt> header is updated to the length of the
+ * decoded content. If the content encoding of the original is not supported
+ * by the decoder, {@link #beginDecode(String)} returns {@code null} and no
+ * decoding occurs (i.e. pass-through).
+ * <p>
+ * Please note that this is an abstract class. You have to extend this class
+ * and implement {@link #beginDecode(String)} properly to make this class
+ * functional. For example, refer to the source code of {@link HttpContentDecompressor}.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Trustin Lee ([hidden email])
+ * @version $Rev$, $Date$
+ */
+@ChannelPipelineCoverage("one")
+public abstract class HttpContentDecoder extends SimpleChannelUpstreamHandler {
+
+ private volatile HttpMessage previous;
+ private volatile DecoderEmbedder<ChannelBuffer> decoder;
+
+ /**
+ * Creates a new instance.
+ */
+ protected HttpContentDecoder() {
+ super();
+ }
+
+ @Override
+ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
+ Object msg = e.getMessage();
+ if (msg instanceof HttpMessage) {
+ HttpMessage m = (HttpMessage) msg;
+
+ decoder = null;
+ if (m.isChunked()) {
+ previous = m;
+ } else {
+ previous = null;
+ }
+
+ // Determine the content encoding.
+ String contentEncoding = m.getHeader(HttpHeaders.Names.CONTENT_ENCODING);
+ if (contentEncoding != null) {
+ contentEncoding = contentEncoding.trim();
+ }
+
+ if (contentEncoding != null && (decoder = beginDecode(contentEncoding)) != null) {
+ // Decode the content and remove or replace the existing headers
+ // so that the message looks like a decoded message.
+ m.setHeader(HttpHeaders.Names.CONTENT_ENCODING, HttpHeaders.Values.IDENTITY);
+
+ if (!m.isChunked()) {
+ ChannelBuffer content = m.getContent();
+ if (content.readable()) {
+ content = decode(content);
+
+ // Finish decoding.
+ ChannelBuffer lastProduct = finishDecode();
+
+ // Merge the last product into the content.
+ if (content == null) {
+ if (lastProduct != null) {
+ content = lastProduct;
+ }
+ } else {
+ if (lastProduct != null) {
+ content = ChannelBuffers.wrappedBuffer(content, lastProduct);
+ }
+ }
+
+ // Replace the content if necessary.
+ if (content != null) {
+ m.setContent(content);
+ if (m.containsHeader(HttpHeaders.Names.CONTENT_LENGTH)) {
+ m.setHeader(
+ HttpHeaders.Names.CONTENT_LENGTH,
+ Integer.toString(content.readableBytes()));
+ }
+ }
+ }
+ }
+ }
+
+ // Because HttpMessage is a mutable object, we can simply forward the received event.
+ ctx.sendUpstream(e);
+ } else if (msg instanceof HttpChunk) {
+ assert previous != null;
+
+ HttpChunk c = (HttpChunk) msg;
+ ChannelBuffer content = c.getContent();
+
+ // Decode the chunk if necessary.
+ if (decoder != null) {
+ if (!c.isLast()) {
+ content = decode(content);
+ if (content != null) {
+ // Note that HttpChunk is immutable unlike HttpMessage.
+ // XXX API inconsistency? I can live with it though.
+ Channels.fireMessageReceived(ctx, new DefaultHttpChunk(content), e.getRemoteAddress());
+ }
+ } else {
+ ChannelBuffer lastProduct = finishDecode();
+ previous = null;
+ decoder = null;
+
+ // Generate an additional chunk if the decoder produced
+ // the last product on closure,
+ if (lastProduct != null) {
+ Channels.fireMessageReceived(
+ ctx,
+ new DefaultHttpChunk(lastProduct),
+ e.getRemoteAddress());
+ }
+
+ // Emit the last chunk.
+ ctx.sendUpstream(e);
+ }
+ } else {
+ ctx.sendUpstream(e);
+ }
+ } else {
+ ctx.sendUpstream(e);
+ }
+ }
+
+ /**
+ * Returns a new {@link DecoderEmbedder} that decodes the HTTP message
+ * content encoded in the specified <tt>contentEncoding</tt>.
+ *
+ * @param contentEncoding the value of the {@code "Content-Encoding"} header
+ * @return a new {@link DecoderEmbedder} if the specified encoding is supported.
+ * {@code null} otherwise (alternatively, you can throw an exception
+ * to block unknown encoding).
+ */
+ protected abstract DecoderEmbedder<ChannelBuffer> beginDecode(String contentEncoding) throws Exception;
+
+ private ChannelBuffer decode(ChannelBuffer buf) {
+ decoder.offer(buf);
+ return pollDecodeResult();
+ }
+
+ private ChannelBuffer finishDecode() {
+ if (decoder.finish()) {
+ return pollDecodeResult();
+ } else {
+ return null;
+ }
+ }
+
+ private ChannelBuffer pollDecodeResult() {
+ ChannelBuffer result = decoder.poll();
+ if (result != null) {
+ for (;;) {
+ ChannelBuffer moreResult = decoder.poll();
+ if (moreResult == null) {
+ break;
+ }
+ result = ChannelBuffers.wrappedBuffer(result, moreResult);
+ }
+ }
+
+ if (result.readable()) {
+ return result;
+ } else {
+ return null;
+ }
+ }
+}

Added: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java (rev 0)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java 2009-11-02 09:21:13 UTC (rev 1858)
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat 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.http;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.handler.codec.compression.ZlibDecoder;
+import org.jboss.netty.handler.codec.compression.ZlibWrapper;
+import org.jboss.netty.handler.codec.embedder.DecoderEmbedder;
+
+/**
+ * Decompresses an {@link HttpMessage} and an {@link HttpChunk} compressed in
+ * {@code gzip} or {@code deflate} encoding. Insert this handler after
+ * {@link HttpMessageDecoder} in the {@link ChannelPipeline}:
+ * <pre>
+ * ChannelPipeline p = ...;
+ * ...
+ * p.addLast("decoder", new HttpRequestDecoder());
+ * p.addLast("inflater", <b>new HttpContentDecomperssor()</b>);
+ * ...
+ * p.addLast("encoder", new HttpResponseEncoder());
+ * p.addLast("handler", new HttpRequestHandler());
+ * </pre>
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Trustin Lee ([hidden email])
+ * @version $Rev$, $Date$
+ */
+@ChannelPipelineCoverage("one")
+public class HttpContentDecompressor extends HttpContentDecoder {
+ @Override
+ protected DecoderEmbedder<ChannelBuffer> beginDecode(String contentEncoding) throws Exception {
+ if ("gzip".equalsIgnoreCase(contentEncoding) || "x-gzip".equalsIgnoreCase(contentEncoding)) {
+ return new DecoderEmbedder<ChannelBuffer>(new ZlibDecoder(ZlibWrapper.GZIP));
+ } else if ("deflate".equalsIgnoreCase(contentEncoding) || "x-deflate".equalsIgnoreCase(contentEncoding)) {
+ return new DecoderEmbedder<ChannelBuffer>(new ZlibDecoder(ZlibWrapper.ZLIB));
+ }
+
+ // 'identity' or unsupported
+ return null;
+ }
+}

Property changes on: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Deleted: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpDecompressionHandler.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpDecompressionHandler.java 2009-11-02 06:38:53 UTC (rev 1857)
+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpDecompressionHandler.java 2009-11-02 09:21:13 UTC (rev 1858)
@@ -1,154 +0,0 @@
-/*
- * Copyright 2009 Red Hat, Inc.
- *
- * Red Hat 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.http;
-
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.compression.ZlibDecoder;
-import org.jboss.netty.handler.codec.compression.ZlibWrapper;
-import org.jboss.netty.handler.codec.embedder.DecoderEmbedder;
-
-/**
- * Decompresses an {@link HttpMessage} and an {@link HttpChunk} compressed in
- * {@code gzip}, {@code deflate}, and {@code compress} encoding. During the
- * decompression, the {@code "Content-Encoding"} header is removed and the
- * value of the {@code "Content-Length"} header is updated with the length
- * of the decompressed content. If the received message is not compressed,
- * no modification is made. To use this handler, place it after
- * {@link HttpMessageDecoder} in the pipeline.
- *
- * @author The Netty Project ([hidden email])
- * @author Trustin Lee ([hidden email])
- * @version $Rev$, $Date$
- */
-@ChannelPipelineCoverage("one")
-public class HttpDecompressionHandler extends SimpleChannelUpstreamHandler {
-
- private volatile HttpMessage previous;
- private volatile int previousEncoding; // 0 - no compression, 1 - gzip, 2 - deflate, 3 - lzw
- private volatile DecoderEmbedder<ChannelBuffer> inflater;
-
- @Override
- public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
- Object msg = e.getMessage();
- if (msg instanceof HttpMessage) {
- HttpMessage m = (HttpMessage) msg;
-
- // Determine the content encoding.
- String contentEncoding = m.getHeader(HttpHeaders.Names.CONTENT_ENCODING);
- if (contentEncoding != null) {
- contentEncoding = contentEncoding.trim();
- }
-
- int encoding;
- if ("gzip".equalsIgnoreCase(contentEncoding) || "x-gzip".equalsIgnoreCase(contentEncoding)) {
- encoding = 1;
- } else if ("deflate".equalsIgnoreCase(contentEncoding) || "x-deflate".equalsIgnoreCase(contentEncoding)) {
- encoding = 2;
- } else {
- // FIXME Implement 'compress' encoding (lzw)
- encoding = 0;
- }
-
- if (m.isChunked()) {
- previous = m;
- previousEncoding = encoding;
- } else {
- previous = null;
- previousEncoding = 0;
- }
-
- // Decompress the content and remove or replace the existing headers
- // so that the message looks like an uncompressed message.
- if (encoding != 0) {
- if (contentEncoding != null) {
- m.setHeader(HttpHeaders.Names.CONTENT_ENCODING, HttpHeaders.Values.IDENTITY);
- }
- ChannelBuffer content = m.getContent();
- if (content.readable()) {
- beginDecompression(encoding);
- content = decompress(content);
- m.setContent(content);
- if (m.containsHeader(HttpHeaders.Names.CONTENT_LENGTH)) {
- m.setHeader(
- HttpHeaders.Names.CONTENT_LENGTH,
- Integer.toString(content.readableBytes()));
- }
- }
- }
-
- // Because HttpMessage is a mutable object, we can simply forward the received event.
- ctx.sendUpstream(e);
- } else if (msg instanceof HttpChunk) {
- assert previous != null;
-
- HttpChunk c = (HttpChunk) msg;
- ChannelBuffer content = c.getContent();
-
- // Decompress the chunk if necessary.
- if (previousEncoding != 0) {
- if (!c.isLast()) {
- content = decompress(content);
- // HttpChunk is immutable unlike HttpMessage.
- // XXX API inconsistency? I can live with it though.
- Channels.fireMessageReceived(ctx, new DefaultHttpChunk(content), e.getRemoteAddress());
- } else {
- finishDecompression();
- previous = null;
- previousEncoding = 0;
- ctx.sendUpstream(e);
- }
- } else {
- // No need to
- ctx.sendUpstream(e);
- }
- } else {
- ctx.sendUpstream(e);
- }
- }
-
- private void beginDecompression(int encoding) {
- switch (encoding) {
- case 1:
- inflater = new DecoderEmbedder<ChannelBuffer>(new ZlibDecoder(ZlibWrapper.GZIP));
- break;
- case 2:
- inflater = new DecoderEmbedder<ChannelBuffer>(new ZlibDecoder(ZlibWrapper.ZLIB));
- break;
- default:
- throw new Error();
- }
- }
-
- private ChannelBuffer decompress(ChannelBuffer buf) {
- inflater.offer(buf);
- // FIXME Some inflater might produce either an empty buffer or many buffers.
- // Empty buffer should not generate an event and many buffers should generate many events.
- return inflater.poll();
- }
-
- private void finishDecompression() {
- if (inflater.finish()) {
- throw new IllegalStateException("trailing data produced by inflater");
- }
- // TODO Make sure ZlibDecoder.isClosed() is true.
- // The compressed stream ended prematurely if false.
- }
-}

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1857 - trunk/src/main/java/org/jboss/netty/example/qotm.

2009-11-01T22:38:53Z

Author: trustin
Date: 2009-11-02 01:38:53 -0500 (Mon, 02 Nov 2009)
New Revision: 1857

Modified:
trunk/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClient.java
trunk/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServer.java
Log:
Updated the QOTM example so that people do not ask questions about truncated packets

Modified: trunk/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClient.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClient.java 2009-11-02 06:34:16 UTC (rev 1856)
+++ trunk/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClient.java 2009-11-02 06:38:53 UTC (rev 1857)
@@ -55,6 +55,8 @@
b.setOption("broadcast", "true");

// Allow packets as large as up to 1024 bytes (default is 768).
+ // You could increase or decrease this value to avoid truncated packets
+ // or to improve memory footprint respectively.
b.setOption(
"receiveBufferSizePredictorFactory",
new FixedReceiveBufferSizePredictorFactory(1024));

Modified: trunk/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServer.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServer.java 2009-11-02 06:34:16 UTC (rev 1856)
+++ trunk/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServer.java 2009-11-02 06:38:53 UTC (rev 1857)
@@ -54,6 +54,8 @@
b.setOption("broadcast", "false");

// Allow packets as large as up to 1024 bytes (default is 768).
+ // You could increase or decrease this value to avoid truncated packets
+ // or to improve memory footprint respectively.
b.setOption(
"receiveBufferSizePredictorFactory",
new FixedReceiveBufferSizePredictorFactory(1024));

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1856 - trunk/src/main/java/org/jboss/netty/example/qotm.

2009-11-01T22:34:16Z

Author: trustin
Date: 2009-11-02 01:34:16 -0500 (Mon, 02 Nov 2009)
New Revision: 1856

Modified:
trunk/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClient.java
trunk/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServer.java
Log:
Updated the QOTM example so that people do not ask questions about truncated packets

Modified: trunk/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClient.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClient.java 2009-11-02 06:30:10 UTC (rev 1855)
+++ trunk/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClient.java 2009-11-02 06:34:16 UTC (rev 1856)
@@ -20,6 +20,7 @@

import org.jboss.netty.bootstrap.ConnectionlessBootstrap;
import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.FixedReceiveBufferSizePredictorFactory;
import org.jboss.netty.channel.socket.DatagramChannel;
import org.jboss.netty.channel.socket.DatagramChannelFactory;
import org.jboss.netty.channel.socket.oio.OioDatagramChannelFactory;
@@ -43,12 +44,21 @@
new OioDatagramChannelFactory(Executors.newCachedThreadPool());

ConnectionlessBootstrap b = new ConnectionlessBootstrap(f);
+
+ // Configure the pipeline.
ChannelPipeline p = b.getPipeline();
p.addLast("encoder", new StringEncoder("UTF-8"));
p.addLast("decoder", new StringDecoder("UTF-8"));
p.addLast("handler", new QuoteOfTheMomentClientHandler());

+ // Enable broadcast
b.setOption("broadcast", "true");
+
+ // Allow packets as large as up to 1024 bytes (default is 768).
+ b.setOption(
+ "receiveBufferSizePredictorFactory",
+ new FixedReceiveBufferSizePredictorFactory(1024));
+
DatagramChannel c = (DatagramChannel) b.bind(new InetSocketAddress(0));

// Broadcast the QOTM request to port 8080.

Modified: trunk/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServer.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServer.java 2009-11-02 06:30:10 UTC (rev 1855)
+++ trunk/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServer.java 2009-11-02 06:34:16 UTC (rev 1856)
@@ -20,6 +20,7 @@

import org.jboss.netty.bootstrap.ConnectionlessBootstrap;
import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.FixedReceiveBufferSizePredictorFactory;
import org.jboss.netty.channel.socket.DatagramChannelFactory;
import org.jboss.netty.channel.socket.oio.OioDatagramChannelFactory;
import org.jboss.netty.handler.codec.string.StringDecoder;
@@ -42,12 +43,22 @@
new OioDatagramChannelFactory(Executors.newCachedThreadPool());

ConnectionlessBootstrap b = new ConnectionlessBootstrap(f);
+
+ // Configure the pipeline.
ChannelPipeline p = b.getPipeline();
p.addLast("encoder", new StringEncoder("UTF-8"));
p.addLast("decoder", new StringDecoder("UTF-8"));
p.addLast("handler", new QuoteOfTheMomentServerHandler());

+ // Enable broadcast
b.setOption("broadcast", "false");
+
+ // Allow packets as large as up to 1024 bytes (default is 768).
+ b.setOption(
+ "receiveBufferSizePredictorFactory",
+ new FixedReceiveBufferSizePredictorFactory(1024));
+
+ // Bind to the port and start the service.
b.bind(new InetSocketAddress(8080));
}
}

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1855 - in trunk/src/main/java/org/jboss/netty/channel: socket and 2 other directories.

2009-11-01T22:30:10Z

Author: trustin
Date: 2009-11-02 01:30:10 -0500 (Mon, 02 Nov 2009)
New Revision: 1855

Added:
trunk/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictorFactory.java
trunk/src/main/java/org/jboss/netty/channel/FixedReceiveBufferSizePredictorFactory.java
trunk/src/main/java/org/jboss/netty/channel/ReceiveBufferSizePredictorFactory.java
Modified:
trunk/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictor.java
trunk/src/main/java/org/jboss/netty/channel/socket/DatagramChannelConfig.java
trunk/src/main/java/org/jboss/netty/channel/socket/DefaultDatagramChannelConfig.java
trunk/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java
trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelConfig.java
trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java
trunk/src/main/java/org/jboss/netty/channel/xnio/DefaultXnioChannelConfig.java
trunk/src/main/java/org/jboss/netty/channel/xnio/XnioChannelConfig.java
Log:
Resolved issue: NETTY-244 ReceiveBufferSizePredictorFactory
* Added ReceiveBufferSizePredictorFactory
* Added AdaptiveReceiveBufferSizePredictorFactory
* Added FixedReceiveBufferSizePredictorFactory
* Added get/setReceiveBufferSizePredictorFactory() to all related ChannelConfig interfaces and implementations
* More accurate documentation on the default predictors
* the default predictors are null internally and created lazily on demand to reduce footprint

Modified: trunk/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictor.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictor.java 2009-10-30 08:02:53 UTC (rev 1854)
+++ trunk/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictor.java 2009-11-02 06:30:10 UTC (rev 1855)
@@ -37,8 +37,9 @@
public class AdaptiveReceiveBufferSizePredictor implements
ReceiveBufferSizePredictor {

- // FIXME There's no easy way to configure receiveBufferSizePredictor
- // via Bootstrap.setOption() because it works for only one channel.
+ static final int DEFAULT_MINIMUM = 64;
+ static final int DEFAULT_INITIAL = 1024;
+ static final int DEFAULT_MAXIMUM = 65536;

private static final int INDEX_INCREMENT = 4;
private static final int INDEX_DECREMENT = 1;
@@ -97,10 +98,6 @@
throw new Error("shouldn't reach here; please file a bug report.");
}

- private static final int DEFAULT_MINIMUM = 64;
- private static final int DEFAULT_INITIAL = 1024;
- private static final int DEFAULT_MAXIMUM = 65536;
-
private final int minIndex;
private final int maxIndex;
private int index;

Added: trunk/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictorFactory.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictorFactory.java (rev 0)
+++ trunk/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictorFactory.java 2009-11-02 06:30:10 UTC (rev 1855)
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat 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.channel;
+
+
+/**
+ * The {@link ReceiveBufferSizePredictorFactory} that creates a new
+ * {@link AdaptiveReceiveBufferSizePredictor}.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Trustin Lee ([hidden email])
+ *
+ * @version $Rev$, $Date$
+ */
+public class AdaptiveReceiveBufferSizePredictorFactory implements
+ ReceiveBufferSizePredictorFactory {
+
+ private final int minimum;
+ private final int initial;
+ private final int maximum;
+
+ /**
+ * Creates a new factory with the default parameters. With the default
+ * parameters, the expected buffer size starts from {@code 1024}, does not
+ * go down below {@code 64}, and does not go up above {@code 65536}.
+ */
+ public AdaptiveReceiveBufferSizePredictorFactory() {
+ this(AdaptiveReceiveBufferSizePredictor.DEFAULT_MINIMUM,
+ AdaptiveReceiveBufferSizePredictor.DEFAULT_INITIAL,
+ AdaptiveReceiveBufferSizePredictor.DEFAULT_MAXIMUM);
+ }
+
+ /**
+ * Creates a new factory with the specified parameters.
+ *
+ * @param minimum the inclusive lower bound of the expected buffer size
+ * @param initial the initial buffer size when no feed back was received
+ * @param maximum the inclusive upper bound of the expected buffer size
+ */
+ public AdaptiveReceiveBufferSizePredictorFactory(int minimum, int initial, int maximum) {
+ if (minimum <= 0) {
+ throw new IllegalArgumentException("minimum: " + minimum);
+ }
+ if (initial < minimum) {
+ throw new IllegalArgumentException("initial: " + initial);
+ }
+ if (maximum < initial) {
+ throw new IllegalArgumentException("maximum: " + maximum);
+ }
+
+ this.minimum = minimum;
+ this.initial = initial;
+ this.maximum = maximum;
+ }
+
+ public ReceiveBufferSizePredictor getPredictor() throws Exception {
+ return new AdaptiveReceiveBufferSizePredictor(minimum, initial, maximum);
+ }
+}

Property changes on: trunk/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictorFactory.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Added: trunk/src/main/java/org/jboss/netty/channel/FixedReceiveBufferSizePredictorFactory.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/FixedReceiveBufferSizePredictorFactory.java (rev 0)
+++ trunk/src/main/java/org/jboss/netty/channel/FixedReceiveBufferSizePredictorFactory.java 2009-11-02 06:30:10 UTC (rev 1855)
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat 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.channel;
+
+
+/**
+ * The {@link ReceiveBufferSizePredictorFactory} that returns a
+ * {@link FixedReceiveBufferSizePredictor} with the pre-defined configuration.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Trustin Lee ([hidden email])
+ *
+ * @version $Rev$, $Date$
+ */
+public class FixedReceiveBufferSizePredictorFactory implements
+ ReceiveBufferSizePredictorFactory {
+
+ private final ReceiveBufferSizePredictor predictor;
+
+ /**
+ * Creates a new factory that returns a {@link FixedReceiveBufferSizePredictor}
+ * which always returns the same prediction of the specified buffer size.
+ */
+ public FixedReceiveBufferSizePredictorFactory(int bufferSize) {
+ predictor = new FixedReceiveBufferSizePredictor(bufferSize);
+ }
+
+ public ReceiveBufferSizePredictor getPredictor() throws Exception {
+ return predictor;
+ }
+}

Property changes on: trunk/src/main/java/org/jboss/netty/channel/FixedReceiveBufferSizePredictorFactory.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Added: trunk/src/main/java/org/jboss/netty/channel/ReceiveBufferSizePredictorFactory.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/ReceiveBufferSizePredictorFactory.java (rev 0)
+++ trunk/src/main/java/org/jboss/netty/channel/ReceiveBufferSizePredictorFactory.java 2009-11-02 06:30:10 UTC (rev 1855)
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *
+ * Red Hat 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.channel;
+
+/**
+ * Creates a new {@link ReceiveBufferSizePredictor}.
+ *
+ * @author The Netty Project ([hidden email])
+ * @author Trustin Lee ([hidden email])
+ *
+ * @version $Rev$, $Date$
+ */
+public interface ReceiveBufferSizePredictorFactory {
+
+ /**
+ * Returns a newly created {@link ReceiveBufferSizePredictor}.
+ */
+ ReceiveBufferSizePredictor getPredictor() throws Exception;
+}

Property changes on: trunk/src/main/java/org/jboss/netty/channel/ReceiveBufferSizePredictorFactory.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native

Modified: trunk/src/main/java/org/jboss/netty/channel/socket/DatagramChannelConfig.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/socket/DatagramChannelConfig.java 2009-10-30 08:02:53 UTC (rev 1854)
+++ trunk/src/main/java/org/jboss/netty/channel/socket/DatagramChannelConfig.java 2009-11-02 06:30:10 UTC (rev 1855)
@@ -21,7 +21,9 @@

import org.jboss.netty.channel.ChannelConfig;
import org.jboss.netty.channel.FixedReceiveBufferSizePredictor;
+import org.jboss.netty.channel.FixedReceiveBufferSizePredictorFactory;
import org.jboss.netty.channel.ReceiveBufferSizePredictor;
+import org.jboss.netty.channel.ReceiveBufferSizePredictorFactory;

/**
* A {@link ChannelConfig} for a {@link DatagramChannel}.
@@ -49,6 +51,8 @@
* </tr><tr>
* <td>{@code "receiveBufferSizePredictor"}</td><td>{@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}</td>
* </tr><tr>
+ * <td>{@code "receiveBufferSizePredictorFactory"}</td><td>{@link #setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory)}</td>
+ * </tr><tr>
* <td>{@code "sendBufferSize"}</td><td>{@link #setSendBufferSize(int)}</td>
* </tr><tr>
* <td>{@code "timeToLive"}</td><td>{@link #setTimeToLive(int)}</td>
@@ -176,4 +180,24 @@
* predictor is <tt>{@link FixedReceiveBufferSizePredictor}(768)</tt>.
*/
void setReceiveBufferSizePredictor(ReceiveBufferSizePredictor predictor);
+
+ /**
+ * Returns the {@link ReceiveBufferSizePredictorFactory} which creates a new
+ * {@link ReceiveBufferSizePredictor} when a new channel is created and
+ * no {@link ReceiveBufferSizePredictor} was set. If no predictor was set
+ * for the channel, {@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}
+ * will be called with the new predictor. The default factory is
+ * <tt>{@link FixedReceiveBufferSizePredictorFactory}(768)</tt>.
+ */
+ ReceiveBufferSizePredictorFactory getReceiveBufferSizePredictorFactory();
+
+ /**
+ * Sets the {@link ReceiveBufferSizePredictor} which creates a new
+ * {@link ReceiveBufferSizePredictor} when a new channel is created and
+ * no {@link ReceiveBufferSizePredictor} was set. If no predictor was set
+ * for the channel, {@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}
+ * will be called with the new predictor. The default factory is
+ * <tt>{@link FixedReceiveBufferSizePredictorFactory}(768)</tt>.
+ */
+ void setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory predictorFactory);
}

Modified: trunk/src/main/java/org/jboss/netty/channel/socket/DefaultDatagramChannelConfig.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/socket/DefaultDatagramChannelConfig.java 2009-10-30 08:02:53 UTC (rev 1854)
+++ trunk/src/main/java/org/jboss/netty/channel/socket/DefaultDatagramChannelConfig.java 2009-11-02 06:30:10 UTC (rev 1855)
@@ -24,8 +24,9 @@

import org.jboss.netty.channel.ChannelException;
import org.jboss.netty.channel.DefaultChannelConfig;
-import org.jboss.netty.channel.FixedReceiveBufferSizePredictor;
+import org.jboss.netty.channel.FixedReceiveBufferSizePredictorFactory;
import org.jboss.netty.channel.ReceiveBufferSizePredictor;
+import org.jboss.netty.channel.ReceiveBufferSizePredictorFactory;
import org.jboss.netty.util.internal.ConversionUtil;

/**
@@ -40,9 +41,12 @@
public class DefaultDatagramChannelConfig extends DefaultChannelConfig
implements DatagramChannelConfig {

+ private static final ReceiveBufferSizePredictorFactory DEFAULT_PREDICTOR_FACTORY =
+ new FixedReceiveBufferSizePredictorFactory(768);
+
private final DatagramSocket socket;
- private volatile ReceiveBufferSizePredictor predictor =
- new FixedReceiveBufferSizePredictor(768);
+ private volatile ReceiveBufferSizePredictor predictor;
+ private volatile ReceiveBufferSizePredictorFactory predictorFactory = DEFAULT_PREDICTOR_FACTORY;

/**
* Creates a new instance.
@@ -263,13 +267,36 @@
}

public ReceiveBufferSizePredictor getReceiveBufferSizePredictor() {
+ ReceiveBufferSizePredictor predictor = this.predictor;
+ if (predictor == null) {
+ try {
+ this.predictor = predictor = getReceiveBufferSizePredictorFactory().getPredictor();
+ } catch (Exception e) {
+ throw new ChannelException(
+ "Failed to create a new " +
+ ReceiveBufferSizePredictor.class.getSimpleName() + '.',
+ e);
+ }
+ }
return predictor;
}

- public void setReceiveBufferSizePredictor(ReceiveBufferSizePredictor predictor) {
+ public void setReceiveBufferSizePredictor(
+ ReceiveBufferSizePredictor predictor) {
if (predictor == null) {
throw new NullPointerException("predictor");
}
this.predictor = predictor;
}
+
+ public ReceiveBufferSizePredictorFactory getReceiveBufferSizePredictorFactory() {
+ return predictorFactory;
+ }
+
+ public void setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory predictorFactory) {
+ if (predictorFactory == null) {
+ throw new NullPointerException("predictorFactory");
+ }
+ this.predictorFactory = predictorFactory;
+ }
}

Modified: trunk/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java 2009-10-30 08:02:53 UTC (rev 1854)
+++ trunk/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java 2009-11-02 06:30:10 UTC (rev 1855)
@@ -18,8 +18,10 @@
import java.net.Socket;
import java.util.Map;

-import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictor;
+import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictorFactory;
+import org.jboss.netty.channel.ChannelException;
import org.jboss.netty.channel.ReceiveBufferSizePredictor;
+import org.jboss.netty.channel.ReceiveBufferSizePredictorFactory;
import org.jboss.netty.channel.socket.DefaultSocketChannelConfig;
import org.jboss.netty.logging.InternalLogger;
import org.jboss.netty.logging.InternalLoggerFactory;
@@ -40,10 +42,13 @@
private static final InternalLogger logger =
InternalLoggerFactory.getInstance(DefaultNioSocketChannelConfig.class);

+ private static final ReceiveBufferSizePredictorFactory DEFAULT_PREDICTOR_FACTORY =
+ new AdaptiveReceiveBufferSizePredictorFactory();
+
private volatile int writeBufferHighWaterMark = 64 * 1024;
private volatile int writeBufferLowWaterMark = 32 * 1024;
- private volatile ReceiveBufferSizePredictor predictor =
- new AdaptiveReceiveBufferSizePredictor();
+ private volatile ReceiveBufferSizePredictor predictor;
+ private volatile ReceiveBufferSizePredictorFactory predictorFactory = DEFAULT_PREDICTOR_FACTORY;
private volatile int writeSpinCount = 16;

DefaultNioSocketChannelConfig(Socket socket) {
@@ -143,6 +148,17 @@
}

public ReceiveBufferSizePredictor getReceiveBufferSizePredictor() {
+ ReceiveBufferSizePredictor predictor = this.predictor;
+ if (predictor == null) {
+ try {
+ this.predictor = predictor = getReceiveBufferSizePredictorFactory().getPredictor();
+ } catch (Exception e) {
+ throw new ChannelException(
+ "Failed to create a new " +
+ ReceiveBufferSizePredictor.class.getSimpleName() + '.',
+ e);
+ }
+ }
return predictor;
}

@@ -154,6 +170,17 @@
this.predictor = predictor;
}

+ public ReceiveBufferSizePredictorFactory getReceiveBufferSizePredictorFactory() {
+ return predictorFactory;
+ }
+
+ public void setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory predictorFactory) {
+ if (predictorFactory == null) {
+ throw new NullPointerException("predictorFactory");
+ }
+ this.predictorFactory = predictorFactory;
+ }
+
public boolean isReadWriteFair() {
logger.warn(
"Detected an access to a deprecated configuration parameter: " +

Modified: trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelConfig.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelConfig.java 2009-10-30 08:02:53 UTC (rev 1854)
+++ trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelConfig.java 2009-11-02 06:30:10 UTC (rev 1855)
@@ -18,10 +18,8 @@
import java.nio.ByteBuffer;
import java.nio.channels.WritableByteChannel;

-import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictor;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelConfig;
-import org.jboss.netty.channel.ReceiveBufferSizePredictor;
import org.jboss.netty.channel.socket.DatagramChannel;
import org.jboss.netty.channel.socket.DatagramChannelConfig;

@@ -44,8 +42,6 @@
* </tr><tr>
* <td>{@code "writeSpinCount"}</td><td>{@link #setWriteSpinCount(int)}</td>
* </tr><tr>
- * <td>{@code "receiveBufferSizePredictor"}</td><td>{@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}</td>
- * </tr><tr>
* </table>
*
* @author The Netty Project ([hidden email])
@@ -108,18 +104,4 @@
* if the specified value is {@code 0} or less than {@code 0}
*/
void setWriteSpinCount(int writeSpinCount);
-
- /**
- * Returns the {@link ReceiveBufferSizePredictor} which predicts the
- * number of readable bytes in the socket receive buffer. The default
- * predictor is {@link AdaptiveReceiveBufferSizePredictor}.
- */
- ReceiveBufferSizePredictor getReceiveBufferSizePredictor();
-
- /**
- * Sets the {@link ReceiveBufferSizePredictor} which predicts the
- * number of readable bytes in the socket receive buffer. The default
- * predictor is {@link AdaptiveReceiveBufferSizePredictor}.
- */
- void setReceiveBufferSizePredictor(ReceiveBufferSizePredictor predictor);
}

Modified: trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java 2009-10-30 08:02:53 UTC (rev 1854)
+++ trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java 2009-11-02 06:30:10 UTC (rev 1855)
@@ -19,9 +19,11 @@
import java.nio.channels.WritableByteChannel;

import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictor;
+import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictorFactory;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelConfig;
import org.jboss.netty.channel.ReceiveBufferSizePredictor;
+import org.jboss.netty.channel.ReceiveBufferSizePredictorFactory;
import org.jboss.netty.channel.socket.SocketChannel;
import org.jboss.netty.channel.socket.SocketChannelConfig;

@@ -46,6 +48,8 @@
* </tr><tr>
* <td>{@code "receiveBufferSizePredictor"}</td><td>{@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}</td>
* </tr><tr>
+ * <td>{@code "receiveBufferSizePredictorFactory"}</td><td>{@link #setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory)}</td>
+ * </tr><tr>
* <td>{@code "readWriteFair"}</td><td>{@link #setReadWriteFair(boolean)}</td>
* </tr>
* </table>
@@ -113,18 +117,38 @@
/**
* Returns the {@link ReceiveBufferSizePredictor} which predicts the
* number of readable bytes in the socket receive buffer. The default
- * predictor is {@link AdaptiveReceiveBufferSizePredictor}.
+ * predictor is <tt>{@link AdaptiveReceiveBufferSizePredictor}(64, 1024, 65536)</tt>.
*/
ReceiveBufferSizePredictor getReceiveBufferSizePredictor();

/**
* Sets the {@link ReceiveBufferSizePredictor} which predicts the
* number of readable bytes in the socket receive buffer. The default
- * predictor is {@link AdaptiveReceiveBufferSizePredictor}.
+ * predictor is <tt>{@link AdaptiveReceiveBufferSizePredictor}(64, 1024, 65536)</tt>.
*/
void setReceiveBufferSizePredictor(ReceiveBufferSizePredictor predictor);

/**
+ * Returns the {@link ReceiveBufferSizePredictorFactory} which creates a new
+ * {@link ReceiveBufferSizePredictor} when a new channel is created and
+ * no {@link ReceiveBufferSizePredictor} was set. If no predictor was set
+ * for the channel, {@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}
+ * will be called with the new predictor. The default factory is
+ * <tt>{@link AdaptiveReceiveBufferSizePredictorFactory}(64, 1024, 65536)</tt>.
+ */
+ ReceiveBufferSizePredictorFactory getReceiveBufferSizePredictorFactory();
+
+ /**
+ * Sets the {@link ReceiveBufferSizePredictor} which creates a new
+ * {@link ReceiveBufferSizePredictor} when a new channel is created and
+ * no {@link ReceiveBufferSizePredictor} was set. If no predictor was set
+ * for the channel, {@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}
+ * will be called with the new predictor. The default factory is
+ * <tt>{@link AdaptiveReceiveBufferSizePredictorFactory}(64, 1024, 65536)</tt>.
+ */
+ void setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory predictorFactory);
+
+ /**
* @deprecated This property has been replaced by the
* {@code writeBufferHighWaterMark} and {@code writeBufferLowWaterMark}.
*

Modified: trunk/src/main/java/org/jboss/netty/channel/xnio/DefaultXnioChannelConfig.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/xnio/DefaultXnioChannelConfig.java 2009-10-30 08:02:53 UTC (rev 1854)
+++ trunk/src/main/java/org/jboss/netty/channel/xnio/DefaultXnioChannelConfig.java 2009-11-02 06:30:10 UTC (rev 1855)
@@ -20,9 +20,11 @@

import org.jboss.netty.buffer.ChannelBufferFactory;
import org.jboss.netty.buffer.HeapChannelBufferFactory;
-import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictor;
+import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictorFactory;
+import org.jboss.netty.channel.ChannelException;
import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.channel.ReceiveBufferSizePredictor;
+import org.jboss.netty.channel.ReceiveBufferSizePredictorFactory;
import org.jboss.netty.logging.InternalLogger;
import org.jboss.netty.logging.InternalLoggerFactory;
import org.jboss.netty.util.internal.ConversionUtil;
@@ -41,12 +43,15 @@
private static final InternalLogger logger =
InternalLoggerFactory.getInstance(DefaultXnioChannelConfig.class);

+ private static final ReceiveBufferSizePredictorFactory DEFAULT_PREDICTOR_FACTORY =
+ new AdaptiveReceiveBufferSizePredictorFactory();
+
private volatile ChannelBufferFactory bufferFactory = HeapChannelBufferFactory.getInstance();
private volatile ChannelPipelineFactory pipelineFactory;
private volatile int writeBufferHighWaterMark = 64 * 1024;
private volatile int writeBufferLowWaterMark = 32 * 1024;
- private volatile ReceiveBufferSizePredictor predictor =
- new AdaptiveReceiveBufferSizePredictor();
+ private volatile ReceiveBufferSizePredictor predictor;
+ private volatile ReceiveBufferSizePredictorFactory predictorFactory = DEFAULT_PREDICTOR_FACTORY;
private volatile int writeSpinCount = 16;

DefaultXnioChannelConfig() {
@@ -145,6 +150,17 @@
}

public ReceiveBufferSizePredictor getReceiveBufferSizePredictor() {
+ ReceiveBufferSizePredictor predictor = this.predictor;
+ if (predictor == null) {
+ try {
+ this.predictor = predictor = getReceiveBufferSizePredictorFactory().getPredictor();
+ } catch (Exception e) {
+ throw new ChannelException(
+ "Failed to create a new " +
+ ReceiveBufferSizePredictor.class.getSimpleName() + '.',
+ e);
+ }
+ }
return predictor;
}

@@ -156,6 +172,17 @@
this.predictor = predictor;
}

+ public ReceiveBufferSizePredictorFactory getReceiveBufferSizePredictorFactory() {
+ return predictorFactory;
+ }
+
+ public void setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory predictorFactory) {
+ if (predictorFactory == null) {
+ throw new NullPointerException("predictorFactory");
+ }
+ this.predictorFactory = predictorFactory;
+ }
+
public ChannelPipelineFactory getPipelineFactory() {
return pipelineFactory;
}

Modified: trunk/src/main/java/org/jboss/netty/channel/xnio/XnioChannelConfig.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/xnio/XnioChannelConfig.java 2009-10-30 08:02:53 UTC (rev 1854)
+++ trunk/src/main/java/org/jboss/netty/channel/xnio/XnioChannelConfig.java 2009-11-02 06:30:10 UTC (rev 1855)
@@ -19,8 +19,10 @@
import java.nio.channels.WritableByteChannel;

import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictor;
+import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictorFactory;
import org.jboss.netty.channel.ChannelConfig;
import org.jboss.netty.channel.ReceiveBufferSizePredictor;
+import org.jboss.netty.channel.ReceiveBufferSizePredictorFactory;
import org.jboss.netty.channel.socket.SocketChannelConfig;

/**
@@ -39,6 +41,8 @@
* <td>{@code "writeSpinCount"}</td><td>{@link #setWriteSpinCount(int)}</td>
* </tr><tr>
* <td>{@code "receiveBufferSizePredictor"}</td><td>{@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}</td>
+ * </tr><tr>
+ * <td>{@code "receiveBufferSizePredictorFactory"}</td><td>{@link #setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory)}</td>
* </tr>
* </table>
*
@@ -79,14 +83,34 @@
/**
* Returns the {@link ReceiveBufferSizePredictor} which predicts the
* number of readable bytes in the socket receive buffer. The default
- * predictor is {@link AdaptiveReceiveBufferSizePredictor}.
+ * predictor is <tt>{@link AdaptiveReceiveBufferSizePredictor}(64, 1024, 65536)</tt>.
*/
ReceiveBufferSizePredictor getReceiveBufferSizePredictor();

/**
* Sets the {@link ReceiveBufferSizePredictor} which predicts the
* number of readable bytes in the socket receive buffer. The default
- * predictor is {@link AdaptiveReceiveBufferSizePredictor}.
+ * predictor is <tt>{@link AdaptiveReceiveBufferSizePredictor}(64, 1024, 65536)</tt>.
*/
void setReceiveBufferSizePredictor(ReceiveBufferSizePredictor predictor);
+
+ /**
+ * Returns the {@link ReceiveBufferSizePredictorFactory} which creates a new
+ * {@link ReceiveBufferSizePredictor} when a new channel is created and
+ * no {@link ReceiveBufferSizePredictor} was set. If no predictor was set
+ * for the channel, {@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}
+ * will be called with the new predictor. The default factory is
+ * <tt>{@link AdaptiveReceiveBufferSizePredictorFactory}(64, 1024, 65536)</tt>.
+ */
+ ReceiveBufferSizePredictorFactory getReceiveBufferSizePredictorFactory();
+
+ /**
+ * Sets the {@link ReceiveBufferSizePredictor} which creates a new
+ * {@link ReceiveBufferSizePredictor} when a new channel is created and
+ * no {@link ReceiveBufferSizePredictor} was set. If no predictor was set
+ * for the channel, {@link #setReceiveBufferSizePredictor(ReceiveBufferSizePredictor)}
+ * will be called with the new predictor. The default factory is
+ * <tt>{@link AdaptiveReceiveBufferSizePredictorFactory}(64, 1024, 65536)</tt>.
+ */
+ void setReceiveBufferSizePredictorFactory(ReceiveBufferSizePredictorFactory predictorFactory);
}

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits

r1854 - trunk/src/main/java/org/jboss/netty/channel.

2009-10-30T01:02:55Z

Author: trustin
Date: 2009-10-30 04:02:53 -0400 (Fri, 30 Oct 2009)
New Revision: 1854

Modified:
trunk/src/main/java/org/jboss/netty/channel/SimpleChannelHandler.java
trunk/src/main/java/org/jboss/netty/channel/SimpleChannelUpstreamHandler.java
Log:
Wrong pointer - those tables were moved to ChannelEvent

Modified: trunk/src/main/java/org/jboss/netty/channel/SimpleChannelHandler.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/SimpleChannelHandler.java 2009-10-30 08:00:44 UTC (rev 1853)
+++ trunk/src/main/java/org/jboss/netty/channel/SimpleChannelHandler.java 2009-10-30 08:02:53 UTC (rev 1854)
@@ -28,7 +28,7 @@
* or downstream event into more meaningful sub-type event and calls an
* appropriate handler method with the down-cast event. For an upstream
* event, the names of the methods are identical to the upstream event names,
- * as introduced in the {@link ChannelUpstreamHandler} documentation. For a
+ * as introduced in the {@link ChannelEvent} documentation. For a
* downstream event, the names of the methods starts with the name of the
* operation and ends with {@code "Requested"}
* (e.g. {@link #writeRequested(ChannelHandlerContext, MessageEvent) writeRequested}.)

Modified: trunk/src/main/java/org/jboss/netty/channel/SimpleChannelUpstreamHandler.java
===================================================================
--- trunk/src/main/java/org/jboss/netty/channel/SimpleChannelUpstreamHandler.java 2009-10-30 08:00:44 UTC (rev 1853)
+++ trunk/src/main/java/org/jboss/netty/channel/SimpleChannelUpstreamHandler.java 2009-10-30 08:02:53 UTC (rev 1854)
@@ -25,8 +25,7 @@
* for each event type. This handler down-casts the received upstream event
* into more meaningful sub-type event and calls an appropriate handler method
* with the down-cast event. The names of the methods are identical to the
- * upstream event names, as introduced in the {@link ChannelUpstreamHandler}
- * documentation.
+ * upstream event names, as introduced in the {@link ChannelEvent} documentation.
* <p>
* Please use {@link SimpleChannelHandler} if you need to implement both
* {@link ChannelUpstreamHandler} and {@link ChannelDownstreamHandler}.

_______________________________________________
netty-commits mailing list
[hidden email]
https://lists.jboss.org/mailman/listinfo/netty-commits