tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1551352 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Date Mon, 16 Dec 2013 20:59:36 GMT
Author: markt
Date: Mon Dec 16 20:59:36 2013
New Revision: 1551352

URL: http://svn.apache.org/r1551352
Log:
Performance improvement
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=55855
Make the adding of the WsFilter lazy so it doesn't get added to web apps that don't need it.

Modified:
    tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1551352&r1=1551351&r2=1551352&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java Mon Dec 16
20:59:36 2013
@@ -87,76 +87,91 @@ public class WsServerContainer extends W
     private volatile boolean addAllowed = true;
     private final ConcurrentHashMap<String,Set<WsSession>> authenticatedSessions
=
             new ConcurrentHashMap<>();
-    private final ExecutorService executorService;
+    private ExecutorService executorService;
+    private volatile boolean initialized = false;
 
     WsServerContainer(ServletContext servletContext) {
-
         this.servletContext = servletContext;
+    }
 
-        // Configure servlet context wide defaults
-        String value = servletContext.getInitParameter(
-                Constants.BINARY_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM);
-        if (value != null) {
-            setDefaultMaxBinaryMessageBufferSize(Integer.parseInt(value));
-        }
-
-        value = servletContext.getInitParameter(
-                Constants.TEXT_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM);
-        if (value != null) {
-            setDefaultMaxTextMessageBufferSize(Integer.parseInt(value));
-        }
-
-        value = servletContext.getInitParameter(
-                Constants.ENFORCE_NO_ADD_AFTER_HANDSHAKE_CONTEXT_INIT_PARAM);
-        if (value != null) {
-            setEnforceNoAddAfterHandshake(Boolean.parseBoolean(value));
-        }
-        // Executor config
-        int executorCoreSize = 0;
-        int executorMaxSize = 10;
-        long executorKeepAliveTimeSeconds = 60;
-        value = servletContext.getInitParameter(
-                Constants.EXECUTOR_CORE_SIZE_INIT_PARAM);
-        if (value != null) {
-            executorCoreSize = Integer.parseInt(value);
-        }
-        value = servletContext.getInitParameter(
-                Constants.EXECUTOR_MAX_SIZE_INIT_PARAM);
-        if (value != null) {
-            executorMaxSize = Integer.parseInt(value);
-        }
-        value = servletContext.getInitParameter(
-                Constants.EXECUTOR_KEEPALIVETIME_SECONDS_INIT_PARAM);
-        if (value != null) {
-            executorKeepAliveTimeSeconds = Long.parseLong(value);
-        }
-
-        FilterRegistration.Dynamic fr = servletContext.addFilter(
-                "Tomcat WebSocket (JSR356) Filter", new WsFilter());
-        fr.setAsyncSupported(true);
-
-        EnumSet<DispatcherType> types = EnumSet.of(DispatcherType.REQUEST,
-                DispatcherType.FORWARD);
-
-        fr.addMappingForUrlPatterns(types, true, "/*");
-
-        // Use a per web application executor for any threads the the WebSocket
-        // server code needs to create. Group all of the threads under a single
-        // ThreadGroup.
-        StringBuffer threadGroupName = new StringBuffer("WebSocketServer-");
-        threadGroupName.append(servletContext.getVirtualServerName());
-        threadGroupName.append('-');
-        if ("".equals(servletContext.getContextPath())) {
-            threadGroupName.append("ROOT");
-        } else {
-            threadGroupName.append(servletContext.getContextPath());
-        }
-        ThreadGroup threadGroup = new ThreadGroup(threadGroupName.toString());
-        WsThreadFactory wsThreadFactory = new WsThreadFactory(threadGroup);
+    private void init() {
+
+        // Double checked locking. This is safe since Java > 1.5 and initialized
+        // is volatile
+        if (initialized) {
+            return;
+        }
+        synchronized (this) {
+            if (initialized) {
+                return;
+            }
+            initialized = true;
+
+            // Configure servlet context wide defaults
+            String value = servletContext.getInitParameter(
+                    Constants.BINARY_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM);
+            if (value != null) {
+                setDefaultMaxBinaryMessageBufferSize(Integer.parseInt(value));
+            }
+
+            value = servletContext.getInitParameter(
+                    Constants.TEXT_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM);
+            if (value != null) {
+                setDefaultMaxTextMessageBufferSize(Integer.parseInt(value));
+            }
 
-        executorService = new ThreadPoolExecutor(executorCoreSize,
-                executorMaxSize, executorKeepAliveTimeSeconds, TimeUnit.SECONDS,
-                new LinkedBlockingQueue<Runnable>(), wsThreadFactory);
+            value = servletContext.getInitParameter(
+                    Constants.ENFORCE_NO_ADD_AFTER_HANDSHAKE_CONTEXT_INIT_PARAM);
+            if (value != null) {
+                setEnforceNoAddAfterHandshake(Boolean.parseBoolean(value));
+            }
+            // Executor config
+            int executorCoreSize = 0;
+            int executorMaxSize = 10;
+            long executorKeepAliveTimeSeconds = 60;
+            value = servletContext.getInitParameter(
+                    Constants.EXECUTOR_CORE_SIZE_INIT_PARAM);
+            if (value != null) {
+                executorCoreSize = Integer.parseInt(value);
+            }
+            value = servletContext.getInitParameter(
+                    Constants.EXECUTOR_MAX_SIZE_INIT_PARAM);
+            if (value != null) {
+                executorMaxSize = Integer.parseInt(value);
+            }
+            value = servletContext.getInitParameter(
+                    Constants.EXECUTOR_KEEPALIVETIME_SECONDS_INIT_PARAM);
+            if (value != null) {
+                executorKeepAliveTimeSeconds = Long.parseLong(value);
+            }
+
+            FilterRegistration.Dynamic fr = servletContext.addFilter(
+                    "Tomcat WebSocket (JSR356) Filter", new WsFilter());
+            fr.setAsyncSupported(true);
+
+            EnumSet<DispatcherType> types = EnumSet.of(DispatcherType.REQUEST,
+                    DispatcherType.FORWARD);
+
+            fr.addMappingForUrlPatterns(types, true, "/*");
+
+            // Use a per web application executor for any threads the the WebSocket
+            // server code needs to create. Group all of the threads under a single
+            // ThreadGroup.
+            StringBuffer threadGroupName = new StringBuffer("WebSocketServer-");
+            threadGroupName.append(servletContext.getVirtualServerName());
+            threadGroupName.append('-');
+            if ("".equals(servletContext.getContextPath())) {
+                threadGroupName.append("ROOT");
+            } else {
+                threadGroupName.append(servletContext.getContextPath());
+            }
+            ThreadGroup threadGroup = new ThreadGroup(threadGroupName.toString());
+            WsThreadFactory wsThreadFactory = new WsThreadFactory(threadGroup);
+
+            executorService = new ThreadPoolExecutor(executorCoreSize,
+                    executorMaxSize, executorKeepAliveTimeSeconds, TimeUnit.SECONDS,
+                    new LinkedBlockingQueue<Runnable>(), wsThreadFactory);
+        }
     }
 
 
@@ -172,6 +187,8 @@ public class WsServerContainer extends W
     public void addEndpoint(ServerEndpointConfig sec)
             throws DeploymentException {
 
+        init();
+
         if (enforceNoAddAfterHandshake && !addAllowed) {
             throw new DeploymentException(
                     sm.getString("serverContainer.addNotAllowed"));
@@ -223,6 +240,8 @@ public class WsServerContainer extends W
     @Override
     public void addEndpoint(Class<?> pojo) throws DeploymentException {
 
+        init();
+
         ServerEndpoint annotation = pojo.getAnnotation(ServerEndpoint.class);
         if (annotation == null) {
             throw new DeploymentException(



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message