Merge pull request #695 from PowerShell/kapilmb/FixPerformance

Kapil Borle · web-flow · commit c23d0aedfdfb · 2017-01-24T14:00:31.000-08:00
Reuse command info cache during a PS session
diff --git a/Engine/Helper.cs b/Engine/Helper.cs
@@ -65,7 +65,10 @@ internal set
             {
                 lock (syncRoot)
                 {
-                    instance = value;
+                    if (instance == null)
+                    {
+                        instance = value;
+                    }
                 }
             }
         }
@@ -147,7 +150,10 @@ public void Initialize()
             KeywordBlockDictionary = new Dictionary<String, List<Tuple<int, int>>>(StringComparer.OrdinalIgnoreCase);
             VariableAnalysisDictionary = new Dictionary<Ast, VariableAnalysis>();
             ruleArguments = new Dictionary<string, Dictionary<string, object>>(StringComparer.OrdinalIgnoreCase);
-            commandInfoCache = new Dictionary<string, CommandInfo>(StringComparer.OrdinalIgnoreCase);
+            if (commandInfoCache == null)
+            {
+                commandInfoCache = new Dictionary<string, CommandInfo>(StringComparer.OrdinalIgnoreCase);
+            }
 
             IEnumerable<CommandInfo> aliases = this.invokeCommand.GetCommands("*", CommandTypes.Alias, true);
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,10 @@ internal set`
`65`	`65`	`{`
`66`	`66`	`lock (syncRoot)`
`67`	`67`	`{`
`68`		`- instance = value;`
	`68`	`+ if (instance == null)`
	`69`	`+ {`
	`70`	`+ instance = value;`
	`71`	`+ }`
`69`	`72`	`}`
`70`	`73`	`}`
`71`	`74`	`}`
`@@ -147,7 +150,10 @@ public void Initialize()`
`147`	`150`	`KeywordBlockDictionary = new Dictionary<String, List<Tuple<int, int>>>(StringComparer.OrdinalIgnoreCase);`
`148`	`151`	`VariableAnalysisDictionary = new Dictionary<Ast, VariableAnalysis>();`
`149`	`152`	`ruleArguments = new Dictionary<string, Dictionary<string, object>>(StringComparer.OrdinalIgnoreCase);`
`150`		`- commandInfoCache = new Dictionary<string, CommandInfo>(StringComparer.OrdinalIgnoreCase);`
	`153`	`+ if (commandInfoCache == null)`
	`154`	`+ {`
	`155`	`+ commandInfoCache = new Dictionary<string, CommandInfo>(StringComparer.OrdinalIgnoreCase);`
	`156`	`+ }`
`151`	`157`
`152`	`158`	`IEnumerable<CommandInfo> aliases = this.invokeCommand.GetCommands("*", CommandTypes.Alias, true);`
`153`	`159`