commit d1380d52999e3c47e978879059f5017d01b257f3
author Jens Geyer <jensg@apache.org> Fri May 12 22:49:57 2017 +0200
committer Jens Geyer <jensg@apache.org> Sun May 14 12:57:11 2017 +0200
tree 49f9008596e187216cd9a5cd9f6cad52c66689cb
parent b67cad46e43c2a88e6f9cc986a9f0c3b6b300971

THRIFT-4190 Improve C# TThreadPoolServer defaults (part 2 of 2)
Client: C#
Patch: Jens Geyer

This closes #1268

lib/csharp/src/Server/TThreadPoolServer.cs

diff --git a/lib/csharp/src/Server/TThreadPoolServer.cs b/lib/csharp/src/Server/TThreadPoolServer.cs
index 0010ece..b7346b8 100644
--- a/lib/csharp/src/Server/TThreadPoolServer.cs
+++ b/lib/csharp/src/Server/TThreadPoolServer.cs
@@ -33,15 +33,39 @@
   /// </summary>
   public class TThreadPoolServer : TServer
   {
-    private const int DEFAULT_MIN_THREADS = 10;
-    private const int DEFAULT_MAX_THREADS = 100;
+    private const int DEFAULT_MIN_THREADS = -1;  // use .NET ThreadPool defaults
+    private const int DEFAULT_MAX_THREADS = -1;  // use .NET ThreadPool defaults
     private volatile bool stop = false;
 
+    public struct Configuration
+    {
+      public int MinWorkerThreads;
+      public int MaxWorkerThreads;
+      public int MinIOThreads;
+      public int MaxIOThreads;
+
+      public Configuration(int min = DEFAULT_MIN_THREADS, int max = DEFAULT_MAX_THREADS)
+      {
+        MinWorkerThreads = min;
+        MaxWorkerThreads = max;
+        MinIOThreads = min;
+        MaxIOThreads = max;
+      }
+
+      public Configuration(int minWork, int maxWork, int minIO, int maxIO)
+      {
+        MinWorkerThreads = minWork;
+        MaxWorkerThreads = maxWork;
+        MinIOThreads = minIO;
+        MaxIOThreads = maxIO;
+      }
+    }
+
     public TThreadPoolServer(TProcessor processor, TServerTransport serverTransport)
         : this(new TSingletonProcessorFactory(processor), serverTransport,
          new TTransportFactory(), new TTransportFactory(),
          new TBinaryProtocol.Factory(), new TBinaryProtocol.Factory(),
-         DEFAULT_MIN_THREADS, DEFAULT_MAX_THREADS, DefaultLogDelegate)
+         new Configuration(), DefaultLogDelegate)
     {
     }
 
@@ -49,7 +73,7 @@
         : this(new TSingletonProcessorFactory(processor), serverTransport,
          new TTransportFactory(), new TTransportFactory(),
          new TBinaryProtocol.Factory(), new TBinaryProtocol.Factory(),
-         DEFAULT_MIN_THREADS, DEFAULT_MAX_THREADS, logDelegate)
+         new Configuration(), logDelegate)
     {
     }
 
@@ -60,7 +84,7 @@
         : this(new TSingletonProcessorFactory(processor), serverTransport,
            transportFactory, transportFactory,
            protocolFactory, protocolFactory,
-           DEFAULT_MIN_THREADS, DEFAULT_MAX_THREADS, DefaultLogDelegate)
+           new Configuration(), DefaultLogDelegate)
     {
     }
 
@@ -71,7 +95,7 @@
         : this(processorFactory, serverTransport,
          transportFactory, transportFactory,
          protocolFactory, protocolFactory,
-         DEFAULT_MIN_THREADS, DEFAULT_MAX_THREADS, DefaultLogDelegate)
+         new Configuration(), DefaultLogDelegate)
     {
     }
 
@@ -82,24 +106,48 @@
                  TProtocolFactory inputProtocolFactory,
                  TProtocolFactory outputProtocolFactory,
                  int minThreadPoolThreads, int maxThreadPoolThreads, LogDelegate logDel)
+        : this(processorFactory, serverTransport, inputTransportFactory, outputTransportFactory,
+         inputProtocolFactory, outputProtocolFactory,
+         new Configuration(minThreadPoolThreads, maxThreadPoolThreads),
+         logDel)
+    {
+    }
+
+    public TThreadPoolServer(TProcessorFactory processorFactory,
+                 TServerTransport serverTransport,
+                 TTransportFactory inputTransportFactory,
+                 TTransportFactory outputTransportFactory,
+                 TProtocolFactory inputProtocolFactory,
+                 TProtocolFactory outputProtocolFactory,
+                 Configuration threadConfig,
+                 LogDelegate logDel)
         : base(processorFactory, serverTransport, inputTransportFactory, outputTransportFactory,
-          inputProtocolFactory, outputProtocolFactory, logDel)
+        inputProtocolFactory, outputProtocolFactory, logDel)
     {
       lock (typeof(TThreadPoolServer))
       {
-        if(maxThreadPoolThreads > 0)
+        if ((threadConfig.MaxWorkerThreads > 0) || (threadConfig.MaxIOThreads > 0))
         {
-          if (!ThreadPool.SetMaxThreads(maxThreadPoolThreads, maxThreadPoolThreads))
-          {
+          int work, comm;
+          ThreadPool.GetMaxThreads(out work, out comm);
+          if (threadConfig.MaxWorkerThreads > 0)
+            work = threadConfig.MaxWorkerThreads;
+          if (threadConfig.MaxIOThreads > 0)
+            comm = threadConfig.MaxIOThreads;
+          if (!ThreadPool.SetMaxThreads(work, comm))
             throw new Exception("Error: could not SetMaxThreads in ThreadPool");
-          }
         }
-        if (minThreadPoolThreads > 0)
+
+        if ((threadConfig.MinWorkerThreads > 0) || (threadConfig.MinIOThreads > 0))
         {
-          if (!ThreadPool.SetMinThreads(minThreadPoolThreads, minThreadPoolThreads))
-          {
+          int work, comm;
+          ThreadPool.GetMinThreads(out work, out comm);
+          if (threadConfig.MinWorkerThreads > 0)
+            work = threadConfig.MinWorkerThreads;
+          if (threadConfig.MinIOThreads > 0)
+            comm = threadConfig.MinIOThreads;
+          if (!ThreadPool.SetMinThreads(work, comm))
             throw new Exception("Error: could not SetMinThreads in ThreadPool");
-          }
         }
       }
     }