diff options
| author | 2020-07-15 18:30:06 -0400 | |
|---|---|---|
| committer | 2020-07-15 18:54:15 -0400 | |
| commit | 8b50c660dfce50a07c2b2aa3c1b6b8642259a944 (patch) | |
| tree | 798b0427a660bf249311f3a13d96c6df69a6bcb5 /src/core/hle/kernel | |
| parent | Merge pull request #4342 from lioncash/endian (diff) | |
| download | yuzu-8b50c660dfce50a07c2b2aa3c1b6b8642259a944.tar.gz yuzu-8b50c660dfce50a07c2b2aa3c1b6b8642259a944.tar.xz yuzu-8b50c660dfce50a07c2b2aa3c1b6b8642259a944.zip | |
core_timing: Make use of std::chrono with ScheduleEvent
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/server_session.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/time_manager.cpp | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 1f2af7a1b..35fb270b8 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -149,11 +149,13 @@ struct KernelCore::Impl { | |||
| 149 | SchedulerLock lock(kernel); | 149 | SchedulerLock lock(kernel); |
| 150 | global_scheduler.PreemptThreads(); | 150 | global_scheduler.PreemptThreads(); |
| 151 | } | 151 | } |
| 152 | s64 time_interval = Core::Timing::msToCycles(std::chrono::milliseconds(10)); | 152 | const auto time_interval = std::chrono::nanoseconds{ |
| 153 | Core::Timing::msToCycles(std::chrono::milliseconds(10))}; | ||
| 153 | system.CoreTiming().ScheduleEvent(time_interval, preemption_event); | 154 | system.CoreTiming().ScheduleEvent(time_interval, preemption_event); |
| 154 | }); | 155 | }); |
| 155 | 156 | ||
| 156 | s64 time_interval = Core::Timing::msToCycles(std::chrono::milliseconds(10)); | 157 | const auto time_interval = |
| 158 | std::chrono::nanoseconds{Core::Timing::msToCycles(std::chrono::milliseconds(10))}; | ||
| 157 | system.CoreTiming().ScheduleEvent(time_interval, preemption_event); | 159 | system.CoreTiming().ScheduleEvent(time_interval, preemption_event); |
| 158 | } | 160 | } |
| 159 | 161 | ||
diff --git a/src/core/hle/kernel/server_session.cpp b/src/core/hle/kernel/server_session.cpp index 7b23a6889..8c32f28b5 100644 --- a/src/core/hle/kernel/server_session.cpp +++ b/src/core/hle/kernel/server_session.cpp | |||
| @@ -184,8 +184,8 @@ ResultCode ServerSession::CompleteSyncRequest() { | |||
| 184 | 184 | ||
| 185 | ResultCode ServerSession::HandleSyncRequest(std::shared_ptr<Thread> thread, | 185 | ResultCode ServerSession::HandleSyncRequest(std::shared_ptr<Thread> thread, |
| 186 | Core::Memory::Memory& memory) { | 186 | Core::Memory::Memory& memory) { |
| 187 | ResultCode result = QueueSyncRequest(std::move(thread), memory); | 187 | const ResultCode result = QueueSyncRequest(std::move(thread), memory); |
| 188 | const u64 delay = kernel.IsMulticore() ? 0U : 20000U; | 188 | const auto delay = std::chrono::nanoseconds{kernel.IsMulticore() ? 0 : 20000}; |
| 189 | Core::System::GetInstance().CoreTiming().ScheduleEvent(delay, request_event, {}); | 189 | Core::System::GetInstance().CoreTiming().ScheduleEvent(delay, request_event, {}); |
| 190 | return result; | 190 | return result; |
| 191 | } | 191 | } |
diff --git a/src/core/hle/kernel/time_manager.cpp b/src/core/hle/kernel/time_manager.cpp index 941305e8e..ebb1e5568 100644 --- a/src/core/hle/kernel/time_manager.cpp +++ b/src/core/hle/kernel/time_manager.cpp | |||
| @@ -34,7 +34,8 @@ void TimeManager::ScheduleTimeEvent(Handle& event_handle, Thread* timetask, s64 | |||
| 34 | ASSERT(timetask); | 34 | ASSERT(timetask); |
| 35 | ASSERT(timetask->GetStatus() != ThreadStatus::Ready); | 35 | ASSERT(timetask->GetStatus() != ThreadStatus::Ready); |
| 36 | ASSERT(timetask->GetStatus() != ThreadStatus::WaitMutex); | 36 | ASSERT(timetask->GetStatus() != ThreadStatus::WaitMutex); |
| 37 | system.CoreTiming().ScheduleEvent(nanoseconds, time_manager_event_type, event_handle); | 37 | system.CoreTiming().ScheduleEvent(std::chrono::nanoseconds{nanoseconds}, |
| 38 | time_manager_event_type, event_handle); | ||
| 38 | } else { | 39 | } else { |
| 39 | event_handle = InvalidHandle; | 40 | event_handle = InvalidHandle; |
| 40 | } | 41 | } |