fix(RandomWalk): do not use Thread.Abort

richardschneider · May 21, 2019 · e5674de · e5674de
1 parent 34d534d
commit e5674de
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/RandomWalk.cs b/src/RandomWalk.cs
@@ -21,6 +21,7 @@ public class RandomWalk : IService
         static ILog log = LogManager.GetLogger(typeof(RandomWalk));
         Random rng = new Random();
         Thread thread;
+        CancellationTokenSource cancel;
 
         /// <summary>
         ///   The Distributed Hash Table to query.
@@ -58,6 +59,7 @@ public Task StartAsync()
             {
                 IsBackground = true
             };
+            cancel = new CancellationTokenSource();
             thread.Start();
             log.Debug("started");
 
@@ -69,7 +71,9 @@ public Task StartAsync()
         /// </summary>
         public Task StopAsync()
         {
-            thread?.Abort();
+            cancel?.Cancel();
+            cancel?.Dispose();
+            cancel = null;
             thread = null;
 
             log.Debug("stopped");
@@ -106,7 +110,8 @@ void RunQuery()
             var id = MultiHash.ComputeHash(x);
 
             // Run the query for a while.
-            using (var cts = new CancellationTokenSource(QueryTime))
+            using (var timeout = new CancellationTokenSource(QueryTime))
+            using (var cts = CancellationTokenSource.CreateLinkedTokenSource(timeout.Token, cancel.Token))
             {
                 var _ = Dht.FindPeerAsync(id, cts.Token).Result;
             }