Author: markt
Date: Sun Sep 23 19:32:20 2012
New Revision: 1389128
URL: http://svn.apache.org/viewvc?rev=1389128&view=rev
Log:
Rename as per kkolinko's review
Added:
tomcat/trunk/java/org/apache/tomcat/util/collections/SynchronizedStack.java
- copied, changed from r1389122,
tomcat/trunk/java/org/apache/tomcat/util/collections/ConcurrentStack.java
tomcat/trunk/test/org/apache/tomcat/util/collections/TestSynchronizedStack.java
- copied, changed from r1389122,
tomcat/trunk/test/org/apache/tomcat/util/collections/TestConcurrentStack.java
tomcat/trunk/test/org/apache/tomcat/util/collections/TesterPerformanceSynchronizedStack.java
- copied, changed from r1389076,
tomcat/trunk/test/org/apache/tomcat/util/collections/TesterPerformanceConcurrentStack.java
Removed:
tomcat/trunk/java/org/apache/tomcat/util/collections/ConcurrentStack.java
tomcat/trunk/test/org/apache/tomcat/util/collections/TestConcurrentStack.java
tomcat/trunk/test/org/apache/tomcat/util/collections/TesterPerformanceConcurrentStack.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Copied:
tomcat/trunk/java/org/apache/tomcat/util/collections/SynchronizedStack.java
(from r1389122,
tomcat/trunk/java/org/apache/tomcat/util/collections/ConcurrentStack.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/collections/SynchronizedStack.java?p2=tomcat/trunk/java/org/apache/tomcat/util/collections/SynchronizedStack.java&p1=tomcat/trunk/java/org/apache/tomcat/util/collections/ConcurrentStack.java&r1=1389122&r2=1389128&rev=1389128&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/collections/ConcurrentStack.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/collections/SynchronizedStack.java
Sun Sep 23 19:32:20 2012
@@ -23,7 +23,7 @@ package org.apache.tomcat.util.collectio
* The aim is to provide the bare minimum of required functionality as quickly
* as possible with minimum garbage.
*/
-public class ConcurrentStack<T> {
+public class SynchronizedStack<T> {
public static final int DEFAULT_SIZE = 128;
private static final int DEFAULT_LIMIT = -1;
@@ -39,11 +39,11 @@ public class ConcurrentStack<T> {
private Object[] stack;
- public ConcurrentStack() {
+ public SynchronizedStack() {
this(DEFAULT_SIZE, DEFAULT_LIMIT);
}
- public ConcurrentStack(int size, int limit) {
+ public SynchronizedStack(int size, int limit) {
this.size = size;
this.limit = limit;
stack = new Object[size];
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java?rev=1389128&r1=1389127&r2=1389128&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java Sun
Sep 23 19:32:20 2012
@@ -34,7 +34,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
-import org.apache.tomcat.util.collections.ConcurrentStack;
+import org.apache.tomcat.util.collections.SynchronizedStack;
import org.apache.tomcat.util.net.NioEndpoint.KeyAttachment;
public class NioBlockingSelector {
@@ -43,8 +43,8 @@ public class NioBlockingSelector {
private static int threadCounter = 0;
- private ConcurrentStack<KeyReference> keyReferenceStack =
- new ConcurrentStack<>();
+ private SynchronizedStack<KeyReference> keyReferenceStack =
+ new SynchronizedStack<>();
protected Selector sharedSelector;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1389128&r1=1389127&r2=1389128&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Sun Sep 23
19:32:20 2012
@@ -51,7 +51,7 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.IntrospectionUtils;
-import org.apache.tomcat.util.collections.ConcurrentStack;
+import org.apache.tomcat.util.collections.SynchronizedStack;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.SecureNioChannel.ApplicationBufferHandler;
import org.apache.tomcat.util.net.jsse.NioX509KeyManager;
@@ -127,29 +127,29 @@ public class NioEndpoint extends Abstrac
/**
* Cache for SocketProcessor objects
*/
- protected final ConcurrentStack<SocketProcessor> processorCache =
- new ConcurrentStack<>(ConcurrentStack.DEFAULT_SIZE,
+ protected final SynchronizedStack<SocketProcessor> processorCache =
+ new SynchronizedStack<>(SynchronizedStack.DEFAULT_SIZE,
socketProperties.getProcessorCache());
/**
* Cache for key attachment objects
*/
- protected final ConcurrentStack<KeyAttachment> keyCache =
- new ConcurrentStack<>(ConcurrentStack.DEFAULT_SIZE,
+ protected final SynchronizedStack<KeyAttachment> keyCache =
+ new SynchronizedStack<>(SynchronizedStack.DEFAULT_SIZE,
socketProperties.getKeyCache());
/**
* Cache for poller events
*/
- protected final ConcurrentStack<PollerEvent> eventCache =
- new ConcurrentStack<>(ConcurrentStack.DEFAULT_SIZE,
+ protected final SynchronizedStack<PollerEvent> eventCache =
+ new SynchronizedStack<>(SynchronizedStack.DEFAULT_SIZE,
socketProperties.getEventCache());
/**
* Bytebuffer cache, each channel holds a set of buffers (two, except for
SSL holds four)
*/
- protected final ConcurrentStack<NioChannel> nioChannels =
- new ConcurrentStack<>(ConcurrentStack.DEFAULT_SIZE,
+ protected final SynchronizedStack<NioChannel> nioChannels =
+ new SynchronizedStack<>(SynchronizedStack.DEFAULT_SIZE,
socketProperties.getBufferPoolSize());
Copied:
tomcat/trunk/test/org/apache/tomcat/util/collections/TestSynchronizedStack.java
(from r1389122,
tomcat/trunk/test/org/apache/tomcat/util/collections/TestConcurrentStack.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/collections/TestSynchronizedStack.java?p2=tomcat/trunk/test/org/apache/tomcat/util/collections/TestSynchronizedStack.java&p1=tomcat/trunk/test/org/apache/tomcat/util/collections/TestConcurrentStack.java&r1=1389122&r2=1389128&rev=1389128&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/util/collections/TestConcurrentStack.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/collections/TestSynchronizedStack.java
Sun Sep 23 19:32:20 2012
@@ -19,17 +19,17 @@ package org.apache.tomcat.util.collectio
import org.junit.Assert;
import org.junit.Test;
-public class TestConcurrentStack {
+public class TestSynchronizedStack {
@Test
public void testPopEmpty() {
- ConcurrentStack<Object> stack = new ConcurrentStack<>();
+ SynchronizedStack<Object> stack = new SynchronizedStack<>();
Assert.assertNull(stack.pop());
}
@Test
public void testPushPopOrder() {
- ConcurrentStack<Object> stack = new ConcurrentStack<>();
+ SynchronizedStack<Object> stack = new SynchronizedStack<>();
Object o1 = new Object();
Object o2 = new Object();
@@ -51,7 +51,7 @@ public class TestConcurrentStack {
@Test
public void testExpandPushPopOrder() {
- ConcurrentStack<Object> stack = new ConcurrentStack<>();
+ SynchronizedStack<Object> stack = new SynchronizedStack<>();
Object o1 = new Object();
Object o2 = new Object();
@@ -77,7 +77,7 @@ public class TestConcurrentStack {
@Test
public void testLimit() {
- ConcurrentStack<Object> stack = new ConcurrentStack<>(2,2);
+ SynchronizedStack<Object> stack = new SynchronizedStack<>(2,2);
Object o1 = new Object();
Object o2 = new Object();
@@ -98,7 +98,7 @@ public class TestConcurrentStack {
@Test
public void testLimitExpand() {
- ConcurrentStack<Object> stack = new ConcurrentStack<>(1,3);
+ SynchronizedStack<Object> stack = new SynchronizedStack<>(1,3);
Object o1 = new Object();
Object o2 = new Object();
Copied:
tomcat/trunk/test/org/apache/tomcat/util/collections/TesterPerformanceSynchronizedStack.java
(from r1389076,
tomcat/trunk/test/org/apache/tomcat/util/collections/TesterPerformanceConcurrentStack.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/collections/TesterPerformanceSynchronizedStack.java?p2=tomcat/trunk/test/org/apache/tomcat/util/collections/TesterPerformanceSynchronizedStack.java&p1=tomcat/trunk/test/org/apache/tomcat/util/collections/TesterPerformanceConcurrentStack.java&r1=1389076&r2=1389128&rev=1389128&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/util/collections/TesterPerformanceConcurrentStack.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/collections/TesterPerformanceSynchronizedStack.java
Sun Sep 23 19:32:20 2012
@@ -21,13 +21,13 @@ import java.util.concurrent.ConcurrentLi
import org.junit.Test;
-public class TesterPerformanceConcurrentStack {
+public class TesterPerformanceSynchronizedStack {
private static final int THREAD_COUNT = 8;
private static final int ITERATIONS = 1000000;
- private static final ConcurrentStack<Object> STACK =
- new ConcurrentStack<>();
+ private static final SynchronizedStack<Object> STACK =
+ new SynchronizedStack<>();
private static final Queue<Object> QUEUE = new ConcurrentLinkedQueue<>();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
