N-archive/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu.git synced 2024-12-01 19:22:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8531 from FernandoS27/core-timing-fix-reg

Browse source 
Core timing: use only one thread.
This commit is contained in:
liamwhite 2022-07-10 00:47:05 -04:00 committed by GitHub
commit c765d5be0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/core/core_timing.cpp
View file

@ -61,12 +61,7 @@ void CoreTiming::Initialize(std::function<void()>&& on_thread_init_) {
const auto empty_timed_callback = [](std::uintptr_t, std::chrono::nanoseconds) {}; const auto empty_timed_callback = [](std::uintptr_t, std::chrono::nanoseconds) {};
ev_lost = CreateEvent("_lost_event", empty_timed_callback); ev_lost = CreateEvent("_lost_event", empty_timed_callback);
if (is_multicore) { if (is_multicore) {
const auto hardware_concurrency = std::thread::hardware_concurrency(); worker_threads.emplace_back(ThreadEntry, std::ref(*this), 0);
size_t id = 0;
worker_threads.emplace_back(ThreadEntry, std::ref(*this), id++);
if (hardware_concurrency > 8) {
worker_threads.emplace_back(ThreadEntry, std::ref(*this), id++);
}
} }
} }
@ -228,14 +223,11 @@ std::optional<s64> CoreTiming::Advance() {
event_queue.pop_back(); event_queue.pop_back();
if (const auto event_type{evt.type.lock()}) { if (const auto event_type{evt.type.lock()}) {
sequence_mutex.lock();
event_mutex.unlock(); event_mutex.unlock();
event_type->guard.lock();
sequence_mutex.unlock();
const s64 delay = static_cast<s64>(GetGlobalTimeNs().count() - evt.time); const s64 delay = static_cast<s64>(GetGlobalTimeNs().count() - evt.time);
event_type->callback(evt.user_data, std::chrono::nanoseconds{delay}); event_type->callback(evt.user_data, std::chrono::nanoseconds{delay});
event_type->guard.unlock();
event_mutex.lock(); event_mutex.lock();
pending_events.fetch_sub(1, std::memory_order_relaxed); pending_events.fetch_sub(1, std::memory_order_relaxed);

2
src/core/core_timing.h
View file

@ -32,7 +32,6 @@ struct EventType {
TimedCallback callback; TimedCallback callback;
/// A pointer to the name of the event. /// A pointer to the name of the event.
const std::string name; const std::string name;
mutable std::mutex guard;
}; };
/** /**
@ -157,7 +156,6 @@ private:
std::condition_variable wait_pause_cv; std::condition_variable wait_pause_cv;
std::condition_variable wait_signal_cv; std::condition_variable wait_signal_cv;
mutable std::mutex event_mutex; mutable std::mutex event_mutex;
mutable std::mutex sequence_mutex;
std::atomic<bool> paused_state{}; std::atomic<bool> paused_state{};
bool is_paused{}; bool is_paused{};