mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-01 14:58:14 +00:00
Henrik RydgårdandClaude Opus 5.5
7ec860c24f
sceNetAdhocctlInit waits until the friend finder has logged into the adhoc server, polling in emulated time but giving up only after 5s of wall time. The friend finder makes one attempt per login request, and it too waited the full 5s on a connection that had already been refused, because it only looked for success. Now it checks the socket error and gives up at once, and records the failure so the wait ends with it. In headless, which runs far ahead of real time, Gods Eater Burst sat in this wait for its whole run. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
49 lines
1.7 KiB
C++
49 lines
1.7 KiB
C++
// Copyright (c) 2025- PPSSPP Project.
|
|
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, version 2.0 or later versions.
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License 2.0 for more details.
|
|
|
|
// A copy of the GPL 2.0 should have been included with the program.
|
|
// If not, see http://www.gnu.org/licenses/
|
|
|
|
// Official git repository and contact information can be found at
|
|
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
|
|
|
|
#include "Core/HLE/NetAdhocCommon.h"
|
|
|
|
#include "sceKernelMemory.h"
|
|
#include "Core/MemMapHelpers.h"
|
|
|
|
u32 dummyThreadHackAddr = 0;
|
|
u32_le dummyThreadCode[3];
|
|
|
|
|
|
void netAdhocValidateLoopMemory() {
|
|
// Allocate Memory if it wasn't valid/allocated after loaded from old SaveState
|
|
if (!dummyThreadHackAddr || strcmp("dummythreadhack", kernelMemory.GetBlockTag(dummyThreadHackAddr)) != 0) {
|
|
u32 blockSize = sizeof(dummyThreadCode);
|
|
dummyThreadHackAddr = kernelMemory.Alloc(blockSize, false, "dummythreadhack");
|
|
if (dummyThreadHackAddr)
|
|
Memory::Memcpy(dummyThreadHackAddr, dummyThreadCode, sizeof(dummyThreadCode));
|
|
}
|
|
}
|
|
|
|
int netAdhocEnterGameModeTimeout = 15000000; // 15 sec as default timeout, to wait for all players to join
|
|
|
|
std::recursive_mutex adhocEvtMtx;
|
|
|
|
int IsAdhocctlInCB = 0;
|
|
|
|
|
|
u32 matchingThreadHackAddr = 0;
|
|
u32_le matchingThreadCode[3];
|
|
|
|
bool g_adhocServerConnected = false;
|
|
std::atomic<bool> g_adhocServerLoginFailed(false);
|