Merge branch 'master' of https://github.com/microsoft/perfview into addProcessorStacks

Author: vascoveigams

src/PerfView/CommandLineArgs.cs

@@ -227,6 +227,21 @@ private CommandLineArgs(int maxLineWidth, out string helpString)
             SetupCommandLine(parser);
             helpString = parser.GetHelp(maxLineWidth, null);
         }
+
+        /// <summary>
+        /// Shared logic to configure CommandLineArgs for GCCollectOnly mode
+        /// </summary>
+        /// <param name="commandLineArgs"></param>
+        internal static void ConfigureForGCCollectOnly(CommandLineArgs commandLineArgs)
+        {
+            // The process events are so we get process names. The ImageLoad events are so that we get version information about the DLLs.
+            commandLineArgs.KernelEvents = KernelTraceEventParser.Keywords.Process | KernelTraceEventParser.Keywords.ImageLoad;
+            commandLineArgs.ClrEvents = ClrTraceEventParser.Keywords.GC;
+            commandLineArgs.ClrEventLevel = TraceEventLevel.Informational;
+            commandLineArgs.TplEvents = TplEtwProviderTraceEventParser.Keywords.None;
+            commandLineArgs.NoRundown = true;
+        }
+
         private void SetupCommandLine(CommandLineParser parser)
         {
             // #CommandLineDefinitions
@@ -353,7 +368,7 @@ private void SetupCommandLine(CommandLineParser parser)
                 "On the unzip command.   See 'Working with WPA' in the help for more.");
             parser.DefineOptionalQualifier("LowPriority", ref LowPriority, "Do merging and ZIPing at low priority to minimize impact to system.");
             parser.DefineOptionalQualifier("NoRundown", ref NoRundown, "Don't collect rundown events.  Use only if you know the process of interest has exited.");
-            parser.DefineOptionalQualifier("FocusProcess", ref FocusProcess, "Either a decimal process ID or a process name (exe name without path but WITH extension) to focus ETW commands." + 
+            parser.DefineOptionalQualifier("FocusProcess", ref FocusProcess, "Either a decimal process ID or a process name (exe name without path but WITH extension) to focus ETW commands." +
                 "All NON-KERNEL providers are only send to this process (and rundown is only done on this process) which can cut overhead significantly in some cases.");
 
             parser.DefineOptionalQualifier("NoNGenPdbs", ref NoNGenPdbs, "Don't generate NGEN Pdbs");
@@ -460,13 +475,7 @@ private void SetupCommandLine(CommandLineParser parser)
             parser.DefineOptionalQualifier("GCCollectOnly", ref GCCollectOnly, "Turns on GC collections (no allocation sampling).");
             if (GCCollectOnly)
             {
-                // TODO this logic is cloned.  We need it in only one place.  If you update it do the other location as well
-                // The process events are so we get process names.  The ImageLoad events are so that we get version information about the DLLs 
-                KernelEvents = KernelTraceEventParser.Keywords.Process | KernelTraceEventParser.Keywords.ImageLoad;
-                ClrEvents = ClrTraceEventParser.Keywords.GC | ClrTraceEventParser.Keywords.Exception;
-                ClrEventLevel = TraceEventLevel.Informational;
-                TplEvents = TplEtwProviderTraceEventParser.Keywords.None;
-                NoRundown = true;
+                ConfigureForGCCollectOnly(this);
                 CommandProcessor.s_UserModeSessionName = "PerfViewGCSession";
                 DataFile = "PerfViewGCCollectOnly.etl";
             }

src/PerfView/Dialogs/RunCommandDialog.xaml.cs

@@ -696,11 +696,8 @@ private void OKButtonClick(object sender, RoutedEventArgs e)
                 {
                     m_args.GCCollectOnly = true;
 
-                    // The process events are so we get process names.  The ImageLoad events are so that we get version information about the DLLs 
-                    m_args.KernelEvents = KernelTraceEventParser.Keywords.Process | KernelTraceEventParser.Keywords.ImageLoad;
-                    m_args.ClrEvents = ClrTraceEventParser.Keywords.GC | ClrTraceEventParser.Keywords.Exception;
-                    m_args.ClrEventLevel = TraceEventLevel.Informational;
-                    m_args.NoRundown = true;
+                    CommandLineArgs.ConfigureForGCCollectOnly(m_args);
+
                     if (!m_args.Merge.HasValue)
                     {
                         m_args.Merge = false;

src/TraceEvent/TraceEventSession.cs

@@ -2318,16 +2318,16 @@ public void AddArgument(string key, string value)
         /// </summary>
         public byte[] RawArguments { get; set; }
         /// <summary>
-        /// Setting StackEnabled to true will cause all events in the provider to collect stacks when event are fired. 
+        /// Setting StackEnabled to true will cause all events in the provider to collect stacks when events are fired. 
         /// </summary>
         public bool StacksEnabled { get; set; }
         /// <summary>
-        /// Setting ProcessIDFilter will limit the providers that receive the EnableCommand to those that match on of
+        /// Setting ProcessIDFilter will limit the providers that receive the EnableCommand to those that match one of
         /// the given Process IDs.  
         /// </summary>
         public IList<int> ProcessIDFilter { get; set; }
         /// <summary>
-        /// Setting ProcessNameFilter will limit the providers that receive the EnableCommand to those that match on of
+        /// Setting ProcessNameFilter will limit the providers that receive the EnableCommand to those that match one of
         /// the given Process names (a process name is the name of the EXE without the PATH but WITH the extension).  
         /// </summary>
         public IList<string> ProcessNameFilter { get; set; }
@@ -2337,7 +2337,7 @@ public void AddArgument(string key, string value)
         /// </summary>
         public IList<int> EventIDsToEnable { get; set; }
         /// <summary>
-        /// Setting EventIDs to Enable will enable the collection of stacks for  a event of a provider by EventID 
+        /// Setting EventIDs to Enable will enable the collection of stacks for an event of a provider by EventID 
         /// (Has no effect if StacksEnabled is also set since that enable stacks for all events IDs)
         /// </summary>
         public IList<int> EventIDStacksToEnable { get; set; }
@@ -2347,7 +2347,7 @@ public void AddArgument(string key, string value)
         /// </summary>
         public IList<int> EventIDsToDisable { get; set; }
         /// <summary>
-        /// Setting EventIDs to Enable will disable the collection of stacks for a event of a provider by EventID 
+        /// Setting EventIDs to Enable will disable the collection of stacks for an event of a provider by EventID 
         /// Has no effect unless StacksEnabled is also set (since otherwise stack collection is off).   
         /// </summary>
         public IList<int> EventIDStacksToDisable { get; set; }