diff options
Diffstat (limited to 'lldb/source/Plugins')
8 files changed, 28 insertions, 27 deletions
diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp index 288accfe871..cabb3ffb1c1 100644 --- a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp +++ b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp @@ -203,7 +203,7 @@ Error PlatformAndroidRemoteGDBServer::MakeConnectURL( } lldb::ProcessSP PlatformAndroidRemoteGDBServer::ConnectProcess( - const char *connect_url, const char *plugin_name, + llvm::StringRef connect_url, llvm::StringRef plugin_name, lldb_private::Debugger &debugger, lldb_private::Target *target, lldb_private::Error &error) { // We don't have the pid of the remote gdbserver when it isn't started by us @@ -216,7 +216,8 @@ lldb::ProcessSP PlatformAndroidRemoteGDBServer::ConnectProcess( int remote_port; llvm::StringRef scheme, host, path; if (!UriParser::Parse(connect_url, scheme, host, remote_port, path)) { - error.SetErrorStringWithFormat("Invalid URL: %s", connect_url); + error.SetErrorStringWithFormat("Invalid URL: %s", + connect_url.str().c_str()); return nullptr; } @@ -227,6 +228,6 @@ lldb::ProcessSP PlatformAndroidRemoteGDBServer::ConnectProcess( if (error.Fail()) return nullptr; - return PlatformRemoteGDBServer::ConnectProcess( - new_connect_url.c_str(), plugin_name, debugger, target, error); + return PlatformRemoteGDBServer::ConnectProcess(new_connect_url, plugin_name, + debugger, target, error); } diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h index f9593fa8e80..6d5bfecd993 100644 --- a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h +++ b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h @@ -37,8 +37,8 @@ public: Error DisconnectRemote() override; - lldb::ProcessSP ConnectProcess(const char *connect_url, - const char *plugin_name, + lldb::ProcessSP ConnectProcess(llvm::StringRef connect_url, + llvm::StringRef plugin_name, lldb_private::Debugger &debugger, lldb_private::Target *target, lldb_private::Error &error) override; diff --git a/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp b/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp index 482e183ca80..569a862d3ea 100644 --- a/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp +++ b/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp @@ -836,8 +836,8 @@ Error PlatformPOSIX::UnloadImage(lldb_private::Process *process, return Error(); } -lldb::ProcessSP PlatformPOSIX::ConnectProcess(const char *connect_url, - const char *plugin_name, +lldb::ProcessSP PlatformPOSIX::ConnectProcess(llvm::StringRef connect_url, + llvm::StringRef plugin_name, lldb_private::Debugger &debugger, lldb_private::Target *target, lldb_private::Error &error) { diff --git a/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.h b/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.h index 98df91b2d68..93213b295ca 100644 --- a/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.h +++ b/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.h @@ -156,8 +156,8 @@ public: lldb_private::Error UnloadImage(lldb_private::Process *process, uint32_t image_token) override; - lldb::ProcessSP ConnectProcess(const char *connect_url, - const char *plugin_name, + lldb::ProcessSP ConnectProcess(llvm::StringRef connect_url, + llvm::StringRef plugin_name, lldb_private::Debugger &debugger, lldb_private::Target *target, lldb_private::Error &error) override; diff --git a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp index ccc73015adc..7962ca82c84 100644 --- a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp +++ b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp @@ -852,7 +852,7 @@ std::string PlatformRemoteGDBServer::MakeUrl(const char *scheme, } lldb::ProcessSP PlatformRemoteGDBServer::ConnectProcess( - const char *connect_url, const char *plugin_name, + llvm::StringRef connect_url, llvm::StringRef plugin_name, lldb_private::Debugger &debugger, lldb_private::Target *target, lldb_private::Error &error) { if (!IsRemote() || !IsConnected()) { @@ -869,8 +869,7 @@ size_t PlatformRemoteGDBServer::ConnectToWaitingProcesses(Debugger &debugger, GetPendingGdbServerList(connection_urls); for (size_t i = 0; i < connection_urls.size(); ++i) { - ConnectProcess(connection_urls[i].c_str(), nullptr, debugger, nullptr, - error); + ConnectProcess(connection_urls[i].c_str(), "", debugger, nullptr, error); if (error.Fail()) return i; // We already connected to i process succsessfully } diff --git a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h index 6df37926079..edc223a2d7f 100644 --- a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h +++ b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h @@ -162,8 +162,8 @@ public: const lldb::UnixSignalsSP &GetRemoteUnixSignals() override; - lldb::ProcessSP ConnectProcess(const char *connect_url, - const char *plugin_name, + lldb::ProcessSP ConnectProcess(llvm::StringRef connect_url, + llvm::StringRef plugin_name, lldb_private::Debugger &debugger, lldb_private::Target *target, lldb_private::Error &error) override; diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp index 3761f06628a..876af4ffdce 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -651,7 +651,8 @@ Error ProcessGDBRemote::WillAttachToProcessWithName(const char *process_name, return WillLaunchOrAttach(); } -Error ProcessGDBRemote::DoConnectRemote(Stream *strm, const char *remote_url) { +Error ProcessGDBRemote::DoConnectRemote(Stream *strm, + llvm::StringRef remote_url) { Log *log(ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_PROCESS)); Error error(WillLaunchOrAttach()); @@ -695,15 +696,15 @@ Error ProcessGDBRemote::DoConnectRemote(Stream *strm, const char *remote_url) { if (state != eStateInvalid) { SetPrivateState(state); } else - error.SetErrorStringWithFormat("Process %" PRIu64 - " was reported after connecting to " - "'%s', but state was not stopped: %s", - pid, remote_url, StateAsCString(state)); + error.SetErrorStringWithFormat( + "Process %" PRIu64 " was reported after connecting to " + "'%s', but state was not stopped: %s", + pid, remote_url.str().c_str(), StateAsCString(state)); } else error.SetErrorStringWithFormat("Process %" PRIu64 " was reported after connecting to '%s', " "but no stop reply packet was received", - pid, remote_url); + pid, remote_url.str().c_str()); } if (log) @@ -963,15 +964,15 @@ Error ProcessGDBRemote::DoLaunch(Module *exe_module, return error; } -Error ProcessGDBRemote::ConnectToDebugserver(const char *connect_url) { +Error ProcessGDBRemote::ConnectToDebugserver(llvm::StringRef connect_url) { Error error; // Only connect if we have a valid connect URL Log *log(ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_PROCESS)); - if (connect_url && connect_url[0]) { + if (!connect_url.empty()) { if (log) log->Printf("ProcessGDBRemote::%s Connecting to %s", __FUNCTION__, - connect_url); + connect_url.str().c_str()); std::unique_ptr<ConnectionFileDescriptor> conn_ap( new ConnectionFileDescriptor()); if (conn_ap.get()) { @@ -3353,7 +3354,7 @@ Error ProcessGDBRemote::LaunchAndConnectToDebugserver( if (m_gdb_comm.IsConnected()) { // Finish the connection process by doing the handshake without connecting // (send NULL URL) - ConnectToDebugserver(NULL); + ConnectToDebugserver(""); } else { error.SetErrorString("connection failed"); } diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h index d607d3592fe..6423abc5583 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h @@ -89,7 +89,7 @@ public: Error WillAttachToProcessWithName(const char *process_name, bool wait_for_launch) override; - Error DoConnectRemote(Stream *strm, const char *remote_url) override; + Error DoConnectRemote(Stream *strm, llvm::StringRef remote_url) override; Error WillLaunchOrAttach(); @@ -379,7 +379,7 @@ protected: void DidLaunchOrAttach(ArchSpec &process_arch); - Error ConnectToDebugserver(const char *host_port); + Error ConnectToDebugserver(llvm::StringRef host_port); const char *GetDispatchQueueNameForThread(lldb::addr_t thread_dispatch_qaddr, std::string &dispatch_queue_name); |
