From dfce95dd5ad992394cc370d2aa6fe57173c87006 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Tue, 12 Jun 2012 18:09:05 +0900 Subject: [PATCH] Remove unused type --- .../handler/ssl/DefaultSslBufferPool.java | 89 ------------------- .../io/netty/handler/ssl/SslBufferPool.java | 50 ----------- .../channel/IllegalBufferAccessException.java | 42 --------- 3 files changed, 181 deletions(-) delete mode 100644 handler/src/main/java/io/netty/handler/ssl/DefaultSslBufferPool.java delete mode 100644 handler/src/main/java/io/netty/handler/ssl/SslBufferPool.java delete mode 100644 transport/src/main/java/io/netty/channel/IllegalBufferAccessException.java diff --git a/handler/src/main/java/io/netty/handler/ssl/DefaultSslBufferPool.java b/handler/src/main/java/io/netty/handler/ssl/DefaultSslBufferPool.java deleted file mode 100644 index 5b186694e3..0000000000 --- a/handler/src/main/java/io/netty/handler/ssl/DefaultSslBufferPool.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright 2012 The Netty Project - * - * The Netty Project licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package io.netty.handler.ssl; - -import java.nio.ByteBuffer; - -public class DefaultSslBufferPool implements SslBufferPool { - - private static final int DEFAULT_POOL_SIZE = MAX_PACKET_SIZE * 1024; - - private final ByteBuffer[] pool; - private final int maxBufferCount; - private int index; - - /** - * Creates a new buffer pool whose size is {@code 18113536}, which can - * hold {@code 1024} buffers. - */ - public DefaultSslBufferPool() { - this(DEFAULT_POOL_SIZE); - } - - /** - * Creates a new buffer pool. - * - * @param maxPoolSize the maximum number of bytes that this pool can hold - */ - public DefaultSslBufferPool(int maxPoolSize) { - if (maxPoolSize <= 0) { - throw new IllegalArgumentException("maxPoolSize: " + maxPoolSize); - } - - int maxBufferCount = maxPoolSize / MAX_PACKET_SIZE; - if (maxPoolSize % MAX_PACKET_SIZE != 0) { - maxBufferCount ++; - } - - pool = new ByteBuffer[maxBufferCount]; - this.maxBufferCount = maxBufferCount; - } - - /** - * Returns the maximum size of this pool in byte unit. The returned value - * can be somewhat different from what was specified in the constructor. - */ - public int getMaxPoolSize() { - return maxBufferCount * MAX_PACKET_SIZE; - } - - /** - * Returns the number of bytes which were allocated but have not been - * acquired yet. You can estimate how optimal the specified maximum pool - * size is from this value. If it keeps returning {@code 0}, it means the - * pool is getting exhausted. If it keeps returns a unnecessarily big - * value, it means the pool is wasting the heap space. - */ - public synchronized int getUnacquiredPoolSize() { - return index * MAX_PACKET_SIZE; - } - - @Override - public synchronized ByteBuffer acquireBuffer() { - if (index == 0) { - return ByteBuffer.allocate(MAX_PACKET_SIZE); - } else { - return (ByteBuffer) pool[-- index].clear(); - } - } - - @Override - public synchronized void releaseBuffer(ByteBuffer buffer) { - if (index < maxBufferCount) { - pool[index ++] = buffer; - } - } -} diff --git a/handler/src/main/java/io/netty/handler/ssl/SslBufferPool.java b/handler/src/main/java/io/netty/handler/ssl/SslBufferPool.java deleted file mode 100644 index 081818d19e..0000000000 --- a/handler/src/main/java/io/netty/handler/ssl/SslBufferPool.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2012 The Netty Project - * - * The Netty Project licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package io.netty.handler.ssl; - -import java.nio.ByteBuffer; - -import javax.net.ssl.SSLEngine; - -/** - * A {@link ByteBuffer} pool dedicated for {@link SslHandler} performance - * improvement. - * - * The reason why {@link SslHandler} requires a buffer pool is because the - * current {@link SSLEngine} implementation always requires a 17KiB buffer for - * every 'wrap' and 'unwrap' operation. In most cases, the actual size of the - * required buffer is much smaller than that, and therefore allocating a 17KiB - * buffer for every 'wrap' and 'unwrap' operation wastes a lot of memory - * bandwidth, resulting in the application performance degradation. - */ -public interface SslBufferPool { - - // Returned buffers must be large enough to accomodate the maximum SSL record size. - // Header (5) + Data (2^14) + Compression (1024) + Encryption (1024) + MAC (20) + Padding (256) - int MAX_PACKET_SIZE = 18713; - - /** - * Acquire a new {@link ByteBuffer} out of the {@link SslBufferPool} - */ - ByteBuffer acquireBuffer(); - - /** - * Release a previously acquired {@link ByteBuffer} - * - * @param buffer - */ - void releaseBuffer(ByteBuffer buffer); -} diff --git a/transport/src/main/java/io/netty/channel/IllegalBufferAccessException.java b/transport/src/main/java/io/netty/channel/IllegalBufferAccessException.java deleted file mode 100644 index add0b4ab63..0000000000 --- a/transport/src/main/java/io/netty/channel/IllegalBufferAccessException.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2012 The Netty Project - * - * The Netty Project licenses this file to you under the Apache License, - * version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package io.netty.channel; - -public class IllegalBufferAccessException extends ChannelPipelineException { - - private static final long serialVersionUID = -1313647533364810258L; - - private static final String DEFAULT_MESSAGE = - "The buffers that belong to a " + ChannelHandlerContext.class.getSimpleName() + - " must be accessed from the thread of the associated " + - EventExecutor.class.getSimpleName() + "."; - - public IllegalBufferAccessException() { - this(DEFAULT_MESSAGE); - } - - public IllegalBufferAccessException(String message, Throwable cause) { - super(message, cause); - } - - public IllegalBufferAccessException(String message) { - super(message); - } - - public IllegalBufferAccessException(Throwable cause) { - super(cause); - } -}