Build Release

main/OpenCover.Console/OpenCover.Console.csproj

@@ -115,6 +115,9 @@
     <None Include="app.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="OpenCover.Console.ini">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

main/OpenCover.Console/OpenCover.Console.ini

@@ -0,0 +1,3 @@
+[.NET Framework Debugging Control] 
+GenerateTrackingInfo=1 
+AllowOptimize=0

main/OpenCover.Framework/Manager/MemoryManager.cs

@@ -145,7 +145,7 @@ public void Dispose()
                     s.Release(1);
                     s.Dispose();
                 });
-                //ProfilerHasResults.Do(e => e.Dispose());
+                ProfilerHasResults.Do(e => e.Dispose());
                 ResultsHaveBeenReceived.Do(e => e.Dispose());
                 StreamAccessorResults.Do(r => r.Dispose());
                 _mmfResults.Do(r => r.Dispose());
@@ -252,7 +252,7 @@ public void Dispose()
                     s.Release(1);
                     s.Dispose();
                 });
-                //ProfilerRequestsInformation.Do(e => e.Dispose());
+                ProfilerRequestsInformation.Do(e => e.Dispose());
                 InformationReadyForProfiler.Do(e => e.Dispose());
                 InformationReadByProfiler.Do(e => e.Dispose());
                 StreamAccessorComms.Do(r => r.Dispose());

main/OpenCover.Framework/Manager/ProfilerManager.cs

@@ -41,7 +41,7 @@ public class ProfilerManager : IProfilerManager
 
         private static readonly ILog DebugLogger = LogManager.GetLogger("DebugLogger");
 
-        class ThreadTermination
+        private class ThreadTermination
         {
             public ThreadTermination()
             {
@@ -85,7 +85,8 @@ public void RunProcess(Action<Action<StringDictionary>> process, string[] servic
             _memoryManager.Initialise(@namespace, key, servicePrincipal);
             _messageQueue = new ConcurrentQueue<byte[]>();
 
-            using (_mcb = new MemoryManager.ManagedCommunicationBlock(@namespace, key, MaxMsgSize, -1, servicePrincipal))
+            using (_mcb = new MemoryManager.ManagedCommunicationBlock(@namespace, key, MaxMsgSize, -1, servicePrincipal)
+                )
             using (var processMgmt = new AutoResetEvent(false))
             using (var queueMgmt = new AutoResetEvent(false))
             using (var environmentKeyRead = new AutoResetEvent(false))
@@ -242,7 +243,8 @@ private void ProcessMessages(WaitHandle[] handles)
                             ConsumeException(() =>
                             {
                                 g.Select(h => h.CancelThreadEvent).ToList().ForEach(h => h.Set());
-                                WaitHandle.WaitAll(g.Select(h => h.ThreadFinishedEvent).ToArray<WaitHandle>(), new TimeSpan(0, 0, 20));
+                                WaitHandle.WaitAll(g.Select(h => h.ThreadFinishedEvent).ToArray<WaitHandle>(),
+                                    new TimeSpan(0, 0, 20));
                             });
                         })).ToArray();
 
@@ -289,51 +291,53 @@ private WaitCallback ProcessBlock(ManagedBufferBlock block,
         {
             return state =>
             {
-                var processEvents = new WaitHandle[]
-                {
-                    block.CommunicationBlock.ProfilerRequestsInformation,
-                    block.MemoryBlock.ProfilerHasResults,
-                    threadTermination.CancelThreadEvent
-                };
-                threadActivatedEvent.Set();
-
                 try
                 {
-                    while (block.Active)
+                    var processEvents = new WaitHandle[]
                     {
-                        switch (WaitHandle.WaitAny(processEvents))
+                        block.CommunicationBlock.ProfilerRequestsInformation,
+                        block.MemoryBlock.ProfilerHasResults,
+                        threadTermination.CancelThreadEvent
+                    };
+                    threadActivatedEvent.Set();
+
+                    try
+                    {
+                        while (block.Active)
                         {
-                            case 0:
-                                _communicationManager.HandleCommunicationBlock(block.CommunicationBlock, b => { });
-                                break;
-                            case 1:
-                                var data = _communicationManager.HandleMemoryBlock(block.MemoryBlock);
-                                // don't let the queue get too big as using too much memory causes 
-                                // problems i.e. the target process closes down but the host takes 
-                                // ages to shutdown; this is a compromise. 
-                                _messageQueue.Enqueue(data);
-                                if (_messageQueue.Count > 400)
-                                {
-                                    do
+                            switch (WaitHandle.WaitAny(processEvents))
+                            {
+                                case 0:
+                                    _communicationManager.HandleCommunicationBlock(block.CommunicationBlock, b => { });
+                                    break;
+                                case 1:
+                                    var data = _communicationManager.HandleMemoryBlock(block.MemoryBlock);
+                                    // don't let the queue get too big as using too much memory causes 
+                                    // problems i.e. the target process closes down but the host takes 
+                                    // ages to shutdown; this is a compromise. 
+                                    _messageQueue.Enqueue(data);
+                                    if (_messageQueue.Count > 400)
                                     {
-                                        ThreadHelper.YieldOrSleep(100);
-                                    } while (_messageQueue.Count > 200);
-                                }
-                                break;
-                            case 2:
-                                return;
+                                        do
+                                        {
+                                            ThreadHelper.YieldOrSleep(100);
+                                        } while (_messageQueue.Count > 200);
+                                    }
+                                    break;
+                                case 2:
+                                    return;
+                            }
                         }
+                        _memoryManager.RemoveDeactivatedBlocks();
+                    }
+                    finally
+                    {
+                        threadTermination.ThreadFinishedEvent.Set();
                     }
-                    _memoryManager.RemoveDeactivatedBlocks();
                 }
-                finally
+                catch (ObjectDisposedException)
                 {
-                    // we can now dispose these events as we no longer need them
-                    block.CommunicationBlock.ProfilerRequestsInformation.Dispose();
-                    block.MemoryBlock.ProfilerHasResults.Dispose();
-
-                    threadTermination.ThreadFinishedEvent.Set();  
-
+                    /* an attempt to close thread has probably happened and the events disposed */
                 }
             };
         }

main/cmdline/pedigree.cmd

@@ -1 +1,5 @@
-OpenCover.Console.exe -register:user -enableperformancecounters -target:dogfood.cmd -filter:+[OpenCover*]* -output:pedigree_results.xml
+@echo off
+pushd %cd%
+cd %~dp0
+OpenCover.Console.exe -register:user -enableperformancecounters -target:dogfood.cmd -filter:+[OpenCover*]* -output:pedigree_results.xml
+popd