The lazy start for ConsumerWorkService's threads introduced. A disambiguation between the main model and others no longer needed - first AddWork will spawn a working thread.

Author: Scooletz

projects/client/RabbitMQ.Client/src/client/impl/ConcurrentConsumerDispatcher.cs

@@ -13,7 +13,6 @@ public ConcurrentConsumerDispatcher(ModelBase model, ConsumerWorkService ws)
         {
             this.model = model;
             this.workService = ws;
-            this.workService.RegisterKey(model);
             this.IsShutdown = false;
         }
 

projects/client/RabbitMQ.Client/src/client/impl/ConsumerWorkService.cs

@@ -10,35 +10,27 @@ public class ConsumerWorkService
 
         public void AddWork(IModel model, Action fn)
         {
+            // two step approach is taken, as TryGetValue does not aquire locks
+            // if this fails, GetOrAdd is called, which takes a lock
+
             WorkPool workPool;
-            if (workPools.TryGetValue(model, out workPool))
+            if (workPools.TryGetValue(model, out workPool) == false)
             {
-                workPool.Enqueue(fn);
-            }
-        }
+                var newWorkPool = new WorkPool(model);
+                workPool = workPools.GetOrAdd(model, newWorkPool);
 
-        public void RegisterKey(IModel model)
-        {
-            // the main model can be skipped, as it will not use CWS anyway
-            if (model.ChannelNumber == 0)
-            {
-                return;
+                // start if it's only the workpool that has been just created
+                if (newWorkPool == workPool)
+                {
+                    newWorkPool.Start();
+                }
             }
 
-            var workPool = new WorkPool(model);
-            if (workPools.TryAdd(model, workPool))
-            {
-                workPool.Start();
-            }
+            workPool.Enqueue(fn);
         }
 
         public void StopWork(IModel model)
         {
-            if (model.ChannelNumber == 0)
-            {
-                return;
-            }
-
             WorkPool workPool;
             if (workPools.TryRemove(model, out workPool))
             {
@@ -54,7 +46,6 @@ public void StopWork()
             }
         }
 
-
         class WorkPool
         {
             readonly ConcurrentQueue<Action> actions;