Author: Emre Kultursay Date: 2020-05-20T11:32:03+02:00 New Revision: a9d7b458c094d62a8c11ada11e39bf0d4da596c8
URL: https://github.com/llvm/llvm-project/commit/a9d7b458c094d62a8c11ada11e39bf0d4da596c8 DIFF: https://github.com/llvm/llvm-project/commit/a9d7b458c094d62a8c11ada11e39bf0d4da596c8.diff LOG: Use IPv4 for Android connections Summary: When adb client connects to adb server, or when lldb connects to lldb server on Android device, IPv6 does not work (at least on Windows it does not work). For Android on Windows, each IPv6 failure (fallback-to-IPv4) wastes 2 seconds, and since this is called 5 times when attaching, LLDB is wasting 10 seconds. This CL brings a big improvement to attach latency. Reviewers: labath Reviewed By: labath Subscribers: aadsm, clayborg, mgrang, lldb-commits Tags: #lldb Differential Revision: https://reviews.llvm.org/D79757 Added: Modified: lldb/source/Plugins/Platform/Android/AdbClient.cpp lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/Platform/Android/AdbClient.cpp b/lldb/source/Plugins/Platform/Android/AdbClient.cpp index 81698b74a1b1..14d97ebe7c3c 100644 --- a/lldb/source/Plugins/Platform/Android/AdbClient.cpp +++ b/lldb/source/Plugins/Platform/Android/AdbClient.cpp @@ -141,7 +141,7 @@ Status AdbClient::Connect() { if (const char *env_port = std::getenv("ANDROID_ADB_SERVER_PORT")) { port = env_port; } - std::string uri = "connect://localhost:" + port; + std::string uri = "connect://127.0.0.1:" + port; m_conn->Connect(uri.c_str(), &error); return error; diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp index a94ead11b08b..6dd5306a93e8 100644 --- a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp +++ b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp @@ -188,7 +188,7 @@ Status PlatformAndroidRemoteGDBServer::MakeConnectURL( if (error.Success()) { m_port_forwards[pid] = local_port; std::ostringstream url_str; - url_str << "connect://localhost:" << local_port; + url_str << "connect://127.0.0.1:" << local_port; connect_url = url_str.str(); break; } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits