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 2015/01/29 10:29:36 UTC
svn commit: r1655559 - in /tomcat/tc8.0.x/trunk: ./
java/org/apache/catalina/ java/org/apache/catalina/core/
java/org/apache/catalina/webresources/
Author: markt
Date: Thu Jan 29 09:29:35 2015
New Revision: 1655559
URL: http://svn.apache.org/r1655559
Log:
Separate out the gc process from the background process so gc() can be called independently.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceRoot.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceSet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 29 09:29:35 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceRoot.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceRoot.java?rev=1655559&r1=1655558&r2=1655559&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceRoot.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceRoot.java Thu Jan 29 09:29:35 2015
@@ -407,6 +407,12 @@ public interface WebResourceRoot extends
*/
List<URL> getBaseUrls();
+ /**
+ * Implementations may cache some information to improve performance. This
+ * method triggers the clean-up of those resources.
+ */
+ void gc();
+
static enum ResourceSetType {
PRE,
RESOURCE_JAR,
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceSet.java?rev=1655559&r1=1655558&r2=1655559&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceSet.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceSet.java Thu Jan 29 09:29:35 2015
@@ -147,8 +147,8 @@ public interface WebResourceSet extends
boolean isReadOnly();
/**
- * Hook to allow the WebResourceRoot to trigger regular tasks on this set of
- * resources.
+ * Implementations may cache some information to improve performance. This
+ * method triggers the clean-up of those resources.
*/
- void backgroundProcess();
+ void gc();
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1655559&r1=1655558&r2=1655559&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Thu Jan 29 09:29:35 2015
@@ -5217,11 +5217,10 @@ public class StandardContext extends Con
}
// The WebResources implementation caches references to JAR files. On
- // some platforms these references may lock the JAR files. The
- // WebResources implementaion cleans-up unused JAR file references every
- // run of background processing but since web application start is
- // likely to have read from lots of JARs, trigger a clean-up now.
- getResources().backgroundProcess();
+ // some platforms these references may lock the JAR files. Since web
+ // application start is likely to have read from lots of JARs, trigger
+ // a clean-up now.
+ getResources().gc();
// Reinitializing if something went wrong
if (!ok) {
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java?rev=1655559&r1=1655558&r2=1655559&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java Thu Jan 29 09:29:35 2015
@@ -294,7 +294,7 @@ public abstract class AbstractArchiveRes
}
@Override
- public void backgroundProcess() {
+ public void gc() {
synchronized (archiveLock) {
if (archive != null && archiveUseCount == 0) {
try {
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java?rev=1655559&r1=1655558&r2=1655559&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java Thu Jan 29 09:29:35 2015
@@ -132,7 +132,7 @@ public abstract class AbstractFileResour
* This is a NO-OP by default for File based resource sets.
*/
@Override
- public void backgroundProcess() {
+ public void gc() {
// NO-OP
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java?rev=1655559&r1=1655558&r2=1655559&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java Thu Jan 29 09:29:35 2015
@@ -153,7 +153,7 @@ public class EmptyResourceSet extends Li
}
@Override
- public void backgroundProcess() {
+ public void gc() {
// NO-OP
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1655559&r1=1655558&r2=1655559&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java Thu Jan 29 09:29:35 2015
@@ -593,14 +593,20 @@ public class StandardRoot extends Lifecy
@Override
public void backgroundProcess() {
cache.backgroundProcess();
+ gc();
+ }
+
+
+
+ @Override
+ public void gc() {
for (List<WebResourceSet> list : allResources) {
for (WebResourceSet webResourceSet : list) {
- webResourceSet.backgroundProcess();
+ webResourceSet.gc();
}
}
}
-
@Override
public void registerTrackedResource(TrackedWebResource trackedResource) {
trackedResources.add(trackedResource);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org