admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid boxing when passing value type arguments to PSTraceSource.WriteLine (#10052)

Browse Source
This commit is contained in:
Ilya
2019-07-22 09:50:46 -07:00
committed by Dongbo Wang
parent 48c7e112db
commit 260459ccd4
4 changed files with 77 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/engine/CmdletParameterBinderController.cs
+1 -1
View File
@@ -980,7 +980,7 @@ namespace System.Management.Automation
{
ParameterBinderBase.bindingTracer.WriteLine(
"{0} valid parameter sets, using the DEFAULT PARAMETER SET: [{0}]",
this.BindableParameters.ParameterSetCount,
this.BindableParameters.ParameterSetCount.ToString(),
_commandMetadata.DefaultParameterSetName);
_currentParameterSetFlag =
src/System.Management.Automation/engine/remoting/fanin/WSManTransportManager.cs
+7 -7
View File
@@ -1878,7 +1878,7 @@ namespace System.Management.Automation.Remoting.Client
if (errorStruct.errorCode != 0)
{
tracer.WriteLine("Got error with error code {0}. Message {1}", errorStruct.errorCode, errorStruct.errorDetail);
tracer.WriteLine("Got error with error code {0}. Message {1}", errorStruct.errorCode.ToString(), errorStruct.errorDetail);
// Test error code for possible session connection retry.
if (sessionTM.RetrySessionCreation(errorStruct.errorCode))
@@ -1975,7 +1975,7 @@ namespace System.Management.Automation.Remoting.Client
if (errorStruct.errorCode != 0)
{
tracer.WriteLine("Got error with error code {0}. Message {1}", errorStruct.errorCode, errorStruct.errorDetail);
tracer.WriteLine("Got error with error code {0}. Message {1}", errorStruct.errorCode.ToString(), errorStruct.errorDetail);
TransportErrorOccuredEventArgs eventargs = WSManTransportManagerUtils.ConstructTransportErrorEventArgs(
sessionTM.WSManAPIData.WSManAPIHandle,
@@ -2027,7 +2027,7 @@ namespace System.Management.Automation.Remoting.Client
if (errorStruct.errorCode != 0)
{
tracer.WriteLine("Got error with error code {0}. Message {1}", errorStruct.errorCode, errorStruct.errorDetail);
tracer.WriteLine("Got error with error code {0}. Message {1}", errorStruct.errorCode.ToString(), errorStruct.errorDetail);
TransportErrorOccuredEventArgs eventargs = WSManTransportManagerUtils.ConstructTransportErrorEventArgs(
sessionTM.WSManAPIData.WSManAPIHandle,
@@ -2095,7 +2095,7 @@ namespace System.Management.Automation.Remoting.Client
if (errorStruct.errorCode != 0)
{
tracer.WriteLine("Got error with error code {0}. Message {1}", errorStruct.errorCode, errorStruct.errorDetail);
tracer.WriteLine("Got error with error code {0}. Message {1}", errorStruct.errorCode.ToString(), errorStruct.errorDetail);
TransportErrorOccuredEventArgs eventargs = WSManTransportManagerUtils.ConstructTransportErrorEventArgs(
sessionTM.WSManAPIData.WSManAPIHandle,
@@ -2198,7 +2198,7 @@ namespace System.Management.Automation.Remoting.Client
if (errorStruct.errorCode != 0)
{
tracer.WriteLine("Got error with error code {0}. Message {1}", errorStruct.errorCode, errorStruct.errorDetail);
tracer.WriteLine("Got error with error code {0}. Message {1}", errorStruct.errorCode.ToString(), errorStruct.errorDetail);
TransportErrorOccuredEventArgs eventargs = WSManTransportManagerUtils.ConstructTransportErrorEventArgs(
sessionTM.WSManAPIData.WSManAPIHandle,
@@ -2304,7 +2304,7 @@ namespace System.Management.Automation.Remoting.Client
// way of notifying the same using state change events.
if ((errorStruct.errorCode != 0) && (errorStruct.errorCode != 995))
{
tracer.WriteLine("Got error with error code {0}. Message {1}", errorStruct.errorCode, errorStruct.errorDetail);
tracer.WriteLine("Got error with error code {0}. Message {1}", errorStruct.errorCode.ToString(), errorStruct.errorDetail);
TransportErrorOccuredEventArgs eventargs = WSManTransportManagerUtils.ConstructTransportErrorEventArgs(
sessionTM.WSManAPIData.WSManAPIHandle,
@@ -2371,7 +2371,7 @@ namespace System.Management.Automation.Remoting.Client
if (errorStruct.errorCode != 0)
{
tracer.WriteLine("Got error with error code {0}. Message {1}", errorStruct.errorCode, errorStruct.errorDetail);
tracer.WriteLine("Got error with error code {0}. Message {1}", errorStruct.errorCode.ToString(), errorStruct.errorDetail);
TransportErrorOccuredEventArgs eventargs = WSManTransportManagerUtils.ConstructTransportErrorEventArgs(
sessionTM.WSManAPIData.WSManAPIHandle,
src/System.Management.Automation/namespaces/LocationGlobber.cs
+1 -1
View File
@@ -4402,7 +4402,7 @@ namespace System.Management.Automation
}
} while (false);
s_tracer.WriteLine("result = {0}; childName = {1}", result, childName);
s_tracer.WriteLine("result = {0}; childName = {1}", result.ToString(), childName);
return result;
}
src/System.Management.Automation/utils/StructuredTraceSource.cs
+68 -37
View File
@@ -346,7 +346,7 @@ namespace System.Management.Automation
OutputLine(
PSTraceSourceOptions.All,
"\tCurrent time: {0}",
DateTime.Now);
DateTime.Now.ToString());
// OS build
@@ -429,7 +429,7 @@ namespace System.Management.Automation
OutputLine(
PSTraceSourceOptions.All,
"\tAssembly File Timestamp: {0}",
assemblyFileInfo.CreationTime);
assemblyFileInfo.CreationTime.ToString());
}
StringBuilder flagBuilder = new StringBuilder();
@@ -924,6 +924,56 @@ namespace System.Management.Automation
}
}
internal void WriteLine(string format, bool arg1)
{
WriteLine(format, (object)arg1.ToString());
}
internal void WriteLine(string format, byte arg1)
{
WriteLine(format, (object)arg1.ToString());
}
internal void WriteLine(string format, char arg1)
{
WriteLine(format, (object)arg1.ToString());
}
internal void WriteLine(string format, decimal arg1)
{
WriteLine(format, (object)arg1.ToString());
}
internal void WriteLine(string format, double arg1)
{
WriteLine(format, (object)arg1.ToString());
}
internal void WriteLine(string format, float arg1)
{
WriteLine(format, (object)arg1.ToString());
}
internal void WriteLine(string format, int arg1)
{
WriteLine(format, (object)arg1.ToString());
}
internal void WriteLine(string format, long arg1)
{
WriteLine(format, (object)arg1.ToString());
}
internal void WriteLine(string format, uint arg1)
{
WriteLine(format, (object)arg1.ToString());
}
internal void WriteLine(string format, ulong arg1)
{
WriteLine(format, (object)arg1.ToString());
}
/// <summary>
/// Traces the formatted output when PSTraceSourceOptions.WriteLine is enabled.
/// </summary>
@@ -1046,10 +1096,10 @@ namespace System.Management.Automation
/// </param>
/// <param name="classFormatter">
/// This is the trace class formatter. For instance,
/// TraceError has a formatter like "ERROR: {0}"
/// TraceError has a formatter like "ERROR: {0}".
/// </param>
/// <param name="format">
/// Additional format string
/// Additional format string.
/// </param>
/// <param name="args">
/// Arguments for the additional format string
@@ -1064,7 +1114,6 @@ namespace System.Management.Automation
{
// First format the class format string and the
// user provided format string together
StringBuilder output = new StringBuilder();
if (classFormatter != null)
@@ -1081,13 +1130,12 @@ namespace System.Management.Automation
}
// finally trace the output
OutputLine(flag, output.ToString());
}
catch
{
// Eat all exceptions
//
// Do not assert here because exceptions can be
// raised while a thread is shutting down during
// normal operation.
@@ -1108,10 +1156,10 @@ namespace System.Management.Automation
/// GetCallingMethodNameAndParameters.
/// </remarks>
/// <param name="skipFrames">
/// The number of frames to skip in the calling stack
/// The number of frames to skip in the calling stack.
/// </param>
/// <returns>
/// The name of the method on the stack
/// The name of the method on the stack.
/// </returns>
private static string GetCallingMethodNameAndParameters(int skipFrames)
{
@@ -1251,38 +1299,31 @@ namespace System.Management.Automation
return prefixBuilder;
}
private static void AddTab(ref StringBuilder lineBuilder)
private static void AddTab(StringBuilder lineBuilder)
{
// The Trace.IndentSize does not change at all
// through the running of the process so there
// are no thread issues here.
int indentSize = Trace.IndentSize;
int threadIndentLevel = ThreadIndentLevel;
for (
int index = 0;
index < indentSize * threadIndentLevel;
index++)
{
lineBuilder.Append(" ");
}
lineBuilder.Append(System.Management.Automation.Internal.StringUtil.Padding(indentSize * threadIndentLevel));
}
// used to find and blocks cyclic-loops in tracing.
private bool _alreadyTracing = false;
/// <summary>
/// Composes a line of trace output and then writes it.
/// </summary>
/// <param name="flag">
/// The flag that caused the line to be traced
/// The flag that caused the line to be traced.
/// </param>
/// <param name="format">
/// The string to write with format symbols if necessary
/// The string to write with format symbols if necessary.
/// </param>
/// <param name="args">
/// Arguments to the format string
/// <param name="arg">
/// Arguments to the format string.
/// </param>
/// <remarks>
/// The line is composed by prefixing the process name, thread ID,
@@ -1293,7 +1334,7 @@ namespace System.Management.Automation
internal void OutputLine(
PSTraceSourceOptions flag,
string format,
params object[] args)
string arg = null)
{
// if already tracing something for this current TraceSource,
// dont trace again. This will block cyclic-loops from happening.
@@ -1315,28 +1356,18 @@ namespace System.Management.Automation
{
// Get the line prefix string which includes things
// like App name, clock tick, thread ID, etc.
lineBuilder.Append(GetLinePrefix(flag));
}
// Add the spaces for the indent
AddTab(lineBuilder);
AddTab(ref lineBuilder);
if (args != null && args.Length > 0)
if (arg != null)
{
for (int index = 0; index < args.Length; ++index)
{
if (args[index] == null)
{
args[index] = "null";
}
}
lineBuilder.AppendFormat(
CultureInfo.CurrentCulture,
format,
args);
arg);
}
else
{