Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@
#include "GDBRemoteCommunicationHistory.h"
#include "lldb/Core/Communication.h"
#include "lldb/Host/Config.h"
#include "lldb/Host/HostThread.h"
#include "lldb/Host/Socket.h"
#include "lldb/Utility/Args.h"
#include "lldb/Utility/StringExtractorGDBRemote.h"
#include <future>
#include <mutex>
#include <string>

Expand Down
1 change: 0 additions & 1 deletion lldb/tools/lldb-server/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ add_lldb_tool(lldb-server
lldbPluginInstructionMIPS64
lldbPluginInstructionRISCV
${LLDB_SYSTEM_LIBS}
lldbServerPluginInterface
lldbServerPluginMockGPU
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ void LLDBServerPluginAMDGPU::AcceptAndMainLoopThread(

LLDB_LOGF(log, "%s initializing connection", __PRETTY_FUNCTION__);
std::unique_ptr<Connection> connection_up(
new ConnectionFileDescriptor(socket));
new ConnectionFileDescriptor(std::unique_ptr<Socket>(socket)));
m_gdb_server->InitializeConnection(std::move(connection_up));
LLDB_LOGF(log, "%s running main loop", __PRETTY_FUNCTION__);
m_main_loop_status = m_main_loop.Run();
Expand Down Expand Up @@ -310,7 +310,7 @@ LLDBServerPluginAMDGPU::CreateConnection() {
"LLDBServerPluginAMDGPU::AcceptAndMainLoopThread() "
"initializing connection");
std::unique_ptr<Connection> connection_up(
new ConnectionFileDescriptor(socket.release()));
new ConnectionFileDescriptor(std::move(socket)));
this->m_gdb_server->InitializeConnection(
std::move(connection_up));
m_is_connected = true;
Expand Down
3 changes: 1 addition & 2 deletions lldb/tools/lldb-server/Plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
if(DEFINED ROCM_PATH AND EXISTS ${ROCM_PATH})
add_subdirectory(AMDGPU)
else()
add_subdirectory(MockGPU)
endif()
add_subdirectory(MockGPU)
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ void LLDBServerPluginMockGPU::AcceptAndMainLoopThread(

LLDB_LOGF(log, "%s initializing connection", __PRETTY_FUNCTION__);
std::unique_ptr<Connection> connection_up(
new ConnectionFileDescriptor(socket));
new ConnectionFileDescriptor(std::unique_ptr<Socket>(socket)));
m_gdb_server->InitializeConnection(std::move(connection_up));
LLDB_LOGF(log, "%s running main loop", __PRETTY_FUNCTION__);
m_main_loop_status = m_main_loop.Run();
Expand Down