WiimoteReal: Use Event for timing scans

This makes exiting instant since it removes a random 0-500ms delay.
dolphin-emu · Jul 7, 2016 · 481d7aa · 481d7aa
1 parent 37a9932
commit 481d7aa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
@@ -449,6 +449,7 @@ void WiimoteScanner::StartScanning(bool scan_only_once)
     m_run_thread.store(true);
     m_scan_thread = std::thread(&WiimoteScanner::ThreadFunc, this);
   }
+  m_scan_event.Set();
 }
 
 void WiimoteScanner::StopScanning(bool stop_thread)
@@ -457,6 +458,7 @@ void WiimoteScanner::StopScanning(bool stop_thread)
   if (!stop_thread)
     return;
   m_run_thread.store(false);
+  m_scan_event.Set();
   if (m_scan_thread.joinable())
   {
     m_scan_thread.join();
@@ -480,11 +482,9 @@ void WiimoteScanner::ThreadFunc()
 
   while (m_run_thread.load())
   {
+    m_scan_event.WaitFor(std::chrono::milliseconds(500));
     if (!m_should_scan.load())
-    {
-      Common::SleepCurrentThread(500);
       continue;
-    }
     m_should_scan.store(!m_should_scan_only_once.load());
 
     std::vector<Wiimote*> found_wiimotes;
@@ -512,9 +512,6 @@ void WiimoteScanner::ThreadFunc()
 
     if (m_want_bb.load() && found_board)
       TryToConnectBalanceBoard(found_board);
-
-    // std::this_thread::yield();
-    Common::SleepCurrentThread(500);
   }
 
   NOTICE_LOG(WIIMOTE, "Wiimote scanning thread has stopped.");

diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h
@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "Common/Common.h"
+#include "Common/Event.h"
 #include "Common/FifoQueue.h"
 #include "Common/NonCopyable.h"
 #include "Core/HW/Wiimote.h"
@@ -136,6 +137,7 @@ class WiimoteScanner
 
   std::thread m_scan_thread;
 
+  Common::Event m_scan_event;
   std::atomic<bool> m_run_thread{false};
   std::atomic<bool> m_should_scan{false};
   std::atomic<bool> m_should_scan_only_once{false};  // for the Refresh button