ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WiimoteReal: Don't block on refresh 

This changes Refresh() to use the existing scanning thread to scan for
devices, instead of running the scan on the UI thread and blocking it.

Also makes the UI thread not block when Continuous Scanning is disabled
and removes duplicated code.

Should fix issue 8992.

Under the hood:
* The scanning thread is now always active, even when continuous
  scanning is disabled.
* The initialize code which waits for Wiimotes to be connected also
  uses the scanning thread instead of scanning on yet another thread.
* The scanning thread now always checks for disconnected devices, to
  avoid Dolphin thinking a Wiimote is still connected when it isn't. So
  we now check if we need new Wiimotes or a Balance Board at scan time.
This commit is contained in:
Léo Lam 2016-07-07 15:40:14 +02:00
parent ece5de24bc
commit c827fdd2b5
7 changed files with 79 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Core.cpp
View File

@ -533,7 +533,9 @@ void EmuThread()
if (core_parameter.bWii)
{
if (init_controllers)
Wiimote::Initialize(s_window_handle, !s_state_filename.empty());
Wiimote::Initialize(s_window_handle, !s_state_filename.empty() ?
Wiimote::InitializeMode::DO_WAIT_FOR_WIIMOTES :
Wiimote::InitializeMode::DO_NOT_WAIT_FOR_WIIMOTES);
else
Wiimote::LoadConfig();

4
Source/Core/Core/HW/Wiimote.cpp
View File

@ -28,7 +28,7 @@ void Shutdown()
g_controller_interface.Shutdown();
}
void Initialize(void* const hwnd, bool wait)
void Initialize(void* const hwnd, InitializeMode init_mode)
{
if (s_config.ControllersNeedToBeCreated())
{
@ -40,7 +40,7 @@ void Initialize(void* const hwnd, bool wait)
s_config.LoadConfig(false);
WiimoteReal::Initialize(wait);
WiimoteReal::Initialize(init_mode);
// Reload Wiimotes with our settings
if (Movie::IsMovieActive())

10
Source/Core/Core/HW/Wiimote.h
View File

@ -35,8 +35,14 @@ extern unsigned int g_wiimote_sources[MAX_BBMOTES];
namespace Wiimote
{
enum class InitializeMode
{
DO_WAIT_FOR_WIIMOTES,
DO_NOT_WAIT_FOR_WIIMOTES,
};
void Shutdown();
void Initialize(void* const hwnd, bool wait = false);
void Initialize(void* const hwnd, InitializeMode init_mode);
void ResetAllWiimotes();
void LoadConfig();
void Resume();
@ -54,7 +60,7 @@ void Update(int _number, bool _connected);
namespace WiimoteReal
{
void Initialize(bool wait = false);
void Initialize(::Wiimote::InitializeMode init_mode);
void Stop();
void Shutdown();
void Resume();

156
Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
View File

@ -430,34 +430,29 @@ static unsigned int CalculateWantedBB()
return wanted_bb;
}
void WiimoteScanner::WantWiimotes(bool do_want)
void WiimoteScanner::StartThread()
{
m_want_wiimotes.store(do_want);
if (m_scan_thread_running.IsSet())
return;
m_scan_thread_running.Set();
m_scan_thread = std::thread(&WiimoteScanner::ThreadFunc, this);
}
void WiimoteScanner::WantBB(bool do_want)
void WiimoteScanner::StopThread()
{
m_want_bb.store(do_want);
}
void WiimoteScanner::StartScanning()
{
if (!m_run_thread.load())
{
m_run_thread.store(true);
m_scan_thread = std::thread(&WiimoteScanner::ThreadFunc, this);
}
}
void WiimoteScanner::StopScanning()
{
m_run_thread.store(false);
if (m_scan_thread.joinable())
if (m_scan_thread_running.TestAndClear())
{
SetScanMode(WiimoteScanMode::DO_NOT_SCAN);
m_scan_thread.join();
}
}
void WiimoteScanner::SetScanMode(WiimoteScanMode scan_mode)
{
m_scan_mode.store(scan_mode);
m_scan_mode_changed_event.Set();
}
static void CheckForDisconnectedWiimotes()
{
std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
@ -471,41 +466,33 @@ void WiimoteScanner::ThreadFunc()
{
Common::SetCurrentThreadName("Wiimote Scanning Thread");
NOTICE_LOG(WIIMOTE, "Wiimote scanning has started.");
NOTICE_LOG(WIIMOTE, "Wiimote scanning thread has started.");
while (m_run_thread.load())
while (m_scan_thread_running.IsSet())
{
std::vector<Wiimote*> found_wiimotes;
Wiimote* found_board = nullptr;
m_scan_mode_changed_event.WaitFor(std::chrono::milliseconds(500));
// NOTICE_LOG(WIIMOTE, "In loop");
if (m_want_wiimotes.load() || m_want_bb.load())
{
FindWiimotes(found_wiimotes, found_board);
}
else
{
// Does stuff needed to detect disconnects on Windows
Update();
}
// NOTICE_LOG(WIIMOTE, "After update");
// TODO: this is a fairly lame place for this
Update(); // Does stuff needed to detect disconnects on Windows
CheckForDisconnectedWiimotes();
if (m_want_wiimotes.load())
if (m_scan_mode.load() == WiimoteScanMode::DO_NOT_SCAN)
continue;
if (CalculateWantedWiimotes() != 0 || CalculateWantedBB() != 0)
{
std::vector<Wiimote*> found_wiimotes;
Wiimote* found_board = nullptr;
FindWiimotes(found_wiimotes, found_board);
HandleFoundWiimotes(found_wiimotes);
if (found_board)
TryToConnectBalanceBoard(found_board);
}
if (m_want_bb.load() && found_board)
TryToConnectBalanceBoard(found_board);
// std::this_thread::yield();
Common::SleepCurrentThread(500);
if (m_scan_mode.load() == WiimoteScanMode::SCAN_ONCE)
m_scan_mode.store(WiimoteScanMode::DO_NOT_SCAN);
}
NOTICE_LOG(WIIMOTE, "Wiimote scanning has stopped.");
NOTICE_LOG(WIIMOTE, "Wiimote scanning thread has stopped.");
}
bool Wiimote::Connect(int index)
@ -621,33 +608,27 @@ void LoadSettings()
}
// config dialog calls this when some settings change
void Initialize(bool wait)
void Initialize(::Wiimote::InitializeMode init_mode)
{
if (!g_real_wiimotes_initialized)
g_wiimote_scanner.StartThread();
if (SConfig::GetInstance().m_WiimoteContinuousScanning)
g_wiimote_scanner.StartScanning();
g_wiimote_scanner.SetScanMode(WiimoteScanMode::CONTINUOUSLY_SCAN);
else
g_wiimote_scanner.StopScanning();
g_wiimote_scanner.SetScanMode(WiimoteScanMode::DO_NOT_SCAN);
std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes());
g_wiimote_scanner.WantBB(0 != CalculateWantedBB());
// wait for connection because it should exist before state load
if (wait)
if (init_mode == ::Wiimote::InitializeMode::DO_WAIT_FOR_WIIMOTES)
{
int timeout = 100;
std::vector<Wiimote*> found_wiimotes;
Wiimote* found_board = nullptr;
g_wiimote_scanner.FindWiimotes(found_wiimotes, found_board);
if (SConfig::GetInstance().m_WiimoteContinuousScanning)
g_wiimote_scanner.SetScanMode(WiimoteScanMode::SCAN_ONCE);
while (CalculateWantedWiimotes() > CalculateConnectedWiimotes() && timeout)
{
while (CalculateWantedWiimotes() && CalculateConnectedWiimotes() < found_wiimotes.size() &&
timeout)
{
Common::SleepCurrentThread(100);
timeout--;
}
Common::SleepCurrentThread(100);
timeout--;
}
}
@ -670,17 +651,12 @@ void Stop()
// called when the Dolphin app exits
void Shutdown()
{
g_wiimote_scanner.StopScanning();
g_wiimote_scanner.StopThread();
std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
if (!g_real_wiimotes_initialized)
return;
NOTICE_LOG(WIIMOTE, "WiimoteReal::Shutdown");
g_real_wiimotes_initialized = false;
for (unsigned int i = 0; i < MAX_BBMOTES; ++i)
HandleWiimoteDisconnect(i);
}
@ -704,8 +680,6 @@ void ChangeWiimoteSource(unsigned int index, int source)
{
std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
g_wiimote_sources[index] = source;
g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes());
g_wiimote_scanner.WantBB(0 != CalculateWantedBB());
// kill real connection (or swap to different slot)
DoneWithWiimote(index);
}
@ -744,8 +718,6 @@ void TryToConnectWiimote(Wiimote* wm)
}
}
g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes());
lk.unlock();
delete wm;
@ -760,8 +732,6 @@ void TryToConnectBalanceBoard(Wiimote* wm)
wm = nullptr;
}
g_wiimote_scanner.WantBB(0 != CalculateWantedBB());
lk.unlock();
delete wm;
@ -790,10 +760,7 @@ void HandleWiimoteDisconnect(int index)
{
std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
std::swap(wm, g_wiimotes[index]);
g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes());
g_wiimote_scanner.WantBB(0 != CalculateWantedBB());
}
if (wm)
@ -811,39 +778,8 @@ void HandleFoundWiimotes(const std::vector<Wiimote*>& wiimotes)
// This is called from the GUI thread
void Refresh()
{
g_wiimote_scanner.StopScanning();
{
std::unique_lock<std::recursive_mutex> lk(g_refresh_lock);
std::vector<Wiimote*> found_wiimotes;
Wiimote* found_board = nullptr;
if (0 != CalculateWantedWiimotes() || 0 != CalculateWantedBB())
{
// Don't hang Dolphin when searching
lk.unlock();
g_wiimote_scanner.FindWiimotes(found_wiimotes, found_board);
lk.lock();
}
CheckForDisconnectedWiimotes();
// Brief rumble for already connected Wiimotes.
// Don't do this for Balance Board as it doesn't have rumble anyway.
for (int i = 0; i < MAX_WIIMOTES; ++i)
{
if (g_wiimotes[i])
{
g_wiimotes[i]->Prepare();
}
}
HandleFoundWiimotes(found_wiimotes);
if (found_board)
TryToConnectBalanceBoard(found_board);
}
Initialize();
if (!SConfig::GetInstance().m_WiimoteContinuousScanning)
g_wiimote_scanner.SetScanMode(WiimoteScanMode::SCAN_ONCE);
}
void InterruptChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 _Size)

23
Source/Core/Core/HW/WiimoteReal/WiimoteReal.h
View File

@ -12,7 +12,9 @@
#include <vector>
#include "Common/Common.h"
#include "Common/Event.h"
#include "Common/FifoQueue.h"
#include "Common/Flag.h"
#include "Common/NonCopyable.h"
#include "Core/HW/Wiimote.h"
#include "Core/HW/WiimoteReal/WiimoteRealBase.h"
@ -112,6 +114,13 @@ private:
Common::FifoQueue<Report> m_write_reports;
};
enum class WiimoteScanMode
{
DO_NOT_SCAN,
CONTINUOUSLY_SCAN,
SCAN_ONCE
};
class WiimoteScanner
{
public:
@ -120,11 +129,9 @@ public:
bool IsReady() const;
void WantWiimotes(bool do_want);
void WantBB(bool do_want);
void StartScanning();
void StopScanning();
void StartThread();
void StopThread();
void SetScanMode(WiimoteScanMode scan_mode);
void FindWiimotes(std::vector<Wiimote*>&, Wiimote*&);
@ -136,9 +143,9 @@ private:
std::thread m_scan_thread;
std::atomic<bool> m_run_thread{false};
std::atomic<bool> m_want_wiimotes{false};
std::atomic<bool> m_want_bb{false};
Common::Event m_scan_mode_changed_event;
Common::Flag m_scan_thread_running;
std::atomic<WiimoteScanMode> m_scan_mode{WiimoteScanMode::DO_NOT_SCAN};
#if defined(_WIN32)
void CheckDeviceType(std::basic_string<TCHAR>& devicepath, WinWriteMethod& write_method,

2
Source/Core/DolphinWX/ControllerConfigDiag.h
View File

@ -59,7 +59,7 @@ private:
void OnContinuousScanning(wxCommandEvent& event)
{
SConfig::GetInstance().m_WiimoteContinuousScanning = event.IsChecked();
WiimoteReal::Initialize();
WiimoteReal::Initialize(Wiimote::InitializeMode::DO_NOT_WAIT_FOR_WIIMOTES);
event.Skip();
}

6
Source/Core/DolphinWX/Frame.cpp
View File

@ -348,12 +348,14 @@ bool CFrame::InitControllers()
Window win = X11Utils::XWindowFromHandle(GetHandle());
Pad::Initialize(reinterpret_cast<void*>(win));
Keyboard::Initialize(reinterpret_cast<void*>(win));
Wiimote::Initialize(reinterpret_cast<void*>(win));
Wiimote::Initialize(reinterpret_cast<void*>(win),
Wiimote::InitializeMode::DO_NOT_WAIT_FOR_WIIMOTES);
HotkeyManagerEmu::Initialize(reinterpret_cast<void*>(win));
#else
Pad::Initialize(reinterpret_cast<void*>(GetHandle()));
Keyboard::Initialize(reinterpret_cast<void*>(GetHandle()));
Wiimote::Initialize(reinterpret_cast<void*>(GetHandle()));
Wiimote::Initialize(reinterpret_cast<void*>(GetHandle()),
Wiimote::InitializeMode::DO_NOT_WAIT_FOR_WIIMOTES);
HotkeyManagerEmu::Initialize(reinterpret_cast<void*>(GetHandle()));
#endif
return true;