Dispatch callbacks separately from the IRC ticks. Fixes #22.

Is this thread safe? YOLO
voided · Jul 14, 2018 · 4e467cf · 4e467cf
1 parent ed1ec5e
commit 4e467cf
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/SteamIrcBot/Service/ServiceDispatcher.cs b/SteamIrcBot/Service/ServiceDispatcher.cs
@@ -13,35 +13,48 @@ class ServiceDispatcher
         public static ServiceDispatcher Instance { get { return _instance; } }
 
 
-        Task dispatcher;
+        Task mainDispatcher;
+        Task ircDispatcher;
         CancellationTokenSource cancelToken;
 
 
         ServiceDispatcher()
         {
             cancelToken = new CancellationTokenSource();
-            dispatcher = new Task( ServiceTick, cancelToken.Token, TaskCreationOptions.LongRunning );
+            mainDispatcher = new Task(MainTick, cancelToken.Token, TaskCreationOptions.LongRunning);
+            ircDispatcher = new Task(IrcTick, cancelToken.Token, TaskCreationOptions.LongRunning);
         }
 
 
-        void ServiceTick()
+        void MainTick()
         {
             while ( true )
             {
                 if ( cancelToken.IsCancellationRequested )
                     break;
 
                 Steam.Instance.Tick();
-                IRC.Instance.Tick();
                 RSS.Instance.Tick();
             }
         }
 
+        void IrcTick()
+        {
+            while (true)
+            {
+                if (cancelToken.IsCancellationRequested)
+                    break;
+
+                IRC.Instance.Tick();
+            }
+        }
+
 
 
         public void Start()
         {
-            dispatcher.Start();
+            mainDispatcher.Start();
+            ircDispatcher.Start();
         }
 
         public void Stop()
@@ -52,7 +65,7 @@ public void Stop()
 
         public void Wait()
         {
-            dispatcher.Wait();
+            Task.WaitAll(mainDispatcher, ircDispatcher);
         }
 
     }