Merge pull request #48 from fassadlr/memleaks-node-part2

Memory leak fixes for node [Part 2]
stratisproject · Nov 2, 2017 · 2b0fbc3 · 2b0fbc3
2 parents 55ac6dd + 3acd928
commit 2b0fbc3
Show file tree

Hide file tree

Showing 3 changed files with 112 additions and 69 deletions.
diff --git a/NBitcoin.Tests/ProtocolTests.cs b/NBitcoin.Tests/ProtocolTests.cs
@@ -403,26 +403,27 @@ public void CanGetTransactionsFromMemPool()
 		[Fact]
 		public void CanConnectToRandomNode()
 		{
-			Stopwatch watch = new Stopwatch();
-			NodeConnectionParameters parameters = new NodeConnectionParameters();
+			var watch = new Stopwatch();
+			var parameters = new NodeConnectionParameters();
+
 			var addrman = GetCachedAddrMan("addrmancache.dat");
 			parameters.TemplateBehaviors.Add(new AddressManagerBehavior(addrman)
 			{
 				PeersToDiscover = 50
 			});
+
 			watch.Start();
-			IPEndPoint[] connectedEndpoints = null;
-			using (var node = Node.Connect(Network.Main, parameters, connectedEndpoints))
-			{
-				var timeToFind = watch.Elapsed;
-				node.VersionHandshake();
-				node.Dispose();
-				watch.Restart();
-				using (var node2 = Node.Connect(Network.Main, parameters, connectedEndpoints))
-				{
-					var timeToFind2 = watch.Elapsed;
-				}
-			}
+
+			Node node = Node.Connect(Network.Main, parameters);
+			TimeSpan timeToFind = watch.Elapsed;
+			node.VersionHandshake();
+			node.Disconnect();
+
+			watch.Restart();
+			Node node2 = Node.Connect(Network.Main, parameters);
+			TimeSpan timeToFind2 = watch.Elapsed;
+			node.Disconnect();
+
 			addrman.SavePeerFile("addrmancache.dat", Network.Main);
 		}
 

diff --git a/NBitcoin/Protocol/MessageListener.cs b/NBitcoin/Protocol/MessageListener.cs
@@ -1,4 +1,5 @@
 #if !NOSOCKET
+
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -9,7 +10,6 @@
 
 namespace NBitcoin.Protocol
 {
-
 	public interface MessageListener<in T>
 	{
 		void PushMessage(T message);
@@ -35,6 +35,7 @@ public NewThreadMessageListener(Action<T> process)
 				throw new ArgumentNullException("process");
 			_Process = process;
 		}
+
 		#region MessageListener<T> Members
 
 		public void PushMessage(T message)
@@ -85,6 +86,7 @@ public EventLoopMessageListener(Action<T> processMessage)
 				}
 			})).Start();
 		}
+
 		BlockingCollection<T> _MessageQueue = new BlockingCollection<T>(new ConcurrentQueue<T>());
 		public BlockingCollection<T> MessageQueue
 		{
@@ -94,7 +96,6 @@ public BlockingCollection<T> MessageQueue
 			}
 		}
 
-
 		#region MessageListener Members
 
 		public void PushMessage(T message)
@@ -107,20 +108,21 @@ public void PushMessage(T message)
 		#region IDisposable Members
 
 		CancellationTokenSource cancellationSource = new CancellationTokenSource();
+
 		public void Dispose()
 		{
 			if(cancellationSource.IsCancellationRequested)
 				return;
+
 			cancellationSource.Cancel();
+			cancellationSource.Dispose();
 		}
 
 		#endregion
-
 	}
 
 	public class PollMessageListener<T> : MessageListener<T>
 	{
-
 		BlockingCollection<T> _MessageQueue = new BlockingCollection<T>(new ConcurrentQueue<T>());
 		public BlockingCollection<T> MessageQueue
 		{
@@ -145,4 +147,5 @@ public virtual void PushMessage(T message)
 		#endregion
 	}
 }
+
 #endif