Add overload of Poller.Run to allow user to specify SynchronizationContext

Author: simonholt

src/NetMQ/NetMQPoller.cs

@@ -355,6 +355,7 @@ public void RunAsync(string threadName)
             m_switch.WaitForOn();
         }
 
+#if NET35
         /// <summary>
         /// Runs the poller on the caller's thread. Only returns when <see cref="Stop"/> or <see cref="StopAsync"/> are called from another thread.
         /// </summary>
@@ -364,16 +365,68 @@ public void Run()
             if (IsRunning)
                 throw new InvalidOperationException("NetMQPoller is already running");
 
-#if NET35
             m_pollerThread = Thread.CurrentThread;
+            m_stopSignaler.Reset();
+            m_switch.SwitchOn();
+
+            try
+            {
+                RunPoller();
+            }
+            finally
+            {
+                m_pollerThread = null;
+                m_switch.SwitchOff();
+            }
+        }
 #else
+        /// <summary>
+        /// Runs the poller on the caller's thread. Only returns when <see cref="Stop"/> or <see cref="StopAsync"/> are called from another thread.
+        /// </summary>
+        public void Run()
+        {
+            Run(new NetMQSynchronizationContext(this));
+        }
+
+        /// <summary>
+        /// Runs the poller on the caller's thread. Only returns when <see cref="Stop" /> or <see cref="StopAsync" /> are called from another thread.
+        /// </summary>
+        /// <param name="syncContext">The synchronization context that will be used.</param>
+         public void Run(SynchronizationContext syncContext)
+         {
+            if (syncContext == null)
+                throw new ArgumentNullException("Must supply a Synchronization Context");
+
+            CheckDisposed();
+            if (IsRunning)
+                throw new InvalidOperationException("NetMQPoller is already running");
+
             var oldSynchronisationContext = SynchronizationContext.Current;
-            SynchronizationContext.SetSynchronizationContext(new NetMQSynchronizationContext(this));
+            SynchronizationContext.SetSynchronizationContext(syncContext);
             m_isSchedulerThread.Value = true;
-#endif
-            m_stopSignaler.Reset();
 
+            m_stopSignaler.Reset();
             m_switch.SwitchOn();
+
+            try
+            {
+                RunPoller();
+            }
+            finally
+            {
+                m_isSchedulerThread.Value = false;
+                SynchronizationContext.SetSynchronizationContext(oldSynchronisationContext);
+                m_switch.SwitchOff();
+            }
+
+        }
+#endif
+
+        /// <summary>
+        /// Runs the poller on the caller's thread. Only returns when <see cref="Stop"/> or <see cref="StopAsync"/> are called from another thread.
+        /// </summary>
+        private void RunPoller()
+        {
             try
             {
                 // Recalculate all timers now
@@ -487,21 +540,8 @@ public void Run()
             }
             finally
             {
-                try
-                {
-                    foreach (var socket in m_sockets.ToList())
-                        Remove(socket);
-                }
-                finally
-                {
-#if NET35
-                    m_pollerThread = null;
-#else
-                    m_isSchedulerThread.Value = false;
-                    SynchronizationContext.SetSynchronizationContext(oldSynchronisationContext);
-#endif
-                    m_switch.SwitchOff();
-                }
+                foreach (var socket in m_sockets.ToList())
+                    Remove(socket);
             }
         }
 
@@ -540,7 +580,7 @@ public void StopAsync()
             m_stopSignaler.RequestStop();
         }
 
-        #endregion
+#endregion
 
         private void OnSocketEventsChanged(object sender, NetMQSocketEventArgs e)
         {
@@ -579,7 +619,7 @@ private void RebuildPollset()
             m_isPollSetDirty = false;
         }
 
-        #region IEnumerable
+#region IEnumerable
 
         /// <summary>This class only implements <see cref="IEnumerable"/> in order to support collection initialiser syntax.</summary>
         /// <returns>An empty enumerator.</returns>
@@ -588,9 +628,9 @@ IEnumerator IEnumerable.GetEnumerator()
             yield break;
         }
 
-        #endregion
+#endregion
 
-        #region IDisposable
+#region IDisposable
 
         private enum DisposeState
         {
@@ -647,9 +687,9 @@ public void Dispose()
             m_disposeState = (int)DisposeState.Disposed;
         }
 
-        #endregion
+#endregion
 
-        #region ISynchronizeInvoke
+#region ISynchronizeInvoke
 
 #if NET40
         IAsyncResult ISynchronizeInvoke.BeginInvoke(Delegate method, object[] args)
@@ -678,9 +718,9 @@ object ISynchronizeInvoke.Invoke(Delegate method, object[] args)
         bool ISynchronizeInvoke.InvokeRequired => !CanExecuteTaskInline;
 #endif
 
-        #endregion
+#endregion
 
-        #region Synchronisation context
+#region Synchronisation context
 
 #if !NET35
         private sealed class NetMQSynchronizationContext : SynchronizationContext
@@ -709,6 +749,6 @@ public override void Send(SendOrPostCallback d, object state)
         }
 #endif
 
-        #endregion
+#endregion
     }
 }