mirrors/yuzu
2
1
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-07-04 23:31:19 +01:00
Code Issues Releases Activity

gdbstub: Ensure gdbstub doesn't drop packets crucial to initialization

Browse source
This commit is contained in:
Gauvain "GovanifY" Roussel-Tarbouriech 2020-02-23 21:33:49 +01:00 committed by FearlessTobi
parent e8ded20d24
commit 38036eb1c8
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/core.cpp
View file

@ -166,7 +166,7 @@ struct System::Impl {
service_manager = std::make_shared<Service::SM::ServiceManager>(); service_manager = std::make_shared<Service::SM::ServiceManager>();
Service::Init(service_manager, system); Service::Init(service_manager, system);
GDBStub::Init(); GDBStub::DeferStart();
renderer = VideoCore::CreateRenderer(emu_window, system); renderer = VideoCore::CreateRenderer(emu_window, system);
if (!renderer->Init()) { if (!renderer->Init()) {

9
src/core/gdbstub/gdbstub.cpp
View file

@ -141,6 +141,7 @@ constexpr char target_xml[] =
)"; )";
int gdbserver_socket = -1; int gdbserver_socket = -1;
bool defer_start = false;
u8 command_buffer[GDB_BUFFER_SIZE]; u8 command_buffer[GDB_BUFFER_SIZE];
u32 command_length; u32 command_length;
@ -1165,7 +1166,8 @@ static void RemoveBreakpoint() {
} }
void HandlePacket() { void HandlePacket() {
if (!IsConnected()) { if (!IsConnected() && defer_start) {
ToggleServer(true);
return; return;
} }
@ -1256,6 +1258,10 @@ void ToggleServer(bool status) {
} }
} }
void DeferStart() {
defer_start = true;
}
static void Init(u16 port) { static void Init(u16 port) {
if (!server_enabled) { if (!server_enabled) {
// Set the halt loop to false in case the user enabled the gdbstub mid-execution. // Set the halt loop to false in case the user enabled the gdbstub mid-execution.
@ -1341,6 +1347,7 @@ void Shutdown() {
if (!server_enabled) { if (!server_enabled) {
return; return;
} }
defer_start = false;
LOG_INFO(Debug_GDBStub, "Stopping GDB ..."); LOG_INFO(Debug_GDBStub, "Stopping GDB ...");
if (gdbserver_socket != -1) { if (gdbserver_socket != -1) {

7
src/core/gdbstub/gdbstub.h
View file

@ -43,6 +43,13 @@ void ToggleServer(bool status);
/// Start the gdbstub server. /// Start the gdbstub server.
void Init(); void Init();
/**
* Defer initialization of the gdbstub to the first packet processing functions.
* This avoids a case where the gdbstub thread is frozen after initialization
* and fails to respond in time to packets.
*/
void DeferStart();
/// Stop gdbstub server. /// Stop gdbstub server.
void Shutdown(); void Shutdown();