Added method monitoring for finding slow methods

guija · Sep 20, 2018 · 41921dd · 41921dd
1 parent 06f0ec2
commit 41921dd
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 1 deletion.
diff --git a/Sprung/Settings.cs b/Sprung/Settings.cs
@@ -9,6 +9,7 @@
 using Newtonsoft.Json.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
+using MethodTimer;
 
 namespace Sprung
 {
@@ -41,6 +42,7 @@ public static Settings GetInstance()
         }
 
         // TODO constants
+        [Time]
         public void LoadFromFile()
         {
             try

diff --git a/Sprung/Sprung.cs b/Sprung/Sprung.cs
@@ -11,6 +11,7 @@
 using System.Threading;
 using Nancy.Hosting.Self;
 using System.Collections.Concurrent;
+using MethodTimer;
 
 namespace Sprung
 {
@@ -65,6 +66,7 @@ public Sprung()
             // StartTabService();
         }
 
+        [Time]
         private void StartTabService()
         {
             Debug.WriteLine("StartTabService");
@@ -141,6 +143,7 @@ private void InputChangedCallback(object sender, EventArgs e)
             ShowProcesses(windowMatcher.match(pattern, cachedWindows));
         }
 
+        [Time]
         private void ShowProcesses(List<Window> windows)
         {
             windowListBox.BeginUpdate();
@@ -304,6 +307,7 @@ private void ShowBox()
             this.Opacity = 100;
         }
 
+        [Time]
         public void CloseSelectedWindow()
         {
             Window selectedWindow = GetSelectedWindow();
@@ -384,7 +388,6 @@ private void DeactivateCallback(object sender, EventArgs e)
                 return;
             }
 
-            Debug.WriteLine("lost focus");
             this.HideBox();
         }
 

diff --git a/Sprung/Sprung.csproj b/Sprung/Sprung.csproj
@@ -27,6 +27,8 @@
     <ApplicationVersion>2.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -71,6 +73,9 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="MethodTimer, Version=2.2.0.0, Culture=neutral, PublicKeyToken=cb1364609f40a1dc, processorArchitecture=MSIL">
+      <HintPath>..\packages\MethodTimer.Fody.2.2.0\lib\net452\MethodTimer.dll</HintPath>
+    </Reference>
     <Reference Include="Nancy, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Nancy.1.4.4\lib\net40\Nancy.dll</HintPath>
     </Reference>
@@ -93,6 +98,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="MethodTimerLogger.cs" />
     <Compile Include="Properties\Resources1.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -156,6 +162,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
     <Content Include="Properties\spring.png" />
     <Content Include="settings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -171,6 +178,13 @@
     <Folder Include="Resources\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\Fody.3.1.3\build\Fody.targets" Condition="Exists('..\packages\Fody.3.1.3\build\Fody.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Fody.3.1.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.1.3\build\Fody.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/Sprung/Window.cs b/Sprung/Window.cs
@@ -5,6 +5,7 @@
 using System.Windows.Forms;
 using System.Drawing;
 using Newtonsoft.Json;
+using MethodTimer;
 
 namespace Sprung
 {
@@ -40,6 +41,7 @@ public Window()
         {
         }
 
+        [Time]
         public Window(IntPtr handle)
         {
             if (handle.Equals(IntPtr.Zero))
@@ -68,6 +70,7 @@ public Window(IntPtr handle)
             }
         }
 
+        [Time]
         public virtual void SendToFront()
         {
             uint foreThread = GetWindowThreadProcessId(GetForegroundWindow(), IntPtr.Zero);
@@ -90,6 +93,7 @@ public void Close()
             SendMessage(Handle, WM_CLOSE, IntPtr.Zero, IntPtr.Zero);
         }
 
+        [Time]
         public Int32 GetWindowProcessId(Int32 handle)
         {
             Int32 pointer = 1;
@@ -108,6 +112,7 @@ public int CompareTo(Window other)
                         : (MatchingGroups > other.MatchingGroups) ? 1 : 0;
         }
 
+        [Time]
         public Image GetIconImage()
         {
             Icon icon = GetIcon();
@@ -120,6 +125,7 @@ public Image GetIconImage()
             return (iconImage = (Image)new Bitmap(icon.ToBitmap(), new Size(IconSize, IconSize)));
         }
 
+        [Time]
         public Icon GetIcon()
         {
             if (icon != null)

diff --git a/Sprung/WindowManager.cs b/Sprung/WindowManager.cs
@@ -5,6 +5,7 @@
 using Sprung.Tabs;
 using System.Collections;
 using System.Diagnostics;
+using MethodTimer;
 
 namespace Sprung
 {
@@ -27,6 +28,7 @@ public static WindowManager GetInstance()
 
         public object TabsLock { get; set; } = new object();
 
+        [Time]
         public List<Window> GetWindowsWithTabs()
         {
             lock (TabsLock)
@@ -50,6 +52,7 @@ public List<Window> GetWindowsWithTabs()
             }
         }
 
+        [Time]
         public List<Window> GetWindows()
         {
             windows.Clear();
@@ -65,6 +68,7 @@ public List<Window> GetWindows()
             return windows;
         }
 
+        [Time]
         private List<Window> FilterWindows10ApplicationFrameHostWindows(List<Window> windows)
         {
             List<Window> filteredList = new List<Window>();
@@ -95,6 +99,7 @@ private List<Window> FilterWindows10ApplicationFrameHostWindows(List<Window> win
             return filteredList;
         }
 
+        [Time]
         private bool EnumWindowsProc(IntPtr hWnd, int lParam)
         {
             if (IsWindowVisible(hWnd)) {

diff --git a/Sprung/WindowMatcher.cs b/Sprung/WindowMatcher.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using MethodTimer;
 
 namespace Sprung
 {
@@ -14,6 +15,7 @@ public WindowMatcher(WindowManager windowManager)
             this.windowManager = windowManager;
         }
 
+        [Time]
         public List<Window> match(String pattern)
         {
             // TODO getWIndows oder getWindow with Tabs?
@@ -22,6 +24,7 @@ public List<Window> match(String pattern)
             return match(pattern, windowManager.GetWindows());
         }
 
+        [Time]
         public List<Window> match(String pattern, List<Window> windows)
         {
             if (pattern.Length == 0) return windows;

diff --git a/Sprung/packages.config b/Sprung/packages.config
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Fody" version="3.1.3" targetFramework="net461" developmentDependency="true" />
+  <package id="MethodTimer.Fody" version="2.2.0" targetFramework="net461" />
   <package id="Nancy" version="1.4.4" targetFramework="net45" />
   <package id="Nancy.Hosting.Self" version="1.4.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />