now you can see also how much time takes each method

ignatandrei · Aug 30, 2018 · dc6ace7 · dc6ace7
1 parent cdecea8
commit dc6ace7
Show file tree

Hide file tree

Showing 9 changed files with 97 additions and 47 deletions.
diff --git a/AOPRoslyn/AOPRoslyn/AOPRoslyn.csproj b/AOPRoslyn/AOPRoslyn/AOPRoslyn.csproj
@@ -21,4 +21,8 @@
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\AOPStatistics\AOPStatistics.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/...slyn/AOPStatistics/AOPStatisticsMethod.cs → AOPRoslyn/AOPStatistics/AOPMethod.cs b/...slyn/AOPStatistics/AOPStatisticsMethod.cs → AOPRoslyn/AOPStatistics/AOPMethod.cs
@@ -3,34 +3,26 @@
 
 namespace AOPStatistics
 {
-    public struct Method
-    {
-        public string className;
-        public string methodName;
-        public int line;
-    }
-    public class AOPStatisticsMethod : IDisposable
+    public class AOPMethod : IDisposable
     {
         private readonly string methodName;
         private readonly string className;
         private readonly int line;
         private readonly Stopwatch sw;
-        public AOPStatisticsMethod(string className, string methodName, int line)
+        public AOPMethod(string className, string methodName, int line)
         {
             sw = Stopwatch.StartNew();            
             this.className = className;
             this.methodName = methodName;
-            this.line = line;
+            this.line = line;            
         }
 
 
         public void Dispose()
         {
             sw.Stop();
-            AOPStatistics.PushMethod(new Method() {  className = this.className, line= this.line, methodName= this.methodName}
+            GatherStatistics.PushMethod(new Method() {  className = this.className, line= this.line, methodName= this.methodName}
                 , sw.ElapsedMilliseconds);
-
-
         }
     }
 }
diff --git a/AOPRoslyn/AOPStatistics/AOPStatistics.cs b/AOPRoslyn/AOPStatistics/AOPStatistics.cs
diff --git a/AOPRoslyn/AOPStatistics/AOPStatistics.csproj b/AOPRoslyn/AOPStatistics/AOPStatistics.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/AOPRoslyn/AOPStatistics/GatherStatistics.cs b/AOPRoslyn/AOPStatistics/GatherStatistics.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace AOPStatistics
+{
+    public struct Data
+    {
+        public Method m;
+        public int NumberHits;
+        public long TotalDuration;
+    }
+
+    public class GatherStatistics
+    {
+        public static ConcurrentDictionary<Method, List<long>> timingMethod;
+        static GatherStatistics()
+        {
+            timingMethod = new ConcurrentDictionary<Method, List<long>>();
+        }
+
+        public static void PushMethod(Method m, long timeExecuting)
+        {
+            var data = new List<long>();
+            data.Add(timeExecuting);
+            timingMethod.AddOrUpdate(m,data ,(newValue, oldValue) =>
+                {
+                    oldValue.Add(timeExecuting);
+                    return oldValue;
+                }
+            );
+        }
+        public static Data[] DataGathered()
+        {
+            return GatherStatistics.timingMethod.Select(it =>
+            new Data()
+            {
+                m = it.Key,
+                NumberHits = it.Value.Count,
+                TotalDuration = it.Value.Sum(),
+
+            }).ToArray();
+
+        }
+
+    }
+}
diff --git a/AOPRoslyn/AOPStatistics/Method.cs b/AOPRoslyn/AOPStatistics/Method.cs
@@ -0,0 +1,9 @@
+namespace AOPStatistics
+{
+    public struct Method
+    {
+        public string className;
+        public string methodName;
+        public int line;
+    }
+}
diff --git a/AOPRoslyn/aopCmd/Program.cs b/AOPRoslyn/aopCmd/Program.cs
@@ -1,8 +1,11 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using AOPRoslyn;
+using AOPStatistics;
+using ConsoleTables;
 using InterpreterDll;
 using McMaster.Extensions.CommandLineUtils;
 
@@ -28,7 +31,23 @@ public static int Main(string[] args)
                 Console.WriteLine($"no arguments name file, taking default processme.txt file from on {pathFile}");                
                 args = new string[] { pathFile };
             }
-            return CommandLineApplication.Execute<Program>(args);
+            var ret= CommandLineApplication.Execute<Program>(args);
+            var table = new ConsoleTable("Class", "Method(Line)", "NumberHit", "TotalTime", "AverageTime");
+            if (GatherStatistics.timingMethod.Count == 0)
+            {
+                Console.WriteLine("no statistics loaded");
+                return ret;
+            }
+            var data = GatherStatistics.DataGathered()
+                        .OrderByDescending(it => it.TotalDuration / it.NumberHits)
+                        .ToArray();
+
+            foreach (var item in data)
+            {
+                table.AddRow(item.m.className, $"{item.m.methodName}({item.m.line})", item.NumberHits, item.TotalDuration, (item.TotalDuration / item.NumberHits));
+            }
+            table.Write(Format.Alternative);
+            return ret;
         }
 
         [Argument(0, Description = "The settings file to aop.\nYou can find a processme.txt near the executable.")]

diff --git a/AOPRoslyn/aopCmd/aop.csproj b/AOPRoslyn/aopCmd/aop.csproj
@@ -54,10 +54,12 @@ dotnet aop processme.txt</Description>
   <ItemGroup>
     <PackageReference Include="InterpreterDll" Version="2018.7.13.3" />
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.3" />
+    <PackageReference Include="PortableConsoleLibs" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\AOPRoslyn\AOPRoslyn.csproj" />
+    <ProjectReference Include="..\AOPStatistics\AOPStatistics.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/AOPRoslyn/processme.txt b/AOPRoslyn/processme.txt
@@ -1,6 +1,6 @@
 {
   "$type": "AOPRoslyn.RewriteCodeFolder, AOPRoslyn",
-  "ExcludeFileNames": ["TestClassPerson.cs","TestClassPersonWithArguments.cs"],
+  "ExcludeFileNames": ["TestClassPerson.cs","TestClassPersonWithArguments.cs","AOPMethod.cs","GatherStatistics.cs"],
   "FolderName": "@static:Environment.CurrentDirectory@",
   "SearchPattern": "*.cs",
 "AddDefaultArguments": "true",
@@ -11,15 +11,19 @@
     },
 	"MethodsToLog":1,
     "AddDefaultArguments": true,
-    "FormatterFirstLine": "try
+    "FormatterFirstLine": "
+	using(new AOPStatistics.AOPMethod(\"{nameClass}\",\"{nameMethod}\",{lineStartNumber})){{
+	try
 	{{
 	System.Console.WriteLine(\"start method {nameClass}_{nameMethod}_{lineStartNumber}\");System.Console.WriteLine(\"!!!arguments \" + {arguments});
 	",
-    "FormatterLastLine": "}}
+    "FormatterLastLine": "
+	}}//try
 	catch(System.Exception ex)
 	{{
 	System.Console.WriteLine(\"error in{nameClass}_{nameMethod}_{lineStartNumber}:\" + ex.Message);throw;}}finally{{System.Console.WriteLine(\"end method {nameClass}_{nameMethod}_{lineStartNumber}\");
 	}}
+	}}//using
 	"
   },
   "Options": {