First pass at a branch with reduced memory usage; Keeps an open handle on the file, dispose your modules

1 files changed, 9 insertions, 5 deletions

diff --git a/Mono.Cecil/ModuleDefinition.cs b/Mono.Cecil/ModuleDefinition.cs
index 0d137e0..4e4ef37 100644
--- a/Mono.Cecil/ModuleDefinition.cs
+++ b/Mono.Cecil/ModuleDefinition.cs
@@ -189,7 +189,7 @@ namespace Mono.Cecil {
 
 #endif
 
-	public sealed class ModuleDefinition : ModuleReference, ICustomAttributeProvider {
+	public sealed class ModuleDefinition : ModuleReference, ICustomAttributeProvider, IDisposable {
 
 		internal Image Image;
 		internal MetadataSystem MetadataSystem;
@@ -439,11 +439,17 @@ namespace Mono.Cecil {
 			this.runtime = image.Runtime;
 			this.architecture = image.Architecture;
 			this.attributes = image.Attributes;
-			this.fq_name = image.FileName;
+			this.fq_name = image.Stream.GetFullyQualifiedName ();
 
 			this.reader = new MetadataReader (this);
 		}
 
+		public void Dispose ()
+		{
+			if (Image != null)
+				Image.Dispose ();
+		}
+
 		public bool HasTypeReference (string fullName)
 		{
 			return HasTypeReference (string.Empty, fullName);
@@ -915,9 +921,7 @@ namespace Mono.Cecil {
 
 		public static ModuleDefinition ReadModule (string fileName, ReaderParameters parameters)
 		{
-			using (var stream = GetFileStream (fileName, FileMode.Open, FileAccess.Read, FileShare.Read)) {
-				return ReadModule (stream, parameters);
-			}
+			return ReadModule (GetFileStream (fileName, FileMode.Open, FileAccess.Read, FileShare.Read), parameters);
 		}
 
 		static void CheckStream (object stream)