LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

gdb: fix hang when "debug next application" is used more than once

Browse Source
This commit is contained in:
TuxSH 2019-05-01 19:37:46 +02:00
parent 8b56098d64
commit 6423d0c1b3
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sysmodules/rosalina/source/gdb/server.c
View File

@ -246,9 +246,6 @@ GDBContext *GDB_GetClient(GDBServer *server, u16 port)
return NULL; return NULL;
} }
if (ctx->localPort == GDB_PORT_BASE + MAX_DEBUG)
TaskRunner_WaitReady(); // Finish grabbing new process debug, if anything...
ctx->flags |= GDB_FLAG_USED; ctx->flags |= GDB_FLAG_USED;
ctx->state = GDB_STATE_CONNECTED; ctx->state = GDB_STATE_CONNECTED;
ctx->parent = server; ctx->parent = server;
@ -273,6 +270,20 @@ GDBContext *GDB_GetClient(GDBServer *server, u16 port)
} }
GDB_UnlockAllContexts(server); GDB_UnlockAllContexts(server);
if (port == GDB_PORT_BASE + MAX_DEBUG)
{
// this is not sufficient/foolproof and is buggy: TaskRunner_WaitReady(); // Finish grabbing new process debug, if anything...
bool ok = false;
do
{
svcSleepThread(5 * 1000 * 1000LL);
RecursiveLock_Lock(&ctx->lock);
ok = ctx->debug != 0;
RecursiveLock_Unlock(&ctx->lock);
}
while (!ok);
}
return ctx; return ctx;
} }