[input/sdl] nuke SDL_Vibration thread

Signed-off-by: lizzie <lizzie@eden-emu.dev>

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt

@@ -83,6 +83,7 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
     SHOW_SHADERS_BUILDING("show_shaders_building"),
 
     DEBUG_FLUSH_BY_LINE("flush_line"),
+    EXTENDED_LOGGING("extended_logging"),
     DONT_SHOW_DRIVER_SHADER_WARNING("dont_show_driver_shader_warning"),
     ENABLE_OVERLAY("enable_overlay"),
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt

@@ -262,6 +262,13 @@ abstract class SettingsItem(
                     descriptionId = R.string.flush_by_line_description
                 )
             )
+            put(
+                SwitchSetting(
+                    BooleanSetting.EXTENDED_LOGGING,
+                    titleId = R.string.extended_logging,
+                    descriptionId = R.string.extended_logging_description
+                )
+            )
 
             val dockedModeSetting = object : AbstractBooleanSetting {
                 override val key = BooleanSetting.USE_DOCKED_MODE.key

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt

@@ -1323,6 +1323,7 @@ class SettingsFragmentPresenter(
                 add(HeaderSetting(R.string.log))
 
                 add(BooleanSetting.DEBUG_FLUSH_BY_LINE.key)
+                add(BooleanSetting.EXTENDED_LOGGING.key)
                 add(StringSetting.LOG_FILTER.key)
             }
 

src/android/app/src/main/res/values/strings.xml

@@ -636,6 +636,8 @@
     <string name="log">Logging</string>
     <string name="flush_by_line">Flush debug logs by line</string>
     <string name="flush_by_line_description">Flushes debugging logs on each line written, making debugging easier in cases of crashing or freezing.</string>
+    <string name="extended_logging">Enable extended logging</string>
+    <string name="extended_logging_description">Increases the maximum log file size from 100 MiB to 1 GiB.</string>
     <string name="log_filter">Log filter</string>
     <string name="log_filter_description">Controls Eden\'s log categories. Example: *:Info Service.LM:Debug</string>
 

src/input_common/drivers/sdl_driver.cpp

@@ -697,16 +697,6 @@ SDLDriver::SDLDriver(std::string input_engine_) : InputEngine(std::move(input_en
     SDL_AddEventWatch(&SDLEventWatcher, this);
 
     initialized = true;
-    if (start_thread) {
-        vibration_thread = std::thread([this] {
-            Common::SetCurrentThreadName("SDL_Vibration");
-            using namespace std::chrono_literals;
-            while (initialized) {
-                SendVibrations();
-                std::this_thread::sleep_for(250ms); // 4 TPS
-            }
-        });
-    }
     // Because the events for joystick connection happens before we have our event watcher added, we
     // can just open all the joysticks right here
     int joystick_count = 0;
@@ -725,7 +715,6 @@ SDLDriver::~SDLDriver() {
 
     initialized = false;
     if (start_thread) {
-        vibration_thread.join();
         SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_GAMEPAD);
     }
 }
@@ -805,10 +794,7 @@ Common::Input::DriverResult SDLDriver::SetVibration(
         .type = Common::Input::VibrationAmplificationType::Exponential,
     };
 
-    vibration_queue.Push(VibrationRequest{
+    joystick->RumblePlay(new_vibration);
-        .identifier = identifier,
-        .vibration = new_vibration,
-    });
 
     return Common::Input::DriverResult::Success;
 }
@@ -852,31 +838,6 @@ bool SDLDriver::IsVibrationEnabled(const PadIdentifier& identifier) {
     return true;
 }
 
-void SDLDriver::SendVibrations() {
-    std::vector<VibrationRequest> filtered_vibrations{};
-    while (!vibration_queue.Empty()) {
-        VibrationRequest request;
-        vibration_queue.Pop(request);
-        const auto joystick = GetSDLJoystickByGUID(request.identifier.guid.RawString(),
-                                                   static_cast<int>(request.identifier.port));
-        const auto it = std::find_if(filtered_vibrations.begin(), filtered_vibrations.end(),
-                                     [request](VibrationRequest vibration) {
-                                         return vibration.identifier == request.identifier;
-                                     });
-        if (it == filtered_vibrations.end()) {
-            filtered_vibrations.push_back(std::move(request));
-            continue;
-        }
-        *it = request;
-    }
-
-    for (const auto& vibration : filtered_vibrations) {
-        const auto joystick = GetSDLJoystickByGUID(vibration.identifier.guid.RawString(),
-                                                   static_cast<int>(vibration.identifier.port));
-        joystick->RumblePlay(vibration.vibration);
-    }
-}
-
 Common::ParamPackage SDLDriver::BuildAnalogParamPackageForButton(int port, const Common::UUID& guid,
                                                                  s32 axis, float value) const {
     Common::ParamPackage params{};

src/input_common/drivers/sdl_driver.h

@@ -113,16 +113,11 @@ private:
     /// Returns true if the button is on the left joycon
     bool IsButtonOnLeftSide(Settings::NativeButton::Values button) const;
 
-    /// Queue of vibration request to controllers
-    Common::SPSCQueue<VibrationRequest> vibration_queue;
-
     /// Map of GUID of a list of corresponding virtual Joysticks
     ::Common::unordered_map<Common::UUID, std::vector<std::shared_ptr<SDLJoystick>>> joystick_map;
     std::mutex joystick_map_mutex;
 
-    bool start_thread = false;
     std::atomic<bool> initialized = false;
-
+    bool start_thread;
-    std::thread vibration_thread;
 };
 } // namespace InputCommon

src/video_core/gpu.cpp

@@ -55,11 +55,11 @@ constexpr u64 GpuClockMultiplier(Settings::GpuClock clock) {
 
 struct GPU::Impl {
     explicit Impl(Core::System& system_, bool is_async_, bool use_nvdec_)
-        : gpu_thread{system_}
+        : system{system_}
-        , system{system_}
         , use_nvdec{use_nvdec_}
         , shader_notify()
         , is_async{is_async_}
+        , gpu_thread{system_}
     {}
 
     ~Impl() = default;
@@ -301,10 +301,6 @@ struct GPU::Impl {
         return out;
     }
 
-    // Destruction of thread must be done before all (non trivial)
-    // previous members has been destroyed
-    VideoCommon::GPUThread::ThreadManager gpu_thread;
-
     Core::System& system;
 
     std::unique_ptr<VideoCore::RendererBase> renderer;
@@ -333,6 +329,7 @@ struct GPU::Impl {
 
     const bool is_async;
 
+    VideoCommon::GPUThread::ThreadManager gpu_thread;
     std::unique_ptr<Core::Frontend::GraphicsContext> cpu_context;
 
     Tegra::Control::Scheduler scheduler;