From ad090a40eb8d659a9fa0d5975132a817d7f57836 Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Tue, 18 Aug 2015 10:18:30 -0700 Subject: [PATCH] Fixing misuse of std::chrono. --- src/xenia/apu/audio_system.cc | 2 +- src/xenia/gpu/gl4/command_processor.cc | 3 +-- src/xenia/gpu/gl4/gl4_graphics_system.cc | 2 +- src/xenia/kernel/apps/xmp_app.cc | 2 +- src/xenia/kernel/kernel_state.cc | 2 +- src/xenia/kernel/objects/xthread.cc | 2 +- src/xenia/kernel/xboxkrnl_audio_xma.cc | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/xenia/apu/audio_system.cc b/src/xenia/apu/audio_system.cc index fb6f7daa2..7fb1315c7 100644 --- a/src/xenia/apu/audio_system.cc +++ b/src/xenia/apu/audio_system.cc @@ -143,7 +143,7 @@ void AudioSystem::WorkerThreadMain() { if (!pumped) { SCOPE_profile_cpu_i("apu", "Sleep"); - xe::threading::Sleep(std::chrono::milliseconds::duration(500)); + xe::threading::Sleep(std::chrono::milliseconds(500)); } } worker_running_ = false; diff --git a/src/xenia/gpu/gl4/command_processor.cc b/src/xenia/gpu/gl4/command_processor.cc index 6edb79b5e..467f3f0ad 100644 --- a/src/xenia/gpu/gl4/command_processor.cc +++ b/src/xenia/gpu/gl4/command_processor.cc @@ -1104,8 +1104,7 @@ bool CommandProcessor::ExecutePacketType3_WAIT_REG_MEM(RingbufferReader* reader, // User wants it fast and dangerous. xe::threading::MaybeYield(); } else { - xe::threading::Sleep( - std::chrono::milliseconds::duration(wait / 0x100)); + xe::threading::Sleep(std::chrono::milliseconds(wait / 0x100)); } xe::threading::SyncMemory(); ReturnFromWait(); diff --git a/src/xenia/gpu/gl4/gl4_graphics_system.cc b/src/xenia/gpu/gl4/gl4_graphics_system.cc index 32d7fe0c4..1d2cd320f 100644 --- a/src/xenia/gpu/gl4/gl4_graphics_system.cc +++ b/src/xenia/gpu/gl4/gl4_graphics_system.cc @@ -126,7 +126,7 @@ X_STATUS GL4GraphicsSystem::Setup(cpu::Processor* processor, MarkVblank(); last_frame_time = current_time; } - xe::threading::Sleep(std::chrono::milliseconds::duration(1)); + xe::threading::Sleep(std::chrono::milliseconds(1)); } return 0; })); diff --git a/src/xenia/kernel/apps/xmp_app.cc b/src/xenia/kernel/apps/xmp_app.cc index 98c54c5d9..5a8fb8ca5 100644 --- a/src/xenia/kernel/apps/xmp_app.cc +++ b/src/xenia/kernel/apps/xmp_app.cc @@ -32,7 +32,7 @@ XXMPApp::XXMPApp(KernelState* kernel_state) X_RESULT XXMPApp::XMPGetStatus(uint32_t state_ptr) { // Some stupid games will hammer this on a thread - induce a delay // here to keep from starving real threads. - xe::threading::Sleep(std::chrono::milliseconds::duration(1)); + xe::threading::Sleep(std::chrono::milliseconds(1)); XELOGD("XMPGetStatus(%.8X)", state_ptr); xe::store_and_swap(memory_->TranslateVirtual(state_ptr), diff --git a/src/xenia/kernel/kernel_state.cc b/src/xenia/kernel/kernel_state.cc index 739bb34b1..a63528460 100644 --- a/src/xenia/kernel/kernel_state.cc +++ b/src/xenia/kernel/kernel_state.cc @@ -585,7 +585,7 @@ void KernelState::CompleteOverlappedDeferredEx( dispatch_queue_.push_back([this, completion_callback, overlapped_ptr, result, extended_error, length]() { xe::threading::Sleep( - std::chrono::milliseconds::duration(kDeferredOverlappedDelayMillis)); + std::chrono::milliseconds(kDeferredOverlappedDelayMillis)); completion_callback(); CompleteOverlappedEx(overlapped_ptr, result, extended_error, length); }); diff --git a/src/xenia/kernel/objects/xthread.cc b/src/xenia/kernel/objects/xthread.cc index e06c0947e..e950c1d9b 100644 --- a/src/xenia/kernel/objects/xthread.cc +++ b/src/xenia/kernel/objects/xthread.cc @@ -409,7 +409,7 @@ void XThread::Execute() { // All threads get a mandatory sleep. This is to deal with some buggy // games that are assuming the 360 is so slow to create threads that they // have time to initialize shared structures AFTER CreateThread (RR). - xe::threading::Sleep(std::chrono::milliseconds::duration(100)); + xe::threading::Sleep(std::chrono::milliseconds(100)); int exit_code = 0; diff --git a/src/xenia/kernel/xboxkrnl_audio_xma.cc b/src/xenia/kernel/xboxkrnl_audio_xma.cc index 61ff6f381..cabc87149 100644 --- a/src/xenia/kernel/xboxkrnl_audio_xma.cc +++ b/src/xenia/kernel/xboxkrnl_audio_xma.cc @@ -346,7 +346,7 @@ SHIM_CALL XMABlockWhileInUse_shim(PPCContext* ppc_context, if (!context.input_buffer_0_valid && !context.input_buffer_1_valid) { break; } - xe::threading::Sleep(std::chrono::milliseconds::duration(1)); + xe::threading::Sleep(std::chrono::milliseconds(1)); } while (true); SHIM_SET_RETURN_32(0);