mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-12-26 18:40:06 +00:00
Core/HostTiming: Allow events to be advanced manually.
This commit is contained in:
parent
1f7dd36499
commit
49a7e0984a
@ -110,7 +110,7 @@ Fiber::Fiber(std::function<void(void*)>&& entry_point_func, void* start_paramete
|
|||||||
FiberStartFunc);
|
FiberStartFunc);
|
||||||
}
|
}
|
||||||
|
|
||||||
Fiber::Fiber() : guard{}, entry_point{}, start_parameter{}, previous_fiber{} {
|
Fiber::Fiber() {
|
||||||
impl = std::make_unique<FiberImpl>();
|
impl = std::make_unique<FiberImpl>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,14 +42,15 @@ public:
|
|||||||
|
|
||||||
u64 GetClockCycles() override {
|
u64 GetClockCycles() override {
|
||||||
std::chrono::nanoseconds time_now = GetTimeNS();
|
std::chrono::nanoseconds time_now = GetTimeNS();
|
||||||
const u128 temporal = Common::Multiply64Into128(time_now.count(), emulated_clock_frequency);
|
const u128 temporary =
|
||||||
return Common::Divide128On32(temporal, 1000000000).first;
|
Common::Multiply64Into128(time_now.count(), emulated_clock_frequency);
|
||||||
|
return Common::Divide128On32(temporary, 1000000000).first;
|
||||||
}
|
}
|
||||||
|
|
||||||
u64 GetCPUCycles() override {
|
u64 GetCPUCycles() override {
|
||||||
std::chrono::nanoseconds time_now = GetTimeNS();
|
std::chrono::nanoseconds time_now = GetTimeNS();
|
||||||
const u128 temporal = Common::Multiply64Into128(time_now.count(), emulated_cpu_frequency);
|
const u128 temporary = Common::Multiply64Into128(time_now.count(), emulated_cpu_frequency);
|
||||||
return Common::Divide128On32(temporal, 1000000000).first;
|
return Common::Divide128On32(temporary, 1000000000).first;
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -42,7 +42,7 @@ CoreTiming::CoreTiming() {
|
|||||||
CoreTiming::~CoreTiming() = default;
|
CoreTiming::~CoreTiming() = default;
|
||||||
|
|
||||||
void CoreTiming::ThreadEntry(CoreTiming& instance) {
|
void CoreTiming::ThreadEntry(CoreTiming& instance) {
|
||||||
instance.Advance();
|
instance.ThreadLoop();
|
||||||
}
|
}
|
||||||
|
|
||||||
void CoreTiming::Initialize() {
|
void CoreTiming::Initialize() {
|
||||||
@ -137,38 +137,49 @@ void CoreTiming::RemoveEvent(const std::shared_ptr<EventType>& event_type) {
|
|||||||
basic_lock.unlock();
|
basic_lock.unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
void CoreTiming::Advance() {
|
std::optional<u64> CoreTiming::Advance() {
|
||||||
|
advance_lock.lock();
|
||||||
|
basic_lock.lock();
|
||||||
|
global_timer = GetGlobalTimeNs().count();
|
||||||
|
|
||||||
|
while (!event_queue.empty() && event_queue.front().time <= global_timer) {
|
||||||
|
Event evt = std::move(event_queue.front());
|
||||||
|
std::pop_heap(event_queue.begin(), event_queue.end(), std::greater<>());
|
||||||
|
event_queue.pop_back();
|
||||||
|
basic_lock.unlock();
|
||||||
|
|
||||||
|
if (auto event_type{evt.type.lock()}) {
|
||||||
|
event_type->callback(evt.userdata, global_timer - evt.time);
|
||||||
|
}
|
||||||
|
|
||||||
|
basic_lock.lock();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!event_queue.empty()) {
|
||||||
|
const u64 next_time = event_queue.front().time - global_timer;
|
||||||
|
basic_lock.unlock();
|
||||||
|
advance_lock.unlock();
|
||||||
|
return next_time;
|
||||||
|
} else {
|
||||||
|
basic_lock.unlock();
|
||||||
|
advance_lock.unlock();
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void CoreTiming::ThreadLoop() {
|
||||||
has_started = true;
|
has_started = true;
|
||||||
while (!shutting_down) {
|
while (!shutting_down) {
|
||||||
while (!paused) {
|
while (!paused) {
|
||||||
paused_set = false;
|
paused_set = false;
|
||||||
basic_lock.lock();
|
const auto next_time = Advance();
|
||||||
global_timer = GetGlobalTimeNs().count();
|
if (next_time) {
|
||||||
|
std::chrono::nanoseconds next_time_ns = std::chrono::nanoseconds(*next_time);
|
||||||
while (!event_queue.empty() && event_queue.front().time <= global_timer) {
|
event.WaitFor(next_time_ns);
|
||||||
Event evt = std::move(event_queue.front());
|
|
||||||
std::pop_heap(event_queue.begin(), event_queue.end(), std::greater<>());
|
|
||||||
event_queue.pop_back();
|
|
||||||
basic_lock.unlock();
|
|
||||||
|
|
||||||
if (auto event_type{evt.type.lock()}) {
|
|
||||||
event_type->callback(evt.userdata, global_timer - evt.time);
|
|
||||||
}
|
|
||||||
|
|
||||||
basic_lock.lock();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!event_queue.empty()) {
|
|
||||||
std::chrono::nanoseconds next_time =
|
|
||||||
std::chrono::nanoseconds(event_queue.front().time - global_timer);
|
|
||||||
basic_lock.unlock();
|
|
||||||
event.WaitFor(next_time);
|
|
||||||
} else {
|
} else {
|
||||||
basic_lock.unlock();
|
|
||||||
wait_set = true;
|
wait_set = true;
|
||||||
event.Wait();
|
event.Wait();
|
||||||
}
|
}
|
||||||
|
|
||||||
wait_set = false;
|
wait_set = false;
|
||||||
}
|
}
|
||||||
paused_set = true;
|
paused_set = true;
|
||||||
|
@ -103,6 +103,9 @@ public:
|
|||||||
/// Returns current time in nanoseconds.
|
/// Returns current time in nanoseconds.
|
||||||
std::chrono::nanoseconds GetGlobalTimeNs() const;
|
std::chrono::nanoseconds GetGlobalTimeNs() const;
|
||||||
|
|
||||||
|
/// Checks for events manually and returns time in nanoseconds for next event, threadsafe.
|
||||||
|
std::optional<u64> Advance();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct Event;
|
struct Event;
|
||||||
|
|
||||||
@ -110,7 +113,7 @@ private:
|
|||||||
void ClearPendingEvents();
|
void ClearPendingEvents();
|
||||||
|
|
||||||
static void ThreadEntry(CoreTiming& instance);
|
static void ThreadEntry(CoreTiming& instance);
|
||||||
void Advance();
|
void ThreadLoop();
|
||||||
|
|
||||||
std::unique_ptr<Common::WallClock> clock;
|
std::unique_ptr<Common::WallClock> clock;
|
||||||
|
|
||||||
@ -128,6 +131,7 @@ private:
|
|||||||
std::shared_ptr<EventType> ev_lost;
|
std::shared_ptr<EventType> ev_lost;
|
||||||
Common::Event event{};
|
Common::Event event{};
|
||||||
Common::SpinLock basic_lock{};
|
Common::SpinLock basic_lock{};
|
||||||
|
Common::SpinLock advance_lock{};
|
||||||
std::unique_ptr<std::thread> timer_thread;
|
std::unique_ptr<std::thread> timer_thread;
|
||||||
std::atomic<bool> paused{};
|
std::atomic<bool> paused{};
|
||||||
std::atomic<bool> paused_set{};
|
std::atomic<bool> paused_set{};
|
||||||
|
Loading…
Reference in New Issue
Block a user