Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Don't cache time in a variable.

Browse Source 
A little weirdness in the code that has stuck around for a long, long
time. It's really not necessary and mostly just confusing.
This commit is contained in:
Henrik Rydgård 2020-09-24 23:52:03 +02:00
parent c4c7897a26
commit 054acf768c
27 changed files with 68 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Common/TimeUtil.cpp
View File

@ -24,7 +24,7 @@ LARGE_INTEGER frequency;
double frequencyMult;
LARGE_INTEGER startTime;
double real_time_now() {
double time_now_d() {
if (frequency.QuadPart == 0) {
QueryPerformanceFrequency(&frequency);
QueryPerformanceCounter(&startTime);
@ -42,7 +42,7 @@ double real_time_now() {
uint64_t _frequency = 0;
uint64_t _starttime = 0;
double real_time_now() {
double time_now_d() {
static time_t start;
struct timeval tv;
gettimeofday(&tv, NULL);
@ -55,18 +55,6 @@ double real_time_now() {
#endif
void time_update() {
curtime = real_time_now();
}
double time_now_d() {
return curtime;
}
int time_now_ms() {
return int(curtime*1000.0);
}
void sleep_ms(int ms) {
#ifdef _WIN32
Sleep(ms);
@ -79,7 +67,6 @@ void sleep_ms(int ms) {
LoggingDeadline::LoggingDeadline(const char *name, int ms) : name_(name), endCalled_(false) {
totalTime_ = (double)ms * 0.001;
time_update();
endTime_ = time_now_d() + totalTime_;
}
@ -90,9 +77,9 @@ LoggingDeadline::~LoggingDeadline() {
bool LoggingDeadline::End() {
endCalled_ = true;
time_update();
if (time_now_d() > endTime_) {
double late = (time_now_d() - endTime_);
double now = time_now_d();
if (now > endTime_) {
double late = (now - endTime_);
double totalTime = late + totalTime_;
ERROR_LOG(SYSTEM, "===== %0.2fms DEADLINE PASSED FOR %s at %0.2fms - %0.2fms late =====", totalTime_ * 1000.0, name_, 1000.0 * totalTime, 1000.0 * late);
return false;

13
Common/TimeUtil.h
View File

@ -2,25 +2,12 @@
// http://linux.die.net/man/3/clock_gettime
// This time implementation caches the time for max performance (call time_now_d() as much as you like).
// You need to call time_update() once per frame (or whenever you need the correct time right now).
// Or you can use real_time_now() directly.
void time_update();
// Seconds.
double time_now_d();
// Uncached time. Slower than the above cached time functions. Does not update cached time, call time_update for that.
double real_time_now();
int time_now_ms();
// Sleep. Does not necessarily have millisecond granularity, especially on Windows.
void sleep_ms(int ms);
// Can be sprinkled around the code to make sure that thing don't take
// unexpectedly long. What that means is up to you.
class LoggingDeadline {

3
Core/Core.cpp
View File

@ -218,12 +218,10 @@ void Core_RunLoop(GraphicsContext *ctx) {
while ((GetUIState() != UISTATE_INGAME || !PSP_IsInited()) && GetUIState() != UISTATE_EXIT) {
// In case it was pending, we're not in game anymore. We won't get to Core_Run().
Core_StateProcessed();
time_update();
double startTime = time_now_d();
UpdateRunLoop();
// Simple throttling to not burn the GPU in the menu.
time_update();
double diffTime = time_now_d() - startTime;
int sleepTime = (int)(1000.0 / 60.0) - (int)(diffTime * 1000.0);
if (sleepTime > 0)
@ -234,7 +232,6 @@ void Core_RunLoop(GraphicsContext *ctx) {
}
while ((coreState == CORE_RUNNING || coreState == CORE_STEPPING) && GetUIState() == UISTATE_INGAME) {
time_update();
UpdateRunLoop();
if (!windowHidden && !Core_IsStepping()) {
ctx->SwapBuffers();

4
Core/Dialog/PSPNetconfDialog.cpp
View File

@ -91,7 +91,7 @@ int PSPNetconfDialog::Init(u32 paramAddr) {
connResult = -1;
scanInfosAddr = 0;
scanStep = 0;
startTime = (u64)(real_time_now() * 1000000.0);
startTime = (u64)(time_now_d() * 1000000.0);
StartFade(true);
return 0;
@ -252,7 +252,7 @@ int PSPNetconfDialog::Update(int animSpeed) {
UpdateButtons();
auto di = GetI18NCategory("Dialog");
auto err = GetI18NCategory("Error");
u64 now = (u64)(real_time_now() * 1000000.0);
u64 now = (u64)(time_now_d() * 1000000.0);
// It seems JPCSP doesn't check for NETCONF_STATUS_APNET
if (request.netAction == NETCONF_CONNECT_APNET || request.netAction == NETCONF_STATUS_APNET || request.netAction == NETCONF_CONNECT_APNET_LAST) {

2
Core/HLE/HLE.cpp
View File

@ -705,7 +705,6 @@ void CallSyscall(MIPSOpcode op)
PROFILE_THIS_SCOPE("syscall");
double start = 0.0; // need to initialize to fix the race condition where coreCollectDebugStats is enabled in the middle of this func.
if (coreCollectDebugStats) {
time_update();
start = time_now_d();
}
@ -729,7 +728,6 @@ void CallSyscall(MIPSOpcode op)
}
if (coreCollectDebugStats) {
time_update();
u32 callno = (op >> 6) & 0xFFFFF; //20 bits
int funcnum = callno & 0xFFF;
int modulenum = (callno & 0xFF000) >> 12;

10
Core/HLE/proAdhoc.cpp
View File

@ -578,7 +578,7 @@ void postAcceptAddSiblings(SceNetAdhocMatchingContext * context, int siblingcoun
sibling->state = PSP_ADHOC_MATCHING_PEER_CHILD;
// Initialize Ping Timer
sibling->lastping = CoreTiming::GetGlobalTimeUsScaled(); //real_time_now()*1000000.0;
sibling->lastping = CoreTiming::GetGlobalTimeUsScaled(); //time_now_d()*1000000.0;
// Link Peer
sibling->next = context->peerlist;
@ -979,7 +979,7 @@ void handleTimeout(SceNetAdhocMatchingContext * context)
// Get Next Pointer (to avoid crash on memory freeing)
SceNetAdhocMatchingMemberInternal * next = peer->next;
u64_le now = CoreTiming::GetGlobalTimeUsScaled(); //real_time_now()*1000000.0
u64_le now = CoreTiming::GetGlobalTimeUsScaled(); //time_now_d()*1000000.0
// Timeout!
if (peer->state != 0 && (now - peer->lastping) > context->timeout)
{
@ -1343,7 +1343,7 @@ int friendFinder(){
if (networkInited) {
// Ping Server
now = real_time_now() * 1000000.0; // Use real_time_now()*1000000.0 instead of CoreTiming::GetGlobalTimeUsScaled() if the game gets disconnected from AdhocServer too soon when FPS wasn't stable
now = time_now_d() * 1000000.0; // Use time_now_d()*1000000.0 instead of CoreTiming::GetGlobalTimeUsScaled() if the game gets disconnected from AdhocServer too soon when FPS wasn't stable
// original code : ((sceKernelGetSystemTimeWide() - lastping) >= ADHOCCTL_PING_TIMEOUT)
if (now - lastping >= PSP_ADHOCCTL_PING_TIMEOUT) { // We may need to use lower interval to prevent getting timeout at Pro Adhoc Server through internet
// Prepare Packet
@ -2078,9 +2078,9 @@ int initNetwork(SceNetAdhocctlAdhocId *adhoc_id){
errorcode = errno;
if (iResult == SOCKET_ERROR && errorcode != EISCONN) {
u64 startTime = (u64)(real_time_now() * 1000.0);
u64 startTime = (u64)(time_now_d() * 1000.0);
while (IsSocketReady(metasocket, false, true) <= 0) {
u64 now = (u64)(real_time_now() * 1000.0);
u64 now = (u64)(time_now_d() * 1000.0);
if (coreState == CORE_POWERDOWN) return iResult;
if (now - startTime > adhocDefaultTimeout) break;
sleep_ms(10);

23
Core/HLE/sceDisplay.cpp
View File

@ -192,7 +192,7 @@ static void ScheduleLagSync(int over = 0) {
over = 0;
}
CoreTiming::ScheduleEvent(usToCycles(1000 + over), lagSyncEvent, 0);
lastLagSync = real_time_now();
lastLagSync = time_now_d();
}
}
@ -296,7 +296,7 @@ void __DisplayDoState(PointerWrap &p) {
Do(p, lagSyncEvent);
Do(p, lagSyncScheduled);
CoreTiming::RestoreRegisterEvent(lagSyncEvent, "LagSync", &hleLagSync);
lastLagSync = real_time_now();
lastLagSync = time_now_d();
if (lagSyncScheduled != g_Config.bForceLagSync) {
ScheduleLagSync();
}
@ -451,7 +451,6 @@ static bool IsRunningSlow() {
}
static void CalculateFPS() {
time_update();
double now = time_now_d();
if (now >= lastFpsTime + 1.0) {
@ -580,8 +579,6 @@ static void DoFrameTiming(bool &throttle, bool &skipFrame, float timestep) {
if (!throttle && !doFrameSkip)
return;
time_update();
float scaledTimestep = timestep;
if (fpsLimit > 0 && fpsLimit != 60) {
scaledTimestep *= 60.0f / fpsLimit;
@ -636,7 +633,6 @@ static void DoFrameTiming(bool &throttle, bool &skipFrame, float timestep) {
const double left = nextFrameTime - curFrameTime;
usleep((long)(left * 1000000));
#endif
time_update();
}
}
curFrameTime = time_now_d();
@ -652,8 +648,6 @@ static void DoFrameIdleTiming() {
return;
}
time_update();
double before = time_now_d();
double dist = before - lastFrameTime;
// Ignore if the distance is just crazy. May mean wrap or pause.
@ -681,7 +675,6 @@ static void DoFrameIdleTiming() {
const double left = goal - time_now_d();
usleep((long)(left * 1000000));
#endif
time_update();
}
if (g_Config.bDrawFrameGraph) {
@ -846,7 +839,7 @@ void __DisplayFlip(int cyclesLate) {
if (g_Config.bDrawFrameGraph) {
// Track how long we sleep (whether vsync or sleep_ms.)
frameSleepHistory[frameSleepPos] += real_time_now() - lastFrameTimeHistory;
frameSleepHistory[frameSleepPos] += time_now_d() - lastFrameTimeHistory;
}
} else {
// Okay, there's no new frame to draw. But audio may be playing, so we need to time still.
@ -894,23 +887,23 @@ void hleLagSync(u64 userdata, int cyclesLate) {
}
const double goal = lastLagSync + (scale / 1000.0f);
time_update();
double before = time_now_d();
// Don't lag too long ever, if they leave it paused.
while (time_now_d() < goal && goal < time_now_d() + 0.01) {
double now = before;
while (now < goal && goal < now + 0.01) {
#ifndef _WIN32
const double left = goal - time_now_d();
usleep((long)(left * 1000000));
#endif
time_update();
now = time_now_d();
}
const int emuOver = (int)cyclesToUs(cyclesLate);
const int over = (int)((time_now_d() - goal) * 1000000);
const int over = (int)((now - goal) * 1000000);
ScheduleLagSync(over - emuOver);
if (g_Config.bDrawFrameGraph) {
frameSleepHistory[frameTimeHistoryPos] += time_now_d() - before;
frameSleepHistory[frameTimeHistoryPos] += now - before;
}
}

36
Core/HLE/sceNetAdhoc.cpp
View File

@ -243,7 +243,7 @@ static void __AdhocctlNotify(u64 userdata, int cyclesLate) {
if (adhocctlState != waitVal && error == 0) {
// Detecting Adhocctl Initialization using waitVal < 0
if (waitVal >= 0 || (waitVal < 0 && (g_Config.bEnableWlan && !networkInited))) {
u64 now = (u64)(real_time_now() * 1000.0);
u64 now = (u64)(time_now_d() * 1000.0);
if (now - adhocctlStartTime <= adhocDefaultTimeout) {
// Try again in another 0.5ms until state matched or timedout.
CoreTiming::ScheduleEvent(usToCycles(500) - cyclesLate, adhocctlNotifyEvent, userdata);
@ -275,7 +275,7 @@ int WaitAdhocctlState(AdhocctlRequest request, int state, int usec, const char*
adhocctlNotifyEvent = CoreTiming::RegisterEvent("__AdhocctlNotify", __AdhocctlNotify);
u64 param = ((u64)__KernelGetCurThread()) << 32 | uid;
adhocctlStartTime = (u64)(real_time_now() * 1000.0);
adhocctlStartTime = (u64)(time_now_d() * 1000.0);
adhocctlRequests[uid] = request;
CoreTiming::ScheduleEvent(usToCycles(usec), adhocctlNotifyEvent, param);
__KernelWaitCurThread(WAITTYPE_NET, uid, state, 0, false, reason);
@ -343,7 +343,7 @@ int DoBlockingPdpRecv(int uid, AdhocSocketRequest& req, s64& result) {
}
// On Windows: recvfrom on UDP can get error WSAECONNRESET when previous sendto's destination is unreachable (or destination port is not bound yet), may need to disable SIO_UDP_CONNRESET error
else if (sockerr == EAGAIN || sockerr == EWOULDBLOCK || sockerr == ECONNRESET || sockerr == ETIMEDOUT) {
u64 now = (u64)(real_time_now() * 1000000.0);
u64 now = (u64)(time_now_d() * 1000000.0);
auto sock = adhocSockets[req.id - 1];
if (sock->flags & ADHOC_F_ALERTRECV) {
result = ERROR_NET_ADHOC_SOCKET_ALERTED;
@ -390,7 +390,7 @@ int DoBlockingPdpSend(int uid, AdhocSocketRequest& req, s64& result, AdhocSendTa
}
else {
if (ret == SOCKET_ERROR && (sockerr == EAGAIN || sockerr == EWOULDBLOCK || sockerr == ETIMEDOUT)) {
u64 now = (u64)(real_time_now() * 1000000.0);
u64 now = (u64)(time_now_d() * 1000000.0);
if (sock->flags & ADHOC_F_ALERTSEND) {
result = ERROR_NET_ADHOC_SOCKET_ALERTED;
// FIXME: Should we clear the flag after alert signaled?
@ -437,7 +437,7 @@ int DoBlockingPtpSend(int uid, AdhocSocketRequest& req, s64& result) {
result = 0;
}
else if (ret == SOCKET_ERROR && (sockerr == EAGAIN || sockerr == EWOULDBLOCK || sockerr == ETIMEDOUT)) {
u64 now = (u64)(real_time_now() * 1000000.0);
u64 now = (u64)(time_now_d() * 1000000.0);
if (sock->flags & ADHOC_F_ALERTSEND) {
result = ERROR_NET_ADHOC_SOCKET_ALERTED;
// FIXME: Should we clear the flag after alert signaled?
@ -485,7 +485,7 @@ int DoBlockingPtpRecv(int uid, AdhocSocketRequest& req, s64& result) {
result = 0;
}
else if (ret == SOCKET_ERROR && (sockerr == EAGAIN || sockerr == EWOULDBLOCK || sockerr == ETIMEDOUT)) {
u64 now = (u64)(real_time_now() * 1000000.0);
u64 now = (u64)(time_now_d() * 1000000.0);
if (sock->flags & ADHOC_F_ALERTRECV) {
result = ERROR_NET_ADHOC_SOCKET_ALERTED;
// FIXME: Should we clear the flag after alert signaled?
@ -535,7 +535,7 @@ int DoBlockingPtpAccept(int uid, AdhocSocketRequest& req, s64& result) {
result = newid;
}
else if (ret == 0 || (ret == SOCKET_ERROR && (sockerr == EAGAIN || sockerr == EWOULDBLOCK || sockerr == ETIMEDOUT))) {
u64 now = (u64)(real_time_now() * 1000000.0);
u64 now = (u64)(time_now_d() * 1000000.0);
if (sock->flags & ADHOC_F_ALERTACCEPT) {
result = ERROR_NET_ADHOC_SOCKET_ALERTED;
// FIXME: Should we clear the flag after alert signaled?
@ -582,7 +582,7 @@ int DoBlockingPtpConnect(int uid, AdhocSocketRequest& req, s64& result) {
}
// Timeout
else if (ret == 0) {
u64 now = (u64)(real_time_now() * 1000000.0);
u64 now = (u64)(time_now_d() * 1000000.0);
if (sock->flags & ADHOC_F_ALERTCONNECT) {
result = ERROR_NET_ADHOC_SOCKET_ALERTED;
// FIXME: Should we clear the flag after alert signaled?
@ -616,7 +616,7 @@ int DoBlockingPtpFlush(int uid, AdhocSocketRequest& req, s64& result) {
return 0;
}
else if (sockerr == EAGAIN || sockerr == EWOULDBLOCK || sockerr == ETIMEDOUT) {
u64 now = (u64)(real_time_now() * 1000000.0);
u64 now = (u64)(time_now_d() * 1000000.0);
if (sock->flags & ADHOC_F_ALERTFLUSH) {
result = ERROR_NET_ADHOC_SOCKET_ALERTED;
// FIXME: Should we clear the flag after alert signaled?
@ -643,7 +643,7 @@ int DoBlockingAdhocPollSocket(int uid, AdhocSocketRequest& req, s64& result) {
SceNetAdhocPollSd* sds = (SceNetAdhocPollSd*)req.buffer;
int ret = PollAdhocSocket(sds, req.id, 0);
if (ret <= 0) {
u64 now = (u64)(real_time_now() * 1000000.0);
u64 now = (u64)(time_now_d() * 1000000.0);
if (req.timeout == 0 || now - req.startTime <= req.timeout) {
return -1;
}
@ -776,7 +776,7 @@ int WaitBlockingAdhocSocket(u64 threadSocketId, int type, int pspSocketId, void*
if (tmout > 0)
tmout = std::max(tmout, minSocketTimeoutUS);
u64 startTime = (u64)(real_time_now() * 1000000.0);
u64 startTime = (u64)(time_now_d() * 1000000.0);
adhocSocketRequests[threadSocketId] = { type, pspSocketId, buffer, len, tmout, startTime, remoteMAC, remotePort };
// Some games (ie. Power Stone Collection) are using as small as 100 usec timeout
CoreTiming::ScheduleEvent(usToCycles(100), adhocSocketNotifyEvent, threadSocketId);
@ -2299,7 +2299,7 @@ int sceNetAdhocctlGetPeerInfo(const char *mac, int size, u32 peerInfoAddr) {
buf->mac_addr = *maddr;
buf->flags = 0x0400; //peer->ip_addr;
buf->padding = 0;
buf->last_recv = peer->last_recv; //CoreTiming::GetGlobalTimeUsScaled(); //real_time_now()*1000000.0; //(uint64_t)time(NULL); //This timestamp is important issue on Dissidia 012
buf->last_recv = peer->last_recv; //CoreTiming::GetGlobalTimeUsScaled(); //time_now_d()*1000000.0; //(uint64_t)time(NULL); //This timestamp is important issue on Dissidia 012
// Success
retval = 0;
@ -5104,7 +5104,7 @@ void __NetTriggerCallbacks()
args[1] = error;
// FIXME: When Joining a group, Do we need to wait for group creator's peer data before triggering the callback to make sure the game not to thinks we're the group creator?
u64 now = (u64)(real_time_now() * 1000.0);
u64 now = (u64)(time_now_d() * 1000.0);
if ((flags != ADHOCCTL_EVENT_CONNECT && flags != ADHOCCTL_EVENT_GAME) || adhocConnectionType != ADHOC_JOIN || getActivePeerCount() > 0 || now - adhocctlStartTime > adhocDefaultTimeout)
{
// Since 0 is a valid index to types_ we use -1 to detects if it was loaded from an old save state
@ -5968,7 +5968,7 @@ void actOnPingPacket(SceNetAdhocMatchingContext * context, SceNetEtherAddr * sen
if (peer != NULL)
{
// Update Receive Timer
peer->lastping = CoreTiming::GetGlobalTimeUsScaled(); //real_time_now()*1000000.0;
peer->lastping = CoreTiming::GetGlobalTimeUsScaled(); //time_now_d()*1000000.0;
}
}
@ -6020,7 +6020,7 @@ void actOnHelloPacket(SceNetAdhocMatchingContext * context, SceNetEtherAddr * se
peer->state = PSP_ADHOC_MATCHING_PEER_OFFER;
// Initialize Ping Timer
peer->lastping = CoreTiming::GetGlobalTimeUsScaled(); //real_time_now()*1000000.0;
peer->lastping = CoreTiming::GetGlobalTimeUsScaled(); //time_now_d()*1000000.0;
peerlock.lock();
// Link Peer into List
@ -6104,7 +6104,7 @@ void actOnJoinPacket(SceNetAdhocMatchingContext * context, SceNetEtherAddr * sen
peer->state = PSP_ADHOC_MATCHING_PEER_INCOMING_REQUEST;
// Initialize Ping Timer
peer->lastping = CoreTiming::GetGlobalTimeUsScaled(); //real_time_now()*1000000.0;
peer->lastping = CoreTiming::GetGlobalTimeUsScaled(); //time_now_d()*1000000.0;
peerlock.lock();
// Link Peer into List
@ -6431,7 +6431,7 @@ void actOnBirthPacket(SceNetAdhocMatchingContext * context, SceNetEtherAddr * se
sibling->state = PSP_ADHOC_MATCHING_PEER_CHILD;
// Initialize Ping Timer
sibling->lastping = CoreTiming::GetGlobalTimeUsScaled(); //real_time_now()*1000000.0;
sibling->lastping = CoreTiming::GetGlobalTimeUsScaled(); //time_now_d()*1000000.0;
peerlock.lock();
@ -6701,7 +6701,7 @@ int matchingInputThread(int matchingId) // TODO: The MatchingInput thread is usi
peerlock.unlock();
if (context != NULL) {
now = CoreTiming::GetGlobalTimeUsScaled(); //real_time_now()*1000000.0;
now = CoreTiming::GetGlobalTimeUsScaled(); //time_now_d()*1000000.0;
// Hello Message Sending Context with unoccupied Slots
if ((context->mode == PSP_ADHOC_MATCHING_MODE_PARENT && (countChildren(context) < (context->maxpeers - 1))) || (context->mode == PSP_ADHOC_MATCHING_MODE_P2P && findP2P(context) == NULL))

4
Core/HW/StereoResampler.cpp
View File

@ -291,7 +291,7 @@ void StereoResampler::PushSamples(const s32 *samples, unsigned int numSamples) {
}
void StereoResampler::GetAudioDebugStats(char *buf, size_t bufSize) {
double elapsed = real_time_now() - startTime_;
double elapsed = time_now_d() - startTime_;
double effective_input_sample_rate = (double)inputSampleCount_ / elapsed;
double effective_output_sample_rate = (double)outputSampleCount_ / elapsed;
@ -335,7 +335,7 @@ void StereoResampler::ResetStatCounters() {
overrunCountTotal_ = 0;
inputSampleCount_ = 0;
outputSampleCount_ = 0;
startTime_ = real_time_now();
startTime_ = time_now_d();
}
void StereoResampler::DoState(PointerWrap &p) {

4
Core/MIPS/MIPSAnalyst.cpp
View File

@ -924,13 +924,13 @@ skip:
// TODO: Load from cache file if available instead.
double st = real_time_now();
double st = time_now_d();
for (auto iter = functions.begin(), end = functions.end(); iter != end; iter++) {
const AnalyzedFunction &f = *iter;
PrecompileFunction(f.start, f.end - f.start + 4);
}
double et = real_time_now();
double et = time_now_d();
NOTICE_LOG(JIT, "Precompiled %d MIPS functions in %0.2f milliseconds", (int)functions.size(), (et - st) * 1000.0);
}

6
Core/SaveState.cpp
View File

@ -683,12 +683,12 @@ namespace SaveState
return;
// For fast-forwarding, otherwise they may be useless and too close.
time_update();
float diff = time_now_d() - rewindLastTime;
double now = time_now_d();
float diff = now - rewindLastTime;
if (diff < rewindMaxWallFrequency)
return;
rewindLastTime = time_now_d();
rewindLastTime = now;
DEBUG_LOG(BOOT, "saving rewind state");
rewindStates.Save();
}

4
Core/WebServer.cpp
View File

@ -257,11 +257,11 @@ static void ExecuteWebServer() {
g_Config.iRemoteISOPort = http->Port();
RegisterServer(http->Port());
double lastRegister = real_time_now();
double lastRegister = time_now_d();
while (RetrieveStatus() == ServerStatus::RUNNING) {
http->RunSlice(1.0);
double now = real_time_now();
double now = time_now_d();
if (now > lastRegister + 540.0) {
RegisterServer(http->Port());
lastRegister = now;

4
GPU/Common/TextureScalerCommon.cpp
View File

@ -542,7 +542,7 @@ void TextureScalerCommon::ScaleAlways(u32 *out, u32 *src, u32 &dstFmt, int &widt
bool TextureScalerCommon::ScaleInto(u32 *outputBuf, u32 *src, u32 &dstFmt, int &width, int &height, int factor) {
#ifdef SCALING_MEASURE_TIME
double t_start = real_time_now();
double t_start = time_now_d();
#endif
bufInput.resize(width*height); // used to store the input image image if it needs to be reformatted
@ -583,7 +583,7 @@ bool TextureScalerCommon::ScaleInto(u32 *outputBuf, u32 *src, u32 &dstFmt, int &
#ifdef SCALING_MEASURE_TIME
if (width*height > 64 * 64 * factor*factor) {
double t = real_time_now() - t_start;
double t = time_now_d() - t_start;
NOTICE_LOG(G3D, "TextureScaler: processed %9d pixels in %6.5lf seconds. (%9.2lf Mpixels/second)",
width*height, t, (width*height) / (t * 1000 * 1000));
}

10
GPU/GLES/ShaderManagerGLES.cpp
View File

@ -850,7 +850,6 @@ void ShaderManagerGLES::Load(const std::string &filename) {
if (header.magic != CACHE_HEADER_MAGIC || header.version != CACHE_VERSION || header.featureFlags != gstate_c.featureFlags) {
return;
}
time_update();
diskCachePending_.start = time_now_d();
diskCachePending_.Clear();
@ -908,12 +907,12 @@ bool ShaderManagerGLES::ContinuePrecompile(float sliceTime) {
PSP_SetLoading("Compiling shaders...");
double start = real_time_now();
double start = time_now_d();
// Let's try to keep it under sliceTime if possible.
double end = start + sliceTime;
for (size_t &i = pending.vertPos; i < pending.vert.size(); i++) {
if (real_time_now() >= end) {
if (time_now_d() >= end) {
// We'll finish later.
return false;
}
@ -943,7 +942,7 @@ bool ShaderManagerGLES::ContinuePrecompile(float sliceTime) {
}
for (size_t &i = pending.fragPos; i < pending.frag.size(); i++) {
if (real_time_now() >= end) {
if (time_now_d() >= end) {
// We'll finish later.
return false;
}
@ -957,7 +956,7 @@ bool ShaderManagerGLES::ContinuePrecompile(float sliceTime) {
}
for (size_t &i = pending.linkPos; i < pending.link.size(); i++) {
if (real_time_now() >= end) {
if (time_now_d() >= end) {
// We'll finish later.
return false;
}
@ -974,7 +973,6 @@ bool ShaderManagerGLES::ContinuePrecompile(float sliceTime) {
}
// Okay, finally done. Time to report status.
time_update();
double finish = time_now_d();
NOTICE_LOG(G3D, "Precompile: Compiled and linked %d programs (%d vertex, %d fragment) in %0.1f milliseconds", (int)pending.link.size(), (int)pending.vert.size(), (int)pending.frag.size(), 1000 * (finish - pending.start));

4
GPU/GPUCommon.cpp
View File

@ -928,7 +928,6 @@ u32 GPUCommon::Break(int mode) {
void GPUCommon::NotifySteppingEnter() {
if (coreCollectDebugStats) {
time_update();
timeSteppingStarted_ = time_now_d();
}
}
@ -937,7 +936,6 @@ void GPUCommon::NotifySteppingExit() {
if (timeSteppingStarted_ <= 0.0) {
ERROR_LOG(G3D, "Mismatched stepping enter/exit.");
}
time_update();
timeSpentStepping_ += time_now_d() - timeSteppingStarted_;
timeSteppingStarted_ = 0.0;
}
@ -947,7 +945,6 @@ bool GPUCommon::InterpretList(DisplayList &list) {
// Initialized to avoid a race condition with bShowDebugStats changing.
double start = 0.0;
if (coreCollectDebugStats) {
time_update();
start = time_now_d();
}
@ -1012,7 +1009,6 @@ bool GPUCommon::InterpretList(DisplayList &list) {
list.offsetAddr = gstate_c.offsetAddr;
if (coreCollectDebugStats) {
time_update();
double total = time_now_d() - start - timeSpentStepping_;
hleSetSteppingTime(timeSpentStepping_);
timeSpentStepping_ = 0.0;

2
SDL/SDLMain.cpp
View File

@ -1122,7 +1122,6 @@ int main(int argc, char *argv[]) {
ToggleFullScreenIfFlagSet(window);
// Simple throttling to not burn the GPU in the menu.
time_update();
if (GetUIState() != UISTATE_INGAME || !PSP_IsInited() || renderThreadPaused) {
double diffTime = time_now_d() - startTime;
int sleepTime = (int)(1000.0 / 60.0) - (int)(diffTime * 1000.0);
@ -1130,7 +1129,6 @@ int main(int argc, char *argv[]) {
sleep_ms(sleepTime);
}
time_update();
framecount++;
}

4
UI/BackgroundAudio.cpp
View File

@ -311,8 +311,6 @@ void BackgroundAudio::Clear(bool hard) {
}
void BackgroundAudio::SetGame(const std::string &path) {
time_update();
std::lock_guard<std::mutex> lock(mutex_);
if (path == bgGamePath_) {
// Do nothing
@ -332,8 +330,6 @@ void BackgroundAudio::SetGame(const std::string &path) {
}
int BackgroundAudio::Play() {
time_update();
std::lock_guard<std::mutex> lock(mutex_);
// Immediately stop the sound if it is turned off while playing.

4
UI/RemoteISOScreen.cpp
View File

@ -427,12 +427,12 @@ void RemoteISOConnectScreen::update() {
break;
case ScanStatus::FAILED:
nextRetry_ = real_time_now() + 15.0;
nextRetry_ = time_now_d() + 15.0;
status_ = ScanStatus::RETRY_SCAN;
break;
case ScanStatus::RETRY_SCAN:
if (nextRetry_ < real_time_now()) {
if (nextRetry_ < time_now_d()) {
status_ = ScanStatus::SCANNING;
nextRetry_ = 0.0;

2
UWP/PPSSPP_UWPMain.cpp
View File

@ -170,10 +170,8 @@ bool PPSSPP_UWPMain::Render() {
hasSetThreadName = true;
}
time_update();
auto context = m_deviceResources->GetD3DDeviceContext();
switch (m_deviceResources->ComputeDisplayRotation()) {
case DXGI_MODE_ROTATION_IDENTITY: g_display_rotation = DisplayRotation::ROTATE_0; break;
case DXGI_MODE_ROTATION_ROTATE90: g_display_rotation = DisplayRotation::ROTATE_90; break;

4
Windows/MainWindow.cpp
View File

@ -614,14 +614,14 @@ namespace MainWindow
// Simulate doubleclick, doesn't work with RawInput enabled
static double lastMouseDown;
double now = real_time_now();
double now = time_now_d();
if ((now - lastMouseDown) < 0.001 * GetDoubleClickTime()) {
if (!g_Config.bShowTouchControls && !g_Config.bMouseControl && GetUIState() == UISTATE_INGAME && g_Config.bFullscreenOnDoubleclick) {
SendToggleFullscreen(!g_Config.bFullScreen);
}
lastMouseDown = 0.0;
} else {
lastMouseDown = real_time_now();
lastMouseDown = time_now_d();
}
}
break;

2
android/jni/app-android.cpp
View File

@ -864,7 +864,6 @@ void UpdateRunLoopAndroid(JNIEnv *env) {
NativeUpdate();
NativeRender(graphicsContext);
time_update();
std::lock_guard<std::mutex> guard(frameCommandLock);
if (!nativeActivity) {
@ -1287,7 +1286,6 @@ extern "C" bool JNICALL Java_org_ppsspp_ppsspp_NativeActivity_runEGLRenderLoop(J
NativeUpdate();
NativeRender(graphicsContext);
time_update();
graphicsContext->SwapBuffers();

6
ext/native/profiler/profiler.cpp
View File

@ -140,7 +140,7 @@ int internal_profiler_enter(const char *category_name, int *out_thread_id) {
int &depth = profiler.depth[thread_id];
if (profiler.eventStart[thread_id][category] == 0.0f) {
double now = real_time_now();
double now = time_now_d();
int parent = profiler.parentCategory[thread_id][depth];
// Temporarily suspend the parent on entering a child.
if (parent != -1) {
@ -170,7 +170,7 @@ void internal_profiler_leave(int thread_id, int category) {
return;
}
double now = real_time_now();
double now = time_now_d();
depth--;
_assert_msg_(depth >= 0, "Profiler enter/leave mismatch!");
@ -191,7 +191,7 @@ void internal_profiler_leave(int thread_id, int category) {
void internal_profiler_end_frame() {
int thread_id = internal_profiler_find_thread();
_assert_msg_(profiler.depth[thread_id] == 0, "Can't be inside a profiler scope at end of frame!");
profiler.curFrameStart = real_time_now();
profiler.curFrameStart = time_now_d();
profiler.historyPos++;
profiler.historyPos &= (HISTORY_SIZE - 1);
memset(&history[MAX_THREADS * profiler.historyPos], 0, sizeof(CategoryFrame) * MAX_THREADS);

4
ext/native/thin3d/VulkanQueueRunner.cpp
View File

@ -479,7 +479,7 @@ void VulkanQueueRunner::PreprocessSteps(std::vector<VKRStep *> &steps) {
void VulkanQueueRunner::RunSteps(VkCommandBuffer cmd, std::vector<VKRStep *> &steps, QueueProfileContext *profile) {
if (profile)
profile->cpuStartTime = real_time_now();
profile->cpuStartTime = time_now_d();
bool emitLabels = vulkan_->Extensions().EXT_debug_utils;
for (size_t i = 0; i < steps.size(); i++) {
@ -528,7 +528,7 @@ void VulkanQueueRunner::RunSteps(VkCommandBuffer cmd, std::vector<VKRStep *> &st
}
if (profile)
profile->cpuEndTime = real_time_now();
profile->cpuEndTime = time_now_d();
}
void VulkanQueueRunner::ApplyMGSHack(std::vector<VKRStep *> &steps) {

2
headless/Headless.cpp
View File

@ -170,7 +170,6 @@ bool RunAutoTest(HeadlessHost *headlessHost, CoreParameter &coreParameter, bool
if (autoCompare)
headlessHost->SetComparisonScreenshot(ExpectedScreenshotFromFilename(coreParameter.fileToStart));
time_update();
bool passed = true;
// TODO: We must have some kind of stack overflow or we're not following the ABI right.
// This gets trashed if it's not static.
@ -194,7 +193,6 @@ bool RunAutoTest(HeadlessHost *headlessHost, CoreParameter &coreParameter, bool
coreState = CORE_RUNNING;
headlessHost->SwapBuffers();
}
time_update();
if (time_now_d() > deadline) {
// Don't compare, print the output at least up to this point, and bail.
printf("%s", output.c_str());

1
ios/ViewController.mm
View File

@ -249,7 +249,6 @@ static LocationHelper *locationHelper;
while (threadEnabled) {
NativeUpdate();
NativeRender(graphicsContext);
time_update();
}

6
unittest/JitHarness.cpp
View File

@ -55,7 +55,7 @@ HLEFunction UnitTestFakeSyscalls[] = {
double ExecCPUTest() {
int blockTicks = 1000000;
int total = 0;
double st = real_time_now();
double st = time_now_d();
do {
for (int j = 0; j < 1000; ++j) {
currentMIPS->pc = PSP_GetUserMemoryBase();
@ -67,8 +67,8 @@ double ExecCPUTest() {
++total;
}
}
while (real_time_now() - st < 0.5);
double elapsed = real_time_now() - st;
while (time_now_d() - st < 0.5);
double elapsed = time_now_d() - st;
return total / elapsed;
}

6
unittest/TestVertexJit.cpp
View File

@ -86,14 +86,14 @@ public:
SetupExecute(vtype, useJit);
int total = 0;
double st = real_time_now();
double st = time_now_d();
do {
for (int j = 0; j < ROUNDS; ++j) {
dec_->DecodeVerts(dst_, src_, indexLowerBound_, indexUpperBound);
++total;
}
} while (real_time_now() - st < 0.5);
double elapsed = real_time_now() - st;
} while (time_now_d() - st < 0.5);
double elapsed = time_now_d() - st;
return total / elapsed;
}