mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-17 19:34:39 +01:00
Push game and stepping events from the CPU thread instead of polling for them
GameBroadcaster and SteppingBroadcaster ran per connection on the WebSocket thread, so every connected debugger was reading pc, the tick count, coreState, the UI state and the param SFO out from under the CPU thread on every lap of its loop - up to 1000 times a second in high-activity mode. Inverted: the CPU thread notices the transition once in WebSocketDebuggerTick(), formats the event there, and drops it into a per-connection mailbox that the connection's own thread drains and sends. Same events, same conditions, no core reads off the CPU thread, and no per-connection polling of emulator state. The tick hangs off Core_ProcessCPUQueue(), the one function reliably called on the CPU thread both in game (Core_RunLoopUntil) and at the menu (NativeFrame). It polls even with nothing connected, since skipping would let the "previous state" go stale and fire a bogus event at whoever connects next. Behavior preserved including the awkward bit: a debugger that connects while the CPU is already stopped still gets an immediate cpu.stepping, which used to fall out of SteppingBroadcaster's counter starting at 0. That's now an explicit per-connection prime instead of an accident. Part of removing the WebSocket debugger's lifecycleLock. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01GZq8ZtJmFY7bkX5FVkr3P9
This commit is contained in:
1 parent
14e8ba8486
commit
3273e8081e
7 files changed
+160
-65
No files matched your search
@@ -73,22 +73,28 @@ struct GameStatusEvent {
|
||||
// - id: string disc ID (such as ULUS12345.)
|
||||
// - version: string disc version.
|
||||
// - title: string game title.
|
||||
void GameBroadcaster::Broadcast(net::WebSocketServer *ws) {
|
||||
// TODO: This is ugly. Callbacks instead?
|
||||
GlobalUIState state = GetUIState();
|
||||
if (prevState_ != state) {
|
||||
if (state == UISTATE_PAUSEMENU) {
|
||||
ws->Send(GameStatusEvent{"game.pause"});
|
||||
prevState_ = state;
|
||||
} else if (state == UISTATE_INGAME && prevState_ == UISTATE_PAUSEMENU) {
|
||||
ws->Send(GameStatusEvent{"game.resume"});
|
||||
prevState_ = state;
|
||||
} else if (state == UISTATE_INGAME && PSP_GetBootState() == BootState::Complete) {
|
||||
ws->Send(GameStatusEvent{"game.start"});
|
||||
prevState_ = state;
|
||||
} else if (state == UISTATE_MENU && PSP_GetBootState() != BootState::Complete) {
|
||||
ws->Send(GameStatusEvent{"game.quit"});
|
||||
prevState_ = state;
|
||||
}
|
||||
std::string GameBroadcaster::PollChange() {
|
||||
// Tracked globally rather than per connection: this runs on the CPU thread, which owns the state
|
||||
// being read, and the resulting event is then handed to every connected debugger.
|
||||
static GlobalUIState prevState = GetUIState();
|
||||
|
||||
const GlobalUIState state = GetUIState();
|
||||
if (prevState == state)
|
||||
return std::string();
|
||||
|
||||
const char *ev = nullptr;
|
||||
if (state == UISTATE_PAUSEMENU) {
|
||||
ev = "game.pause";
|
||||
} else if (state == UISTATE_INGAME && prevState == UISTATE_PAUSEMENU) {
|
||||
ev = "game.resume";
|
||||
} else if (state == UISTATE_INGAME && PSP_GetBootState() == BootState::Complete) {
|
||||
ev = "game.start";
|
||||
} else if (state == UISTATE_MENU && PSP_GetBootState() != BootState::Complete) {
|
||||
ev = "game.quit";
|
||||
}
|
||||
if (!ev)
|
||||
return std::string();
|
||||
|
||||
prevState = state;
|
||||
return GameStatusEvent{ev};
|
||||
}
|
||||
Reference in new issue
Block a user