Merge pull request #393 from vancem/WindowsContainerSupport.9-27-17

Added support for Windows Containers.

Author: vancem

src/PerfView/App.cs

@@ -47,7 +47,9 @@ public static int Main(string[] args)
             {
                 // Can't display on ARM because the SplashScreen is WPF
                 var noGui = SupportFiles.ProcessArch == ProcessorArchitecture.Arm ||
-                    (args.Length > 0 && string.Compare(args[0], "/noGui", StringComparison.OrdinalIgnoreCase) == 0);
+                    (args.Length > 0 &&
+                    (string.Compare(args[0], "/noGui", StringComparison.OrdinalIgnoreCase) == 0 ||
+                     string.Compare(args[0], 0, "/logFile", 0, 8, StringComparison.OrdinalIgnoreCase) == 0));              
 
                 // If we need to install, display the splash screen early, otherwise wait
                 if (!Directory.Exists(SupportFiles.SupportFileDir) && !noGui)
@@ -798,8 +800,9 @@ private static void CloseSplashScreen()
             if (s_splashScreen != null)
             {
                 var splashScreen = (SplashScreen)s_splashScreen.Target;
-                splashScreen.Close(new TimeSpan(0));
                 s_splashScreen = null;
+                if (splashScreen != null)
+                    splashScreen.Close(new TimeSpan(0));
             }
         }
         private static WeakReference s_splashScreen;

src/PerfView/OtherSources/Linux/LinuxPerfScriptStackSource.cs

@@ -409,24 +409,29 @@ private StackSourceCallStackIndex InternFrames(IEnumerator<Frame> frameIterator,
         private Stream GetPerfScriptStream(string path, out ZipArchive archive)
         {
             archive = null;
-            if (path.EndsWith(".trace.zip"))
+            if (path.EndsWith(".trace.zip", StringComparison.OrdinalIgnoreCase))
             {
                 archive = ZipFile.OpenRead(path);
                 ZipArchiveEntry foundEntry = null;
 
                 foreach (ZipArchiveEntry entry in archive.Entries)
                 {
-                    if (entry.FullName.EndsWith(".data.txt"))
+                    if (entry.FullName.EndsWith(".data.txt", StringComparison.OrdinalIgnoreCase))
                     {
                         foundEntry = entry;
                         break;
                     }
                 }
 
-                return foundEntry?.Open();
+                if (foundEntry == null)
+                    throw new ApplicationException($"file {path} is does not have a *.data.txt file inside.");
+
+                return foundEntry.Open();
             }
-            else
+            else if (path.EndsWith(".data.txt", StringComparison.OrdinalIgnoreCase) || path.EndsWith(".perf.data.dump", StringComparison.OrdinalIgnoreCase))
                 return new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
+            else
+                throw new ApplicationException($"file {path} is not a *.trace.zip *.data.txt or a *.perf.data.dump suffix.");
         }
 
         private double? SampleEndTime;

src/PerfView/PerfView.csproj

@@ -11,7 +11,7 @@
     <Description>PerfView</Description>
     <Company>Microsoft</Company>
     <Copyright>Copyright © Microsoft 2010</Copyright>
-    <FileVersion>1.9.62.0</FileVersion>
+    <FileVersion>1.9.64.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/PerfView/PerfViewData.cs

@@ -5844,7 +5844,7 @@ protected override Action<Action> OpenImpl(Window parentWindow, StatusBar worker
                     {
                         obsolete.Children.Add(new PerfViewStackSource(this, "ASP.NET Thread Time (with Tasks)"));
                     }
-                    else
+                    else if (!hasCSwitchStacks)
                         name += " (CPU ONLY)";
                     obsolete.Children.Add(new PerfViewStackSource(this, name));
                 }

src/PerfView/SupportFiles/UsersGuide.htm

@@ -8045,6 +8045,21 @@ <h2>
             </ul>
         </li>
         -->
+        <li>
+            Version 1.9.64 9/27/17
+            <ul>
+                <li>
+                    Added Support for Argon (light weight) Windows containers.   Most of this is in fact work-arounds which
+                    will eventually be removed, but this makes PerfView work with Argon containers in the RS3 version of the OS
+                    (the version currently available).   Note that there seems to still be issues with looking up symbols for SOME
+                    OS DLLs, but all managed code should work.    Also PerfView is a GUI app and Argon containers don't use
+                    gui, so you need to use the techniques in 'Automating data collection' to use perfView in the container. 
+                    (for example 'Perfview.exe /logfile:logfile.txt /accepteula /maxcollectsec:30 collect').  PerfView (like 
+                    all gui apps) will run in the background if run from the command line directly, but will block until exit
+                    when run from a batch script).  
+                   </li>
+            </ul>
+        </li> 
         <li>
             Version 1.9.55 5/9/17
             <ul>

src/TraceEvent/Parsers/KernelTraceEventParser.cs

@@ -190,6 +190,11 @@ public enum Keywords
                 | SystemCall        // Interesting but very expensive. 
                 | OS,
 
+            /// <summary>
+            /// These are the kernel events that are not allowed in containers.  Can be subtracted out.  
+            /// </summary>
+            NonContainer = ~(Process | Thread | ImageLoad | Profile | ContextSwitch), 
+
             // These are ones that I have made up  
             // All = 0x07B3FFFF, so 4'0000, 8'0000, 40'0000, and F000'00000 are free.  
             /// <summary>
@@ -3409,6 +3414,22 @@ public string this[string kernelName]
                 if (kernelToDriveMap.Count == 0)
                     PopulateFromLocalMachine();
 
+#if !CONTAINER_WORKAROUND_NOT_NEEDED
+                // Currently ETW shows paths from the HOST not the CLIENT for some files.   We recognise them 
+                // because they have have the form of a GUID path \Files and then the client path.   We only
+                // need to fix this for windows (OS) files, so we use \Files\Windows\as the key that this is
+                // happening, and we morph the name to fix it.
+
+                // We can pull this out when the OS fixes ETW to show client names.  
+                var filesIdx = kernelName.IndexOf(@"\Files\Windows\", StringComparison.OrdinalIgnoreCase);
+                if (16 < filesIdx)
+                {
+                    var ret = systemDrive + kernelName.Substring(filesIdx + 6);
+                    return ret;
+                }
+
+#endif 
+
                 for (int i = 0; i < kernelToDriveMap.Count; i++)
                 {
                     Debug.Assert(kernelToDriveMap[i].Key.EndsWith(@"\"));