Minor features. See release notes for 2.0.27 for details.

Author: Vance Morrison

src/Directory.Build.props

@@ -22,8 +22,8 @@
 
   <PropertyGroup>
     <!-- These are the versions of the things we are CREATING in this repository -->
-    <PerfViewVersion>2.0.26</PerfViewVersion>
-    <TraceEventVersion>2.0.26</TraceEventVersion>
+    <PerfViewVersion>2.0.27</PerfViewVersion>
+    <TraceEventVersion>2.0.27</TraceEventVersion>
   </PropertyGroup>
 
   <!-- versions of dependencies that more than one project use -->

src/PerfView/CommandLineArgs.cs

@@ -101,16 +101,16 @@ public static string GetHelpString(int maxLineWidth)
         public string StopOnEventLogMessage;    // stop collection on event logs
         public string StopCommand;              // is executed when a stop is triggered.   
         public int StopOnAppFabricOverMsec;
-        public int DelayAfterTriggerSec = 5;   // Number of seconds to wait after a trigger  
+        public int DelayAfterTriggerSec = 5;    // Number of seconds to wait after a trigger  
         public string[] MonitorPerfCounter;     // logs perf counters to the ETL file.  
 
         // Start options.
-        public bool StackCompression;           // Used compresses stacks when collecting traces. 
+        public bool StackCompression = true;    // Use compresses stacks when collecting traces. 
         public int BufferSizeMB = 256;
         public int CircularMB;
         public bool InMemoryCircularBuffer;         // Uses EVENT_TRACE_BUFFERING_MODE for an in-memory circular buffer
         public KernelTraceEventParser.Keywords KernelEvents = KernelTraceEventParser.Keywords.Default;
-        public string[] CpuCounters;    // Specifies any profile sources (CPU counters) to turn on (Win 8 only)
+        public string[] CpuCounters;        // Specifies any profile sources (CPU counters) to turn on (Win 8 only)
         public ClrTraceEventParser.Keywords ClrEvents = ClrTraceEventParser.Keywords.Default;
         public TraceEventLevel ClrEventLevel = Microsoft.Diagnostics.Tracing.TraceEventLevel.Verbose;    // The verbosity of CLR events
         public TplEtwProviderTraceEventParser.Keywords TplEvents = TplEtwProviderTraceEventParser.Keywords.Default;
@@ -514,8 +514,15 @@ private void SetupCommandLine(CommandLineParser parser)
             parser.DefineOptionalQualifier("SafeMode", ref SafeMode, "Turn off parallelism and other risky features.");
             parser.DefineOptionalQualifier("RestartingToElevelate", ref RestartingToElevelate, "Internal: indicates that perfView is restarting to get Admin privileges.");
 
-            // TODO FIX NOW this is a hack, does not handle kernel mode ... 
-            parser.DefineOptionalQualifier("SessionName", ref CommandProcessor.s_UserModeSessionName, "Define the name for the user mode session, if kernel events are off.");
+            string sessionName = null;
+            parser.DefineOptionalQualifier("SessionName", ref sessionName, "Define the name for the user mode session, if kernel events are off.");
+            if (sessionName != null)
+            {
+                if (Environment.OSVersion.Version.Major * 10 + Environment.OSVersion.Version.Minor < 62)
+                    throw new ApplicationException("SessionName qualifier only works on Windows 8 and above.");
+                CommandProcessor.s_UserModeSessionName = sessionName;
+                CommandProcessor.s_KernelessionName = sessionName + "Kernel";
+            }
 
             parser.DefineOptionalQualifier("MaxNodeCountK", ref MaxNodeCountK,
                 "The maximum number of objects (in K or thousands) that will even be examined when dumping the heap.  Avoids memory use at collection time.  " +

src/PerfView/CommandProcessor.cs

@@ -430,7 +430,7 @@ public void Start(CommandLineArgs parsedArgs)
                 LogFile.WriteLine("[Kernel Log: {0}]", Path.GetFullPath(kernelFileName));
             }
 
-            using (TraceEventSession kernelModeSession = new TraceEventSession(KernelTraceEventParser.KernelSessionName, kernelFileName))
+            using (TraceEventSession kernelModeSession = new TraceEventSession(s_KernelessionName, kernelFileName))
             {
                 if (parsedArgs.CpuCounters != null)
                 {
@@ -540,7 +540,7 @@ public void Start(CommandLineArgs parsedArgs)
                     PerfViewLogger.Log.StartTracing();
                     PerfViewLogger.StartTime = DateTime.UtcNow;
 
-                    PerfViewLogger.Log.SessionParameters(KernelTraceEventParser.KernelSessionName, kernelFileName ?? "",
+                    PerfViewLogger.Log.SessionParameters(s_KernelessionName, kernelFileName ?? "",
                         kernelModeSession.BufferSizeMB, kernelModeSession.CircularBufferMB);
                     PerfViewLogger.Log.KernelEnableParameters(parsedArgs.KernelEvents, parsedArgs.KernelEvents);
                     PerfViewLogger.Log.SessionParameters(s_UserModeSessionName, userFileName ?? "",
@@ -1109,7 +1109,7 @@ public void Stop(CommandLineArgs parsedArgs)
 
             }
 
-            LogFile.WriteLine("Stopping tracing for sessions '" + KernelTraceEventParser.KernelSessionName +
+            LogFile.WriteLine("Stopping tracing for sessions '" + s_KernelessionName +
                 "' and '" + s_UserModeSessionName + "'.");
 
             PerfViewLogger.Log.CommandLineParameters(ParsedArgsAsString(null, parsedArgs), Environment.CurrentDirectory, AppLog.VersionNumber);
@@ -1135,70 +1135,91 @@ public void Stop(CommandLineArgs parsedArgs)
             }
 
             // Try to stop the kernel session
-            try
+
+            Task stopKernel = Task.Factory.StartNew(delegate ()
             {
-                if (parsedArgs.KernelEvents != KernelTraceEventParser.Keywords.None)
+                try
                 {
-                    using (var kernelSession = new TraceEventSession(KernelTraceEventParser.KernelSessionName, TraceEventSessionOptions.Attach))
+                    if (parsedArgs.KernelEvents != KernelTraceEventParser.Keywords.None)
                     {
-                        if (parsedArgs.InMemoryCircularBuffer)
+                        using (var kernelSession = new TraceEventSession(s_KernelessionName, TraceEventSessionOptions.Attach))
                         {
-                            kernelSession.SetFileName(Path.ChangeExtension(parsedArgs.DataFile, ".kernel.etl")); // Flush the file 
-
-                            // We need to manually do a kernel rundown to get the list of running processes and images loaded into memory
-                            // Ideally this is done by the SetFileName API so we can avoid merging.  
-                            var rundownFile = Path.ChangeExtension(parsedArgs.DataFile, ".kernelRundown.etl");
-
-                            // Note that enabling providers is async, and thus there is a concern that we would lose events if we don't wait 
-                            // until the events are logged before shutting down the session.   However we only need the DCEnd events and
-                            // those are PART of kernel session stop, which is synchronous (the session will not die until it is complete)
-                            // so we don't have to wait after enabling the kernel session.    It is somewhat unfortunate that we have both
-                            // the DCStart and the DCStop events, but there does not seem to be a way of asking for just one set.  
-                            using (var kernelRundownSession = new TraceEventSession(s_UserModeSessionName + "Rundown", rundownFile))
+                            if (parsedArgs.InMemoryCircularBuffer)
                             {
-                                kernelRundownSession.BufferSizeMB = 256;    // Try to avoid lost events.  
-                                kernelRundownSession.EnableKernelProvider(KernelTraceEventParser.Keywords.Process | KernelTraceEventParser.Keywords.ImageLoad);
+                                LogFile.WriteLine("InMemoryCircularBuffer Set, Dumping kernel log");
+                                kernelSession.SetFileName(Path.ChangeExtension(parsedArgs.DataFile, ".kernel.etl")); // Flush the file 
+
+
+                                LogFile.WriteLine("InMemoryCircularBuffer Set, Doing Kernel Rundown");
+                                // We need to manually do a kernel rundown to get the list of running processes and images loaded into memory
+                                // Ideally this is done by the SetFileName API so we can avoid merging.  
+                                var rundownFile = Path.ChangeExtension(parsedArgs.DataFile, ".kernelRundown.etl");
+
+                                // Note that enabling providers is async, and thus there is a concern that we would lose events if we don't wait 
+                                // until the events are logged before shutting down the session.   However we only need the DCEnd events and
+                                // those are PART of kernel session stop, which is synchronous (the session will not die until it is complete)
+                                // so we don't have to wait after enabling the kernel session.    It is somewhat unfortunate that we have both
+                                // the DCStart and the DCStop events, but there does not seem to be a way of asking for just one set.  
+                                using (var kernelRundownSession = new TraceEventSession(s_UserModeSessionName + "KernelRundown", rundownFile))
+                                {
+                                    kernelRundownSession.BufferSizeMB = 256;    // Try to avoid lost events.  
+                                    kernelRundownSession.EnableKernelProvider(KernelTraceEventParser.Keywords.Process | KernelTraceEventParser.Keywords.ImageLoad);
+                                }
+                                LogFile.WriteLine("InMemoryCircularBuffer Set, Finished Kernel Rundown");
                             }
+                            kernelSession.Stop();
                         }
-                        kernelSession.Stop();
                     }
                 }
-            }
-            catch (FileNotFoundException) { LogFile.WriteLine("No Kernel events were active for this trace."); }
-            catch (Exception e) { if (!(e is ThreadInterruptedException)) { LogFile.WriteLine("Error stopping Kernel session: " + e.Message); } throw; }
+                catch (FileNotFoundException) { LogFile.WriteLine("No Kernel events were active for this trace."); }
+                catch (Exception e) { if (!(e is ThreadInterruptedException)) { LogFile.WriteLine("Error stopping Kernel session: " + e.Message); } throw; }
+            });
 
             string dataFile = null;
-            try
+            Task stopUser = Task.Factory.StartNew(delegate ()
             {
-                using (TraceEventSession clrSession = new TraceEventSession(s_UserModeSessionName, TraceEventSessionOptions.Attach))
+                try
                 {
-                    if (parsedArgs.InMemoryCircularBuffer)
+                    using (TraceEventSession clrSession = new TraceEventSession(s_UserModeSessionName, TraceEventSessionOptions.Attach))
                     {
-                        dataFile = parsedArgs.DataFile;
-                        clrSession.SetFileName(dataFile);   // Flush the file 
-                    }
-                    else
-                    {
-                        dataFile = clrSession.FileName;
-                    }
+                        if (parsedArgs.InMemoryCircularBuffer)
+                        {
+                            LogFile.WriteLine("InMemoryCircularBuffer Set, Dumping kernel log");                  
+                            dataFile = parsedArgs.DataFile;
+                            clrSession.SetFileName(dataFile);   // Flush the file 
+                        }
+                        else
+                        {
+                            dataFile = clrSession.FileName;
+                        }
 
-                    clrSession.Stop();
+                        clrSession.Stop();
 
-                    // Try to force the rundown of CLR method and loader events.  This routine does not fail.  
-                    DoClrRundownForSession(dataFile, clrSession.SessionName, parsedArgs);
+                        // Try to force the rundown of CLR method and loader events.  This routine does not fail.  
+                        DoClrRundownForSession(dataFile, clrSession.SessionName, parsedArgs);
+                    }
                 }
-            }
-            catch (Exception e) { if (!(e is ThreadInterruptedException)) { LogFile.WriteLine("Error stopping User session: " + e.Message); } throw; }
+                catch (Exception e) { if (!(e is ThreadInterruptedException)) { LogFile.WriteLine("Error stopping User session: " + e.Message); } throw; }
+            });
 
-            try
+            Task stopHeap = Task.Factory.StartNew(delegate ()
             {
-                using (var heapSession = new TraceEventSession(s_HeapSessionName, TraceEventSessionOptions.Attach))
+                try
                 {
-                    heapSession.Stop();
+                    using (var heapSession = new TraceEventSession(s_HeapSessionName, TraceEventSessionOptions.Attach))
+                    {
+                        heapSession.Stop();
+                    }
                 }
-            }
-            catch (FileNotFoundException) { LogFile.WriteLine("No Heap events were active for this trace."); }
-            catch (Exception e) { if (!(e is ThreadInterruptedException)) { LogFile.WriteLine("Error stopping Heap session: " + e.Message); } throw; }
+                catch (FileNotFoundException) { LogFile.WriteLine("No Heap events were active for this trace."); }
+                catch (Exception e) { if (!(e is ThreadInterruptedException)) { LogFile.WriteLine("Error stopping Heap session: " + e.Message); } throw; }
+            });
+
+            // We stop the two sessions concurrently because we have notice that sometime the kernel session 
+            // Takes a while to shutdown, and we want the user mode session to shutdown at basically the same time
+            // Doing them concurrently minimizes any skew.  
+            Task.WaitAll(stopKernel, stopUser, stopHeap);
+            LogFile.WriteLine("Done stopping sessions.");
 
             UninstallETWClrProfiler(LogFile);
 
@@ -1268,10 +1289,10 @@ public void Abort(CommandLineArgs parsedArgs)
 
                 s_abortInProgress = true;
                 m_logFile.WriteLine("Aborting tracing for sessions '" +
-                    KernelTraceEventParser.KernelSessionName + "' and '" + s_UserModeSessionName + "'.");
+                    s_KernelessionName + "' and '" + s_UserModeSessionName + "'.");
                 try
                 {
-                    using (var kernelSession = new TraceEventSession(KernelTraceEventParser.KernelSessionName, TraceEventSessionOptions.Attach))
+                    using (var kernelSession = new TraceEventSession(s_KernelessionName, TraceEventSessionOptions.Attach))
                     {
                         kernelSession.Stop(true);
                     }
@@ -3362,6 +3383,7 @@ private void WaitForRundownIdle(int minSeconds, int maxSeconds, string rundownFi
         }
 
         internal static string s_UserModeSessionName = "PerfViewSession";
+        internal static string s_KernelessionName = KernelTraceEventParser.KernelSessionName;
         private static string s_HeapSessionName { get { return s_UserModeSessionName + "Heap"; } }
 
         private static bool s_addedSupportDirToPath;
@@ -3675,9 +3697,7 @@ private static void ParseProviderSpec(string providerSpec, TraceEventLevel level
                 providerGuid = TraceEventProviders.GetProviderGuidByName(providerSpec);
                 // Look it up by name 
                 if (providerGuid == Guid.Empty)
-                {
-                    throw new ApplicationException("Could not find provider name '" + providerSpec + "'");
-                }
+                    TraceEventProviders.GetEventSourceGuidFromName(providerSpec);
             }
 
             retList.Add(new ParsedProvider()

src/PerfView/PerfView.csproj

@@ -216,13 +216,13 @@
       <Link>amd64\EtwClrProfiler.dll</Link>
       <Visible>False</Visible>
     </EmbeddedResource>
-    <!--<EmbeddedResource Include="$(OutDir)\PerfView.xml">
+    <EmbeddedResource Include="SupportFiles\PerfView.xml">
       <Type>Non-Resx</Type>
       <WithCulture>false</WithCulture>
       <LogicalName>.\PerfView.xml</LogicalName>
-      <SubType>Designer</SubType>
+      <Link>PerfView.xml</Link>
       <Visible>False</Visible>
-    </EmbeddedResource>-->
+    </EmbeddedResource>
     <EmbeddedResource Include="..\TraceEvent\$(OutDir)Microsoft.Diagnostics.Tracing.TraceEvent.dll">
       <Type>Non-Resx</Type>
       <WithCulture>false</WithCulture>