You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/10/28 17:18:08 UTC
svn commit: r1190392 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/catalina/core/StandardWrapper.java webapps/docs/changelog.xml
Author: markt
Date: Fri Oct 28 15:18:08 2011
New Revision: 1190392
URL: http://svn.apache.org/viewvc?rev=1190392&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52091
Address performance issues related to lock contention in StandardWrapper
Patch provided by Taiki Sugawara.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 28 15:18:08 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187755,1187
775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1190392&r1=1190391&r2=1190392&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Fri Oct 28 15:18:08 2011
@@ -26,6 +26,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Stack;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.management.ListenerNotFoundException;
import javax.management.MBeanNotificationInfo;
@@ -295,6 +296,16 @@ public class StandardWrapper extends Con
ServletResponse.class};
+ private final ReentrantReadWriteLock parametersLock =
+ new ReentrantReadWriteLock();
+
+ private final ReentrantReadWriteLock mappingsLock =
+ new ReentrantReadWriteLock();
+
+ private final ReentrantReadWriteLock referencesLock =
+ new ReentrantReadWriteLock();
+
+
// ------------------------------------------------------------- Properties
@Override
@@ -744,8 +755,11 @@ public class StandardWrapper extends Con
@Override
public void addInitParameter(String name, String value) {
- synchronized (parameters) {
+ try {
+ parametersLock.writeLock().lock();
parameters.put(name, value);
+ } finally {
+ parametersLock.writeLock().unlock();
}
fireContainerEvent("addInitParameter", name);
@@ -773,8 +787,11 @@ public class StandardWrapper extends Con
@Override
public void addMapping(String mapping) {
- synchronized (mappings) {
+ try {
+ mappingsLock.writeLock().lock();
mappings.add(mapping);
+ } finally {
+ mappingsLock.writeLock().unlock();
}
if(parent.getState().equals(LifecycleState.STARTED))
fireContainerEvent(ADD_MAPPING_EVENT, mapping);
@@ -792,8 +809,11 @@ public class StandardWrapper extends Con
@Override
public void addSecurityReference(String name, String link) {
- synchronized (references) {
+ try {
+ referencesLock.writeLock().lock();
references.put(name, link);
+ } finally {
+ referencesLock.writeLock().unlock();
}
fireContainerEvent("addSecurityReference", name);
@@ -948,8 +968,11 @@ public class StandardWrapper extends Con
@Override
public String findInitParameter(String name) {
- synchronized (parameters) {
+ try {
+ parametersLock.readLock().lock();
return parameters.get(name);
+ } finally {
+ parametersLock.readLock().unlock();
}
}
@@ -962,9 +985,12 @@ public class StandardWrapper extends Con
@Override
public String[] findInitParameters() {
- synchronized (parameters) {
+ try {
+ parametersLock.readLock().lock();
String results[] = new String[parameters.size()];
return parameters.keySet().toArray(results);
+ } finally {
+ parametersLock.readLock().unlock();
}
}
@@ -976,8 +1002,11 @@ public class StandardWrapper extends Con
@Override
public String[] findMappings() {
- synchronized (mappings) {
+ try {
+ mappingsLock.readLock().lock();
return mappings.toArray(new String[mappings.size()]);
+ } finally {
+ mappingsLock.readLock().unlock();
}
}
@@ -992,8 +1021,11 @@ public class StandardWrapper extends Con
@Override
public String findSecurityReference(String name) {
- synchronized (references) {
+ try {
+ referencesLock.readLock().lock();
return references.get(name);
+ } finally {
+ referencesLock.readLock().unlock();
}
}
@@ -1006,9 +1038,12 @@ public class StandardWrapper extends Con
@Override
public String[] findSecurityReferences() {
- synchronized (references) {
+ try {
+ referencesLock.readLock().lock();
String results[] = new String[references.size()];
return references.keySet().toArray(results);
+ } finally {
+ referencesLock.readLock().unlock();
}
}
@@ -1265,8 +1300,11 @@ public class StandardWrapper extends Con
@Override
public void removeInitParameter(String name) {
- synchronized (parameters) {
+ try {
+ parametersLock.writeLock().lock();
parameters.remove(name);
+ } finally {
+ parametersLock.writeLock().unlock();
}
fireContainerEvent("removeInitParameter", name);
@@ -1294,8 +1332,11 @@ public class StandardWrapper extends Con
@Override
public void removeMapping(String mapping) {
- synchronized (mappings) {
+ try {
+ mappingsLock.writeLock().lock();
mappings.remove(mapping);
+ } finally {
+ mappingsLock.writeLock().unlock();
}
if(parent.getState().equals(LifecycleState.STARTED))
fireContainerEvent(REMOVE_MAPPING_EVENT, mapping);
@@ -1311,8 +1352,11 @@ public class StandardWrapper extends Con
@Override
public void removeSecurityReference(String name) {
- synchronized (references) {
+ try {
+ referencesLock.writeLock().lock();
references.remove(name);
+ } finally {
+ referencesLock.writeLock().unlock();
}
fireContainerEvent("removeSecurityReference", name);
@@ -1522,8 +1566,11 @@ public class StandardWrapper extends Con
@Override
public Enumeration<String> getInitParameterNames() {
- synchronized (parameters) {
+ try {
+ parametersLock.readLock().lock();
return (new Enumerator<String>(parameters.keySet()));
+ } finally {
+ parametersLock.readLock().unlock();
}
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1190392&r1=1190391&r2=1190392&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Oct 28 15:18:08 2011
@@ -161,6 +161,10 @@
exception throwing when an application attempts to modify the associated
JNDI context to be disabled. (markt)
</add>
+ <fix>
+ <bug>52091</bug>: Address performance issues related to lock contention
+ StandardWrapper. Patch provided by Taiki Sugawara. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
@@ -199,7 +203,7 @@
client rather than a 500 response. (markt)
</fix>
<fix>
- <bug>52091</bug>: ddress performance issues related to log creation
+ <bug>52091</bug>: Address performance issues related to log creation
TagHandlerPool. Patch provided by Taiki Sugawara. (markt)
</fix>
</changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org