svn commit: r1103268 - in /trafficserver/traffic/trunk/proxy: Main.cc config/records.config.default.in

[zw...@apache.org]

Author: zwoop
Date: Sun May 15 03:16:30 2011
New Revision: 1103268

URL: http://svn.apache.org/viewvc?rev=1103268&view=rev
Log:
TS-780 Retune the number of SSL threads

Modified:
    trafficserver/traffic/trunk/proxy/Main.cc
    trafficserver/traffic/trunk/proxy/config/records.config.default.in

Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=1103268&r1=1103267&r2=1103268&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Sun May 15 03:16:30 2011
@@ -1409,29 +1409,20 @@ getNumSSLThreads(void)
   // enabled, leave num of ssl threads one, incase a remap rule
   // requires traffic server to act as an ssl client.
   if (ssl_enabled) {
-    if (config_num_ssl_threads != 0)
+    if (config_num_ssl_threads != 0) {
       num_of_ssl_threads = config_num_ssl_threads;
-    else if (ssl_blocking != 0)
-      num_of_ssl_threads = number_of_processors * 4;
-    else {
+    } else {
+      float autoconfig_scale = 1.5;
+
       ink_assert(number_of_processors);
-      switch (number_of_processors) {
-      case 0:
-        break;
-      case 1:
-      case 2:
-        num_of_ssl_threads = number_of_processors;
-        break;
-      case 3:
-      case 4:
-      default:
-        num_of_ssl_threads = number_of_processors * 2;
-        break;
-      }
+      TS_ReadConfigFloat(autoconfig_scale, "proxy.config.exec_thread.autoconfig.scale");
+      num_of_ssl_threads = number_of_processors * autoconfig_scale;
+      if (ssl_blocking != 0)
+        num_of_ssl_threads *= 2; // Double when blocking I/O
     }
   }
-  return (num_of_ssl_threads);
 
+  return num_of_ssl_threads;
 }
 
 static void

Modified: trafficserver/traffic/trunk/proxy/config/records.config.default.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/config/records.config.default.in?rev=1103268&r1=1103267&r2=1103268&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/config/records.config.default.in (original)
+++ trafficserver/traffic/trunk/proxy/config/records.config.default.in Sun May 15 03:16:30 2011
@@ -467,6 +467,10 @@ CONFIG proxy.config.url_remap.pristine_h
    #   0 - none
    #   1 - SSL enabled
 CONFIG proxy.config.ssl.enabled INT 0
+   # The number of SSL threads is a multiplier of number of CPUs and
+   # proxy.config.exec_thread.autoconfig.scale by default. You can
+   # override that here (set it to a non-zero value).
+CONFIG proxy.config.ssl.number.threads INT 0
    # proxy.config.ssl.accelerator_required should be:
    #   0 - not required
    #   1 - required for SSL; won't start SSL if card not present