preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-12 09:09:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

sceNetAdhoc: Time adhocctl requests and the joiner's GAME wait in emulated time

Browse Source 
How long an adhocctl request waits for the server before giving up, and
how long a joiner's GAME event waits for the host to show up, were
measured in wall time, so a game saw them shorter when sped up and
longer when slowed down.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Henrik RydgårdandClaude Opus 5.5 committed 2026-10-31 00:44:36 +01:00
1 parent f988ab9566
commit 99e518d2b2
1 file changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files
Core/HLE/sceNetAdhoc.cpp
+5 -5
View File
@@ -667,7 +667,7 @@ static void __AdhocctlNotify(u64 userdata, int cyclesLate) {
if (call_status == ADHOCCTL_CALL_WOULDBLOCK) {
bool retry = true;
u64 now = (u64)(time_now_d() * 1000000.0);
u64 now = CoreTiming::GetGlobalTimeUs();
if (now - adhocctlStartTime > static_cast<u64>(adhocDefaultTimeout) + 500) {
retry = false;
}
@@ -746,7 +746,7 @@ int WaitBlockingAdhocctlSocket(AdhocctlRequest request, int usec, const char* re
}
u64 param = ((u64)__KernelGetCurThread()) << 32 | uid;
adhocctlStartTime = (u64)(time_now_d() * 1000000.0);
adhocctlStartTime = CoreTiming::GetGlobalTimeUs();
adhocctlRequestTimeUs = CoreTiming::GetGlobalTimeUs();
adhocctlRequests[uid] = request;
CoreTiming::ScheduleEvent(usToCycles(usec), adhocctlNotifyEvent, param);
@@ -1440,7 +1440,7 @@ void __NetAdhocDoState(PointerWrap &p) {
// wait ends in an error, which for Init can't be retried: the library already counts as inited.
Do(p, adhocctlRequests);
if (p.mode == p.MODE_READ) {
adhocctlStartTime = (u64)(time_now_d() * 1000000.0);
adhocctlStartTime = CoreTiming::GetGlobalTimeUs();
}
} else if (p.mode == p.MODE_READ) {
adhocctlRequests.clear();
@@ -3040,7 +3040,7 @@ int NetAdhocctl_Create(const char *groupName) {
}
//Faking success, to prevent Full Auto 2 from freezing while Initializing Network
else {
adhocctlStartTime = (u64)(time_now_d() * 1000000.0);
adhocctlStartTime = CoreTiming::GetGlobalTimeUs();
if (adhocctlCurrentMode == ADHOCCTL_MODE_GAMEMODE) {
adhocctlState = ADHOCCTL_STATE_GAMEMODE;
notifyAdhocctlHandlers(ADHOCCTL_EVENT_GAME, 0);
@@ -4608,7 +4608,7 @@ void __NetTriggerCallbacks()
u32_le args[3] = { 0, 0, 0 };
args[0] = flags;
args[1] = error;
u64 now = (u64)(time_now_d() * 1000000.0);
u64 now = CoreTiming::GetGlobalTimeUs();
// A PSP delivers CONNECT after a Join before the host shows up in its peer list (pspautotests
// net/adhoc/pair/timing), so only GAME waits for a peer here.