rmaucher commented on a change in pull request #354:
URL: https://github.com/apache/tomcat/pull/354#discussion_r484426457
##########
File path: java/org/apache/catalina/startup/ContextConfig.java
##########
@@ -122,6 +126,11 @@
private static final Log log = LogFactory.getLog(ContextConfig.class);
+ private static final int DEFAULT_CLASS_CACHE_SIZE = 16384;
+
+ private static final float DEFAULT_LOAD_FACTOR = .75f;
+
+ private static int CONCURRENCY_LEVEL = 1;
Review comment:
Ok for the map size, maybe (it seems very large, 16k classes ?), I don't
quite see the point of the rest. The concurrency may be up to the utility
executor thread count, and I don't think this is an optimization which makes
any difference.
##########
File path: java/org/apache/catalina/startup/ContextConfig.java
##########
@@ -1374,7 +1383,19 @@ protected void webConfig() {
protected void processClasses(WebXml webXml, Set<WebXml> orderedFragments)
{
// Step 4. Process /WEB-INF/classes for annotations and
// @HandlesTypes matches
- Map<String, JavaClassCacheEntry> javaClassCache = new HashMap<>();
+
+ Map<String, JavaClassCacheEntry> javaClassCache;
+
+ if (context.getParent() instanceof Host) {
+ Host host = (Host) context.getParent();
+ Container container = host.getParent();
+ CONCURRENCY_LEVEL = container.getStartStopThreads();
+ javaClassCache = new ConcurrentHashMap<>(DEFAULT_CLASS_CACHE_SIZE,
DEFAULT_LOAD_FACTOR,
+ CONCURRENCY_LEVEL);
+ } else {
+ javaClassCache = new ConcurrentHashMap<>(DEFAULT_CLASS_CACHE_SIZE,
DEFAULT_LOAD_FACTOR,
+ CONCURRENCY_LEVEL);
+ }
Review comment:
Well, if it's changed to be always a ConcurrentHashMap, it probably
won't be a measurable performance difference.
##########
File path: java/org/apache/catalina/startup/ContextConfig.java
##########
@@ -2136,26 +2157,98 @@ protected InputSource getWebXmlSource(String filename,
boolean global) {
}
protected void processAnnotations(Set<WebXml> fragments,
- boolean handlesTypesOnly, Map<String,JavaClassCacheEntry>
javaClassCache) {
- for(WebXml fragment : fragments) {
- // Only need to scan for @HandlesTypes matches if any of the
- // following are true:
- // - it has already been determined only @HandlesTypes is required
- // (e.g. main web.xml has metadata-complete="true"
- // - this fragment is for a container JAR (Servlet 3.1 section 8.1)
- // - this fragment has metadata-complete="true"
- boolean htOnly = handlesTypesOnly || !fragment.getWebappJar() ||
- fragment.isMetadataComplete();
-
- WebXml annotations = new WebXml();
- // no impact on distributable
- annotations.setDistributable(true);
- URL url = fragment.getURL();
- processAnnotationsUrl(url, annotations, htOnly, javaClassCache);
- Set<WebXml> set = new HashSet<>();
- set.add(annotations);
- // Merge annotations into fragment - fragment takes priority
- fragment.merge(set);
+ boolean handlesTypesOnly, Map<String, JavaClassCacheEntry>
javaClassCache) {
+
+ if (context.getParent() instanceof Host && ((Host)
context.getParent()).isParallelAnnotationScanning()) {
+ processAnnotationsInParallel(fragments, handlesTypesOnly,
javaClassCache);
+ return;
+ }
+
+ for (WebXml fragment : fragments) {
+ scanWebXmlFragment(handlesTypesOnly, fragment, javaClassCache);
+ }
+ }
+
+ private void scanWebXmlFragment(boolean handlesTypesOnly, WebXml fragment,
Map<String, JavaClassCacheEntry> javaClassCache) {
+
+ // Only need to scan for @HandlesTypes matches if any of the
+ // following are true:
+ // - it has already been determined only @HandlesTypes is required
+ // (e.g. main web.xml has metadata-complete="true"
+ // - this fragment is for a container JAR (Servlet 3.1 section 8.1)
+ // - this fragment has metadata-complete="true"
+ boolean htOnly = handlesTypesOnly || !fragment.getWebappJar() ||
+ fragment.isMetadataComplete();
+
+ WebXml annotations = new WebXml();
+ // no impact on distributable
+ annotations.setDistributable(true);
+ URL url = fragment.getURL();
+ processAnnotationsUrl(url, annotations, htOnly, javaClassCache);
+ Set<WebXml> set = new HashSet<>();
+ set.add(annotations);
+ // Merge annotations into fragment - fragment takes priority
+ fragment.merge(set);
+ }
+
+ /**
+ * Executable task to scan a segment for annotations. Each task does the
+ * same work as the for loop inside processAnnotations();
+ *
+ * @author Engebretson, John
+ * @author Kamnani, Jatin
+ */
+ private class AnnotationScanTask implements Callable<Void> {
+ private final WebXml fragment;
+ private final boolean handlesTypesOnly;
+ private Map<String, JavaClassCacheEntry> javaClassCache;
+
+ private AnnotationScanTask(WebXml fragment, boolean handlesTypesOnly,
Map<String, JavaClassCacheEntry> javaClassCache) {
+ this.fragment = fragment;
+ this.handlesTypesOnly = handlesTypesOnly;
+ this.javaClassCache = javaClassCache;
+ }
+
+ @Override
+ public Void call() {
+ scanWebXmlFragment(handlesTypesOnly, fragment, javaClassCache);
+
+ return null;
+ }
+
+ }
+
+ /**
+ * Parallelized version of processAnnotationsInParallel(). Constructs
tasks,
+ * submits them as they're created, then waits for completion.
+ *
+ * @param fragments Set of parallelizable scans
+ * @param handlesTypesOnly Important parameter for the underlying scan
+ */
+ protected void processAnnotationsInParallel(Set<WebXml> fragments, boolean
handlesTypesOnly,
+ Map<String,
JavaClassCacheEntry> javaClassCache) {
+
+
+ Server s = getServer();
+ ExecutorService pool = null;
+ try {
+ pool = s.getUtilityExecutor();
+ List<Future<Void>> futures = new ArrayList<>(fragments.size());
+ for (WebXml fragment : fragments) {
+ Callable<Void> task = new AnnotationScanTask(fragment,
handlesTypesOnly, javaClassCache);
+ futures.add(pool.submit(task));
+ }
+ try {
+ for (Future<?> future : futures) {
+ future.get();
+ }
+ } catch (Exception e) {
+ throw new RuntimeException("Parallel execution failed", e);
Review comment:
Localization missing.
##########
File path: java/org/apache/catalina/mbeans/MBeanFactory.java
##########
@@ -490,6 +491,7 @@ public String createStandardContext(String parent,
public String createStandardHost(String parent, String name,
String appBase,
boolean autoDeploy,
+ boolean parallelAnnotationScanning,
Review comment:
I disagree with this API change. IMO this new feature does not justify
it.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
