This is an archive of the discontinued LLVM Phabricator instance.

Differential D16861

Pass socket scheme as part of debug server listen URL
ClosedPublic

Authored by ovyalov on Feb 3 2016, 10:55 AM.

Details

Reviewers
sivachandra
tberghammer
Summary

Pass socket scheme as part of debug server listen URL in order to fix custom protocols like unix-abstract.

Diff Detail

Event Timeline

ovyalov updated this revision to Diff 46805.Feb 3 2016, 10:55 AM
ovyalov retitled this revision from to Pass socket scheme as part of debug server listen URL.
ovyalov updated this object.
ovyalov added reviewers: sivachandra, tberghammer.
ovyalov added a subscriber: lldb-commits.
sivachandra accepted this revision.Feb 3 2016, 12:10 PM
sivachandra edited edge metadata.
This revision is now accepted and ready to land.Feb 3 2016, 12:10 PM
ovyalov closed this revision.Feb 3 2016, 2:07 PM

Submitted as http://reviews.llvm.org/rL259714

tfiala added a subscriber: tfiala.May 26 2016, 8:28 PM

This change broke connection to debugserver on OS X - the constructed URL on debugserver does not take the tcp:// (URL-scheme) portion. This would manifest when 'lldb-server platform' was attempting to launch debugserver.

I'm going to be making a fix for the debugserver case. I'll make sure it doesn't break Linux.

ovyalov added a comment.May 27 2016, 10:04 AM
In D16861#441964, @tfiala wrote:

This change broke connection to debugserver on OS X - the constructed URL on debugserver does not take the tcp:// (URL-scheme) portion. This would manifest when 'lldb-server platform' was attempting to launch debugserver.

I'm going to be making a fix for the debugserver case. I'll make sure it doesn't break Linux.

thanks for the fix, Todd!

tfiala added a comment.May 27 2016, 10:08 AM
In D16861#442396, @ovyalov wrote:
In D16861#441964, @tfiala wrote:

This change broke connection to debugserver on OS X - the constructed URL on debugserver does not take the tcp:// (URL-scheme) portion. This would manifest when 'lldb-server platform' was attempting to launch debugserver.

I'm going to be making a fix for the debugserver case. I'll make sure it doesn't break Linux.

thanks for the fix, Todd!

Sure think, Oleksiy!

Revision Contents

PathSize
source/
Plugins/
Process/
gdb-remote/
1 line

Diff 46805

source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp

Show First 20 Lines • Show All 129 Lines • ▼ Show 20 LinesGDBRemoteCommunicationServerPlatform::LaunchGDBServer(const lldb_private::Args& args,
std::string platform_ip; std::string platform_ip;
int platform_port; int platform_port;
std::string platform_path; std::string platform_path;
bool ok = UriParser::Parse(GetConnection()->GetURI().c_str(), platform_scheme, platform_ip, platform_port, platform_path); bool ok = UriParser::Parse(GetConnection()->GetURI().c_str(), platform_scheme, platform_ip, platform_port, platform_path);
UNUSED_IF_ASSERT_DISABLED(ok); UNUSED_IF_ASSERT_DISABLED(ok);
assert(ok); assert(ok);
std::ostringstream url; std::ostringstream url;
url << m_socket_scheme << "://";
uint16_t* port_ptr = &port; uint16_t* port_ptr = &port;
if (m_socket_protocol == Socket::ProtocolTcp) if (m_socket_protocol == Socket::ProtocolTcp)
url << platform_ip << ":" << port; url << platform_ip << ":" << port;
else else
{ {
socket_name = GetDomainSocketPath("gdbserver").GetPath(); socket_name = GetDomainSocketPath("gdbserver").GetPath();
url << socket_name; url << socket_name;
port_ptr = nullptr; port_ptr = nullptr;
▲ Show 20 Lines • Show All 459 Lines • Show Last 20 Lines