catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for large delays precision + Linux build

This commit is contained in:
psucien 2024-07-11 09:09:37 +02:00 committed by georgemoralis
parent d3e8e95334
commit ba5fb78c5a
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/logging/backend.cpp
View File

@ -170,7 +170,7 @@ public:
const char* function, std::string message) { const char* function, std::string message) {
// Propagate important log messages to the profiler // Propagate important log messages to the profiler
if (IsProfilerConnected()) { if (IsProfilerConnected()) {
const auto& msg_str = std::format("[{}] {}", GetLogClassName(log_class), message); const auto& msg_str = fmt::format("[{}] {}", GetLogClassName(log_class), message);
switch (log_level) { switch (log_level) {
case Level::Warning: case Level::Warning:
TRACE_WARN(msg_str); TRACE_WARN(msg_str);

22
src/core/libraries/kernel/event_queue.cpp
View File

@ -11,7 +11,7 @@ EqueueInternal::~EqueueInternal() = default;
bool EqueueInternal::AddEvent(EqueueEvent& event) { bool EqueueInternal::AddEvent(EqueueEvent& event) {
std::scoped_lock lock{m_mutex}; std::scoped_lock lock{m_mutex};
event.time_added = std::chrono::high_resolution_clock::now(); event.time_added = std::chrono::steady_clock::now();
const auto& it = std::ranges::find(m_events, event); const auto& it = std::ranges::find(m_events, event);
if (it != m_events.cend()) { if (it != m_events.cend()) {
@ -52,16 +52,22 @@ int EqueueInternal::WaitForEvents(SceKernelEvent* ev, int num, u32 micros) {
m_cond.wait_for(lock, std::chrono::microseconds(micros), predicate); m_cond.wait_for(lock, std::chrono::microseconds(micros), predicate);
} }
if (HasSmallTimer()) {
if (count > 0) {
const auto time_waited = std::chrono::duration_cast<std::chrono::microseconds>(
std::chrono::steady_clock::now() - m_events[0].time_added)
.count();
count = WaitForSmallTimer(ev, num, std::max(0l, long(micros - time_waited)));
}
small_timer_event.event.data = 0;
}
if (ev->flags & SceKernelEvent::Flags::OneShot) { if (ev->flags & SceKernelEvent::Flags::OneShot) {
for (auto ev_id = 0u; ev_id < count; ++ev_id) { for (auto ev_id = 0u; ev_id < count; ++ev_id) {
RemoveEvent(ev->ident); RemoveEvent(ev->ident);
} }
} }
if (HasSmallTimer()) {
count = WaitForSmallTimer(ev, num, micros);
}
return count; return count;
} }
@ -108,7 +114,7 @@ bool EqueueInternal::AddSmallTimer(EqueueEvent& ev) {
// can be posted to the queue, based on observations so far. In the opposite case, // can be posted to the queue, based on observations so far. In the opposite case,
// the small timer storage and wait logic should be reworked. // the small timer storage and wait logic should be reworked.
ASSERT(!HasSmallTimer() || small_timer_event.event.ident == ev.event.ident); ASSERT(!HasSmallTimer() || small_timer_event.event.ident == ev.event.ident);
ev.time_added = std::chrono::high_resolution_clock::now(); ev.time_added = std::chrono::steady_clock::now();
small_timer_event = std::move(ev); small_timer_event = std::move(ev);
return true; return true;
} }
@ -118,11 +124,11 @@ int EqueueInternal::WaitForSmallTimer(SceKernelEvent* ev, int num, u32 micros) {
ASSERT(num == 1); ASSERT(num == 1);
auto curr_clock = std::chrono::high_resolution_clock::now(); auto curr_clock = std::chrono::steady_clock::now();
const auto wait_end_us = curr_clock + std::chrono::microseconds{micros}; const auto wait_end_us = curr_clock + std::chrono::microseconds{micros};
do { do {
curr_clock = std::chrono::high_resolution_clock::now(); curr_clock = std::chrono::steady_clock::now();
{ {
std::unique_lock lock{m_mutex}; std::unique_lock lock{m_mutex};