The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-09 15:49:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Android/GCAdapter: Don't join current thread"

Browse Source 
This reverts commit 74ed5e55326b9d8e67dfbb8dd6f61d04bcae2445.
It solves a problem that no longer exists.
This commit is contained in:
JosJuice 2025-01-02 17:50:17 +01:00
parent 44f1c2010c
commit b134d7c2b9
1 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Source/Core/InputCommon/GCAdapter.cpp
View File

@ -66,13 +66,7 @@ static void AddGCAdapter(libusb_device* device);
static void ResetRumbleLockNeeded(); static void ResetRumbleLockNeeded();
#endif #endif
enum class CalledFromReadThread static void Reset();
{
No,
Yes,
};
static void Reset(CalledFromReadThread called_from_read_thread);
static void Setup(); static void Setup();
static void ProcessInputPayload(const u8* data, std::size_t size); static void ProcessInputPayload(const u8* data, std::size_t size);
static void ReadThreadFunc(); static void ReadThreadFunc();
@ -129,7 +123,6 @@ static std::atomic<int> s_controller_write_payload_size{0};
static std::thread s_read_adapter_thread; static std::thread s_read_adapter_thread;
static Common::Flag s_read_adapter_thread_running; static Common::Flag s_read_adapter_thread_running;
static Common::Flag s_read_adapter_thread_needs_joining;
static std::thread s_write_adapter_thread; static std::thread s_write_adapter_thread;
static Common::Flag s_write_adapter_thread_running; static Common::Flag s_write_adapter_thread_running;
static Common::Event s_write_happened; static Common::Event s_write_happened;
@ -330,7 +323,7 @@ static int HotplugCallback(libusb_context* ctx, libusb_device* dev, libusb_hotpl
else if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT) else if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT)
{ {
if (s_handle != nullptr && libusb_get_device(s_handle) == dev) if (s_handle != nullptr && libusb_get_device(s_handle) == dev)
Reset(CalledFromReadThread::No); Reset();
// Reset a potential error status now that the adapter is unplugged // Reset a potential error status now that the adapter is unplugged
if (s_status == AdapterStatus::Error) if (s_status == AdapterStatus::Error)
@ -359,7 +352,7 @@ Java_org_dolphinemu_dolphinemu_utils_GCAdapter_onAdapterDisconnected(JNIEnv* env
{ {
INFO_LOG_FMT(CONTROLLERINTERFACE, "GC adapter disconnected"); INFO_LOG_FMT(CONTROLLERINTERFACE, "GC adapter disconnected");
if (s_detected) if (s_detected)
Reset(CalledFromReadThread::No); Reset();
} }
} }
#endif #endif
@ -549,11 +542,8 @@ static void Setup()
s_detected = true; s_detected = true;
// Make sure the thread isn't in the middle of shutting down while starting a new one // Make sure the thread isn't in the middle of shutting down while starting a new one
if (s_read_adapter_thread_needs_joining.TestAndClear() || if (s_read_adapter_thread_running.TestAndClear())
s_read_adapter_thread_running.TestAndClear())
{
s_read_adapter_thread.join(); s_read_adapter_thread.join();
}
s_read_adapter_thread_running.Set(true); s_read_adapter_thread_running.Set(true);
s_read_adapter_thread = std::thread(ReadThreadFunc); s_read_adapter_thread = std::thread(ReadThreadFunc);
@ -723,7 +713,7 @@ void Shutdown()
env->GetStaticMethodID(s_adapter_class, "disableHotplugCallback", "()V"); env->GetStaticMethodID(s_adapter_class, "disableHotplugCallback", "()V");
env->CallStaticVoidMethod(s_adapter_class, disable_hotplug_callback_func); env->CallStaticVoidMethod(s_adapter_class, disable_hotplug_callback_func);
#endif #endif
Reset(CalledFromReadThread::No); Reset();
#if GCADAPTER_USE_LIBUSB_IMPLEMENTATION #if GCADAPTER_USE_LIBUSB_IMPLEMENTATION
s_libusb_context.reset(); s_libusb_context.reset();
@ -737,7 +727,7 @@ void Shutdown()
} }
} }
static void Reset(CalledFromReadThread called_from_read_thread) static void Reset()
{ {
std::unique_lock lock(s_init_mutex, std::defer_lock); std::unique_lock lock(s_init_mutex, std::defer_lock);
if (!lock.try_lock()) if (!lock.try_lock())
@ -750,16 +740,8 @@ static void Reset(CalledFromReadThread called_from_read_thread)
return; return;
#endif #endif
if (called_from_read_thread == CalledFromReadThread::No)
{
if (s_read_adapter_thread_running.TestAndClear()) if (s_read_adapter_thread_running.TestAndClear())
s_read_adapter_thread.join(); s_read_adapter_thread.join();
}
else
{
s_read_adapter_thread_needs_joining.Set();
s_read_adapter_thread_running.Clear();
}
// The read thread will close the write thread // The read thread will close the write thread
s_port_states.fill({}); s_port_states.fill({});