Skip to content

Change COMPlus_DiagnosticsServerTransportPath #32087

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
josalem merged 2 commits into from
Feb 19, 2020
Merged

Change COMPlus_DiagnosticsServerTransportPath #32087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b1edae
Change COMPlus_DiagnosticsServerTransportPath to COMPlus_DiagnosticsS…
Feb 11, 2020
208ff4e
Change variable prefix to `DOTNET`
Feb 11, 2020
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
2 changes: 1 addition & 1 deletion src/coreclr/src/inc/clrconfigvalues.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ RETAIL_CONFIG_DWORD_INFO(INTERNAL_EventPipeProcNumbers, W("EventPipeProcNumbers"
//
// Diagnostics Server
//
RETAIL_CONFIG_STRING_INFO(EXTERNAL_DiagnosticsServerTransportPath, W("DiagnosticsServerTransportPath"), "The full path including filename for the OS transport (NamedPipe on Windows; Unix Domain Socket on Linux) to be used by the Diagnostics Server");
RETAIL_CONFIG_STRING_INFO_EX(EXTERNAL_DOTNET_DiagnosticsServerAddress, W("DOTNET_DiagnosticsServerAddress"), "The full path including filename for the OS transport (NamedPipe on Windows; Unix Domain Socket on Linux) to be used by the Diagnostics Server", CLRConfig::DontPrependCOMPlus_);

//
// LTTng
Expand Down
16 changes: 7 additions & 9 deletions src/coreclr/src/vm/diagnosticserver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,24 +135,22 @@ bool DiagnosticServer::Initialize()
szMessage); // data2
};

// char transportPath[MAX_PATH];
NewArrayHolder<char> transportPath = nullptr;
CLRConfigStringHolder wTransportPath = CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_DiagnosticsServerTransportPath);
NewArrayHolder<char> address = nullptr;
CLRConfigStringHolder wAddress = CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_DOTNET_DiagnosticsServerAddress);
int nCharactersWritten = 0;
if (wTransportPath != nullptr)
if (wAddress != nullptr)
{
nCharactersWritten = WideCharToMultiByte(CP_UTF8, 0, wTransportPath, -1, NULL, 0, NULL, NULL);
nCharactersWritten = WideCharToMultiByte(CP_UTF8, 0, wAddress, -1, NULL, 0, NULL, NULL);
if (nCharactersWritten != 0)
{
transportPath = new char[nCharactersWritten];
nCharactersWritten = WideCharToMultiByte(CP_UTF8, 0, wTransportPath, -1, transportPath, nCharactersWritten, NULL, NULL);
address = new char[nCharactersWritten];
nCharactersWritten = WideCharToMultiByte(CP_UTF8, 0, wAddress, -1, address, nCharactersWritten, NULL, NULL);
assert(nCharactersWritten != 0);
}
}

// TODO: Should we handle/assert that (s_pIpc == nullptr)?
s_pIpc = IpcStream::DiagnosticsIpc::Create(
transportPath, ErrorCallback);
s_pIpc = IpcStream::DiagnosticsIpc::Create(address, ErrorCallback);

if (s_pIpc != nullptr)
{
Expand Down