Skip to content

Reduces allocations in case the tracing is not enabled #7814

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
MichalPavlik merged 2 commits into from
Jul 12, 2022
Merged

Reduces allocations in case the tracing is not enabled #7814

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a6e624
Reduces allocations in case the tracing is not enabled
MichalPavlik Jul 12, 2022
4f95479
Resolving comment
MichalPavlik Jul 12, 2022
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
14 changes: 7 additions & 7 deletions src/Build/BackEnd/Client/MSBuildClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,11 +354,11 @@ private bool TrySendPacket(Func<INodePacket> packetResolver)
{
packet = packetResolver();
WritePacket(_nodeStream, packet);
CommunicationsUtilities.Trace($"Command packet of type '{packet.Type}' sent...");
CommunicationsUtilities.Trace("Command packet of type '{0}' sent...", packet.Type);
}
catch (Exception ex)
{
CommunicationsUtilities.Trace($"Failed to send command packet of type '{packet?.Type.ToString() ?? "Unknown"}' to server: {0}", ex);
CommunicationsUtilities.Trace("Failed to send command packet of type '{0}' to server: {1}", packet?.Type.ToString() ?? "Unknown", ex);
_exitResult.MSBuildClientExitType = MSBuildClientExitType.ConnectionError;
return false;
}
Expand Down Expand Up @@ -392,11 +392,11 @@ private bool TryLaunchServer()
NodeLauncher nodeLauncher = new NodeLauncher();
CommunicationsUtilities.Trace("Starting Server...");
Process msbuildProcess = nodeLauncher.Start(_msbuildLocation, string.Join(" ", msBuildServerOptions));
CommunicationsUtilities.Trace($"Server started with PID: {msbuildProcess?.Id}");
CommunicationsUtilities.Trace("Server started with PID: {0}", msbuildProcess?.Id);
}
catch (Exception ex)
{
CommunicationsUtilities.Trace($"Failed to launch the msbuild server: {ex}");
CommunicationsUtilities.Trace("Failed to launch the msbuild server: {0}", ex);
_exitResult.MSBuildClientExitType = MSBuildClientExitType.LaunchError;
return false;
}
Expand Down Expand Up @@ -454,7 +454,7 @@ private void HandleCancellation()
/// </summary>
private void HandlePacketPumpError(MSBuildClientPacketPump packetPump)
{
CommunicationsUtilities.Trace($"MSBuild client error: packet pump unexpectedly shut down: {packetPump.PacketPumpException}");
CommunicationsUtilities.Trace("MSBuild client error: packet pump unexpectedly shut down: {0}", packetPump.PacketPumpException);
throw packetPump.PacketPumpException ?? new InternalErrorException("Packet pump unexpectedly shut down");
}

Expand Down Expand Up @@ -496,7 +496,7 @@ private void HandleServerNodeConsoleWrite(ServerNodeConsoleWrite consoleWrite)

private void HandleServerNodeBuildResult(ServerNodeBuildResult response)
{
CommunicationsUtilities.Trace($"Build response received: exit code {response.ExitCode}, exit type '{response.ExitType}'");
CommunicationsUtilities.Trace("Build response received: exit code '{0}', exit type '{1}'", response.ExitCode, response.ExitType);
_exitResult.MSBuildClientExitType = MSBuildClientExitType.Success;
_exitResult.MSBuildAppExitTypeString = response.ExitType;
_buildFinished = true;
Expand All @@ -514,7 +514,7 @@ private bool TryConnectToServer(int timeout)
}
catch (Exception ex)
{
CommunicationsUtilities.Trace($"Failed to connect to server: {ex}");
CommunicationsUtilities.Trace("Failed to connect to server: {0}", ex);
_exitResult.MSBuildClientExitType = MSBuildClientExitType.ConnectionError;
return false;
}
Expand Down