mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-06 01:12:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing some issues introduced by the Fix time - sceKernelClockGettime… #2766

Browse Source
This commit is contained in:
Dmugetsu 2025-03-06 11:18:52 -06:00
parent 8b7eed3ffc
commit a7c1b897e1
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/core/libraries/kernel/time.cpp
View File

@ -97,7 +97,8 @@ int PS4_SYSV_ABI sceKernelClockGettime(s32 clock_id, OrbisKernelTimespec* tp) {
if (tp == nullptr) { if (tp == nullptr) {
return ORBIS_KERNEL_ERROR_EFAULT; return ORBIS_KERNEL_ERROR_EFAULT;
} }
clockid_t pclock_id = CLOCK_REALTIME;
clockid_t pclock_id;
switch (clock_id) { switch (clock_id) {
case ORBIS_CLOCK_REALTIME: case ORBIS_CLOCK_REALTIME:
case ORBIS_CLOCK_REALTIME_PRECISE: case ORBIS_CLOCK_REALTIME_PRECISE:
@ -111,18 +112,26 @@ int PS4_SYSV_ABI sceKernelClockGettime(s32 clock_id, OrbisKernelTimespec* tp) {
pclock_id = CLOCK_MONOTONIC; pclock_id = CLOCK_MONOTONIC;
break; break;
default: default:
LOG_ERROR(Lib_Kernel, "unsupported = {} using CLOCK_REALTIME", clock_id); LOG_ERROR(Lib_Kernel, "unsupported clock_id = {}. Returning error.", clock_id);
break;
}
time_t raw_time = time(nullptr);
if (raw_time == (time_t)(-1)) {
return ORBIS_KERNEL_ERROR_EINVAL; return ORBIS_KERNEL_ERROR_EINVAL;
} }
tp->tv_sec = static_cast<long>(raw_time); struct timespec ts;
tp->tv_nsec = 0; if (clock_gettime(pclock_id, &ts) != 0) {
return ORBIS_KERNEL_ERROR_EINVAL;
}
if (pclock_id == CLOCK_REALTIME) {
time_t raw_time = time(nullptr);
if (raw_time == (time_t)(-1)) {
return ORBIS_KERNEL_ERROR_EINVAL;
}
tp->tv_sec = static_cast<long>(raw_time);
tp->tv_nsec = ts.tv_nsec;
} else {
tp->tv_sec = ts.tv_sec;
tp->tv_nsec = ts.tv_nsec;
}
return ORBIS_OK; return ORBIS_OK;
} }
@ -130,7 +139,7 @@ int PS4_SYSV_ABI sceKernelClockGettime(s32 clock_id, OrbisKernelTimespec* tp) {
int PS4_SYSV_ABI posix_clock_gettime(s32 clock_id, OrbisKernelTimespec* time) { int PS4_SYSV_ABI posix_clock_gettime(s32 clock_id, OrbisKernelTimespec* time) {
int result = sceKernelClockGettime(clock_id, time); int result = sceKernelClockGettime(clock_id, time);
if (result < 0) { if (result < 0) {
UNREACHABLE(); // TODO return posix error code return ORBIS_KERNEL_ERROR_EINVAL; // this should return a proper error
} }
return result; return result;
} }