Merge pull request #1388 from rabbitmq/rabbitmq-dotnet-client-1355

Start main reader loop using the default TaskScheduler
rabbitmq · Sep 25, 2023 · 66f499a · 66f499a
2 parents 6677851 + b502081
commit 66f499a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 72 deletions.
diff --git a/projects/RabbitMQ.Client/client/api/ConnectionFactory.cs b/projects/RabbitMQ.Client/client/api/ConnectionFactory.cs
@@ -428,7 +428,9 @@ public ICredentialsProvider CredentialsProvider
 
         /// <summary>
         /// When set to true, background thread will be used for the I/O loop.
+        /// NB: No-op
         /// </summary>
+        [Obsolete("Currently a no-op. UseBackgroundThreadsForIO will be removed in version 7")]
         public bool UseBackgroundThreadsForIO { get; set; }
 
         /// <summary>

diff --git a/projects/RabbitMQ.Client/client/impl/Connection.cs b/projects/RabbitMQ.Client/client/impl/Connection.cs
@@ -116,7 +116,8 @@ public Connection(IConnectionFactory factory, bool insist, IFrameHandler frameHa
             _session0 = new MainSession(this) { Handler = NotifyReceivedCloseOk };
             _model0 = (ModelBase)Protocol.CreateModel(_session0);
 
-            StartMainLoop(factory.UseBackgroundThreadsForIO);
+            StartMainLoop();
+
             try
             {
                 Open(insist);
@@ -848,9 +849,10 @@ public void MaybeStartHeartbeatTimers()
             }
         }
 
-        public void StartMainLoop(bool useBackgroundThread)
+        public void StartMainLoop()
         {
-            _mainLoopTask = Task.Factory.StartNew(MainLoop, TaskCreationOptions.LongRunning | TaskCreationOptions.DenyChildAttach);
+            TaskCreationOptions opts = TaskCreationOptions.LongRunning | TaskCreationOptions.DenyChildAttach;
+            _mainLoopTask = Task.Factory.StartNew(MainLoop, CancellationToken.None, opts, TaskScheduler.Default);
         }
 
         public void HeartbeatReadTimerCallback(object state)

diff --git a/projects/Unit/APIApproval.Approve.verified.txt b/projects/Unit/APIApproval.Approve.verified.txt
@@ -121,6 +121,7 @@ namespace RabbitMQ.Client
         public RabbitMQ.Client.TopologyRecoveryExceptionHandler TopologyRecoveryExceptionHandler { get; set; }
         public RabbitMQ.Client.TopologyRecoveryFilter TopologyRecoveryFilter { get; set; }
         public System.Uri Uri { get; set; }
+        [System.Obsolete("Currently a no-op. UseBackgroundThreadsForIO will be removed in version 7")]
         public bool UseBackgroundThreadsForIO { get; set; }
         public string UserName { get; set; }
         public string VirtualHost { get; set; }

diff --git a/projects/Unit/TestConnectionWithBackgroundThreads.cs b/projects/Unit/TestConnectionWithBackgroundThreads.cs