diff options
7 files changed, 7 insertions, 53 deletions
diff --git a/lldb/include/lldb/Target/Process.h b/lldb/include/lldb/Target/Process.h index ac13f3c20fe..cc94cdaa6e6 100644 --- a/lldb/include/lldb/Target/Process.h +++ b/lldb/include/lldb/Target/Process.h @@ -1453,31 +1453,14 @@ public: /// @param[in] pid /// The process ID that we should attempt to attach to. /// - /// @return - /// Returns \a pid if attaching was successful, or - /// LLDB_INVALID_PROCESS_ID if attaching fails. - //------------------------------------------------------------------ - virtual Error - DoAttachToProcessWithID (lldb::pid_t pid) - { - Error error; - error.SetErrorStringWithFormat("error: %s does not support attaching to a process by pid", GetPluginName().GetCString()); - return error; - } - - //------------------------------------------------------------------ - /// Attach to an existing process using a process ID. - /// - /// @param[in] pid - /// The process ID that we should attempt to attach to. - /// /// @param[in] attach_info /// Information on how to do the attach. For example, GetUserID() /// will return the uid to attach as. /// /// @return - /// Returns \a pid if attaching was successful, or - /// LLDB_INVALID_PROCESS_ID if attaching fails. + /// Returns a successful Error attaching was successful, or + /// an appropriate (possibly platform-specific) error code if + /// attaching fails. /// hanming : need flag //------------------------------------------------------------------ virtual Error @@ -1499,7 +1482,9 @@ public: /// will return the uid to attach as. /// /// @return - /// Returns an error object. + /// Returns a successful Error attaching was successful, or + /// an appropriate (possibly platform-specific) error code if + /// attaching fails. //------------------------------------------------------------------ virtual Error DoAttachToProcessWithName (const char *process_name, const ProcessAttachInfo &attach_info) diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp index 87c6d15c3ba..2acc81bb483 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp @@ -406,15 +406,6 @@ ProcessKDP::DoLaunch (Module *exe_module, return error; } - -Error -ProcessKDP::DoAttachToProcessWithID (lldb::pid_t attach_pid) -{ - Error error; - error.SetErrorString ("attach to process by ID is not suppported in kdp remote debugging"); - return error; -} - Error ProcessKDP::DoAttachToProcessWithID (lldb::pid_t attach_pid, const ProcessAttachInfo &attach_info) { diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h index f7f12350fa5..f67b0490905 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h @@ -97,9 +97,6 @@ public: DoConnectRemote (lldb_private::Stream *strm, const char *remote_url); virtual lldb_private::Error - DoAttachToProcessWithID (lldb::pid_t pid); - - virtual lldb_private::Error DoAttachToProcessWithID (lldb::pid_t pid, const lldb_private::ProcessAttachInfo &attach_info); virtual lldb_private::Error diff --git a/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp b/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp index 09f72cbde97..71284d1edaf 100644 --- a/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp +++ b/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp @@ -85,7 +85,7 @@ ProcessPOSIX::CanDebug(Target &target, bool plugin_specified_by_name) } Error -ProcessPOSIX::DoAttachToProcessWithID(lldb::pid_t pid) +ProcessPOSIX::DoAttachToProcessWithID (lldb::pid_t pid, const ProcessAttachInfo &attach_info) { Error error; assert(m_monitor == NULL); @@ -134,12 +134,6 @@ ProcessPOSIX::DoAttachToProcessWithID(lldb::pid_t pid) } Error -ProcessPOSIX::DoAttachToProcessWithID (lldb::pid_t pid, const ProcessAttachInfo &attach_info) -{ - return DoAttachToProcessWithID(pid); -} - -Error ProcessPOSIX::WillLaunch(Module* module) { Error error; diff --git a/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.h b/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.h index 5db66f59ee0..2e8f46e48d8 100644 --- a/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.h +++ b/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.h @@ -51,9 +51,6 @@ public: WillLaunch(lldb_private::Module *module) override; lldb_private::Error - DoAttachToProcessWithID(lldb::pid_t pid) override; - - lldb_private::Error DoAttachToProcessWithID (lldb::pid_t pid, const lldb_private::ProcessAttachInfo &attach_info) override; lldb_private::Error diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp index 01c48d75822..1526b0911a1 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -1301,13 +1301,6 @@ ProcessGDBRemote::DidLaunch () } Error -ProcessGDBRemote::DoAttachToProcessWithID (lldb::pid_t attach_pid) -{ - ProcessAttachInfo attach_info; - return DoAttachToProcessWithID(attach_pid, attach_info); -} - -Error ProcessGDBRemote::DoAttachToProcessWithID (lldb::pid_t attach_pid, const ProcessAttachInfo &attach_info) { Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS)); diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h index e9d117c12db..a6c2d107dc1 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h @@ -105,9 +105,6 @@ public: Error WillLaunchOrAttach (); - - Error - DoAttachToProcessWithID (lldb::pid_t pid) override; Error DoAttachToProcessWithID (lldb::pid_t pid, const ProcessAttachInfo &attach_info) override; |
