fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WaitForClient moved to server, now working.

Browse Source
This commit is contained in:
Ben Vanik
2013-12-20 23:52:47 -08:00
parent 8a7bd7b69a
commit d98d5c855a
7 changed files with 76 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/xenia/debug/debug_server.cc
View File

@@ -30,8 +30,10 @@ DebugServer::DebugServer(Emulator* emulator) :
emulator_(emulator), lock_(0) {
lock_ = xe_mutex_alloc(10000);
//protocols_.push_back(
// new protocols::gdb::GDBProtocol(this));
client_event_ = CreateEvent(NULL, FALSE, FALSE, NULL);
protocols_.push_back(
new protocols::gdb::GDBProtocol(this));
protocols_.push_back(
new protocols::ws::WSProtocol(this));
}
@@ -39,10 +41,19 @@ DebugServer::DebugServer(Emulator* emulator) :
DebugServer::~DebugServer() {
Shutdown();
CloseHandle(client_event_);
xe_free(lock_);
lock_ = 0;
}
bool DebugServer::has_clients() {
xe_mutex_lock(lock_);
bool has_clients = clients_.size() > 0;
xe_mutex_unlock(lock_);
return has_clients;
}
int DebugServer::Startup() {
return 0;
}
@@ -66,7 +77,7 @@ int DebugServer::BeforeEntry() {
// If desired, wait until the first client connects.
//if (FLAGS_wait_for_debugger) {
XELOGI("Waiting for debugger...");
if (protocols_[0]->WaitForClient()) {
if (WaitForClient()) {
return 1;
}
XELOGI("Debugger attached, continuing...");
@@ -95,6 +106,13 @@ void DebugServer::Shutdown() {
xe_mutex_unlock(lock_);
}
int DebugServer::WaitForClient() {
while (!has_clients()) {
WaitForSingleObject(client_event_, INFINITE);
}
return 0;
}
void DebugServer::AddClient(DebugClient* debug_client) {
xe_mutex_lock(lock_);
@@ -108,6 +126,8 @@ void DebugServer::AddClient(DebugClient* debug_client) {
clients_.push_back(debug_client);
xe_mutex_unlock(lock_);
SetEvent(client_event_);
}
void DebugServer::RemoveClient(DebugClient* debug_client) {