diff options
Diffstat (limited to 'lldb/source')
7 files changed, 2 insertions, 123 deletions
diff --git a/lldb/source/API/SBProcess.cpp b/lldb/source/API/SBProcess.cpp index afb4b6f17b3..95deabc2823 100644 --- a/lldb/source/API/SBProcess.cpp +++ b/lldb/source/API/SBProcess.cpp @@ -19,7 +19,6 @@ #include "lldb/Core/Debugger.h" #include "lldb/Core/Log.h" #include "lldb/Core/Module.h" -#include "lldb/Core/PluginManager.h" #include "lldb/Core/State.h" #include "lldb/Core/Stream.h" #include "lldb/Core/StreamFile.h" @@ -1426,27 +1425,3 @@ SBProcess::IsInstrumentationRuntimePresent(InstrumentationRuntimeType type) return runtime_sp->IsActive(); } - -lldb::SBError -SBProcess::SaveCore(const char *file_name) -{ - lldb::SBError error; - ProcessSP process_sp(GetSP()); - if (!process_sp) - { - error.SetErrorString("SBProcess is invalid"); - return error; - } - - Mutex::Locker api_locker(process_sp->GetTarget().GetAPIMutex()); - - if (process_sp->GetState() != eStateStopped) - { - error.SetErrorString("the process is not stopped"); - return error; - } - - FileSpec core_file(file_name, false); - error.ref() = PluginManager::SaveCore(process_sp, core_file); - return error; -} diff --git a/lldb/source/Commands/CommandObjectTarget.cpp b/lldb/source/Commands/CommandObjectTarget.cpp index 026ae357085..b530517074e 100644 --- a/lldb/source/Commands/CommandObjectTarget.cpp +++ b/lldb/source/Commands/CommandObjectTarget.cpp @@ -256,7 +256,7 @@ protected: { if (!symfile.Readable()) { - result.AppendErrorWithFormat("symbol file '%s' is not readable", symfile.GetPath().c_str()); + result.AppendErrorWithFormat("symbol file '%s' is not readable", core_file.GetPath().c_str()); result.SetStatus (eReturnStatusFailed); return false; } diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/CMakeLists.txt b/lldb/source/Plugins/ObjectFile/PECOFF/CMakeLists.txt index 5c7c488f362..89c2bb2d1da 100644 --- a/lldb/source/Plugins/ObjectFile/PECOFF/CMakeLists.txt +++ b/lldb/source/Plugins/ObjectFile/PECOFF/CMakeLists.txt @@ -1,4 +1,3 @@ add_lldb_library(lldbPluginObjectFilePECOFF ObjectFilePECOFF.cpp - WindowsMiniDump.cpp ) diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp index b6624481324..8b994590504 100644 --- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp +++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// #include "ObjectFilePECOFF.h" -#include "WindowsMiniDump.h" #include "llvm/Support/COFF.h" @@ -25,7 +24,6 @@ #include "lldb/Core/Timer.h" #include "lldb/Core/UUID.h" #include "lldb/Symbol/ObjectFile.h" -#include "lldb/Target/Process.h" #include "lldb/Target/SectionLoadList.h" #include "lldb/Target/Target.h" @@ -44,8 +42,7 @@ ObjectFilePECOFF::Initialize() GetPluginDescriptionStatic(), CreateInstance, CreateMemoryInstance, - GetModuleSpecifications, - SaveCore); + GetModuleSpecifications); } void @@ -151,14 +148,6 @@ ObjectFilePECOFF::GetModuleSpecifications (const lldb_private::FileSpec& file, return specs.GetSize() - initial_count; } -bool -ObjectFilePECOFF::SaveCore(const lldb::ProcessSP &process_sp, - const lldb_private::FileSpec &outfile, - lldb_private::Error &error) -{ - return SaveMiniDump(process_sp, outfile, error); -} - bool ObjectFilePECOFF::MagicBytesMatch (DataBufferSP& data_sp) diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h index fd33cd3d32f..1c7fefcf5de 100644 --- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h +++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h @@ -95,11 +95,6 @@ public: lldb_private::ModuleSpecList &specs); static bool - SaveCore (const lldb::ProcessSP &process_sp, - const lldb_private::FileSpec &outfile, - lldb_private::Error &error); - - static bool MagicBytesMatch (lldb::DataBufferSP& data_sp); bool diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp b/lldb/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp deleted file mode 100644 index 85b1c715786..00000000000 --- a/lldb/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp +++ /dev/null @@ -1,55 +0,0 @@ -//===-- WindowsMiniDump.cpp -------------------------------------*- C++ -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -// This function is separated out from ObjectFilePECOFF.cpp to name avoid name -// collisions with WinAPI preprocessor macros. - -#include "WindowsMiniDump.h" -#include "lldb/Host/FileSpec.h" -#include "llvm/Support/ConvertUTF.h" - -#ifdef _WIN32 -#include "lldb/Host/windows/windows.h" -#include <DbgHelp.h> // for MiniDumpWriteDump -#endif - -namespace lldb_private { - -bool -SaveMiniDump(const lldb::ProcessSP &process_sp, - const lldb_private::FileSpec &outfile, - lldb_private::Error &error) -{ - if (!process_sp) return false; -#ifdef _WIN32 - HANDLE process_handle = ::OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, process_sp->GetID()); - const std::string file_name = outfile.GetCString(); - std::wstring wide_name; - wide_name.resize(file_name.size() + 1); - char * result_ptr = reinterpret_cast<char *>(&wide_name[0]); - const UTF8 *error_ptr = nullptr; - if (!llvm::ConvertUTF8toWide(sizeof(wchar_t), file_name, result_ptr, error_ptr)) { - error.SetErrorString("cannot convert file name"); - return false; - } - HANDLE file_handle = ::CreateFileW(wide_name.c_str(), GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - const auto result = ::MiniDumpWriteDump(process_handle, process_sp->GetID(), file_handle, MiniDumpNormal, NULL, NULL, NULL); - ::CloseHandle(file_handle); - ::CloseHandle(process_handle); - if (!result) - { - error.SetError(::GetLastError(), lldb::eErrorTypeWin32); - return false; - } - return true; -#endif - return false; -} - -} // namesapce lldb_private diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.h b/lldb/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.h deleted file mode 100644 index cbea88af1fb..00000000000 --- a/lldb/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.h +++ /dev/null @@ -1,24 +0,0 @@ -//===-- WindowsMiniDump.h ---------------------------------------*- C++ -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -#ifndef liblldb_WindowsMiniDump_h_ -#define liblldb_WindowsMiniDump_h_ - -#include "lldb/Target/Process.h" - -namespace lldb_private { - -bool -SaveMiniDump(const lldb::ProcessSP &process_sp, - const lldb_private::FileSpec &outfile, - lldb_private::Error &error); - -} // namespace lldb_private - -#endif |
