Skip to content

Minor performance improvements for runspace initialization #10569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daxian-dbw merged 2 commits into from
Oct 15, 2019
Merged

Minor performance improvements for runspace initialization #10569

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fb35f9
Remove File.Exists() check
iSazonov Sep 18, 2019
b25c1c5
Reduce allocations
iSazonov Sep 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,12 +880,14 @@ internal static Version ReadVersionValue(RegistryKey mshsnapinKey, string name,
internal static void ReadRegistryInfo(out Version assemblyVersion, out string publicKeyToken, out string culture, out string architecture, out string applicationBase, out Version psVersion)
{
applicationBase = Utils.DefaultPowerShellAppBase;
Dbg.Assert(!string.IsNullOrEmpty(applicationBase),
Dbg.Assert(
!string.IsNullOrEmpty(applicationBase),
string.Format(CultureInfo.CurrentCulture, "{0} is empty or null", RegistryStrings.MonadEngine_ApplicationBase));

// Get the PSVersion from Utils..this is hardcoded
psVersion = PSVersionInfo.PSVersion;
Dbg.Assert(psVersion != null,
Dbg.Assert(
psVersion != null,
string.Format(CultureInfo.CurrentCulture, "{0} is null", RegistryStrings.MonadEngine_MonadVersion));

// Get version number in x.x.x.x format
Expand All @@ -895,19 +897,21 @@ internal static void ReadRegistryInfo(out Version assemblyVersion, out string pu
// culture, publickeytoken...This will break the scenarios where only one of
// the assemblies is patched. ie., all monad assemblies should have the
// same version number.

Assembly currentAssembly = typeof(PSSnapInReader).Assembly;
assemblyVersion = currentAssembly.GetName().Version;
byte[] publicTokens = currentAssembly.GetName().GetPublicKeyToken();
AssemblyName assemblyName = currentAssembly.GetName();
assemblyVersion = assemblyName.Version;
byte[] publicTokens = assemblyName.GetPublicKeyToken();
if (publicTokens.Length == 0)
{
throw PSTraceSource.NewArgumentException("PublicKeyToken", MshSnapinInfo.PublicKeyTokenAccessFailed);
}

publicKeyToken = ConvertByteArrayToString(publicTokens);

// save some cpu cycles by hardcoding the culture to neutral
// assembly should never be targeted to a particular culture
culture = "neutral";

// Hardcoding the architecture MSIL as PowerShell assemblies are architecture neutral, this should
// be changed if the assumption is broken. Preferred hardcoded string to using (for perf reasons):
// string architecture = currentAssembly.GetName().ProcessorArchitecture.ToString()
Expand Down Expand Up @@ -1010,13 +1014,20 @@ internal static Collection<PSSnapInInfo> ReadEnginePSSnapIns()

// create default mshsnapininfo objects..
Collection<PSSnapInInfo> engineMshSnapins = new Collection<PSSnapInInfo>();
string assemblyVersionString = assemblyVersion.ToString();
Comment thread
daxian-dbw marked this conversation as resolved.

for (int item = 0; item < DefaultMshSnapins.Count; item++)
{
DefaultPSSnapInInformation defaultMshSnapinInfo = DefaultMshSnapins[item];

string strongName = string.Format(CultureInfo.InvariantCulture, "{0}, Version={1}, Culture={2}, PublicKeyToken={3}, ProcessorArchitecture={4}",
defaultMshSnapinInfo.AssemblyName, assemblyVersion.ToString(), culture, publicKeyToken, architecture);
string strongName = string.Format(
CultureInfo.InvariantCulture,
"{0}, Version={1}, Culture={2}, PublicKeyToken={3}, ProcessorArchitecture={4}",
Comment thread
daxian-dbw marked this conversation as resolved.
defaultMshSnapinInfo.AssemblyName,
assemblyVersionString,
culture,
publicKeyToken,
architecture);

Collection<string> formats = null;
Collection<string> types = null;
Expand All @@ -1026,8 +1037,7 @@ internal static Collection<PSSnapInInfo> ReadEnginePSSnapIns()
formats = smaFormats;
types = smaTypes;
}
else if (defaultMshSnapinInfo.AssemblyName.Equals("Microsoft.PowerShell.Commands.Diagnostics",
StringComparison.OrdinalIgnoreCase))
else if (defaultMshSnapinInfo.AssemblyName.Equals("Microsoft.PowerShell.Commands.Diagnostics", StringComparison.OrdinalIgnoreCase))
{
types = new Collection<string>(new string[] { "GetEvent.types.ps1xml" });
formats = new Collection<string>(new string[] { "Event.format.ps1xml", "Diagnostics.format.ps1xml" });
Expand All @@ -1039,11 +1049,6 @@ internal static Collection<PSSnapInInfo> ReadEnginePSSnapIns()

string moduleName = Path.Combine(applicationBase, defaultMshSnapinInfo.AssemblyName + ".dll");

if (!File.Exists(moduleName))
{
moduleName = defaultMshSnapinInfo.AssemblyName;
}

PSSnapInInfo defaultMshSnapin = new PSSnapInInfo(
defaultMshSnapinInfo.PSSnapInName,
isDefault: true,
Expand Down