Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Rename stoponstart to pauseonstart
  • Loading branch information
John Salem committed May 29, 2020
commit d86cdf3ab37857b2ecf9ff1fcc88f94674d0aad0
2 changes: 1 addition & 1 deletion src/coreclr/src/inc/clrconfigvalues.h
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ RETAIL_CONFIG_DWORD_INFO(INTERNAL_EventPipeProcNumbers, W("EventPipeProcNumbers"
// Diagnostics Server
//
RETAIL_CONFIG_STRING_INFO_EX(EXTERNAL_DOTNET_DiagnosticsMonitorAddress, W("DOTNET_DiagnosticsMonitorAddress"), "NamedPipe path without '\\\\.\\pipe\\' on Windows; Full path of Unix Domain Socket on Linux/Unix. Used for Diagnostics Monitoring Agents.", CLRConfig::DontPrependCOMPlus_);
RETAIL_CONFIG_DWORD_INFO_EX(EXTERNAL_DOTNET_DiagnosticsMonitorStopOnStart, W("DOTNET_DiagnosticsMonitorStopOnStart"), 1, "If DOTNET_DiagnosticsMonitorAddress is set, this will cause the runtime to pause during startup. Resume using the Diagnostics IPC ResumeStartup command.", CLRConfig::DontPrependCOMPlus_);
RETAIL_CONFIG_DWORD_INFO_EX(EXTERNAL_DOTNET_DiagnosticsMonitorPauseOnStart, W("DOTNET_DiagnosticsMonitorPauseOnStart"), 1, "If DOTNET_DiagnosticsMonitorAddress is set, this will cause the runtime to pause during startup. Resume using the Diagnostics IPC ResumeStartup command.", CLRConfig::DontPrependCOMPlus_);

//
// LTTng
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/src/vm/diagnosticserver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,8 @@ void DiagnosticServer::PauseForDiagnosticsMonitor()
CLRConfigStringHolder pDotnetDiagnosticsMonitorAddress = CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_DOTNET_DiagnosticsMonitorAddress);
if (pDotnetDiagnosticsMonitorAddress != nullptr)
{
DWORD dwDotnetDiagnosticsMonitorStopOnStart = CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_DOTNET_DiagnosticsMonitorStopOnStart);
if (dwDotnetDiagnosticsMonitorStopOnStart != 0)
DWORD dwDotnetDiagnosticsMonitorPauseOnStart = CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_DOTNET_DiagnosticsMonitorPauseOnStart);
if (dwDotnetDiagnosticsMonitorPauseOnStart != 0)
{
_ASSERTE(s_ResumeRuntimeStartupEvent != nullptr && s_ResumeRuntimeStartupEvent->IsValid());
const DWORD dwFiveSecondWait = s_ResumeRuntimeStartupEvent->Wait(5000, false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
using Microsoft.Diagnostics.Tracing;
using Microsoft.Diagnostics.Tracing.Parsers;

namespace Tracing.Tests.StopOnStartValidation
namespace Tracing.Tests.PauseOnStartValidation
{
public class StopOnStartValidation
public class PauseOnStartValidation
{
public static async Task<bool> TEST_RuntimeResumesExecutionWithCommand()
{
Expand Down Expand Up @@ -174,7 +174,7 @@ public static async Task<int> Main(string[] args)
}

bool fSuccess = true;
IEnumerable<MethodInfo> tests = typeof(StopOnStartValidation).GetMethods().Where(mi => mi.Name.StartsWith("TEST_"));
IEnumerable<MethodInfo> tests = typeof(PauseOnStartValidation).GetMethods().Where(mi => mi.Name.StartsWith("TEST_"));
foreach (var test in tests)
{
Logger.logger.Log($"::== Running test: {test.Name}");
Expand Down